Fix up PLISTs and remove unused files left over from the incomplete

package update in the previous commit.

10 files changed, 39 insertions, 76 deletions

diff --git a/mail/postfix/MESSAGE.sasl b/mail/postfix/MESSAGE.sasl
index 661718cbdf2..5085a7bcb92 100644
--- a/mail/postfix/MESSAGE.sasl
+++ b/mail/postfix/MESSAGE.sasl
@@ -1,24 +1,30 @@
 ===========================================================================
-$NetBSD: MESSAGE.sasl,v 1.7 2005/03/08 18:35:04 bad Exp $
+$NetBSD: MESSAGE.sasl,v 1.8 2005/03/28 08:53:07 jlam Exp $
 
 To enable SASL authentication in the SMTP server, you may want to edit
 
 	${SASLLIBDIR}/smtpd.conf
 
 and change the method used to check plaintext passwords.  To use
-security/cyrus-saslauthd, you should change the contents of smtpd.conf to:
+security/cyrus-saslauthd, you should change the contents of smtpd.conf
+to:
 
 	pwcheck_method: saslauthd
 
-You may also want to edit main.cf and set the smtpd_sasl_* variables to
-appropriate values.
+You may also want to edit
 
-To enable SASL authentication in the ${PKGNAME} SMTP client, you may want to
-edit main.cf and set the smtp_sasl_* variables to appropriate values.
+	${PKG_SYSCONFDIR}/main.cf
 
-The corresponding SASL authentication plugins need to be installed also.
+and set the smtpd_sasl_* variables to appropriate values.
 
-Please consult:
+To enable SASL authentication in the SMTP client, you may want to edit
+
+	${PKG_SYSCONFDIR}/main.cf
+
+and set the smtp_sasl_* variables to appropriate values.
+
+The corresponding SASL authentication plugins will also need to be
+installed.  Please consult:
 
 	${DOCDIR}/SASL_README
 
diff --git a/mail/postfix/MESSAGE.tls b/mail/postfix/MESSAGE.tls
deleted file mode 100644
index b41a9cad794..00000000000
--- a/mail/postfix/MESSAGE.tls
+++ /dev/null
@@ -1,23 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.tls,v 1.6 2005/03/08 18:33:39 bad Exp $
-
-To enable TLS, you might need to reconfigure the following files:
-
-	${PKG_SYSCONFDIR}/main.cf
-	${PKG_SYSCONFDIR}/master.cf
-
-The following lines are appropriate for accepting TLS connections by
-the SMTP server.
-
-master.cf:
-----------
-# ==========================================================================
-# service type  private unpriv  chroot  wakeup  maxproc command + args
-# ==========================================================================
-tlsmgr    fifo	-	-	y	300	1	tlsmgr
-smtps     inet	n	-	y	-	-	smtpd
-  -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes
-submission inet	n	-	y	-	-	smtpd
-  -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
-
-===========================================================================
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 1281a3c0083..58d2873adc7 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.158 2005/03/22 10:43:50 cjs Exp $
+# $NetBSD: Makefile,v 1.159 2005/03/28 08:53:07 jlam Exp $
 
 DISTNAME=	postfix-2.2.1
 CATEGORIES=	mail
@@ -120,10 +120,6 @@ post-build:
 	${ECHO} "pwcheck_method: ${PWCHECK_METHOD}" > ${WRKDIR}/smtpd.conf
 .endif
 
-POSTFIX_EXAMPLE_FILES=	LICENSE access aliases canonical header_checks	\
-			main.cf main.cf.default makedefs.out master.cf	\
-			postfix-files relocated transport virtual
-
 do-install:
 	${INSTALL_DATA_DIR} ${LIBEXECDIR}
 	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
diff --git a/mail/postfix/PLIST b/mail/postfix/PLIST
index fa8eb2aeb29..87aa1af634c 100644
--- a/mail/postfix/PLIST
+++ b/mail/postfix/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.12 2004/07/31 05:39:17 jlam Exp $
+@comment $NetBSD: PLIST,v 1.13 2005/03/28 08:53:07 jlam Exp $
 bin/mailq
 bin/newaliases
+libexec/postfix/anvil
 libexec/postfix/bounce
 libexec/postfix/cleanup
+libexec/postfix/discard
 libexec/postfix/error
 libexec/postfix/flush
 libexec/postfix/lmtp
