summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorheas <heas@NetBSD.org>2004-04-27 05:33:55 +0000
committerheas <heas@NetBSD.org>2004-04-27 05:33:55 +0000
commit4e8018dc5939b297a07e9d8cf56e9527a4366da4 (patch)
treea9f64b111e501567fe37a7a212f732913f73e0ae /gnu
parent01837603b00e4b98dfdb26276ea0c78dcf585d63 (diff)
Updates for Postfix 2.1.0
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.sbin/postfix/Makefile9
-rw-r--r--gnu/usr.sbin/postfix/README_FILES/Makefile24
-rw-r--r--gnu/usr.sbin/postfix/bounce/Makefile4
-rw-r--r--gnu/usr.sbin/postfix/cleanup/Makefile5
-rw-r--r--gnu/usr.sbin/postfix/conf/Makefile17
-rw-r--r--gnu/usr.sbin/postfix/global/Makefile44
-rw-r--r--gnu/usr.sbin/postfix/html/Makefile39
-rw-r--r--gnu/usr.sbin/postfix/man/man1/Makefile11
-rw-r--r--gnu/usr.sbin/postfix/man/man5/Makefile11
-rw-r--r--gnu/usr.sbin/postfix/man/man8/Makefile12
-rw-r--r--gnu/usr.sbin/postfix/oqmgr/Makefile (renamed from gnu/usr.sbin/postfix/nqmgr/Makefile)5
-rw-r--r--gnu/usr.sbin/postfix/qmgr/Makefile3
-rw-r--r--gnu/usr.sbin/postfix/smtp/Makefile4
-rw-r--r--gnu/usr.sbin/postfix/smtpd/Makefile5
-rw-r--r--gnu/usr.sbin/postfix/util/Makefile53
-rw-r--r--gnu/usr.sbin/postfix/verify/Makefile19
16 files changed, 147 insertions, 118 deletions
diff --git a/gnu/usr.sbin/postfix/Makefile b/gnu/usr.sbin/postfix/Makefile
index 69d31d937a6..7dec6c9c0ef 100644
--- a/gnu/usr.sbin/postfix/Makefile
+++ b/gnu/usr.sbin/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/02/07 05:10:44 lukem Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/27 05:33:55 heas Exp $
# The first four of these are libraries and have to be built first.
@@ -6,10 +6,11 @@
SUBDIR= util global dns masterlib .WAIT \
README_FILES bounce cleanup error flush html \
- lmtp local man master nqmgr pickup pipe postalias \
+ lmtp local man master oqmgr pickup pipe postalias \
postcat postconf postdrop postfix postkick postlock \
postlog postmap postqueue postsuper proxymap qmgr sendmail \
- showq smtp smtpd spawn trivial-rewrite virtual
+ showq smtp smtpd spawn trivial-rewrite verify virtual \
+ proxymap
.if ${MKSHARE} != "no" || \
make(clean) || make(cleandir) || make(distclean) || make(obj)
@@ -22,7 +23,7 @@ SUBDIR+=conf
# share/examples/postfix, and postfix-etc/Makefile (only called by
# make distribution) installs a copy in /etc/postfix
-# also not built: smtpstone (unneeded), qmqpd (unneeded)
+# also not built: fsstone (unneeded), smtpstone (unneeded), qmqpd (unneeded)
# The distribution: target is invoked from the make distribution
# target in src/etc/Makefile. It is there for building the /etc/
diff --git a/gnu/usr.sbin/postfix/README_FILES/Makefile b/gnu/usr.sbin/postfix/README_FILES/Makefile
index d53502c6e29..f87c82df847 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.5 2004/01/12 01:35:53 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/27 05:33:55 heas Exp $
.include <bsd.own.mk>
@@ -9,14 +9,20 @@ BINDIR= ${PFIX_EXAMPLEDIR}
DIST= ${NETBSDSRCDIR}/gnu/dist/postfix/README_FILES
.PATH: ${DIST}
-FILES= ADDRESS_CLASS_README DEBUG_README ETRN_README FILTER_README \
- LDAP_README LMTP_README LOCAL_RECIPIENT_README MAILDROP_README \
- MYSQL_README NFS_README PCRE_README QMQP_README RELEASE_NOTES \
- RESTRICTION_CLASS_README SASL_README UUCP_README VERP_README \
- VIRTUAL_README
-
-# DB_README INSTALL LINUX_README MACOSX_README ULTRIX_README
-# PACKAGE_README
+FILES= ADDRESS_CLASS_README ADDRESS_REWRITING_README \
+ ADDRESS_VERIFICATION_README BACKSCATTER_README \
+ BASIC_CONFIGURATION_README BUILTIN_FILTER_README \
+ CONTENT_INSPECTION_README DEBUG_README ETRN_README FILTER_README \
+ LMTP_README LOCAL_RECIPIENT_README MAILDROP_README NFS_README \
+ OVERVIEW PCRE_README QSHAPE_README RELEASE_NOTES \
+ RESTRICTION_CLASS_README SASL_README SCHEDULER_README \
+ SMTPD_ACCESS_README SMTPD_POLICY_README SMTPD_PROXY_README \
+ STANDARD_CONFIGURATION_README TUNING_README UUCP_README VERP_README \
+ VIRTUAL_README XCLIENT_README XFORWARD_README
+
+# AAAREADME CYRUS_README DATABASE_README DB_README INSTALL
+# LDAP_README LINUX_README MYSQL_README PACKAGE_README PGSQL_README
+# QMQP_README ULTRIX_README
.endif
diff --git a/gnu/usr.sbin/postfix/bounce/Makefile b/gnu/usr.sbin/postfix/bounce/Makefile
index 536a22d7e7f..4e2beb8490f 100644
--- a/gnu/usr.sbin/postfix/bounce/Makefile
+++ b/gnu/usr.sbin/postfix/bounce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/12/24 19:47:49 perry Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/27 05:33:55 heas Exp $
NOMAN= # defined
@@ -13,7 +13,7 @@ BINDIR= ${PFIX_LIBEXECDIR}
SRCS = bounce.c bounce_append_service.c bounce_notify_service.c \
bounce_cleanup.c bounce_notify_util.c bounce_notify_verp.c \
- bounce_one_service.c
+ bounce_one_service.c bounce_warn_service.c bounce_trace_service.c
DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
diff --git a/gnu/usr.sbin/postfix/cleanup/Makefile b/gnu/usr.sbin/postfix/cleanup/Makefile
index 53280d3551a..4ec96c40548 100644
--- a/gnu/usr.sbin/postfix/cleanup/Makefile
+++ b/gnu/usr.sbin/postfix/cleanup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/09/19 03:09:44 lukem Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/27 05:33:55 heas Exp $
NOMAN= # defined
@@ -14,7 +14,8 @@ BINDIR= ${PFIX_LIBEXECDIR}
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_out_recipient.c cleanup_init.c cleanup_api.c \
+ cleanup_addr.c
DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
diff --git a/gnu/usr.sbin/postfix/conf/Makefile b/gnu/usr.sbin/postfix/conf/Makefile
index d934f165c8c..a6a3011e710 100644
--- a/gnu/usr.sbin/postfix/conf/Makefile
+++ b/gnu/usr.sbin/postfix/conf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/12/24 19:47:49 perry Exp $
+# $NetBSD: Makefile,v 1.8 2004/04/27 05:33:55 heas Exp $
.include <bsd.own.mk>
@@ -9,19 +9,8 @@ DIST= ${NETBSDSRCDIR}/gnu/dist/postfix/conf
# Not built: main.cf.default
-FILES= LICENSE access aliases canonical main.cf master.cf \
- pcre_table post-install postfix-files regexp_table \
- relocated sample-aliases.cf sample-auth.cf \
- sample-canonical.cf sample-compatibility.cf \
- sample-debug.cf sample-filter.cf sample-flush.cf \
- sample-ldap.cf sample-lmtp.cf sample-local.cf \
- sample-mime.cf sample-misc.cf sample-pcre-access.cf \
- sample-pcre-body.cf sample-pcre-header.cf sample-qmqpd.cf \
- sample-rate.cf sample-regexp-access.cf sample-regexp-body.cf \
- sample-regexp-header.cf sample-relocated.cf \
- sample-resource.cf sample-rewrite.cf sample-smtp.cf \
- sample-smtpd.cf sample-transport.cf sample-virtual.cf \
- transport virtual
+FILES= LICENSE access aliases canonical header_checks main.cf master.cf \
+ post-install postfix-files relocated transport virtual
SCRIPTS= postfix-script
diff --git a/gnu/usr.sbin/postfix/global/Makefile b/gnu/usr.sbin/postfix/global/Makefile
index c22b8c7c40e..14fc89f740e 100644
--- a/gnu/usr.sbin/postfix/global/Makefile
+++ b/gnu/usr.sbin/postfix/global/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/03/08 19:12:16 perry Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/27 05:33:55 heas Exp $
NOLINT= # defined
NOPIC= # defined
@@ -11,28 +11,30 @@ LIB= global
DIST= ${NETBSDSRCDIR}/gnu/dist/postfix/src/${LIB}
.PATH: ${DIST}
-SRCS= been_here.c bounce.c canon_addr.c cleanup_strerror.c clnt_stream.c \
- debug_peer.c debug_process.c defer.c deliver_completed.c \
- deliver_flock.c deliver_pass.c deliver_request.c domain_list.c \
- dot_lockfile.c dot_lockfile_as.c ext_prop.c file_id.c \
- header_opts.c is_header.c mail_addr.c mail_addr_crunch.c \
- mail_addr_find.c mail_addr_map.c mail_command_server.c \
- mail_command_client.c mail_conf.c mail_conf_bool.c mail_conf_int.c \
- mail_conf_raw.c mail_conf_str.c mail_connect.c mail_copy.c \
- mail_date.c mail_error.c mail_flush.c mail_open_ok.c mail_params.c \
- mail_pathname.c mail_queue.c mail_run.c \
- mail_scan_dir.c mail_stream.c mail_task.c mail_trigger.c maps.c \
- mark_corrupt.c mkmap_db.c mkmap_dbm.c mkmap_open.c mynetworks.c \
- mypwd.c namadr_list.c off_cvt.c opened.c own_inet_addr.c \
- pipe_command.c post_mail.c quote_821_local.c \
+SRCS= abounce.c been_here.c bounce.c bounce_log.c \
+ canon_addr.c cfg_parser.c cleanup_strerror.c cleanup_strflags.c \
+ clnt_stream.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 domain_list.c \
+ dot_lockfile.c dot_lockfile_as.c ext_prop.c file_id.c flush_clnt.c \
+ header_opts.c header_token.c hold_message.c input_transp.c \
+ is_header.c log_adhoc.c mail_addr.c mail_addr_crunch.c \
+ mail_addr_find.c mail_addr_map.c mail_command_client.c \
+ mail_command_server.c mail_conf.c mail_conf_bool.c mail_conf_int.c \
+ mail_conf_raw.c mail_conf_str.c mail_conf_time.c mail_connect.c \
+ mail_copy.c mail_date.c mail_dict.c mail_error.c mail_flush.c \
+ mail_open_ok.c mail_params.c mail_pathname.c mail_queue.c \
+ mail_run.c mail_scan_dir.c mail_stream.c mail_task.c mail_trigger.c \
+ maps.c mark_corrupt.c match_parent_style.c mbox_conf.c \
+ mbox_open.c mime_state.c mkmap_db.c mkmap_dbm.c mkmap_open.c \
+ mynetworks.c mypwd.c namadr_list.c off_cvt.c opened.c \
+ own_inet_addr.c pipe_command.c post_mail.c quote_821_local.c \
quote_822_local.c rec_streamlf.c rec_type.c recipient_list.c \
record.c remove.c resolve_clnt.c resolve_local.c rewrite_clnt.c \
- sent.c smtp_stream.c split_addr.c string_list.c sys_exits.c \
- timed_ipc.c tok822_find.c tok822_node.c tok822_parse.c \
- tok822_resolve.c tok822_rewrite.c tok822_tree.c xtext.c bounce_log.c \
- flush_clnt.c mail_conf_time.c mbox_conf.c mbox_open.c abounce.c \
- verp_sender.c match_parent_style.c mime_state.c header_token.c \
- strip_addr.c virtual8_maps.c hold_message.c dict_proxy.c mail_dict.c
+ sent.c smtp_stream.c split_addr.c string_list.c strip_addr.c \
+ sys_exits.c timed_ipc.c tok822_find.c tok822_node.c tok822_parse.c \
+ tok822_resolve.c tok822_rewrite.c tok822_tree.c trace.c verify.c \
+ verify_clnt.c verp_sender.c virtual8_maps.c xtext.c
# IPv6
#SRCS+= wildcard_inet_addr.c
diff --git a/gnu/usr.sbin/postfix/html/Makefile b/gnu/usr.sbin/postfix/html/Makefile
index 977b4059100..997a6c13e49 100644
--- a/gnu/usr.sbin/postfix/html/Makefile
+++ b/gnu/usr.sbin/postfix/html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/12 01:33:51 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/27 05:33:55 heas Exp $
.include <bsd.own.mk>
@@ -9,27 +9,26 @@ BINDIR= ${PFIX_HTMLDIR}
DIST= ${NETBSDSRCDIR}/gnu/dist/postfix/html
.PATH: ${DIST}
-FILES= access.5.html aliases.5.html architecture.html \
- backstage.html basic.html big-picture.gif big-picture.html \
- bounce.8.html canonical.5.html cleanup.8.html \
- commands.html delivering.html error.8.html \
- faq.html flush.8.html goals.html inbound.gif index.html \
- lmtp.8.html local.8.html master.8.html \
- motivation.html nqmgr.8.html \
- outbound.gif pcre_table.5.html pickup.8.html \
- pipe.8.html postalias.1.html postcat.1.html \
- postconf.1.html postdrop.1.html postfix.1.html \
- postkick.1.html postlock.1.html postlog.1.html \
- postmap.1.html postqueue.1.html postsuper.1.html \
- proxymap.8.html \
- qmgr.8.html queuing.html rate.html \
- receiving.html regexp_table.5.html relocated.5.html \
- resource.html rewrite.html security.html sendmail.1.html \
- showq.8.html small-picture.gif smtp.8.html smtpd.8.html \
- spawn.8.html transport.5.html trivial-rewrite.8.html \
- uce.html virtual.5.html virtual.8.html
+PFX_DAEMONS = bounce.8.html cleanup.8.html error.8.html local.8.html \
+ lmtp.8.html master.8.html pickup.8.html pipe.8.html qmgr.8.html \
+ showq.8.html smtp.8.html smtpd.8.html trivial-rewrite.8.html \
+ oqmgr.8.html spawn.8.html flush.8.html virtual.8.html qmqpd.8.html \
+ verify.8.html proxymap.8.html
+PFX_COMMANDS= postalias.1.html postcat.1.html \
+ postconf.1.html postfix.1.html postkick.1.html postlock.1.html \
+ postlog.1.html postdrop.1.html postmap.1.html sendmail.1.html \
+ postqueue.1.html postsuper.1.html smtp-source.1.html \
+ smtp-sink.1.html qmqp-source.1.html qmqp-sink.1.html \
+ qshape.1.html
+PFX_CONFIG = access.5.html aliases.5.html canonical.5.html relocated.5.html \
+ transport.5.html virtual.5.html pcre_table.5.html regexp_table.5.html \
+ cidr_table.5.html header_checks.5.html \
+ ldap_table.5.html mysql_table.5.html pgsql_table.5.html
+
+FILES= $(PFX_DAEMONS) $(PFX_COMMANDS) $(PFX_CONFIG)
SYMLINKS= bounce.8.html ${BINDIR}/defer.8.html
+SYMLINKS+=bounce.8.html ${BINDIR}/trace.8.html
SYMLINKS+=sendmail.1.html ${BINDIR}/mailq.1.html
SYMLINKS+=sendmail.1.html ${BINDIR}/newaliases.1.html
diff --git a/gnu/usr.sbin/postfix/man/man1/Makefile b/gnu/usr.sbin/postfix/man/man1/Makefile
index 303adab5798..31b8d8c91c2 100644
--- a/gnu/usr.sbin/postfix/man/man1/Makefile
+++ b/gnu/usr.sbin/postfix/man/man1/Makefile
@@ -1,20 +1,21 @@
-# $NetBSD: Makefile,v 1.5 2002/12/24 19:47:51 perry Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/27 05:34:34 heas Exp $
.include <bsd.own.mk>
DIST= ${NETBSDSRCDIR}/gnu/dist/postfix/man/man1
.PATH: ${DIST}
-MAN= postalias.1 postcat.1 postconf.1 postdrop.1 \
- postfix.1 postkick.1 postlock.1 postlog.1 \
- postmap.1 postqueue.1 postsuper.1
+MAN= postalias.1 postcat.1 postconf.1 postfix.1 \
+ postkick.1 postlock.1 postlog.1 postdrop.1 \
+ postmap.1 \
+ postqueue.1 postsuper.1
# XXX notyet:
# mailq.1 sendmail.1 newaliases.1
# These would conflict with the ones installed by sendmail. It isn't
# clear what to do with them. The missing documentation is not too
# interesting given that the sendmail docs are in place, though.
-# qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1
+# qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1 qshape.1
# These are test programs. It isn't clear that they are wanted by an
# ordinary user.
diff --git a/gnu/usr.sbin/postfix/man/man5/Makefile b/gnu/usr.sbin/postfix/man/man5/Makefile
index 9bab2df90fd..74db04581fd 100644
--- a/gnu/usr.sbin/postfix/man/man5/Makefile
+++ b/gnu/usr.sbin/postfix/man/man5/Makefile
@@ -1,12 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2002/09/19 03:09:46 lukem Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/27 05:34:34 heas Exp $
.include <bsd.own.mk>
DIST= ${NETBSDSRCDIR}/gnu/dist/postfix/man/man5
.PATH: ${DIST}
-MAN= access.5 canonical.5 pcre_table.5 regexp_table.5 \
- relocated.5 transport.5 virtual.5
+MAN= access.5 canonical.5 relocated.5 \
+ transport.5 virtual.5 pcre_table.5 regexp_table.5 \
+ cidr_table.5 header_checks.5
+
+MLINKS= header_checks.5 body_checks.5
# XXX notyet:
# aliases.5
@@ -14,5 +17,7 @@ MAN= access.5 canonical.5 pcre_table.5 regexp_table.5 \
# clear what to do with it. The missing documentation is not too
# interesting given that the sendmail docs are in place, though. The
# format is identical.
+# The base install does include support for these:
+# ldap_table.5 mysql_table.5 pgsql_table.5
.include <bsd.man.mk>
diff --git a/gnu/usr.sbin/postfix/man/man8/Makefile b/gnu/usr.sbin/postfix/man/man8/Makefile
index 957152decd1..e0ec08115ce 100644
--- a/gnu/usr.sbin/postfix/man/man8/Makefile
+++ b/gnu/usr.sbin/postfix/man/man8/Makefile
@@ -1,16 +1,18 @@
-# $NetBSD: Makefile,v 1.5 2003/03/08 19:12:17 perry Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/27 05:34:34 heas Exp $
.include <bsd.own.mk>
DIST= ${NETBSDSRCDIR}/gnu/dist/postfix/man/man8
.PATH: ${DIST}
-MAN= bounce.8 cleanup.8 error.8 flush.8 \
- lmtp.8 local.8 master.8 nqmgr.8 pickup.8 \
- pipe.8 proxymap.8 qmgr.8 showq.8 smtp.8 smtpd.8 \
- spawn.8 trivial-rewrite.8 virtual.8
+MAN= bounce.8 cleanup.8 error.8 local.8 \
+ lmtp.8 master.8 pickup.8 pipe.8 qmgr.8 \
+ showq.8 smtp.8 smtpd.8 trivial-rewrite.8 \
+ oqmgr.8 spawn.8 flush.8 virtual.8 \
+ verify.8 trace.8 proxymap.8
MLINKS= bounce.8 defer.8
+MLINKS+=bounce.8 trace.8
# XXX notyet:
# qmqpd.8
diff --git a/gnu/usr.sbin/postfix/nqmgr/Makefile b/gnu/usr.sbin/postfix/oqmgr/Makefile
index 41a182bff57..1bdad0696ed 100644
--- a/gnu/usr.sbin/postfix/nqmgr/Makefile
+++ b/gnu/usr.sbin/postfix/oqmgr/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2002/09/19 03:09:47 lukem Exp $
+# $NetBSD: Makefile,v 1.1 2004/04/27 05:33:55 heas Exp $
NOMAN= # defined
.include <bsd.own.mk>
-PROG= nqmgr
+PROG= oqmgr
DIST= ${NETBSDSRCDIR}/gnu/dist/postfix/src/${PROG}
.PATH: ${DIST}
@@ -13,7 +13,6 @@ 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_rcpt_list.c \
- qmgr_job.c qmgr_peer.c \
qmgr_defer.c qmgr_enable.c qmgr_scan.c qmgr_bounce.c
DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
diff --git a/gnu/usr.sbin/postfix/qmgr/Makefile b/gnu/usr.sbin/postfix/qmgr/Makefile
index afedf83bcde..2410e522076 100644
--- a/gnu/usr.sbin/postfix/qmgr/Makefile
+++ b/gnu/usr.sbin/postfix/qmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/09/19 03:09:50 lukem Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/27 05:33:55 heas Exp $
NOMAN= # defined
@@ -13,6 +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_rcpt_list.c \
+ qmgr_job.c qmgr_peer.c \
qmgr_defer.c qmgr_enable.c qmgr_scan.c qmgr_bounce.c
DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
diff --git a/gnu/usr.sbin/postfix/smtp/Makefile b/gnu/usr.sbin/postfix/smtp/Makefile
index 43d97c07486..1b44de7e1e3 100644
--- a/gnu/usr.sbin/postfix/smtp/Makefile
+++ b/gnu/usr.sbin/postfix/smtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/12/24 19:47:52 perry Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/27 05:33:55 heas Exp $
NOMAN= # defined
@@ -12,7 +12,7 @@ DIST= ${NETBSDSRCDIR}/gnu/dist/postfix/src/${PROG}
BINDIR= ${PFIX_LIBEXECDIR}
SRCS= smtp.c smtp_connect.c smtp_proto.c smtp_chat.c smtp_session.c \
- smtp_addr.c smtp_trouble.c smtp_state.c \
+ smtp_addr.c smtp_trouble.c smtp_state.c smtp_rcpt.c \
smtp_sasl_proto.c smtp_sasl_glue.c
DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL}
diff --git a/gnu/usr.sbin/postfix/smtpd/Makefile b/gnu/usr.sbin/postfix/smtpd/Makefile
index 307b5b72502..001be1a9865 100644
--- a/gnu/usr.sbin/postfix/smtpd/Makefile
+++ b/gnu/usr.sbin/postfix/smtpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/09/19 03:09:51 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/27 05:33:55 heas Exp $
NOMAN= # defined
@@ -12,7 +12,8 @@ DIST= ${NETBSDSRCDIR}/gnu/dist/postfix/src/${PROG}
BINDIR= ${PFIX_LIBEXECDIR}
SRCS= smtpd.c smtpd_token.c smtpd_check.c smtpd_chat.c smtpd_state.c \
- smtpd_peer.c smtpd_sasl_proto.c smtpd_sasl_glue.c
+ smtpd_peer.c smtpd_sasl_proto.c smtpd_sasl_glue.c smtpd_proxy.c \
+ smtpd_xforward.c
DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL}
LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL}
diff --git a/gnu/usr.sbin/postfix/util/Makefile b/gnu/usr.sbin/postfix/util/Makefile
index 527f4836343..23e5ff26ef9 100644
--- a/gnu/usr.sbin/postfix/util/Makefile
+++ b/gnu/usr.sbin/postfix/util/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/03/27 16:39:00 heas Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/27 05:33:56 heas Exp $
NOLINT= # defined
NOPIC= # defined
@@ -15,30 +15,33 @@ SRCS = alldig.c argv.c argv_split.c attr_print0.c attr_print64.c \
attr_scan0.c attr_scan64.c base64_code.c basename.c binhash.c \
chroot_uid.c clean_env.c close_on_exec.c concatenate.c ctable.c \
dict.c dict_alloc.c dict_db.c dict_dbm.c dict_debug.c dict_env.c \
- dict_ht.c dict_ldap.c dict_mysql.c dict_ni.c dict_nis.c \
- dict_nisplus.c dict_open.c dict_pcre.c dict_regexp.c dict_static.c \
- dict_tcp.c dict_unix.c dir_forest.c doze.c duplex_pipe.c \
- environ.c events.c exec_command.c fifo_listen.c fifo_trigger.c \
- file_limit.c find_inet.c fsspace.c fullname.c get_domainname.c \
- get_hostname.c hex_quote.c htable.c inet_addr_host.c \
- inet_addr_list.c inet_addr_local.c inet_connect.c inet_listen.c \
- inet_trigger.c inet_util.c intv.c line_wrap.c lowercase.c \
- lstat_as.c mac_expand.c mac_parse.c make_dirs.c match_list.c \
- match_ops.c msg.c msg_output.c msg_syslog.c msg_vstream.c \
- mvect.c myflock.c mymalloc.c myrand.c mystrtok.c name_mask.c \
- netstring.c non_blocking.c open_as.c open_limit.c open_lock.c \
- peekfd.c percentm.c posix_signals.c printable.c rand_sleep.c \
- read_wait.c readable.c readlline.c ring.c safe_getenv.c \
- safe_open.c sane_accept.c sane_link.c sane_rename.c \
- sane_socketpair.c sane_time.c scan_dir.c set_eugid.c set_ugid.c \
- sigdelay.c skipblanks.c spawn_command.c split_at.c \
- split_nameval.c stat_as.c stream_connect.c stream_listen.c \
- stream_trigger.c sys_compat.c timed_connect.c timed_read.c \
- timed_wait.c timed_write.c translit.c trimblanks.c unescape.c \
- unix_connect.c unix_listen.c unix_trigger.c unsafe.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 strcasecmp.c nvtable.c host_port.c sane_connect.c
+ dict_cidr.c dict_ht.c dict_ni.c dict_nis.c \
+ dict_nisplus.c dict_open.c dict_pcre.c dict_regexp.c \
+ dict_static.c dict_tcp.c dict_unix.c dir_forest.c doze.c \
+ duplex_pipe.c environ.c events.c exec_command.c fifo_listen.c \
+ fifo_trigger.c file_limit.c find_inet.c fsspace.c fullname.c \
+ get_domainname.c get_hostname.c hex_quote.c host_port.c htable.c \
+ inet_addr_host.c inet_addr_list.c inet_addr_local.c inet_connect.c \
+ inet_listen.c inet_trigger.c inet_util.c line_wrap.c \
+ lowercase.c lstat_as.c mac_expand.c mac_parse.c make_dirs.c \
+ match_list.c match_ops.c msg.c msg_output.c msg_syslog.c \
+ msg_vstream.c mvect.c myflock.c mymalloc.c myrand.c mystrtok.c \
+ name_mask.c netstring.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 read_wait.c readable.c readlline.c \
+ ring.c safe_getenv.c safe_open.c sane_accept.c sane_link.c \
+ sane_rename.c sane_socketpair.c sane_time.c scan_dir.c \
+ set_eugid.c set_ugid.c sigdelay.c skipblanks.c spawn_command.c \
+ split_at.c split_nameval.c stat_as.c strcasecmp.c stream_connect.c \
+ stream_listen.c stream_trigger.c sys_compat.c timed_connect.c \
+ timed_read.c timed_wait.c timed_write.c translit.c trimblanks.c \
+ unescape.c unix_connect.c unix_listen.c unix_trigger.c unsafe.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 auto_clnt.c attr_clnt.c attr_scan_plain.c \
+ attr_print_plain.c sane_connect.c neuter.c name_code.c \
+ uppercase.c
+
# IPv6
#SRCS+= get_port.c
diff --git a/gnu/usr.sbin/postfix/verify/Makefile b/gnu/usr.sbin/postfix/verify/Makefile
new file mode 100644
index 00000000000..6d79dcab770
--- /dev/null
+++ b/gnu/usr.sbin/postfix/verify/Makefile
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2004/04/27 05:33:56 heas Exp $
+
+NOMAN= # defined
+
+.include <bsd.own.mk>
+
+PROG= verify
+
+DIST= ${NETBSDSRCDIR}/gnu/dist/postfix/src/${PROG}
+.PATH: ${DIST}
+
+BINDIR= ${PFIX_LIBEXECDIR}
+
+SRCS= verify.c
+
+DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
+LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
+
+.include <bsd.prog.mk>