Date: Sat, 16 May 2015 18:45:44 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386569 - in head/mail/sendmail: . files Message-ID: <201505161845.t4GIjifd031174@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Sat May 16 18:45:43 2015 New Revision: 386569 URL: https://svnweb.freebsd.org/changeset/ports/386569 Log: - use USERS/GROUPS - removes obsolete @dirrm - support STRIP_CMD - stops rebuilding submit.cf PR: 200244 Submitted by: John Marino Added: head/mail/sendmail/files/patch-Makefile.m4 (contents, props changed) Modified: head/mail/sendmail/Makefile head/mail/sendmail/files/pkg-milter head/mail/sendmail/pkg-plist Modified: head/mail/sendmail/Makefile ============================================================================== --- head/mail/sendmail/Makefile Sat May 16 18:25:02 2015 (r386568) +++ head/mail/sendmail/Makefile Sat May 16 18:45:43 2015 (r386569) @@ -2,7 +2,7 @@ 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} @@ -14,6 +14,9 @@ COMMENT= Reliable, highly configurable m 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 \ @@ -211,14 +214,8 @@ pre-install: .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}` | \ @@ -227,7 +224,6 @@ pre-install: .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. @@ -279,11 +275,17 @@ post-install: ${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} \ Added: head/mail/sendmail/files/patch-Makefile.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/sendmail/files/patch-Makefile.m4 Sat May 16 18:45:43 2015 (r386569) @@ -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 Modified: head/mail/sendmail/files/pkg-milter ============================================================================== --- head/mail/sendmail/files/pkg-milter Sat May 16 18:25:02 2015 (r386568) +++ head/mail/sendmail/files/pkg-milter Sat May 16 18:45:43 2015 (r386569) @@ -3,7 +3,6 @@ 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 @@ -56,4 +55,3 @@ lib/libmilter.a %%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 Modified: head/mail/sendmail/pkg-plist ============================================================================== --- head/mail/sendmail/pkg-plist Sat May 16 18:25:02 2015 (r386568) +++ head/mail/sendmail/pkg-plist Sat May 16 18:45:43 2015 (r386569) @@ -1,10 +1,5 @@ -@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 @@ -29,11 +24,7 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505161845.t4GIjifd031174>