@@ -15,10 +17,12 @@ libexec/postfix/pipe
 libexec/postfix/proxymap
 libexec/postfix/qmgr
 libexec/postfix/qmqpd
+libexec/postfix/scache
 libexec/postfix/showq
 libexec/postfix/smtp
 libexec/postfix/smtpd
 libexec/postfix/spawn
+libexec/postfix/tlsmgr
 libexec/postfix/trivial-rewrite
 libexec/postfix/verify
 libexec/postfix/virtual
@@ -41,9 +45,12 @@ man/man5/aliases.5
 man/man5/body_checks.5
 man/man5/canonical.5
 man/man5/cidr_table.5
+man/man5/generic.5
 man/man5/header_checks.5
 man/man5/ldap_table.5
+man/man5/master.5
 man/man5/mysql_table.5
+man/man5/nisplus_table.5
 man/man5/pcre_table.5
 man/man5/pgsql_table.5
 man/man5/postconf.5
@@ -51,9 +58,11 @@ man/man5/regexp_table.5
 man/man5/relocated.5
 man/man5/transport.5
 man/man5/virtual.5
+man/man8/anvil.8
 man/man8/bounce.8
 man/man8/cleanup.8
 man/man8/defer.8
+man/man8/discard.8
 man/man8/error.8
 man/man8/flush.8
 man/man8/lmtp.8
@@ -65,10 +74,12 @@ man/man8/pipe.8
 man/man8/proxymap.8
 man/man8/qmgr.8
 man/man8/qmqpd.8
+man/man8/scache.8
 man/man8/showq.8
 man/man8/smtp.8
 man/man8/smtpd.8
 man/man8/spawn.8
+man/man8/tlsmgr.8
 man/man8/trace.8
 man/man8/trivial-rewrite.8
 man/man8/verify.8
@@ -92,6 +103,8 @@ share/doc/postfix/ADDRESS_VERIFICATION_README
 share/doc/postfix/BACKSCATTER_README
 share/doc/postfix/BASIC_CONFIGURATION_README
 share/doc/postfix/BUILTIN_FILTER_README
+share/doc/postfix/CDB_README
+share/doc/postfix/CONNECTION_CACHE_README
 share/doc/postfix/CONTENT_INSPECTION_README
 share/doc/postfix/DATABASE_README
 share/doc/postfix/DB_README
@@ -99,6 +112,7 @@ share/doc/postfix/DEBUG_README
 share/doc/postfix/ETRN_README
 share/doc/postfix/FILTER_README
 share/doc/postfix/INSTALL
+share/doc/postfix/IPV6_README
 share/doc/postfix/LDAP_README
 share/doc/postfix/LINUX_README
 share/doc/postfix/LMTP_README
@@ -120,6 +134,7 @@ share/doc/postfix/SMTPD_ACCESS_README
 share/doc/postfix/SMTPD_POLICY_README
 share/doc/postfix/SMTPD_PROXY_README
 share/doc/postfix/STANDARD_CONFIGURATION_README
+share/doc/postfix/TLS_README
 share/doc/postfix/TUNING_README
 share/doc/postfix/ULTRIX_README
 share/doc/postfix/UUCP_README
@@ -128,9 +143,11 @@ share/doc/postfix/VIRTUAL_README
 share/doc/postfix/XCLIENT_README
 share/doc/postfix/XFORWARD_README
 share/examples/postfix/LICENSE
+share/examples/postfix/TLS_LICENSE
 share/examples/postfix/access
 share/examples/postfix/aliases
 share/examples/postfix/canonical
+share/examples/postfix/generic
 share/examples/postfix/header_checks
 share/examples/postfix/mailer.conf
 share/examples/postfix/main.cf
@@ -141,6 +158,7 @@ share/examples/postfix/post-install
 share/examples/postfix/postfix-files
 share/examples/postfix/postfix-script
 share/examples/postfix/relocated
+${SASL}share/examples/postfix/smtpd.conf
 share/examples/postfix/transport
 share/examples/postfix/virtual
 @dirrm share/examples/postfix
