Sendmail:

- Save more documentation in %%PREFIX%%/share/doc/sendmail
- Update Sendmail package, only libmilter will be installed.
- Bump PORTREVISION
- Cleanup configuration, reduced overhead in "site.config.m4" files
- New option SENDMAIL_WITHOUT_IPV6=yes
- Use global WITH_TLS as well as SENDMAIL_WITH_TLS
- New slave ports: sendmail-sasl, sendmail-ldap
- vbsfilter now build a package

4 files changed, 59 insertions, 48 deletions

diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile
index 3e1c23da37af..c469e385ed24 100644
--- a/mail/sendmail812/Makefile
+++ b/mail/sendmail812/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sendmail
 PORTVERSION=	8.11.4
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/sendmail/&,}
@@ -16,17 +17,25 @@ MAINTAINER=	dirk.meyer@dinoex.sub.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 WCONF=		${WRKSRC}/devtools/Site
+SITE=		${FILESDIR}/site.config.m4.pre4
 PLIST=		${WRKDIR}/.PLIST.more
-DOCS=		KNOWNBUGS LICENSE PGPKEYS README RELEASE_NOTES
+DOCS=		KNOWNBUGS LICENSE PGPKEYS README RELEASE_NOTES \
+		sendmail/TRACEFLAGS
+MAN1=		mailq.1 newaliases.1 vacation.1
+MAN5=		aliases.5
+MAN8=		sendmail.8 mailstats.8 makemap.8 praliases.8 smrsh.8 \
+		mail.local.8 rmail.8
 
 # Options to define Features:
+# SENDMAIL_WITHOUT_IPV6=yes
+# SENDMAIL_WITH_MILTER=yes
+# SENDMAIL_WITH_TLS=yes
+# SENDMAIL_WITH_SASL=yes
+# SENDMAIL_WITH_SFIO=yes
+# SENDMAIL_WITH_LDAP=yes
 .if defined(BATCH)
 # all on for package build
-SENDMAIL_WITH_TLS=YES
-SENDMAIL_WITH_SASL=YES
-SENDMAIL_WITH_SFIO=YES
-SENDMAIL_WITH_MILTER=YES
-SENDMAIL_WITH_LDAP=YES
+SENDMAIL_WITH_MILTER=yes
 .endif
 
 .if defined(SENDMAIL_WITH_LDAP)
@@ -38,7 +47,7 @@ LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap2
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
 PKGNAMESUFFIX?=	-sasl
 .endif
-.if defined(SENDMAIL_WITH_TLS)
+.if defined(SENDMAIL_WITH_TLS) || defined(WITH_TLS)
 PKGNAMESUFFIX?=	-tls
 USE_OPENSSL=	yes
 .endif
@@ -47,39 +56,36 @@ PKGNAMESUFFIX?=	-sfio
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libsfio.a:${PORTSDIR}/devel/sfio
 .endif
 
+# Build site.config.m4
 .if exists(${DESTDIR}/etc/mail/mailer.conf)
-pre-configure:
-	${SED} -e "s=%%PREFIX%%=${PREFIX}=" \
-		${FILESDIR}/site.config.m4 > ${WCONF}/site.config.m4
-.if defined(SENDMAIL_WITH_SASL)
-	${SED} -e "s=%%LOCALBASE%%=${LOCALBASE}=" \
-		${FILESDIR}/site.config.m4.sasl >>${WCONF}/site.config.m4
+SITE+=	${FILESDIR}/site.config.m4
+.if ! defined(SENDMAIL_WITHOUT_IPV6)
+SITE+=	${FILESDIR}/site.config.m4.ipv6
+.endif
 .endif
 .if defined(SENDMAIL_WITH_SFIO)
-	${SED} -e "s=%%LOCALBASE%%=${LOCALBASE}=" \
-		${FILESDIR}/site.config.m4.sfio >>${WCONF}/site.config.m4
+SITE+=	${FILESDIR}/site.config.m4.sfio
 .endif
