From 2ad3ac59783857bf6afc7ad9d0a9927233072a16 Mon Sep 17 00:00:00 2001 From: heas Date: Sat, 19 May 2007 18:08:54 +0000 Subject: [PATCH] Changes for PFIX 2.4.1 --- gnu/usr.sbin/postfix/README_FILES/Makefile | 7 ++++--- gnu/usr.sbin/postfix/cleanup/Makefile | 5 +++-- gnu/usr.sbin/postfix/html/Makefile | 9 ++++----- gnu/usr.sbin/postfix/oqmgr/Makefile | 4 ++-- gnu/usr.sbin/postfix/qmgr/Makefile | 7 ++++--- gnu/usr.sbin/postfix/util/Makefile | 7 +++---- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/gnu/usr.sbin/postfix/README_FILES/Makefile b/gnu/usr.sbin/postfix/README_FILES/Makefile index 3859b6885c0c..f07f82fd56e1 100644 --- a/gnu/usr.sbin/postfix/README_FILES/Makefile +++ b/gnu/usr.sbin/postfix/README_FILES/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/07/19 17:43:23 rpaulo Exp $ +# $NetBSD: Makefile,v 1.11 2007/05/19 18:08:54 heas Exp $ .include @@ -15,13 +15,14 @@ FILES= AAAREADME ADDRESS_CLASS_README ADDRESS_REWRITING_README \ CONNECTION_CACHE_README CONTENT_INSPECTION_README \ DATABASE_README DSN_README DB_README DEBUG_README ETRN_README \ FILTER_README \ - IPV6_README LDAP_README LMTP_README LOCAL_RECIPIENT_README \ + IPV6_README LDAP_README LOCAL_RECIPIENT_README \ MAILDROP_README MILTER_README MYSQL_README NFS_README OVERVIEW \ PCRE_README \ PGSQL_README QMQP_README QSHAPE_README RELEASE_NOTES \ RESTRICTION_CLASS_README SASL_README SCHEDULER_README \ SMTPD_ACCESS_README SMTPD_POLICY_README SMTPD_PROXY_README \ - STANDARD_CONFIGURATION_README TLS_README TUNING_README UUCP_README \ + STANDARD_CONFIGURATION_README TLS_README TLS_LEGACY_README \ + TUNING_README UUCP_README \ VERP_README VIRTUAL_README XCLIENT_README XFORWARD_README # not installed: diff --git a/gnu/usr.sbin/postfix/cleanup/Makefile b/gnu/usr.sbin/postfix/cleanup/Makefile index 36233946f4bf..84a658d59ff8 100644 --- a/gnu/usr.sbin/postfix/cleanup/Makefile +++ b/gnu/usr.sbin/postfix/cleanup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/07/19 02:04:43 rpaulo Exp $ +# $NetBSD: Makefile,v 1.7 2007/05/19 18:08:55 heas Exp $ NOMAN= # defined @@ -15,7 +15,8 @@ SRCS= cleanup.c cleanup_out.c cleanup_envelope.c cleanup_message.c \ cleanup_extracted.c cleanup_state.c cleanup_rewrite.c \ cleanup_map11.c cleanup_map1n.c cleanup_masquerade.c \ cleanup_out_recipient.c cleanup_init.c cleanup_api.c \ - cleanup_addr.c cleanup_bounce.c cleanup_milter.c + cleanup_addr.c cleanup_bounce.c cleanup_milter.c \ + cleanup_body_edit.c cleanup_region.c cleanup_final.c DPADD+= ${LIBPMASTER} ${LIBPMILTER} ${LIBPGLOBAL} ${LIBPUTIL} LDADD+= ${LIBPMASTER} ${LIBPMILTER} ${LIBPGLOBAL} ${LIBPUTIL} diff --git a/gnu/usr.sbin/postfix/html/Makefile b/gnu/usr.sbin/postfix/html/Makefile index 7b83d47b4475..6497a87b77e9 100644 --- a/gnu/usr.sbin/postfix/html/Makefile +++ b/gnu/usr.sbin/postfix/html/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2006/08/14 21:35:38 rpaulo Exp $ +# $NetBSD: Makefile,v 1.18 2007/05/19 18:08:55 heas Exp $ .include @@ -32,15 +32,15 @@ PFX_READMES= ADDRESS_CLASS_README.html ADDRESS_REWRITING_README.html \ CONNECTION_CACHE_README.html CONTENT_INSPECTION_README.html \ DATABASE_README.html DSN_README.html DB_README.html DEBUG_README.html \ ETRN_README.html FILTER_README.html IPV6_README.html \ - LDAP_README.html LMTP_README.html \ + LDAP_README.html \ LOCAL_RECIPIENT_README.html MAILDROP_README.html MYSQL_README.html \ MILTER_README.html \ NFS_README.html OVERVIEW.html PCRE_README.html \ - PGSQL_README.html QMQP_README.html QSHAPE_README.html \ + PGSQL_README.html QSHAPE_README.html \ RESTRICTION_CLASS_README.html SASL_README.html SCHEDULER_README.html \ SMTPD_ACCESS_README.html SMTPD_POLICY_README.html \ SMTPD_PROXY_README.html STANDARD_CONFIGURATION_README.html \ - TLS_README.html TUNING_README.html \ + TLS_README.html TLS_LEGACY_README.html TUNING_README.html \ UUCP_README.html VERP_README.html VIRTUAL_README.html \ XCLIENT_README.html XFORWARD_README.html @@ -54,7 +54,6 @@ SYMLINKS+=sendmail.1.html ${BINDIR}/newaliases.1.html # not installed: # CDB_README.html INSTALL.html LINUX_README.html PACKAGE_README.html -# ULTRIX_README.html CYRUS_README.html # qmqpd.8.html qmqp-source.1.html qmqp-sink.1.html .endif # } diff --git a/gnu/usr.sbin/postfix/oqmgr/Makefile b/gnu/usr.sbin/postfix/oqmgr/Makefile index dd671eeb982d..a74e13bc5c82 100644 --- a/gnu/usr.sbin/postfix/oqmgr/Makefile +++ b/gnu/usr.sbin/postfix/oqmgr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2006/07/19 02:04:44 rpaulo Exp $ +# $NetBSD: Makefile,v 1.3 2007/05/19 18:08:55 heas Exp $ NOMAN= # defined @@ -13,7 +13,7 @@ BINDIR= ${PFIX_LIBEXECDIR} SRCS= qmgr.c qmgr_active.c qmgr_transport.c qmgr_queue.c qmgr_entry.c \ qmgr_message.c qmgr_deliver.c qmgr_move.c \ - qmgr_defer.c qmgr_enable.c qmgr_scan.c qmgr_bounce.c + qmgr_defer.c qmgr_enable.c qmgr_scan.c qmgr_bounce.c qmgr_error.c DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL} LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL} diff --git a/gnu/usr.sbin/postfix/qmgr/Makefile b/gnu/usr.sbin/postfix/qmgr/Makefile index 36fbabdedf72..4bd61fd05d2f 100644 --- a/gnu/usr.sbin/postfix/qmgr/Makefile +++ b/gnu/usr.sbin/postfix/qmgr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/07/19 02:04:44 rpaulo Exp $ +# $NetBSD: Makefile,v 1.7 2007/05/19 18:08:55 heas Exp $ NOMAN= # defined @@ -12,8 +12,9 @@ DIST= ${NETBSDSRCDIR}/gnu/dist/postfix/src/${PROG} BINDIR= ${PFIX_LIBEXECDIR} SRCS= qmgr.c qmgr_active.c qmgr_transport.c qmgr_queue.c qmgr_entry.c \ - qmgr_message.c qmgr_deliver.c qmgr_move.c qmgr_job.c \ - qmgr_peer.c qmgr_defer.c qmgr_enable.c qmgr_scan.c qmgr_bounce.c + qmgr_message.c qmgr_deliver.c qmgr_move.c \ + qmgr_job.c qmgr_peer.c \ + qmgr_defer.c qmgr_enable.c qmgr_scan.c qmgr_bounce.c qmgr_error.c DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL} LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL} diff --git a/gnu/usr.sbin/postfix/util/Makefile b/gnu/usr.sbin/postfix/util/Makefile index 5a3c0214a416..ac22a623a344 100644 --- a/gnu/usr.sbin/postfix/util/Makefile +++ b/gnu/usr.sbin/postfix/util/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/11/09 21:40:20 christos Exp $ +# $NetBSD: Makefile,v 1.16 2007/05/19 18:08:55 heas Exp $ MKPRIVATELIB= yes @@ -24,8 +24,7 @@ SRCS= alldig.c allprint.c argv.c argv_split.c attr_clnt.c attr_print0.c \ inet_addr_local.c inet_connect.c inet_listen.c inet_proto.c \ inet_trigger.c line_wrap.c lowercase.c lstat_as.c mac_expand.c \ mac_parse.c make_dirs.c mask_addr.c match_list.c match_ops.c msg.c \ - msg_output.c msg_syslog.c msg_vstream.c mvect.c myaddrinfo.c \ - myflock.c \ + msg_output.c msg_syslog.c msg_vstream.c mvect.c myaddrinfo.c myflock.c \ mymalloc.c myrand.c mystrtok.c name_code.c name_mask.c netstring.c \ neuter.c non_blocking.c nvtable.c open_as.c open_limit.c open_lock.c \ peekfd.c percentm.c posix_signals.c printable.c rand_sleep.c \ @@ -41,7 +40,7 @@ SRCS= alldig.c allprint.c argv.c argv_split.c attr_clnt.c attr_print0.c \ username.c valid_hostname.c vbuf.c vbuf_print.c vstream.c \ vstream_popen.c vstring.c vstring_vstream.c watchdog.c writable.c \ write_buf.c write_wait.c sane_basename.c format_tv.c allspace.c \ - allascii.c load_file.c + allascii.c load_file.c killme_after.c COPTS.unix_recv_fd.c = -Wno-stack-protector COPTS.unix_send_fd.c = -Wno-stack-protector