Date: Wed, 2 Apr 2014 15:34:31 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349926 - head/mail/qmail-contrib Message-ID: <201404021534.s32FYVHq038627@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Apr 2 15:34:30 2014 New Revision: 349926 URL: http://svnweb.freebsd.org/changeset/ports/349926 QAT: https://qat.redports.org/buildarchive/r349926/ Log: - Support staging This uses similar methods as dns/djbns from r346769 and r349241 Modified: head/mail/qmail-contrib/Makefile head/mail/qmail-contrib/pkg-plist Modified: head/mail/qmail-contrib/Makefile ============================================================================== --- head/mail/qmail-contrib/Makefile Wed Apr 2 15:33:18 2014 (r349925) +++ head/mail/qmail-contrib/Makefile Wed Apr 2 15:34:30 2014 (r349926) @@ -18,54 +18,67 @@ OPTIONS_DEFINE= DOCS USES= qmail:run -NO_STAGE= yes -ALL_TARGET= it +ALL_TARGET= prog INSTALL_TARGET= setup -MAN1= dot-forward.1 fastforward.1 printforward.1 setforward.1 \ - newaliases.1 printmaillist.1 setmaillist.1 newinclude.1 - PREFIX?= ${QMAIL_PREFIX} +NO_PREFIX_RMDIR=yes FF_VER= 0.51 DF_VER= 0.71 QCK_VER= 0.1 +# XXX: This port should be split into sub-packages/ports WRKFF= ${WRKDIR}/fastforward-${FF_VER} WRKDF= ${WRKDIR}/dot-forward-${DF_VER} NO_MTREE= yes PORTDOCS= ALIASES +DOCSDIR= doc/${PORTNAME} .include <bsd.port.pre.mk> -.if (${PREFIX} != ${LOCALBASE}) -DOCSDIR= doc -.endif - pre-patch: @${PATCH} -d ${WRKFF} -s <${PATCHDIR}/extra-patch-newaliases post-patch: - @${REINPLACE_CMD} -e "s|.var.qmail|${QMAIL_PREFIX}|" \ - ${WRKFF}/conf-qmail \ - ${WRKDF}/conf-qmail + @${ECHO_CMD} "${QMAIL_PREFIX}" > ${WRKFF}/conf-qmail + @${ECHO_CMD} "${QMAIL_PREFIX}" > ${WRKDF}/conf-qmail @${REINPLACE_CMD} -e '/cat/d; s|doc/fastforward|${DOCSDIR}|g' \ ${WRKFF}/hier.c \ ${WRKDF}/hier.c - @${REINPLACE_CMD} -e "s|-O2|${CFLAGS}|" \ - ${WRKFF}/conf-cc \ - ${WRKDF}/conf-cc -.if empty(PORT_OPTIONS:MDOCS) +.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 do-build: @${MAKE} -C ${WRKDIR}/dot-forward-${DF_VER} ${ALL_TARGET} @${MAKE} -C ${WRKDIR}/fastforward-${FF_VER} ${ALL_TARGET} +# Do a dance to stage and keep out of resulting binaries (see r346769 +# and r349241) +pre-install: + ${MKDIR} ${STAGEDIR}${QMAIL_PREFIX}/${DOCSDIR} + @${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_home.o + @cd ${WRKFF} ; ${MAKE_CMD} 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_home.o + @cd ${WRKDF} ; ${MAKE_CMD} install instcheck + @${TOUCH} ${WRKDF}/dot-forward + @${MV} -f ${WRKDF}/conf-qmail.sav ${WRKDF}/conf-qmail + do-install: @${MAKE} -C ${WRKDIR}/dot-forward-${DF_VER} ${INSTALL_TARGET} @${MAKE} -C ${WRKDIR}/fastforward-${FF_VER} ${INSTALL_TARGET} Modified: head/mail/qmail-contrib/pkg-plist ============================================================================== --- head/mail/qmail-contrib/pkg-plist Wed Apr 2 15:33:18 2014 (r349925) +++ head/mail/qmail-contrib/pkg-plist Wed Apr 2 15:34:30 2014 (r349926) @@ -6,3 +6,11 @@ bin/printforward bin/printmaillist bin/setforward bin/setmaillist +man/man1/dot-forward.1.gz +man/man1/fastforward.1.gz +man/man1/newaliases.1.gz +man/man1/newinclude.1.gz +man/man1/printforward.1.gz +man/man1/printmaillist.1.gz +man/man1/setforward.1.gz +man/man1/setmaillist.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404021534.s32FYVHq038627>