Index: head/mail/sendmail/Makefile
===================================================================
--- head/mail/sendmail/Makefile	(revision 386568)
+++ head/mail/sendmail/Makefile	(revision 386569)
@@ -1,385 +1,387 @@
 # $FreeBSD$
 
 PORTNAME=	sendmail
 PORTVERSION=	8.15.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/
 PKGNAMESUFFIX?=	${TLS_SUFFIX}${SASL_SUFFIX}${LDAP_SUFFIX}${BDB_SUFFIX}${PKGNAMESUFFIX2}
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Reliable, highly configurable mail transfer agent with utilities
 
 CONFLICTS?=	courier-0.* postfix-1.* postfix-2.* smail-3.* zmailer-2.* opensmtpd-*
 NEED_ROOT=	yes
 
+USERS=		smmsp
+GROUPS=		smmsp
+
 USES=		cpe
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 DOCS=		KNOWNBUGS LICENSE PGPKEYS README RELEASE_NOTES \
 		sendmail/TRACEFLAGS sendmail/SECURITY sendmail/TUNING
 PLIST_SUB+=	PREFIX=${PREFIX:S=${PREFIX}/==} MANPREFIX=${MANPREFIX:S=$=/=:S=${PREFIX}==:S=^/==}
 PKGMESSAGE=	${WRKSRC}/pkg-message
 
 WCONF=		${WRKSRC}/devtools/Site
 SITE=		${FILESDIR}/site.config.m4.pre4
 PLIST=		${WRKDIR}/.PLIST.more
 LMAN1=		mailq.1 newaliases.1 vacation.1
 LMAN5=		aliases.5
 LMAN8=		sendmail.8 mailstats.8 makemap.8 praliases.8 smrsh.8 \
 		mail.local.8 rmail.8 editmap.8
 SENDMAIL=	${PREFIX}/sbin/sendmail
 BASEMAIL=	/usr/libexec/sendmail/sendmail
 MILTER_SOVER?=	6
 
 OPTIONS_DEFINE?=	SHMEM SEM LA NIS IPV6 TLS SASL SASLAUTHD LDAP BDB SOCKETMAP CYRUSLOOKUP PICKY_HELO_CHECK MILTER MILTER_SHARED MILTER_POOL TLSEXT_PADDING DOCS
 OPTIONS_DEFAULT?=	SHMEM SEM LA NIS IPV6 TLS SASL SASLAUTHD PICKY_HELO_CHECK MILTER MILTER_SHARED MILTER_POOL
 NO_OPTIONS_SORT=yes
 SHMEM_DESC=		System V shared memory support
 LA_DESC=		load averages support
 TLS_DESC=		SMTP-TLS and SMTPS support
 SASLAUTHD_DESC=		SASLAUTHD support
 BDB_DESC=		Berkeley DB version 4 support
 SOCKETMAP_DESC=		Enable socketmap feature
 CYRUSLOOKUP_DESC=	Enable cyruslookup feature
 PICKY_HELO_CHECK_DESC=	Enable picky HELO check
 MILTER_DESC=		Build libmilter
 MILTER_SHARED_DESC=	Build shared libmilter
 MILTER_POOL_DESC=	Enable milter thread pools
 TLSEXT_PADDING_DESC=	Enable TLSEXT padding
 
 BDB_USE=	BDB=yes
 LDAP_USE=	OPENLDAP=yes
 SASL_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 SASLAUTHD_RUN_DEPENDS=	${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd
 
 .include <bsd.port.options.mk>
 .if ${PORT_OPTIONS:MSHMEM} && !defined(BUILDING_INDEX)
 IPCCHECK!=	ipcrm -q 0 2>&1 || true
 .if ${IPCCHECK:Mimplemented}
 IGNORE=		your system does not support sysvipc
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MBDB}
 BDB_SUFFIX=	+${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,}
 CONFLICTS+=	sendmail-ldap-8.* sendmail-sasl-8.* sendmail-sasl2-8.* sendmail-tls-8.*
 .endif
 .if ${PORT_OPTIONS:MLDAP}
 LDAP_SUFFIX?=	+ldap
 CONFLICTS+=	sendmail-sasl-8.* sendmail-sasl2-8.* sendmail-tls-8.*
 .endif
 .if ${PORT_OPTIONS:MSASL}
 SASL_SUFFIX?=	+sasl2
 CONFLICTS+=	sendmail-ldap-8.* sendmail-sasl-8.* sendmail-tls-8.*
 .endif
 .if ${PORT_OPTIONS:MCYRUSLOOKUP}
 .if ! ${PORT_OPTIONS:MSOCKETMAP}
 IGNORE=		option CYRUSLOOKUP requires option SOCKETMAP
 .else
 EXTRA_PATCHES+=	${FILESDIR}/cyruslookup.patch
 .endif
 .endif
 .if ${PORT_OPTIONS:MTLS}
 TLS_SUFFIX?=	+tls
 CONFLICTS+=	sendmail-ldap-8.* sendmail-sasl-8.* sendmail-sasl2-8.*
 .endif
 
 MAKE_PKGNAMES=	for i in "" +tls; do \
 	for j in "" +sasl +sasl1 +sasl2; do \
 	for k in "" +ldap; do \
 	for l in "" +db2 +db3 +db4 +db41 +db42 +db43 +db44 +db45 +db46 +db47 +db48 +db49; do \
 	echo "sendmail$${i}$${j}$${k}$${l}-8.*" ;\
 	done done done done
 
 ALL_PKGNAMES!=	${MAKE_PKGNAMES}
 CONFLICTS2!=	${MAKE_PKGNAMES} | grep -v "${PORTNAME}${PKGNAMESUFFIX:S|${PKGNAMESUFFIX2}||}-8."
 CONFLICTS+=	${CONFLICTS2}
 
 # Build site.config.m4
 SITE+=	${FILESDIR}/site.config.m4
 .if ${PORT_OPTIONS:MIPV6}
 SITE+=	${FILESDIR}/site.config.m4.ipv6
 .endif
 .if ${PORT_OPTIONS:MSASL}
 SITE+=	${FILESDIR}/site.config.m4.sasl2
 .endif
 .if ${PORT_OPTIONS:MLDAP}
 SITE+=	${FILESDIR}/site.config.m4.ldap
 .endif
 .if ${PORT_OPTIONS:MMILTER}
 SITE+=	${FILESDIR}/site.config.m4.milter
 .endif
 .if ${PORT_OPTIONS:MTLS}
 USE_OPENSSL=	yes
 .endif
 
 .if ${PORT_OPTIONS:MMILTER}
 .if ${PORT_OPTIONS:MMILTER_SHARED}
 PLIST_SUB+=	MILTER_SHARED=""
 PLIST_SUB+=	MILTER_SOVER=${MILTER_SOVER}
 MAKE_ENV+=	MILTER_SOVER=${MILTER_SOVER}
 .else
 PLIST_SUB+=	MILTER_SHARED="@comment "
 .endif
 .endif
 
 SED_SCRIPT=	-e "s|\`-O\'|\`${CFLAGS}\'|" \
 		-e 's|%%CC%%|${CC}|' -e 's|%%LD%%|${LD}|'
 
 .if ! ${PORT_OPTIONS:MNIS}
 SED_SCRIPT+=	-e "s;-DNIS ;;"
 .endif
 
 post-patch:
 	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \
 		-e "s=%%LOCALBASE%%=${LOCALBASE}=g" \
 		-e "s=%%PORTSDIR%%=${PORTSDIR}=g" \
 		${PKGDIR}/pkg-message > ${WRKSRC}/pkg-message
 .if ${PORT_OPTIONS:MMILTER} && ${PORT_OPTIONS:MMILTER_SHARED}
 	@${CP} -pR ${WRKSRC}/libmilter ${WRKSRC}/libsharedmilter
 	${CP} ${FILESDIR}/sharedlibrary.m4 \
 		${WRKSRC}/devtools/M4/UNIX/sharedlibrary.m4
 	${REINPLACE_CMD} -e 's=`library=`sharedlibrary=' \
 		${WRKSRC}/libsharedmilter/Makefile.m4
 .endif
 
 do-configure:
 	${REINPLACE_CMD} ${SED_SCRIPT} ${WRKSRC}/devtools/OS/FreeBSD
 	${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \
 		-e "s=%%LOCALBASE%%=${LOCALBASE}=g" \
 		${SITE} > ${WCONF}/site.config.m4
 .if ${PORT_OPTIONS:MBDB}
 	${ECHO_CMD} \
 	 'APPENDDEF(`confENVDEF'\'', `-I${BDB_INCLUDE_DIR}'\'')' \
 		>> ${WCONF}/site.config.m4
 	${ECHO_CMD} \
 	 'APPENDDEF(`confLIBDIRS'\'', `-L${LOCALBASE}/lib'\'')' \
 		>> ${WCONF}/site.config.m4
 .for i in sendmail editmap makemap praliases vacation
 	${ECHO_CMD} \
 	 'APPENDDEF(`conf_${i}_LIBS'\'', `-l${BDB_LIB_NAME}'\'')' \
 		>> ${WCONF}/site.config.m4
 .endfor
 .endif
 .if ${PORT_OPTIONS:MSOCKETMAP}
 	${ECHO_CMD} \
 	 'APPENDDEF(`conf_sendmail_ENVDEF'\'', `-DSOCKETMAP'\'')' \
 		>> ${WCONF}/site.config.m4
 .endif
 .if ${PORT_OPTIONS:MPICKY_HELO_CHECK}
 	${ECHO_CMD} \
 	 'APPENDDEF(`conf_sendmail_ENVDEF'\'', `-DPICKY_HELO_CHECK'\'')' \
 		>> ${WCONF}/site.config.m4
 .endif
 .if ! ${PORT_OPTIONS:MSHMEM}
 	${ECHO_CMD} \
 	 'APPENDDEF(`confENVDEF'\'', `-DSM_CONF_SHM=0'\'')' \
 		>> ${WCONF}/site.config.m4
 .endif
 .if ! ${PORT_OPTIONS:MSEM}
 	${ECHO_CMD} \
 	'APPENDDEF(`confENVDEF'\'', `-DSM_CONF_SEM=0'\'')' \
 		>> ${WCONF}/site.config.m4
 .endif
 .if ! ${PORT_OPTIONS:MLA}
 	${ECHO_CMD} \
 	'APPENDDEF(`confENVDEF'\'', `-DLA_TYPE=LA_ZERO'\'')' \
 		>> ${WCONF}/site.config.m4
 .endif
 .if ${PORT_OPTIONS:MMILTER} && ${PORT_OPTIONS:MMILTER_POOL} 
 	${ECHO_CMD} \
 	 'APPENDDEF(`conf_libmilter_ENVDEF'\'', `-DSM_CONF_POLL=1'\'')' \
 		>> ${WCONF}/site.config.m4
 	${ECHO_CMD} \
 	 'APPENDDEF(`conf_libmilter_ENVDEF'\'', `-D_FFR_WORKERS_POOL=1'\'')' \
 		>> ${WCONF}/site.config.m4
 .endif
 
 post-build:
 	(cd ${WRKSRC}/doc/op && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} op.txt)
 .if ${PORT_OPTIONS:MMILTER}
 	(cd ${BUILD_WRKSRC}/libmilter; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 .if ${PORT_OPTIONS:MMILTER_SHARED}
 	(cd ${BUILD_WRKSRC}/libsharedmilter; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 .endif
 .endif
 
 pre-install:
 	${MKDIR} ${STAGEDIR}/etc/mail
 	@${CAT} ${PKGDIR}/pkg-plist >${PLIST}
 .if ${PORT_OPTIONS:MMILTER}
 	@${CAT} ${FILESDIR}/pkg-milter >>${PLIST}
 .endif
-	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
 	@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 ${PORT_OPTIONS:MDOCS}
 .for i in ${DOCS}
 	@${ECHO_CMD} `${BASENAME} ${i}` | \
 	${AWK} '{print "%%DOCSDIR%%/" $$1}' >>${PLIST}
 .endfor
 .if ${PORT_OPTIONS:MCYRUSLOOKUP}
 	@${ECHO_CMD} "share/doc/sendmail/CYRUS_LOOKUP" >>${PLIST}
 .endif
-	@${ECHO_CMD} "@dirrm %%DOCSDIR%%" >>${PLIST}
 .endif
 
 # We want mail.local and rmail for our system.
 # the build install catmans only, we have to fix this.
 post-install:
 	(cd ${WRKSRC}/mail.local && \
 	 ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} force-install)
 	(cd ${WRKSRC}/rmail && \
 	 ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} force-install)
 .if ${PORT_OPTIONS:MMILTER}
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/libmilter
 	${INSTALL_DATA} ${WRKSRC}/include/libmilter/mfapi.h \
 		${WRKSRC}/include/libmilter/mfdef.h \
 		${STAGEDIR}${PREFIX}/include/libmilter/
 	${INSTALL_DATA} \
 	 ${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libmilter/libmilter.a \
 	 ${STAGEDIR}${PREFIX}/lib/
 .if ${PORT_OPTIONS:MMILTER_SHARED}
 	${INSTALL_SCRIPT} \
 	 ${WRKSRC}/obj.`${WRKSRC}/devtools/bin/Build -A`/libsharedmilter/libmilter.so \
 	 ${STAGEDIR}${PREFIX}/lib/libmilter.so.${MILTER_SOVER}
 	${LN} -sf libmilter.so.${MILTER_SOVER} \
 		${STAGEDIR}${PREFIX}/lib/libmilter.so
 .endif
 .endif
 .for i in ${LMAN8}
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${MANPREFIX}/man/man8/
 .endfor
 .for i in ${LMAN5}
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${MANPREFIX}/man/man5/
 .endfor
 .for i in ${LMAN1}
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${MANPREFIX}/man/man1/
 .endfor
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/sendmail
 	${TAR} -C ${WRKSRC} -cf - cf | \
 		${TAR} -C ${STAGEDIR}${PREFIX}/share/sendmail -xf -
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${STAGEDIR}${DOCSDIR}/op.ps
 	${INSTALL_DATA} ${WRKSRC}/doc/op/op.txt ${STAGEDIR}${DOCSDIR}/op.txt
 	${INSTALL_DATA} ${WRKSRC}/devtools/README ${STAGEDIR}${DOCSDIR}/DEVTOOLS
 	${INSTALL_DATA} ${WRKSRC}/sendmail/README ${STAGEDIR}${DOCSDIR}/SENDMAIL
 	${INSTALL_DATA} ${WRKSRC}/mail.local/README ${STAGEDIR}${DOCSDIR}/MAIL.LOCAL
 	${INSTALL_DATA} ${WRKSRC}/smrsh/README ${STAGEDIR}${DOCSDIR}/SMRSH
 .if ${PORT_OPTIONS:MMILTER}
 	${INSTALL_DATA} ${WRKSRC}/libmilter/README ${STAGEDIR}${DOCSDIR}/MILTER
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/libmilter
 	${TAR} -C ${WRKSRC}/libmilter/docs -cf - . | \
 		${TAR} -C ${STAGEDIR}${DOCSDIR}/libmilter -xf -
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmilter.so.${MILTER_SOVER}
 .endif
 .if ${PORT_OPTIONS:MCYRUSLOOKUP}
 	${INSTALL_DATA} ${FILESDIR}/CYRUS_LOOKUP ${STAGEDIR}${DOCSDIR}/CYRUS_LOOKUP
 .endif
 .endif
+	${RM} ${STAGEDIR}${PREFIX}/man/cat*/*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vacation
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/rmail
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/*
 
 mailer.base:
 	@${SED} \
 	-e "s=^sendmail[ 	]*/.*$$=sendmail	${BASEMAIL}=" \
 	-e "s=^send-mail[ 	]*/.*$$=send-mail	${BASEMAIL}=" \
 	-e "s=^mailq[ 	]*/.*$$=mailq		${BASEMAIL}=" \
 	-e "s=^newaliases[ 	]*/.*$$=newaliases	${BASEMAIL}=" \
 	-e "s=^hoststat[ 	]*/.*$$=hoststat	${BASEMAIL}=" \
 	-e "s=^purgestat[ 	]*/.*$$=purgestat	${BASEMAIL}=" \
 	 ${DESTDIR}/etc/mail/mailer.conf > ${DESTDIR}/etc/mail/mailer.conf.new
 	${MV} ${DESTDIR}/etc/mail/mailer.conf.new \
 		${DESTDIR}/etc/mail/mailer.conf
 
 mailer.conf:
 	@${SED} \
 	-e "s=^sendmail[ 	]*/.*$$=sendmail	${SENDMAIL}=" \
 	-e "s=^send-mail[ 	]*/.*$$=send-mail	${SENDMAIL}=" \
 	-e "s=^mailq[ 	]*/.*$$=mailq		${SENDMAIL}=" \
 	-e "s=^newaliases[ 	]*/.*$$=newaliases	${SENDMAIL}=" \
 	-e "s=^hoststat[ 	]*/.*$$=hoststat	${SENDMAIL}=" \
 	-e "s=^purgestat[ 	]*/.*$$=purgestat	${SENDMAIL}=" \
 	 ${DESTDIR}/etc/mail/mailer.conf > ${DESTDIR}/etc/mail/mailer.conf.new
 	${MV} ${DESTDIR}/etc/mail/mailer.conf.new \
 		${DESTDIR}/etc/mail/mailer.conf
 
 # create sumbit.cf on older systems
 #
 submit.cf:	${DESTDIR}/etc/mail/submit.cf
 
 ${DESTDIR}/etc/mail/submit.mc:
 	${INSTALL_DATA} ${PREFIX}/share/sendmail/cf/cf/submit.mc \
 		${DESTDIR}/etc/mail/submit.mc
 
 ${DESTDIR}/etc/mail/submit.cf:	${DESTDIR}/etc/mail/submit.mc
 	@( cd ${DESTDIR}/etc/mail && ${MAKE} \
 		SENDMAIL_CF_DIR=${PREFIX}/share/sendmail/cf \
 		SENDMAIL_MC=submit )
 
 # create basics for smtp-auth
 #
 howto-sasldb:
 	@${ECHO_CMD} "# Links:"
 	@${ECHO_CMD} "#"
 	@${ECHO_CMD} "# http://www.sendmail.org/~gshapiro/"
 	@${ECHO_CMD} "# http://www.sendmail.org/~ca/email/auth.html"
 	@${ECHO_CMD} "# http://www.bme.ogi.edu/~pchytil/linux/sendmail/"
 	@${ECHO_CMD} "# http://blue-labs.org/software/sm-pgsql/"
 	@${ECHO_CMD} "# http://www.falkotimme.com/howtos/sendmail_smtp_auth_tls/"
 	@${ECHO_CMD} "#"
 
 # create certificates for TLS/SSL
 #
 tls-install:
 	${SETENV} DESTDIR=${DESTDIR} FILESDIR=${FILESDIR} \
 		${SH} ${FILESDIR}/tls-install.sh
 
 help:
 	@${ECHO_CMD} "# additional targets:"
 	@${ECHO_CMD} "#"
 	@${ECHO_CMD} "# configure ${DESTDIR}/etc/mail/mailer.conf"
 	@${ECHO_CMD} "# for sendmail from ports"
 	@${ECHO_CMD} "make mailer.conf"
 	@${ECHO_CMD} "# for sendmail in the base"
 	@${ECHO_CMD} "make mailer.base"
 	@${ECHO_CMD} "#"
 	@${ECHO_CMD} "# show howto for configuring sasldb"
 	@${ECHO_CMD} "make howto-sasldb"
 	@${ECHO_CMD} "#"
 	@${ECHO_CMD} "# create a self-signed certificate"
 	@${ECHO_CMD} "make tls-install"
 	@${ECHO_CMD} "#"
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MTLS}
 .if !defined(WITH_OPENSSL_BASE)
 SITE+=	${FILESDIR}/site.config.m4.ssl
 .endif
 SITE+=	${FILESDIR}/site.config.m4.tls
 .endif
 
 .if exists(${FILESDIR}/site.config.m4.local)
 SITE+=	${FILESDIR}/site.config.m4.local
 .endif
 
 .if ${PREFIX} == "/usr"
 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 ${PORTSDIR}/mail/sendmail && make mailer.conf"
 	@${ECHO_CMD} "#"
 	@${FALSE}
 .endif
 
 .include <bsd.port.post.mk>
Index: head/mail/sendmail/files/patch-Makefile.m4
===================================================================
--- head/mail/sendmail/files/patch-Makefile.m4	(nonexistent)
+++ head/mail/sendmail/files/patch-Makefile.m4	(revision 386569)
@@ -0,0 +1,12 @@
+--- sendmail/Makefile.m4.orig	2014-11-11 15:49:49 UTC
++++ sendmail/Makefile.m4
+@@ -13,8 +13,7 @@ bldPUSH_SMLIB(`smutil')
+ 
+ 
+ dnl hack: /etc/mail is not defined as "location of .cf" in the build system
+-define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP',
+-`${DESTDIR}/etc/mail/submit.cf ${DESTDIR}${MSPQ}'))dnl
++define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP'))
+ define(`bldTARGET_LINKS', ifdef(`confLINKS', `confLINKS',
+ `${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
+ )dnl

Property changes on: head/mail/sendmail/files/patch-Makefile.m4
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/sendmail/files/pkg-milter
===================================================================
--- head/mail/sendmail/files/pkg-milter	(revision 386568)
+++ head/mail/sendmail/files/pkg-milter	(revision 386569)
@@ -1,59 +1,57 @@
 include/libmilter/mfapi.h
 include/libmilter/mfdef.h
 lib/libmilter.a
 %%MILTER_SHARED%%lib/libmilter.so.%%MILTER_SOVER%%
 %%MILTER_SHARED%%lib/libmilter.so
-@dirrm include/libmilter
 %%PORTDOCS%%share/doc/sendmail/MILTER
 %%PORTDOCS%%share/doc/sendmail/libmilter/api.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/design.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/figure1.fig
 %%PORTDOCS%%share/doc/sendmail/libmilter/figure1.jpg
 %%PORTDOCS%%share/doc/sendmail/libmilter/figure1.ps
 %%PORTDOCS%%share/doc/sendmail/libmilter/figure2.fig
 %%PORTDOCS%%share/doc/sendmail/libmilter/figure2.jpg
 %%PORTDOCS%%share/doc/sendmail/libmilter/figure2.ps
 %%PORTDOCS%%share/doc/sendmail/libmilter/index.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/installation.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/other.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/overview.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/sample.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_addheader.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_addrcpt.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_addrcpt_par.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_chgfrom.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_chgheader.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_delrcpt.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_getpriv.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_getsymval.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_insheader.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_main.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_opensocket.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_progress.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_quarantine.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_register.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_replacebody.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setbacklog.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setconn.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setdbg.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setmlreply.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setpriv.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setreply.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_setsymlist.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_settimeout.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_stop.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/smfi_version.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_abort.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_body.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_close.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_connect.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_data.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_envfrom.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_envrcpt.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_eoh.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_eom.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_header.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_helo.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_negotiate.html
 %%PORTDOCS%%share/doc/sendmail/libmilter/xxfi_unknown.html
-%%PORTDOCS%%@dirrm share/doc/sendmail/libmilter
Index: head/mail/sendmail/pkg-plist
===================================================================
--- head/mail/sendmail/pkg-plist	(revision 386568)
+++ head/mail/sendmail/pkg-plist	(revision 386569)
@@ -1,43 +1,34 @@
-@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
-@exec chown smmsp:smmsp /var/spool/clientmqueue
+@comment cannot use @dir because this is home directory of smmsp
 @exec chmod 770 /var/spool/clientmqueue
-@unexec if pw usershow smmsp | grep -q 90:90; then pw userdel smmsp; fi
-@comment (removed by userdel) pw groupdel smmsp
 bin/hoststat
 bin/mailq
 bin/newaliases
 bin/purgestat
 bin/rmail
 bin/vacation
 libexec/mail.local
 libexec/smrsh
 %%MANPREFIX%%man/man1/mailq.1.gz
 %%MANPREFIX%%man/man1/newaliases.1.gz
 %%MANPREFIX%%man/man1/vacation.1.gz
 %%MANPREFIX%%man/man5/aliases.5.gz
 %%MANPREFIX%%man/man8/sendmail.8.gz
 %%MANPREFIX%%man/man8/mailstats.8.gz
 %%MANPREFIX%%man/man8/makemap.8.gz
 %%MANPREFIX%%man/man8/praliases.8.gz
 %%MANPREFIX%%man/man8/smrsh.8.gz
 %%MANPREFIX%%man/man8/mail.local.8.gz
 %%MANPREFIX%%man/man8/rmail.8.gz
 %%MANPREFIX%%man/man8/editmap.8.gz
 sbin/editmap
 sbin/mailstats
 sbin/makemap
 sbin/praliases
-@group smmsp
-sbin/sendmail
-@group
-@comment (overwritten by pkg_add) chown root:smmsp sbin/sendmail
-@exec chmod 2555 %D/sbin/sendmail
+@(root,smmsp,2555) sbin/sendmail
 share/sendmail/helpfile
 %%PORTDOCS%%%%DOCSDIR%%/op.ps
 %%PORTDOCS%%%%DOCSDIR%%/op.txt
 %%PORTDOCS%%%%DOCSDIR%%/DEVTOOLS
 %%PORTDOCS%%%%DOCSDIR%%/SENDMAIL
 %%PORTDOCS%%%%DOCSDIR%%/MAIL.LOCAL
 %%PORTDOCS%%%%DOCSDIR%%/SMRSH