diff --git a/mail/postfix/PLIST.inet6 b/mail/postfix/PLIST.inet6
deleted file mode 100644
index 95b7baa23c1..00000000000
--- a/mail/postfix/PLIST.inet6
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.inet6,v 1.1 2004/08/07 16:56:53 jlam Exp $
-share/doc/postfix/IPV6_README
diff --git a/mail/postfix/PLIST.sasl b/mail/postfix/PLIST.sasl
deleted file mode 100644
index 30baecfa40c..00000000000
--- a/mail/postfix/PLIST.sasl
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.sasl,v 1.1 2003/11/21 15:33:41 jlam Exp $
-share/examples/postfix/smtpd.conf
diff --git a/mail/postfix/PLIST.tls b/mail/postfix/PLIST.tls
deleted file mode 100644
index 4daf371db19..00000000000
--- a/mail/postfix/PLIST.tls
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.tls,v 1.5 2004/08/07 16:56:53 jlam Exp $
-libexec/postfix/tlsmgr
-man/man8/tlsmgr.8
diff --git a/mail/postfix/files/patch-darwin-inet6 b/mail/postfix/files/patch-darwin-inet6
deleted file mode 100644
index 7bd3f85addc..00000000000
--- a/mail/postfix/files/patch-darwin-inet6
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-darwin-inet6,v 1.1 2004/08/11 06:51:31 jlam Exp $
-
---- src/util/match_ops.c.orig	Tue Aug 10 02:29:26 2004
-+++ src/util/match_ops.c
-@@ -117,6 +117,9 @@
- #include <string.h>
- #include <netdb.h>
- #include <arpa/inet.h>
-+#ifdef RESOLVE_H_NEEDS_NAMESER8_COMPAT_H
-+#include <nameser8_compat.h>
-+#endif
- #include <resolv.h>
- 
- /* prototypes */
diff --git a/mail/postfix/files/patch-inet6-ni_withscopeid b/mail/postfix/files/patch-inet6-ni_withscopeid
deleted file mode 100644
index 6a2c0559013..00000000000
--- a/mail/postfix/files/patch-inet6-ni_withscopeid
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-inet6-ni_withscopeid,v 1.1 2004/12/28 16:13:28 kim Exp $
-
---- src/util/inet_addr_list.h.orig	2004-12-17 04:30:07.000000000 -0500
-+++ src/util/inet_addr_list.h	2004-12-17 04:36:47.000000000 -0500
-@@ -58,7 +58,7 @@
-  * Only on KAME? Use without implementation will result in EAI_BADFLAGS.
-  */
- #ifdef INET6
--# ifndef INET6_KAME
-+# if !defined(INET6_KAME) || (defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 299001100))
- #  ifdef NI_WITHSCOPEID
- #   undef NI_WITHSCOPEID
- #  endif
diff --git a/mail/postfix/options.mk b/mail/postfix/options.mk
index 4c7b950c3da..677ec47b0ca 100644
--- a/mail/postfix/options.mk
+++ b/mail/postfix/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.17 2005/03/28 07:07:49 jlam Exp $
+# $NetBSD: options.mk,v 1.18 2005/03/28 08:53:07 jlam Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postfix
-PKG_SUPPORTED_OPTIONS=	bdb inet6 ldap mysql mysql4 pcre pgsql sasl tls
+PKG_SUPPORTED_OPTIONS=	bdb ldap mysql mysql4 pcre pgsql sasl tls
 .include "../../mk/bsd.options.mk"
 
 ###
@@ -27,8 +27,6 @@ CCARGS+=	-DUSE_TLS
 AUXLIBS+=	-L${BUILDLINK_PREFIX.openssl}/lib			\
 		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib	\
 		-lssl -lcrypto
-PLIST_SRC+=	${PKGDIR}/PLIST.tls
-MESSAGE_SRC+=	${PKGDIR}/MESSAGE.tls
 .endif
 
 ###
@@ -114,8 +112,10 @@ AUXLIBS+=	-L${BUILDLINK_PREFIX.cyrus-sasl}/lib			\
 		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib \
 		-lsasl
 .  endif
-PLIST_SRC+=	${PKGDIR}/PLIST.sasl
+PLIST_SUBST+=	SASL=
 MESSAGE_SRC+=	${PKGDIR}/MESSAGE.sasl
 MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 MESSAGE_SUBST+=	SASLLIBDIR=${SASLLIBDIR}
+.else
+PLIST_SUBST+=	SASL="@comment "
 .endif