-.else
-pre-configure:
-	${SED} -e "s=%%PREFIX%%=${PREFIX}=" \
-		${FILESDIR}/site.config.m4.pre4 > ${WCONF}/site.config.m4
-.if defined(SENDMAIL_WITH_TLS)
-	${SED} -e "s=%%LOCALBASE%%=${LOCALBASE}=" \
-		${FILESDIR}/site.config.m4.ssl >> ${WCONF}/site.config.m4
+.if defined(SENDMAIL_WITH_TLS) || defined(WITH_TLS)
+.if ! exists(${DESTDIR}/etc/mail/mailer.conf)
+SITE+=	${FILESDIR}/site.config.m4.ssl
 .endif
+SITE+=	${FILESDIR}/site.config.m4.tls
 .endif
-.if defined(SENDMAIL_WITH_TLS)
-	${CAT} ${FILESDIR}/site.config.m4.tls >> ${WCONF}/site.config.m4
+.if defined(SENDMAIL_WITH_SASL)
+SITE+=	${FILESDIR}/site.config.m4.sasl
 .endif
 .if defined(SENDMAIL_WITH_LDAP)
-	${SED} -e "s=%%LOCALBASE%%=${LOCALBASE}=" \
-		${FILESDIR}/site.config.m4.ldap >> ${WCONF}/site.config.m4
+SITE+=	${FILESDIR}/site.config.m4.ldap
+.endif
+.if defined(SENDMAIL_WITH_MILTER)
+SITE+=	${FILESDIR}/site.config.m4.milter
 .endif
 .if exists(${FILESDIR}/site.config.m4.local)
-	${SED} -e "s=%%LOCALBASE%%=${LOCALBASE}=" \
-		${FILESDIR}/site.config.m4.local >> ${WCONF}/site.config.m4
+SITE+=	${FILESDIR}/site.config.m4.local
 .endif
 
+# install directly if no mailwrapper support
 .if ! exists(${DESTDIR}/etc/mail/mailer.conf)
 PREFIX?=	${DESTDIR}/usr
 MANPREFIX?=	${DESTDIR}/usr/share
@@ -87,10 +93,14 @@ MANPREFIX?=	${DESTDIR}/usr/share
 PLIST_SUB+=	PREFIX=${PREFIX:S=${PREFIX}/==}
 SENDMAIL=	${PREFIX}/sbin/sendmail
 
-MAN1=	mailq.1 newaliases.1 vacation.1
-MAN5=	aliases.5
-MAN8=	sendmail.8 mailstats.8 makemap.8 praliases.8 smrsh.8 \
-	mail.local.8 rmail.8
+do-configure:
+	${SED} -e "s=%%PREFIX%%=${PREFIX}=" -e "s=%%LOCALBASE%%=${LOCALBASE}=" \
+		${SITE} > ${WCONF}/site.config.m4
+
+.if defined(SENDMAIL_WITH_MILTER)
+post-build:
+	( cd ${WRKSRC}/libmilter && ${MAKE} )
+.endif
 
 pre-install:
 	@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
@@ -104,20 +114,12 @@ pre-install:
 	${AWK} '{print "@dirrm share/sendmail/" $$1}' >>${PLIST}
 	@${ECHO} "@dirrm share/sendmail" >>${PLIST}
 .for i in ${DOCS}
-	@${ECHO} ${i} | \
+	@${ECHO} `${BASENAME} ${i}` | \
 	${AWK} '{print "share/doc/sendmail/" $$1}' >>${PLIST}
 .endfor
 	@${ECHO} "@dirrm share/doc/sendmail" >>${PLIST}
 .endif
 
-.if defined(SENDMAIL_WITH_MILTER)
-post-configure:
-	${CAT} ${FILESDIR}/site.config.m4.milter >>${WCONF}/site.config.m4
-
-post-build:
-	( cd ${WRKSRC}/libmilter && ${MAKE} )
-.endif
-
 # We want mail.local and rmail for our system.
 # the build install catmans only, we have to fix this.
 post-install:
