Module Name: src Committed By: tron Date: Wed Jan 2 19:45:49 UTC 2013
Modified Files: src/external/ibm-public/postfix/lib/global: Makefile src/external/ibm-public/postfix/lib/util: Makefile src/external/ibm-public/postfix/libexec/postscreen: Makefile src/external/ibm-public/postfix/sbin/postconf: Makefile Log Message: Fix build of Postfix 2.9.5. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/ibm-public/postfix/lib/global/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/ibm-public/postfix/lib/util/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/external/ibm-public/postfix/libexec/postscreen/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/ibm-public/postfix/sbin/postconf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/ibm-public/postfix/lib/global/Makefile diff -u src/external/ibm-public/postfix/lib/global/Makefile:1.3 src/external/ibm-public/postfix/lib/global/Makefile:1.4 --- src/external/ibm-public/postfix/lib/global/Makefile:1.3 Sun Mar 4 16:12:24 2012 +++ src/external/ibm-public/postfix/lib/global/Makefile Wed Jan 2 19:45:48 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/03/04 16:12:24 tron Exp $ +# $NetBSD: Makefile,v 1.4 2013/01/02 19:45:48 tron Exp $ LIBISPRIVATE= yes @@ -13,8 +13,8 @@ SRCS= abounce.c anvil_clnt.c been_here.c canon_addr.c cfg_parser.c cleanup_strerror.c cleanup_strflags.c \ clnt_stream.c conv_time.c db_common.c debug_peer.c debug_process.c \ defer.c deliver_completed.c deliver_flock.c deliver_pass.c \ - deliver_request.c dict_ldap.c dict_mysql.c dict_pgsql.c \ - dict_proxy.c dict_sqlite.c \ + deliver_request.c dict_ldap.c dict_memcache.c dict_mysql.c \ + dict_pgsql.c dict_proxy.c dict_sqlite.c \ domain_list.c dot_lockfile.c dot_lockfile_as.c \ dsb_scan.c dsn.c dsn_buf.c dsn_mask.c dsn_print.c dsn_util.c \ ehlo_mask.c ext_prop.c file_id.c flush_clnt.c header_opts.c \ @@ -41,6 +41,7 @@ SRCS= abounce.c anvil_clnt.c been_here.c verp_sender.c wildcard_inet_addr.c xtext.c data_redirect.c \ delivered_hdr.c fold_addr.c mkmap_proxy.c header_body_checks.c \ mail_conf_nint.c match_service.c match_service.h mail_conf_nbool.c \ - smtp_reply_footer.c + smtp_reply_footer.c memcache_proto.c mkmap_fail.c safe_ultostr.c \ + server_acl.c verify_sender_addr.c mail_version.c .include <bsd.lib.mk> Index: src/external/ibm-public/postfix/lib/util/Makefile diff -u src/external/ibm-public/postfix/lib/util/Makefile:1.4 src/external/ibm-public/postfix/lib/util/Makefile:1.5 --- src/external/ibm-public/postfix/lib/util/Makefile:1.4 Wed Mar 2 22:24:55 2011 +++ src/external/ibm-public/postfix/lib/util/Makefile Wed Jan 2 19:45:49 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2011/03/02 22:24:55 tron Exp $ +# $NetBSD: Makefile,v 1.5 2013/01/02 19:45:49 tron Exp $ LIBISPRIVATE= yes @@ -43,7 +43,8 @@ SRCS= alldig.c allprint.c argv.c argv_sp allascii.c load_file.c killme_after.c vstream_tweak.c edit_file.c \ inet_windowsize.c unix_pass_fd_fix.c dict_cache.c dict_thash.c \ ip_match.c nbbio.c stream_pass_connect.c unix_pass_listen.c \ - unix_pass_trigger.c valid_utf_8.c myrand.c + unix_pass_trigger.c valid_utf_8.c myrand.c base32_code.c dict_fail.c \ + dict_surrogate.c dict_test.c msg_rate_delay.c warn_stat.c COPTS.unix_recv_fd.c = -Wno-stack-protector COPTS.unix_send_fd.c = -Wno-stack-protector Index: src/external/ibm-public/postfix/libexec/postscreen/Makefile diff -u src/external/ibm-public/postfix/libexec/postscreen/Makefile:1.1 src/external/ibm-public/postfix/libexec/postscreen/Makefile:1.2 --- src/external/ibm-public/postfix/libexec/postscreen/Makefile:1.1 Wed Mar 2 22:24:55 2011 +++ src/external/ibm-public/postfix/libexec/postscreen/Makefile Wed Jan 2 19:45:49 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2011/03/02 22:24:55 tron Exp $ +# $NetBSD: Makefile,v 1.2 2013/01/02 19:45:49 tron Exp $ NOMAN= # defined @@ -9,7 +9,7 @@ PROG= postscreen DIST= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist/src/${PROG} .PATH: ${DIST} -SRCS= postscreen.c postscreen_access.c postscreen_dict.c postscreen_dnsbl.c \ +SRCS= postscreen.c postscreen_dict.c postscreen_dnsbl.c \ postscreen_early.c postscreen_expand.c postscreen_misc.c \ postscreen_send.c postscreen_smtpd.c postscreen_starttls.c \ postscreen_state.c postscreen_tests.c Index: src/external/ibm-public/postfix/sbin/postconf/Makefile diff -u src/external/ibm-public/postfix/sbin/postconf/Makefile:1.3 src/external/ibm-public/postfix/sbin/postconf/Makefile:1.4 --- src/external/ibm-public/postfix/sbin/postconf/Makefile:1.3 Wed Mar 2 22:24:56 2011 +++ src/external/ibm-public/postfix/sbin/postconf/Makefile Wed Jan 2 19:45:49 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2011/03/02 22:24:56 tron Exp $ +# $NetBSD: Makefile,v 1.4 2013/01/02 19:45:49 tron Exp $ # XXX Note we aren't building ../conf/main.cf.default # The shipped makefiles construct it using postconf -d after building @@ -15,16 +15,18 @@ PROG= postconf DIST= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist/src/${PROG} .PATH: ${DIST} -PSRCS= postconf.c -GENSRCS=bool_table.h bool_vars.h int_table.h int_vars.h nbool_table.h \ - nbool_vars.h nint_table.h nint_vars.h str_table.h str_vars.h \ - time_table.h time_vars.h raw_table.h raw_vars.h -AUTOSRCS=auto_table.h auto_vars.h +PSRCS= postconf.c postconf_builtin.c postconf_dbms.c postconf_edit.c \ + postconf_main.c postconf_master.c postconf_misc.c postconf_node.c \ + postconf_other.c postconf_service.c postconf_unused.c postconf_user.c +GENSRCS=bool_table.h bool_vars.h int_table.h int_vars.h str_table.h \ + str_vars.h time_table.h time_vars.h raw_table.h raw_vars.h \ + nint_table.h nint_vars.h nbool_table.h nbool_vars.h long_table.h \ + long_vars.h -SRCS= ${PSRCS} ${GENSRCS} ${AUTOSRCS} -DPSRCS= ${GENSRCS} ${AUTOSRCS} +SRCS= ${PSRCS} ${GENSRCS} +DPSRCS= ${GENSRCS} -CLEANFILES+= ${GENSRCS} ${AUTOSRCS} +CLEANFILES+= ${GENSRCS} CPPFLAGS+= -I. @@ -39,7 +41,4 @@ postconf-hdrs.stamp: ${DIST}/../global/m ${TOOL_AWK} -f ${DIST}/extract.awk ${DIST}/../*/*.c | ${HOST_SH} - touch ${.TARGET} -auto_table.h auto_vars.h: ${DIST}/auto.awk - ${TOOL_AWK} -f ${DIST}/auto.awk - .include <bsd.prog.mk>