Date: Thu, 3 Sep 2015 16:37:32 +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: r396018 - in head/mail: emil ezmlm gmime2 gmime24 gmime26 hashcash lmtp2nntp mew milter-bogom mixmaster mulberry mutt_vc_query postgrey py-spambayes qmail-activedir qmail-contrib qmhand... Message-ID: <201509031637.t83GbWIW041805@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Sep 3 16:37:31 2015 New Revision: 396018 URL: https://svnweb.freebsd.org/changeset/ports/396018 Log: - Switch to options helpers - Add some NO_ARCHes - Fix and unsilence some installation commands Approved by: portmgr blanket Modified: head/mail/emil/Makefile head/mail/ezmlm/Makefile head/mail/gmime2/Makefile head/mail/gmime24/Makefile head/mail/gmime26/Makefile head/mail/hashcash/Makefile head/mail/lmtp2nntp/Makefile head/mail/mew/Makefile head/mail/milter-bogom/Makefile head/mail/mixmaster/Makefile head/mail/mulberry/Makefile head/mail/mutt_vc_query/Makefile head/mail/postgrey/Makefile head/mail/py-spambayes/Makefile head/mail/qmail-activedir/Makefile head/mail/qmail-contrib/Makefile head/mail/qmhandle/Makefile head/mail/sentinel/Makefile Modified: head/mail/emil/Makefile ============================================================================== --- head/mail/emil/Makefile Thu Sep 3 16:35:25 2015 (r396017) +++ head/mail/emil/Makefile Thu Sep 3 16:37:31 2015 (r396018) @@ -20,10 +20,6 @@ CONFIGURE_ENV= YACC=byacc OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -.if empty(PORT_OPTIONS:MDOCS) -MAKE_ENV= NOPORTDOCS=yes -.endif +DOCS_MAKE_ENV_OFF= NOPORTDOCS=yes .include <bsd.port.mk> Modified: head/mail/ezmlm/Makefile ============================================================================== --- head/mail/ezmlm/Makefile Thu Sep 3 16:35:25 2015 (r396017) +++ head/mail/ezmlm/Makefile Thu Sep 3 16:37:31 2015 (r396018) @@ -30,8 +30,6 @@ DOCS= BLURB INSTALL README THANKS TODO OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-patch: @${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/conf-bin @${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc @@ -46,9 +44,9 @@ do-install: ${INSTALL_PROGRAM} ${PROGRAMS} ${STAGEDIR}${PREFIX}/bin && \ ${INSTALL_MAN} *.1 ${STAGEDIR}${MANPREFIX}/man/man1 && \ ${INSTALL_MAN} *.5 ${STAGEDIR}${MANPREFIX}/man/man5 -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> Modified: head/mail/gmime2/Makefile ============================================================================== --- head/mail/gmime2/Makefile Thu Sep 3 16:35:25 2015 (r396017) +++ head/mail/gmime2/Makefile Thu Sep 3 16:37:31 2015 (r396018) @@ -35,19 +35,15 @@ OPTIONS_DEFINE= DOCS PORTDOCS= * -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e "s|stdint.h|inttypes.h|" ${WRKSRC}/zentimer.h @${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \ ${WRKSRC}/gmime/Makefile.in -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in docs/reference/html/* ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk> Modified: head/mail/gmime24/Makefile ============================================================================== --- head/mail/gmime24/Makefile Thu Sep 3 16:35:25 2015 (r396017) +++ head/mail/gmime24/Makefile Thu Sep 3 16:37:31 2015 (r396018) @@ -35,18 +35,14 @@ OPTIONS_DEFINE= DOCS PORTDOCS= * -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \ ${WRKSRC}/*/Makefile.in -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in docs/reference/html/* ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk> Modified: head/mail/gmime26/Makefile ============================================================================== --- head/mail/gmime26/Makefile Thu Sep 3 16:35:25 2015 (r396017) +++ head/mail/gmime26/Makefile Thu Sep 3 16:37:31 2015 (r396018) @@ -28,22 +28,19 @@ CONFIGURE_ARGS?=--with-html-dir=${PREFIX CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= DOCS +PORTDOCS= * -.include <bsd.port.options.mk> +OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS =/s/tests//' \ ${WRKSRC}/Makefile.in -.if ${PORT_OPTIONS:MDOCS} -PORTDOCS= * -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in docs/reference/html/* ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk> Modified: head/mail/hashcash/Makefile ============================================================================== --- head/mail/hashcash/Makefile Thu Sep 3 16:35:25 2015 (r396017) +++ head/mail/hashcash/Makefile Thu Sep 3 16:37:31 2015 (r396018) @@ -14,7 +14,7 @@ LICENSE_NAME= CPL LICENSE_TEXT= http://www.cypherspace.org/CPL/ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USES= tar:tgz +USES= tar:tgz PLIST_FILES= bin/hashcash bin/sha1 PLIST_FILES+= man/man1/hashcash.1.gz @@ -27,13 +27,7 @@ MAKE_ENV+= STAGEDIR=${STAGEDIR} OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -.if !${PORT_OPTIONS:MDOCS} - -post-patch: +post-patch-DOCS-off: ${REINPLACE_CMD} -e '/DOC_INSTALL_PATH/d' ${WRKSRC}/Makefile -.endif - .include <bsd.port.mk> Modified: head/mail/lmtp2nntp/Makefile ============================================================================== --- head/mail/lmtp2nntp/Makefile Thu Sep 3 16:35:25 2015 (r396017) +++ head/mail/lmtp2nntp/Makefile Thu Sep 3 16:37:31 2015 (r396018) @@ -24,18 +24,14 @@ PORTDOCS= INSTALL README OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - # Try to fix parallel builds (-jX) post-patch: @${REINPLACE_CMD} -e '/^all:/s, _SUBDIRS_all,, ; \ /^$$(PROG)/s,$$, _SUBDIRS_all,' ${WRKSRC}/Makefile.in -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.endif check: build @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \ Modified: head/mail/mew/Makefile ============================================================================== --- head/mail/mew/Makefile Thu Sep 3 16:35:25 2015 (r396017) +++ head/mail/mew/Makefile Thu Sep 3 16:37:31 2015 (r396018) @@ -41,13 +41,11 @@ PORTDOCS= 00api 00changes.0 00changes.1 00changes.6.5 00changes.6.6 \ 00diff 00readme dot.emacs dot.mew dot.theme -.include <bsd.port.options.mk> - post-install: @${RM} -f ${STAGEDIR}${PREFIX}/${INFO_PATH}/*.info.~1~ -.if ${PORT_OPTIONS:MDOCS} + +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> Modified: head/mail/milter-bogom/Makefile ============================================================================== --- head/mail/milter-bogom/Makefile Thu Sep 3 16:35:25 2015 (r396017) +++ head/mail/milter-bogom/Makefile Thu Sep 3 16:37:31 2015 (r396018) @@ -34,8 +34,6 @@ PORTDOCS= README CHANGELOG OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-patch: ${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/bogom.8 ${REINPLACE_CMD} -e \ @@ -48,11 +46,11 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bogom ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_MAN} ${WRKSRC}/bogom.8 ${STAGEDIR}${PREFIX}/man/man8/ ${INSTALL_DATA} ${WRKSRC}/bogom.conf-example ${STAGEDIR}${PREFIX}/etc/ -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ .endfor -.endif .include <bsd.port.mk> Modified: head/mail/mixmaster/Makefile ============================================================================== --- head/mail/mixmaster/Makefile Thu Sep 3 16:35:25 2015 (r396017) +++ head/mail/mixmaster/Makefile Thu Sep 3 16:37:31 2015 (r396018) @@ -29,11 +29,7 @@ CONFIG_FILES= abuse.txt.in dest.blk mix. OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -.if ${OSVERSION} < 1000000 -BROKEN= Does not compile -.endif +BROKEN_FreeBSD_9= does not compile post-patch: @${RM} ${WRKSRC}/Mix/conf/mix.cfg.orig @@ -55,13 +51,13 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/mixmaster-update.pl ${STAGEDIR}${PREFIX}/bin/mixmaster-update ${INSTALL_MAN} ${WRKSRC}/Mix/mixmaster.1 ${STAGEDIR}${PREFIX}/man/man1/mixmaster.1 ${INSTALL_MAN} ${WRKSRC}/Mix/mpgp.1 ${STAGEDIR}${PREFIX}/man/man1/mpgp.1 -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/Mix/,} ${STAGEDIR}${DOCSDIR}/ -.endif .for FILE in ${CONFIG_FILES} @${MKDIR} ${STAGEDIR}${ETCDIR} - @${INSTALL_DATA} ${WRKSRC}/Mix/conf/${FILE} ${STAGEDIR}${ETCDIR}/${FILE}.sample + ${INSTALL_DATA} ${WRKSRC}/Mix/conf/${FILE} ${STAGEDIR}${ETCDIR}/${FILE}.sample .endfor +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/Mix/,} ${STAGEDIR}${DOCSDIR}/ + .include <bsd.port.mk> Modified: head/mail/mulberry/Makefile ============================================================================== --- head/mail/mulberry/Makefile Thu Sep 3 16:35:25 2015 (r396017) +++ head/mail/mulberry/Makefile Thu Sep 3 16:37:31 2015 (r396018) @@ -7,22 +7,19 @@ PORTREVISION= 2 CATEGORIES= mail linux MASTER_SITES= http://www.mulberrymail.com/downloads/Mulberry/v${DISTVERSION:S/./_/g}/ DISTNAME= Mulberry -EXTRACT_SUFX= .tgz DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Scalable high-performance GUI Internet Mail User Agent -OPTIONS_DEFINE= DOCS +USES= tar:tgz NO_WRKSUBDIR= yes USE_LINUX= yes USE_LINUX_APPS= xorglibs ONLY_FOR_ARCHS= i386 amd64 -.include <bsd.port.pre.mk> -.include <bsd.port.options.mk> +OPTIONS_DEFINE= DOCS -INSTALL_DIR?= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 PLUGINSDIR= ${PREFIX}/lib/${PORTNAME}/Plug-ins RESOURCESDIR= ${PREFIX}/lib/${PORTNAME}/Resources PIXMAPSDIR= ${PREFIX}/share/pixmaps @@ -34,8 +31,8 @@ do-build: ${BRANDELF} -t Linux ${WRKSRC}/${PORTNAME} do-install: - ${INSTALL_DIR} ${STAGEDIR}${PLUGINSDIR} - ${INSTALL_DIR} ${STAGEDIR}${PIXMAPSDIR} + ${MKDIR} ${STAGEDIR}${PLUGINSDIR} + ${MKDIR} ${STAGEDIR}${PIXMAPSDIR} ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} # ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTNAME}.bin # ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME} @@ -43,14 +40,15 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/Resources ${INSTALL_DATA} ${WRKSRC}/.${PORTNAME}/Resources/* ${STAGEDIR}${RESOURCESDIR} ${INSTALL_DATA} ${WRKSRC}/.${PORTNAME}/icons/* ${STAGEDIR}${PIXMAPSDIR} - ${INSTALL_DIR} ${STAGEDIR}${PLUGINSDIR}/Timezones + ${MKDIR} ${STAGEDIR}${PLUGINSDIR}/Timezones ${INSTALL_DATA} ${WRKSRC}/.${PORTNAME}/Plug-ins/Timezones/* ${STAGEDIR}${PLUGINSDIR}/Timezones ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${FILESDIR}/mailcap ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${FILESDIR}/url.helpers ${STAGEDIR}${EXAMPLESDIR} -.if ${PORT_OPTIONS:MDOCS} - ${INSTALL_DIR} ${STAGEDIR}${DOCSDIR} + +do-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/.${PORTNAME}/CHANGES* ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/Mulberry_License ${STAGEDIR}${DOCSDIR} -.endif -.include <bsd.port.post.mk> + +.include <bsd.port.mk> Modified: head/mail/mutt_vc_query/Makefile ============================================================================== --- head/mail/mutt_vc_query/Makefile Thu Sep 3 16:35:25 2015 (r396017) +++ head/mail/mutt_vc_query/Makefile Thu Sep 3 16:37:31 2015 (r396018) @@ -22,14 +22,10 @@ PLIST_FILES= bin/mutt_vc_query man/man1/ OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOCS} -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for DOC in AUTHORS ChangeLog NEWS README THANKS ${INSTALL_DATA} ${WRKSRC}/${DOC} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk> Modified: head/mail/postgrey/Makefile ============================================================================== --- head/mail/postgrey/Makefile Thu Sep 3 16:35:25 2015 (r396017) +++ head/mail/postgrey/Makefile Thu Sep 3 16:37:31 2015 (r396018) @@ -21,6 +21,7 @@ RUN_DEPENDS= p5-Net-Server>=0:${PORTSDIR USE_PERL5= run USE_RC_SUBR= ${PORTNAME} NO_BUILD= yes +NO_ARCH= yes POD2MAN?= pod2man PORTDOCS= README Changes README.exim @@ -50,8 +51,6 @@ SHEBANG_FILES= postgrey policy-test cont OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e 's#nogroup#${PG_GROUP}#' \ -e 's#/etc/main.cf#/etc/postfix/main.cf#' ${WRKSRC}/postgrey @@ -74,12 +73,11 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/postgrey_${i} \ ${STAGEDIR}${PREFIX}/etc/postfix/postgrey_${i}.sample .endfor + cd ${WRKSRC} && \ + ${INSTALL_MAN} ${MANPAGES} ${STAGEDIR}${MANPREFIX}/man/man1 -.if ${PORT_OPTIONS:MDOCS} +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.endif - @cd ${WRKSRC} && \ - ${INSTALL_MAN} ${MANPAGES} ${STAGEDIR}${MANPREFIX}/man/man1 + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/mail/py-spambayes/Makefile ============================================================================== --- head/mail/py-spambayes/Makefile Thu Sep 3 16:35:25 2015 (r396017) +++ head/mail/py-spambayes/Makefile Thu Sep 3 16:37:31 2015 (r396018) @@ -19,6 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsdd USES= python:2 USE_PYTHON= distutils autoplist +NO_ARCH= yes USE_RC_SUBR= pyspamd @@ -67,10 +68,13 @@ post-patch: '/unknown_cache/s|pop3proxy-unknown-cache|${CACHEDIR}/pop3proxy-unknown-cache|' \ ${WRKSRC}/spambayes/Options.py -.include <bsd.port.options.mk> - post-install: -.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${CACHEDIR}/pop3proxy-spam-cache + @${MKDIR} ${STAGEDIR}${CACHEDIR}/pop3proxy-ham-cache + @${MKDIR} ${STAGEDIR}${CACHEDIR}/pop3proxy-unknown-cache + @${MKDIR} ${STAGEDIR}${DBDIR} + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in ${PORTDOCS} @if [ -f ${WRKSRC}/${file} ]; then \ @@ -79,12 +83,7 @@ post-install: .endfor @${MKDIR} ${STAGEDIR}${DOCSDIR}/contrib @${MKDIR} ${STAGEDIR}${DOCSDIR}/utilities - @${INSTALL_DATA} ${WRKSRC}/contrib/* ${STAGEDIR}${DOCSDIR}/contrib - @${INSTALL_DATA} ${WRKSRC}/utilities/* ${STAGEDIR}${DOCSDIR}/utilities -.endif - @${MKDIR} ${STAGEDIR}${CACHEDIR}/pop3proxy-spam-cache - @${MKDIR} ${STAGEDIR}${CACHEDIR}/pop3proxy-ham-cache - @${MKDIR} ${STAGEDIR}${CACHEDIR}/pop3proxy-unknown-cache - @${MKDIR} ${STAGEDIR}${DBDIR} + ${INSTALL_DATA} ${WRKSRC}/contrib/* ${STAGEDIR}${DOCSDIR}/contrib + ${INSTALL_DATA} ${WRKSRC}/utilities/* ${STAGEDIR}${DOCSDIR}/utilities .include <bsd.port.mk> Modified: head/mail/qmail-activedir/Makefile ============================================================================== --- head/mail/qmail-activedir/Makefile Thu Sep 3 16:35:25 2015 (r396017) +++ head/mail/qmail-activedir/Makefile Thu Sep 3 16:37:31 2015 (r396018) @@ -25,8 +25,6 @@ WANT_OPENLDAP_VER= ${WITH_OPENLDAP_VER} OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e 's,/var/qmail,${QMAIL_PREFIX},g' \ -e 's,\(#define AD_USE_GC\) 1,\1 0,' \ @@ -43,9 +41,9 @@ do-install: .for prog in ${BINARIES} ${INSTALL_PROGRAM} ${WRKSRC}/${prog} ${STAGEDIR}${PREFIX}/bin/ .endfor -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> Modified: head/mail/qmail-contrib/Makefile ============================================================================== --- head/mail/qmail-contrib/Makefile Thu Sep 3 16:35:25 2015 (r396017) +++ head/mail/qmail-contrib/Makefile Thu Sep 3 16:37:31 2015 (r396018) @@ -36,8 +36,6 @@ NO_MTREE= yes PORTDOCS= ALIASES DOCSDIR= doc/${PORTNAME} -.include <bsd.port.pre.mk> - pre-patch: @${PATCH} -d ${WRKFF} -s <${PATCHDIR}/extra-patch-newaliases @@ -47,40 +45,40 @@ post-patch: @${REINPLACE_CMD} -e '/cat/d; s|doc/fastforward|${DOCSDIR}|g' \ ${WRKFF}/hier.c \ ${WRKDF}/hier.c -.if !${PORT_OPTIONS:MDOCS} - @${REINPLACE_CMD} -E 's|^(.*${DOCSDIR})|// \1|g' \ - ${WRKFF}/hier.c -.endif @${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKFF}/conf-cc @${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKFF}/conf-ld @${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKDF}/conf-cc @${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKDF}/conf-ld +post-patch-DOCS-off: + @${REINPLACE_CMD} -E 's|^(.*${DOCSDIR})|// \1|g' \ + ${WRKFF}/hier.c + do-build: - @${MAKE} -C ${WRKDIR}/dot-forward-${DF_VER} ${ALL_TARGET} - @${MAKE} -C ${WRKDIR}/fastforward-${FF_VER} ${ALL_TARGET} + ${MAKE_CMD} -C ${WRKDIR}/dot-forward-${DF_VER} ${ALL_TARGET} + ${MAKE_CMD} -C ${WRKDIR}/fastforward-${FF_VER} ${ALL_TARGET} # Do a dance to stage and keep out of resulting binaries (see r346769 # and r349241) post-build: @${ECHO_MSG} "===> Rebuilding DJB installer to respect STAGEDIR" - @${MV} -f ${WRKFF}/conf-qmail ${WRKFF}/conf-qmail.sav - @${ECHO_CMD} "${STAGEDIR}${QMAIL_PREFIX}" > ${WRKFF}/conf-qmail - @cd ${WRKFF} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_qmail.o auto_qmail.c - @cd ${WRKFF} ; ${DO_MAKE_BUILD} install instcheck - @${TOUCH} ${WRKFF}/newaliases ${WRKFF}/fastforward ${WRKFF}/newinclude - @${MV} -f ${WRKFF}/conf-qmail.sav ${WRKFF}/conf-qmail - - @${MV} -f ${WRKDF}/conf-qmail ${WRKDF}/conf-qmail.sav - @${ECHO_CMD} "${STAGEDIR}${QMAIL_PREFIX}" > ${WRKDF}/conf-qmail - @cd ${WRKDF} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_qmail.o auto_qmail.c - @cd ${WRKDF} ; ${DO_MAKE_BUILD} install instcheck - @${TOUCH} ${WRKDF}/dot-forward - @${MV} -f ${WRKDF}/conf-qmail.sav ${WRKDF}/conf-qmail + ${MV} -f ${WRKFF}/conf-qmail ${WRKFF}/conf-qmail.sav + ${ECHO_CMD} "${STAGEDIR}${QMAIL_PREFIX}" > ${WRKFF}/conf-qmail + cd ${WRKFF} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_qmail.o auto_qmail.c + cd ${WRKFF} ; ${DO_MAKE_BUILD} install instcheck + ${TOUCH} ${WRKFF}/newaliases ${WRKFF}/fastforward ${WRKFF}/newinclude + ${MV} -f ${WRKFF}/conf-qmail.sav ${WRKFF}/conf-qmail + + ${MV} -f ${WRKDF}/conf-qmail ${WRKDF}/conf-qmail.sav + ${ECHO_CMD} "${STAGEDIR}${QMAIL_PREFIX}" > ${WRKDF}/conf-qmail + cd ${WRKDF} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_qmail.o auto_qmail.c + cd ${WRKDF} ; ${DO_MAKE_BUILD} install instcheck + ${TOUCH} ${WRKDF}/dot-forward + ${MV} -f ${WRKDF}/conf-qmail.sav ${WRKDF}/conf-qmail do-install: @${MKDIR} ${STAGEDIR}${QMAIL_PREFIX}/${DOCSDIR} - @${MAKE} -C ${WRKDIR}/dot-forward-${DF_VER} ${INSTALL_TARGET} - @${MAKE} -C ${WRKDIR}/fastforward-${FF_VER} ${INSTALL_TARGET} + ${MAKE_CMD} -C ${WRKDIR}/dot-forward-${DF_VER} ${INSTALL_TARGET} + ${MAKE_CMD} -C ${WRKDIR}/fastforward-${FF_VER} ${INSTALL_TARGET} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/mail/qmhandle/Makefile ============================================================================== --- head/mail/qmhandle/Makefile Thu Sep 3 16:35:25 2015 (r396017) +++ head/mail/qmhandle/Makefile Thu Sep 3 16:37:31 2015 (r396018) @@ -12,15 +12,14 @@ COMMENT= Tool to view and manage a qmail LICENSE= GPLv2 -OPTIONS_DEFINE= DOCS - USES= qmail:run perl5 tar:bzip2 NO_BUILD= yes +NO_ARCH= yes PORTDOCS= HISTORY README -.include <bsd.port.options.mk> +OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's,^#!/usr/bin/perl,#!${PERL},g' \ @@ -33,11 +32,11 @@ post-patch: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/qmHandle ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/qmHandle.conf.sample ${STAGEDIR}${PREFIX}/etc -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include <bsd.port.mk> Modified: head/mail/sentinel/Makefile ============================================================================== --- head/mail/sentinel/Makefile Thu Sep 3 16:35:25 2015 (r396017) +++ head/mail/sentinel/Makefile Thu Sep 3 16:37:31 2015 (r396018) @@ -35,10 +35,10 @@ do-install: @${MKDIR} ${STAGEDIR}/var/spool/sentinel ${INSTALL_DATA} ${FILESDIR}/000.sentinel.sh ${STAGEDIR}${PREFIX}/etc/rc.d/sentinel.sh-dist ${INSTALL_DATA} ${WRKSRC}/sentinel.cf.SAMPLE ${STAGEDIR}${PREFIX}/etc/sentinel.cf.dist -.if ${PORT_OPTIONS:MDOCS} + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.FreeBSD ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509031637.t83GbWIW041805>