diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2014-04-04 01:07:05 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2014-04-04 01:07:05 +0800 |
| commit | c23d16f40f1f133abd0b2b20d54f185ec3e05830 (patch) | |
| tree | e296c2d9eacd4fb3c5b274cb5179a8891ed4dbf6 /mail/qmail-contrib | |
| parent | 77e48635851dd7eb299525808ad2f91daca5fa06 (diff) | |
| download | freebsd-ports-gnome-c23d16f40f1f133abd0b2b20d54f185ec3e05830.tar.gz freebsd-ports-gnome-c23d16f40f1f133abd0b2b20d54f185ec3e05830.tar.zst freebsd-ports-gnome-c23d16f40f1f133abd0b2b20d54f185ec3e05830.zip | |
- Fix race during build of DJB ports that could lead to files leaking out of
STAGEDIR. The auto_home.c/auto_qmail.c (depending on which conf- file is
used) must be deleted to or else this might not be executed depending on
how quickly build and pre-install run:
./auto-str auto_home `sed 1q conf-home` > auto_home.c
- Move STAGEDIR fixing to post-build with a message explaining the rebuild.
- Bump PORTREVISION as pkg_install packages may have been built without some
files.
Diffstat (limited to 'mail/qmail-contrib')
| -rw-r--r-- | mail/qmail-contrib/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mail/qmail-contrib/Makefile b/mail/qmail-contrib/Makefile index 977a88e886d9..e632da8f6951 100644 --- a/mail/qmail-contrib/Makefile +++ b/mail/qmail-contrib/Makefile @@ -3,7 +3,7 @@ PORTNAME= qmail-contrib PORTVERSION= 0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://cr.yp.to/software/ \ ${MASTER_SITE_GENTOO} @@ -63,23 +63,24 @@ do-build: # Do a dance to stage and keep out of resulting binaries (see r346769 # and r349241) -pre-install: - ${MKDIR} ${STAGEDIR}${QMAIL_PREFIX}/${DOCSDIR} +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_home.o + @cd ${WRKFF} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_qmail.o auto_qmail.c @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} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_qmail.o auto_qmail.c @cd ${WRKDF} ; ${MAKE_CMD} 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} |