Date: Fri, 25 Dec 2015 13:59:50 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404421 - head/mail/bsmtp Message-ID: <201512251359.tBPDxoZa003431@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Fri Dec 25 13:59:50 2015 New Revision: 404421 URL: https://svnweb.freebsd.org/changeset/ports/404421 Log: - Add license - Style nits - Switch to options helpers - Modernize plist - Drop @dirrm's PR: 205571 Submitted by: amdmi3 Approved by: naddy (maintainer) Modified: head/mail/bsmtp/Makefile head/mail/bsmtp/pkg-plist Modified: head/mail/bsmtp/Makefile ============================================================================== --- head/mail/bsmtp/Makefile Fri Dec 25 13:53:48 2015 (r404420) +++ head/mail/bsmtp/Makefile Fri Dec 25 13:59:50 2015 (r404421) @@ -9,6 +9,9 @@ MASTER_SITES= LOCAL/naddy MAINTAINER= naddy@FreeBSD.org COMMENT= Batch SMTP support for sendmail, incoming and outgoing +LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING + RUN_DEPENDS= ${LOCALBASE}/bin/uux:${PORTSDIR}/net/freebsd-uucp CONFLICTS= smail-3.* @@ -19,6 +22,12 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS= --redo SHEBANG_FILES= configure +PRIVBIN= ${STAGEDIR}${PREFIX}/libexec/bsmtp +PUBBIN= ${STAGEDIR}${PREFIX}/bin +MAILERDIR= ${STAGEDIR}${PREFIX}/share/sendmail + +OPTIONS_DEFINE= DOCS + post-patch: @${CP} ${WRKSRC}/bsmtp.m4.8.9.in ${WRKSRC}/bsmtp.m4.8.10.in @${CP} ${FILESDIR}/bsmtp.m4.8.11.in ${WRKSRC}/ @@ -34,32 +43,30 @@ pre-configure: -e 's:%%PREFIX%%:${PREFIX}:' \ -e 's:%%LOCALBASE%%:${LOCALBASE}:' -privbin= ${STAGEDIR}${PREFIX}/libexec/bsmtp -pubbin= ${STAGEDIR}${PREFIX}/bin -mailerdir= ${STAGEDIR}${PREFIX}/share/sendmail - do-install: - ${MKDIR} ${privbin} - ${MKDIR} ${mailerdir} - ${INSTALL_PROGRAM} ${WRKSRC}/batcher.new ${privbin}/batcher - ${INSTALL_PROGRAM} ${WRKSRC}/bsmtp ${privbin} - ${INSTALL_DATA} ${WRKSRC}/bsmtp.m4.8.14 ${mailerdir}/bsmtp.m4 - ${INSTALL_SCRIPT} ${WRKSRC}/rcsmtp ${pubbin} + @${MKDIR} ${PRIVBIN} + @${MKDIR} ${MAILERDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/batcher.new ${PRIVBIN}/batcher + ${INSTALL_PROGRAM} ${WRKSRC}/bsmtp ${PRIVBIN} + ${INSTALL_DATA} ${WRKSRC}/bsmtp.m4.8.14 ${MAILERDIR}/bsmtp.m4 + ${INSTALL_SCRIPT} ${WRKSRC}/rcsmtp ${PUBBIN} .for i in cbsmtp crsmtp rgsmtp - ${LN} -s rcsmtp ${pubbin}/$i + ${LN} -s rcsmtp ${PUBBIN}/$i .endfor - ${INSTALL_PROGRAM} ${WRKSRC}/rsmtp.wrapper ${pubbin}/rsmtp - ${INSTALL_SCRIPT} ${WRKSRC}/rsmtp ${privbin} + ${INSTALL_PROGRAM} ${WRKSRC}/rsmtp.wrapper ${PUBBIN}/rsmtp + ${INSTALL_SCRIPT} ${WRKSRC}/rsmtp ${PRIVBIN} .for i in bsmtp - ${LN} -s rsmtp ${pubbin}/$i + ${LN} -s rsmtp ${PUBBIN}/$i .endfor .for i in c-cbsmtp c-rcsmtp g-rcsmtp g-rgsmtp n-rsmtp - ${INSTALL_SCRIPT} ${WRKSRC}/transmitter.$i ${privbin} + ${INSTALL_SCRIPT} ${WRKSRC}/transmitter.$i ${PRIVBIN} .endfor - ${INSTALL_PROGRAM} ${WRKSRC}/_bqueue ${pubbin} - ${INSTALL_SCRIPT} ${WRKSRC}/bqueue ${pubbin} -# post-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/_bqueue ${PUBBIN} + ${INSTALL_SCRIPT} ${WRKSRC}/bqueue ${PUBBIN} + ${MKDIR} ${STAGEDIR}/var/spool/bsnmp + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/mail/bsmtp/pkg-plist ============================================================================== --- head/mail/bsmtp/pkg-plist Fri Dec 25 13:53:48 2015 (r404420) +++ head/mail/bsmtp/pkg-plist Fri Dec 25 13:59:50 2015 (r404421) @@ -1,8 +1,4 @@ -@owner uucp -@mode 4555 -bin/_bqueue -@mode -@owner +@(uucp,,4555) bin/_bqueue bin/bqueue bin/bsmtp bin/cbsmtp @@ -11,20 +7,13 @@ bin/rcsmtp bin/rgsmtp bin/rsmtp libexec/bsmtp/batcher -@mode 4555 -libexec/bsmtp/bsmtp -@mode +@(root,,4555) libexec/bsmtp/bsmtp libexec/bsmtp/rsmtp libexec/bsmtp/transmitter.c-cbsmtp libexec/bsmtp/transmitter.c-rcsmtp libexec/bsmtp/transmitter.g-rcsmtp libexec/bsmtp/transmitter.g-rgsmtp libexec/bsmtp/transmitter.n-rsmtp -%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README share/sendmail/bsmtp.m4 -@dirrm libexec/bsmtp -@dirrm share/doc/bsmtp -@dirrm share/sendmail -@exec install -d -o uucp -g uucp -m 0770 /var/spool/bsmtp -@comment Do not use rmdir to avoid inappropriate pkg tools magic -@unexec rm -d /var/spool/bsmtp 2>/dev/null || true +@dir(uucp,uucp,770) /var/spool/bsnmp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512251359.tBPDxoZa003431>