- new option SENDMAIL_WITHOUT_SHMEM [1], ports/57781

- install share/sendmail/cf/* files even when NOPORTDOCS [1], ports/57784
- Use of DOCSDIR [2]
- use varibale paths in pkg-message [2]
- make portlint happier [2]
PR:		57781, 57784
Submitted by:	lxv@send2pr.sink.omut.org [1], dinoex [2]

6 files changed, 62 insertions, 38 deletions

diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index b64224286c8a..7ff7cd764bdc 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -19,6 +19,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 WCONF=		${WRKSRC}/devtools/Site
 SITE=		${FILESDIR}/site.config.m4.pre4
 PLIST=		${WRKDIR}/.PLIST.more
+PKGMESSAGE=	${WRKSRC}/pkg-message
 DOCS=		KNOWNBUGS LICENSE PGPKEYS README RELEASE_NOTES \
 		sendmail/TRACEFLAGS sendmail/SECURITY sendmail/TUNING
 MAN1=		mailq.1 newaliases.1 vacation.1
@@ -33,6 +34,7 @@ LDAP_PORT?=	net/openldap20-client
 # Options to define Features:
 # SENDMAIL_WITHOUT_IPV6=yes
 # SENDMAIL_WITHOUT_MILTER=yes
+# SENDMAIL_WITHOUT_SHMEM=yes
 # SENDMAIL_WITH_TLS=yes
 # SENDMAIL_WITH_SMTPS=yes
 # SENDMAIL_WITH_SASL=yes
@@ -103,6 +105,10 @@ post-extract:
 		> ${WRKSRC}/sm-client.sh
 	@${SED} -e "s=%%PREFIX%%=${PREFIX}=" ${FILESDIR}/sendmail.sh \
 		> ${WRKSRC}/sendmail.sh
+	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \
+		-e "s=%%LOCALBASE%%=${LOCALBASE}=g" \
+		-e "s=%%PORTSDIR%%=${PORTSDIR}=g" \
+		${PKGDIR}/pkg-message > ${WRKSRC}/pkg-message
 
 do-configure:
 	@${MV} ${WRKSRC}/devtools/OS/FreeBSD ${WRKSRC}/devtools/OS/FreeBSD.sed
@@ -118,6 +124,11 @@ do-configure:
 	 'APPENDDEF(`conf_sendmail_ENVDEF'\'', `-DPICKY_HELO_CHECK'\'')'  \
 		>> ${WCONF}/site.config.m4
 .endif
+.if defined(SENDMAIL_WITHOUT_SHMEM)
+	${ECHO_CMD} \
+	 'APPENDDEF(`confENVDEF'\'', `-DSM_CONF_SHM=0'\'')' \
+		>> ${WCONF}/site.config.m4
+.endif
 
 post-build:
 	( cd ${WRKSRC}/doc/op && ${MAKE} op.txt )
@@ -133,17 +144,17 @@ pre-install:
 	if ! pw groupshow smmsp; then pw groupadd smmsp -g 25; fi
 	if ! pw usershow smmsp; then pw useradd smmsp -g smmsp -u 25 \
 		-h - -d /nonexistent -s /nonexistent -c "Sendmail Queue"; fi
-.if !defined(NOPORTDOCS)
 	@cd ${WRKSRC} && ${FIND} cf -type f | \
 	${AWK} '{print "share/sendmail/" $$1}' >>${PLIST}
 	@cd ${WRKSRC} && ${FIND} -d cf -type d | \
 	${AWK} '{print "@dirrm share/sendmail/" $$1}' >>${PLIST}
 	@${ECHO_CMD} "@dirrm share/sendmail" >>${PLIST}
+.if !defined(NOPORTDOCS)
 .for i in ${DOCS}
 	@${ECHO_CMD} `${BASENAME} ${i}` | \
-	${AWK} '{print "share/doc/sendmail/" $$1}' >>${PLIST}
+	${AWK} '{print "%%DOCSDIR%%/" $$1}' >>${PLIST}
 .endfor
-	@${ECHO_CMD} "@dirrm share/doc/sendmail" >>${PLIST}
+	@${ECHO_CMD} "@dirrm %%DOCSDIR%%" >>${PLIST}
 .endif
 
 # We want mail.local and rmail for our system.
@@ -180,10 +191,11 @@ post-install:
 	@${RM} -f ${MANPREFIX}/man/cat1/${i} ${MANPREFIX}/man/cat1/${i}.gz
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man1
 .endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/sendmail ${DOCSDIR}
+	${MKDIR} ${PREFIX}/share/sendmail
 	@${TAR} -C ${WRKSRC} -cf - cf | \
 		${TAR} -C ${PREFIX}/share/sendmail -xf -
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${DOCSDIR}/op.ps
 	${INSTALL_DATA} ${WRKSRC}/doc/op/op.txt ${DOCSDIR}/op.txt
@@ -199,7 +211,7 @@ post-install:
 .endif
 .endif
 .if exists(${DESTDIR}/etc/mail/mailer.conf)
-	@${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 mailer.base:
 	@${SED} \
@@ -274,14 +286,14 @@ SITE+=	${FILESDIR}/site.config.m4.local
 .endif
 
 .if exists(${DESTDIR}/etc/mail/mailer.conf) && ${PREFIX} == "/usr"
-pre-everything:
+pre-everything::
 	@${ECHO_CMD} "#"
 	@${ECHO_CMD} "# You can't override the base sendmail this way."
 	@${ECHO_CMD} "# your version FreeBSD use mailwrapper."
 	@${ECHO_CMD} "#"
 	@${ECHO_CMD} "# Please install with normal PREFIX"
 	@${ECHO_CMD} "# and activate the port version with"
-	@${ECHO_CMD} "# cd /usr/ports/mail/sendmail && make mailer.conf"
+	@${ECHO_CMD} "# cd ${PORTSDIR}/mail/sendmail && make mailer.conf"
 	@${ECHO_CMD} "#"
 	@${FALSE}
 .endif
diff --git a/mail/sendmail/pkg-message b/mail/sendmail/pkg-message
index ae9ace6a6fb3..d7ee5410095c 100644
--- a/mail/sendmail/pkg-message
+++ b/mail/sendmail/pkg-message
@@ -2,7 +2,7 @@
 If you update your configuration from 8.11.x you need to install an
 additional config file: /etc/mail/submit.cf, you can generate it
 by calling the target 'submit.cf', submit.mc will be installed too.
-/usr/ports/mail/sendmail$ make submit.cf
+%%PORTSDIR%%/mail/sendmail$ make submit.cf
 
 you should add in /etc/make.conf:
 SENDMAIL_CF_DIR=	%%PREFIX%%/share/sendmail/cf
@@ -22,12 +22,12 @@ To update your configuration look at %%PREFIX%%/share/sendmail/cf/README.
 ---------------------------------------------------
 To use the ports versions you may add to your sendmail.mc file:
 
-define(`confEBINDIR', `/usr/local/libexec')dnl
-define(`UUCP_MAILER_PATH', `/usr/local/bin/uux')dnl
+define(`confEBINDIR', `%%PREFIX%%/libexec')dnl
+define(`UUCP_MAILER_PATH', `%%LOCALBASE%%/bin/uux')dnl
 
 ---------------------------------------------------
 To activate sendmail as your default mailer, call the target 'mailer.conf':
-/usr/ports/mail/sendmail$ make mailer.conf
+$ cd %%PORTSDIR%%/mail/sendmail && make mailer.conf
 
 Your '/etc/mail/mailer.conf' should look like this:
 #
diff --git a/mail/sendmail/pkg-plist b/mail/sendmail/pkg-plist
index 1223c7611724..10ae51cef6f9 100644
--- a/mail/sendmail/pkg-plist
+++ b/mail/sendmail/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail/pkg-plist,v 1.15 2002-09-16 03:17:13 dinoex Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail/pkg-plist,v 1.16 2003-10-09 16:23:40 dinoex Exp $
 @exec if ! pw groupshow smmsp 2>/dev/null; then pw groupadd smmsp -g 25; fi
 @exec if ! pw usershow smmsp 2>/dev/null; then pw useradd smmsp -g smmsp -u 25 -h - -d /nonexistent -s /nonexistent -c "Sendmail Queue"; fi
 @exec mkdir -p /var/spool/clientmqueue
@@ -25,9 +25,9 @@ sbin/sendmail
 @group
 @comment (overwritten by pkg_add) chown root:smmsp sbin/sendmail
 @exec chmod 2555 %D/sbin/sendmail
-%%PORTDOCS%%share/doc/sendmail/op.ps
-%%PORTDOCS%%share/doc/sendmail/op.txt
-%%PORTDOCS%%share/doc/sendmail/DEVTOOLS
-%%PORTDOCS%%share/doc/sendmail/SENDMAIL
-%%PORTDOCS%%share/doc/sendmail/MAIL.LOCAL
-%%PORTDOCS%%share/doc/sendmail/SMRSH
+%%PORTDOCS%%%%DOCSDIR%%/op.ps
+%%PORTDOCS%%%%DOCSDIR%%/op.txt
+%%PORTDOCS%%%%DOCSDIR%%/DEVTOOLS
+%%PORTDOCS%%%%DOCSDIR%%/SENDMAIL
+%%PORTDOCS%%%%DOCSDIR%%/MAIL.LOCAL
+%%PORTDOCS%%%%DOCSDIR%%/SMRSH
diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile
index b64224286c8a..7ff7cd764bdc 100644
--- a/mail/sendmail812/Makefile
+++ b/mail/sendmail812/Makefile
@@ -19,6 +19,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 WCONF=		${WRKSRC}/devtools/Site
 SITE=		${FILESDIR}/site.config.m4.pre4
 PLIST=		${WRKDIR}/.PLIST.more
+PKGMESSAGE=	${WRKSRC}/pkg-message
 DOCS=		KNOWNBUGS LICENSE PGPKEYS README RELEASE_NOTES \
 		sendmail/TRACEFLAGS sendmail/SECURITY sendmail/TUNING
 MAN1=		mailq.1 newaliases.1 vacation.1
@@ -33,6 +34,7 @@ LDAP_PORT?=	net/openldap20-client
 # Options to define Features:
 # SENDMAIL_WITHOUT_IPV6=yes
 # SENDMAIL_WITHOUT_MILTER=yes
+# SENDMAIL_WITHOUT_SHMEM=yes
 # SENDMAIL_WITH_TLS=yes
 # SENDMAIL_WITH_SMTPS=yes
 # SENDMAIL_WITH_SASL=yes
@@ -103,6 +105,10 @@ post-extract:
 		> ${WRKSRC}/sm-client.sh
 	@${SED} -e "s=%%PREFIX%%=${PREFIX}=" ${FILESDIR}/sendmail.sh \
 		> ${WRKSRC}/sendmail.sh
+	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \
+		-e "s=%%LOCALBASE%%=${LOCALBASE}=g" \
+		-e "s=%%PORTSDIR%%=${PORTSDIR}=g" \
+		${PKGDIR}/pkg-message > ${WRKSRC}/pkg-message
 
 do-configure:
 	@${MV} ${WRKSRC}/devtools/OS/FreeBSD ${WRKSRC}/devtools/OS/FreeBSD.sed
@@ -118,6 +124,11 @@ do-configure:
 	 'APPENDDEF(`conf_sendmail_ENVDEF'\'', `-DPICKY_HELO_CHECK'\'')'  \
 		>> ${WCONF}/site.config.m4
 .endif
+.if defined(SENDMAIL_WITHOUT_SHMEM)
+	${ECHO_CMD} \
+	 'APPENDDEF(`confENVDEF'\'', `-DSM_CONF_SHM=0'\'')' \
+		>> ${WCONF}/site.config.m4
+.endif
 
 post-build:
 	( cd ${WRKSRC}/doc/op && ${MAKE} op.txt )
@@ -133,17 +144,17 @@ pre-install:
 	if ! pw groupshow smmsp; then pw groupadd smmsp -g 25; fi
 	if ! pw usershow smmsp; then pw useradd smmsp -g smmsp -u 25 \
 		-h - -d /nonexistent -s /nonexistent -c "Sendmail Queue"; fi
-.if !defined(NOPORTDOCS)
 	@cd ${WRKSRC} && ${FIND} cf -type f | \
 	${AWK} '{print "share/sendmail/" $$1}' >>${PLIST}
 	@cd ${WRKSRC} && ${FIND} -d cf -type d | \
 	${AWK} '{print "@dirrm share/sendmail/" $$1}' >>${PLIST}
 	@${ECHO_CMD} "@dirrm share/sendmail" >>${PLIST}
+.if !defined(NOPORTDOCS)
 .for i in ${DOCS}
 	@${ECHO_CMD} `${BASENAME} ${i}` | \
-	${AWK} '{print "share/doc/sendmail/" $$1}' >>${PLIST}
+	${AWK} '{print "%%DOCSDIR%%/" $$1}' >>${PLIST}
 .endfor
-	@${ECHO_CMD} "@dirrm share/doc/sendmail" >>${PLIST}
+	@${ECHO_CMD} "@dirrm %%DOCSDIR%%" >>${PLIST}
 .endif
 
 # We want mail.local and rmail for our system.
@@ -180,10 +191,11 @@ post-install:
 	@${RM} -f ${MANPREFIX}/man/cat1/${i} ${MANPREFIX}/man/cat1/${i}.gz
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man1
 .endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/sendmail ${DOCSDIR}
+	${MKDIR} ${PREFIX}/share/sendmail
 	@${TAR} -C ${WRKSRC} -cf - cf | \
 		${TAR} -C ${PREFIX}/share/sendmail -xf -
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${DOCSDIR}/op.ps
 	${INSTALL_DATA} ${WRKSRC}/doc/op/op.txt ${DOCSDIR}/op.txt
@@ -199,7 +211,7 @@ post-install:
 .endif
 .endif
 .if exists(${DESTDIR}/etc/mail/mailer.conf)
-	@${SED} s!%%PREFIX%%!${PREFIX}!g ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 mailer.base:
 	@${SED} \
@@ -274,14 +286,14 @@ SITE+=	${FILESDIR}/site.config.m4.local
 .endif
 
 .if exists(${DESTDIR}/etc/mail/mailer.conf) && ${PREFIX} == "/usr"
-pre-everything:
+pre-everything::
 	@${ECHO_CMD} "#"
 	@${ECHO_CMD} "# You can't override the base sendmail this way."
 	@${ECHO_CMD} "# your version FreeBSD use mailwrapper."
 	@${ECHO_CMD} "#"
 	@${ECHO_CMD} "# Please install with normal PREFIX"
 	@${ECHO_CMD} "# and activate the port version with"
-	@${ECHO_CMD} "# cd /usr/ports/mail/sendmail && make mailer.conf"
+	@${ECHO_CMD} "# cd ${PORTSDIR}/mail/sendmail && make mailer.conf"
 	@${ECHO_CMD} "#"
 	@${FALSE}
 .endif
diff --git a/mail/sendmail812/pkg-message b/mail/sendmail812/pkg-message
index ae9ace6a6fb3..d7ee5410095c 100644
--- a/mail/sendmail812/pkg-message
+++ b/mail/sendmail812/pkg-message
@@ -2,7 +2,7 @@
 If you update your configuration from 8.11.x you need to install an
 additional config file: /etc/mail/submit.cf, you can generate it
 by calling the target 'submit.cf', submit.mc will be installed too.
-/usr/ports/mail/sendmail$ make submit.cf
+%%PORTSDIR%%/mail/sendmail$ make submit.cf
 
 you should add in /etc/make.conf:
 SENDMAIL_CF_DIR=	%%PREFIX%%/share/sendmail/cf
@@ -22,12 +22,12 @@ To update your configuration look at %%PREFIX%%/share/sendmail/cf/README.
 ---------------------------------------------------
 To use the ports versions you may add to your sendmail.mc file:
 
-define(`confEBINDIR', `/usr/local/libexec')dnl
-define(`UUCP_MAILER_PATH', `/usr/local/bin/uux')dnl
+define(`confEBINDIR', `%%PREFIX%%/libexec')dnl
+define(`UUCP_MAILER_PATH', `%%LOCALBASE%%/bin/uux')dnl
 
 ---------------------------------------------------
 To activate sendmail as your default mailer, call the target 'mailer.conf':
-/usr/ports/mail/sendmail$ make mailer.conf
+$ cd %%PORTSDIR%%/mail/sendmail && make mailer.conf
 
 Your '/etc/mail/mailer.conf' should look like this:
 #
diff --git a/mail/sendmail812/pkg-plist b/mail/sendmail812/pkg-plist
index b4147a5ff8af..a6b74c3e9575 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.15 2002-09-16 03:17:13 dinoex Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/mail/sendmail812/Attic/pkg-plist,v 1.16 2003-10-09 16:23:40 dinoex Exp $
 @exec if ! pw groupshow smmsp 2>/dev/null; then pw groupadd smmsp -g 25; fi
 @exec if ! pw usershow smmsp 2>/dev/null; then pw useradd smmsp -g smmsp -u 25 -h - -d /nonexistent -s /nonexistent -c "Sendmail Queue"; fi
 @exec mkdir -p /var/spool/clientmqueue
@@ -25,9 +25,9 @@ sbin/sendmail
 @group
 @comment (overwritten by pkg_add) chown root:smmsp sbin/sendmail
 @exec chmod 2555 %D/sbin/sendmail
-%%PORTDOCS%%share/doc/sendmail/op.ps
-%%PORTDOCS%%share/doc/sendmail/op.txt
-%%PORTDOCS%%share/doc/sendmail/DEVTOOLS
-%%PORTDOCS%%share/doc/sendmail/SENDMAIL
-%%PORTDOCS%%share/doc/sendmail/MAIL.LOCAL
-%%PORTDOCS%%share/doc/sendmail/SMRSH
+%%PORTDOCS%%%%DOCSDIR%%/op.ps
+%%PORTDOCS%%%%DOCSDIR%%/op.txt
+%%PORTDOCS%%%%DOCSDIR%%/DEVTOOLS
+%%PORTDOCS%%%%DOCSDIR%%/SENDMAIL
+%%PORTDOCS%%%%DOCSDIR%%/MAIL.LOCAL
+%%PORTDOCS%%%%DOCSDIR%%/SMRSH