@@ -150,7 +152,15 @@ post-install:
 	${MKDIR} ${PREFIX}/share/sendmail ${PREFIX}/share/doc/sendmail
 	@cd ${WRKSRC}; ${TAR} cf - cf |\
 		(cd ${PREFIX}/share/sendmail; ${TAR} xf -)
-	@cd ${WRKSRC}; ${CP} ${DOCS} ${PREFIX}/share/doc/sendmail/
+	@cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/sendmail/
+	${INSTALL_DATA} ${WRKSRC}/devtools/README \
+		${PREFIX}/share/doc/sendmail/DEVTOOLS
+	${INSTALL_DATA} ${WRKSRC}/sendmail/README \
+		${PREFIX}/share/doc/sendmail/SENDMAIL
+	${INSTALL_DATA} ${WRKSRC}/mail.local/README \
+		${PREFIX}/share/doc/sendmail/MAIL.LOCAL
+	${INSTALL_DATA} ${WRKSRC}/smrsh/README \
+		${PREFIX}/share/doc/sendmail/SMRSH
 .if defined(SENDMAIL_WITH_MILTER)
 	${INSTALL_DATA} ${WRKSRC}/libmilter/README \
 		${PREFIX}/share/doc/sendmail/MILTER
diff --git a/mail/sendmail812/files/site.config.m4 b/mail/sendmail812/files/site.config.m4
index 596e4e1a0a50..adc2b11bf108 100644
--- a/mail/sendmail812/files/site.config.m4
+++ b/mail/sendmail812/files/site.config.m4
@@ -6,8 +6,3 @@ define(`confSBINDIR',`%%PREFIX%%/sbin')
 define(`confUBINDIR',`%%PREFIX%%/bin')
 APPENDDEF(`conf_sendmail_ENVDEF', `-DTCPWRAPPERS')
 APPENDDEF(`conf_sendmail_LIBS', `-lwrap')"
-APPENDDEF(`conf_sendmail_ENVDEF', `-DNETINET6')
-APPENDDEF(`conf_libmilter_ENVDEF', `-DNETINET6')
-APPENDDEF(`conf_mail_local_ENVDEF', `-DQUEUE_ONLY')
-APPENDDEF(`conf_smrsh_ENVDEF', `-DCMDDIR="\"%%PREFIX%%/libexec/sm.bin\""')
-APPENDDEF(`conf_smrsh_ENVDEF', `-DPATH="\"/bin:/usr/bin\""')
diff --git a/mail/sendmail812/files/site.config.m4.ipv6 b/mail/sendmail812/files/site.config.m4.ipv6
new file mode 100644
index 000000000000..41f0cccf3a1d
--- /dev/null
+++ b/mail/sendmail812/files/site.config.m4.ipv6
@@ -0,0 +1,2 @@
+APPENDDEF(`conf_sendmail_ENVDEF', `-DNETINET6')
+APPENDDEF(`conf_libmilter_ENVDEF', `-DNETINET6')
diff --git a/mail/sendmail812/pkg-plist b/mail/sendmail812/pkg-plist
index f67e4d617a3f..5c581d8876e3 100644
--- a/mail/sendmail812/pkg-plist
+++ b/mail/sendmail812/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/Attic/pkg-plist,v 1.2 2001-03-10 20:49:31 dinoex Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/Attic/pkg-plist,v 1.3 2001-06-15 17:27:58 dinoex Exp $
 bin/hoststat
 bin/mailq
 bin/newaliases
@@ -11,3 +11,7 @@ sbin/mailstats
 sbin/makemap
 sbin/praliases
 sbin/sendmail
+%%PORTDOCS%%share/doc/sendmail/DEVTOOLS
+%%PORTDOCS%%share/doc/sendmail/SENDMAIL
+%%PORTDOCS%%share/doc/sendmail/MAIL.LOCAL
+%%PORTDOCS%%share/doc/sendmail/SMRSH