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/qtools | |
| 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/qtools')
| -rw-r--r-- | mail/qtools/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mail/qtools/Makefile b/mail/qtools/Makefile index 03d490618524..5b46725e0e87 100644 --- a/mail/qtools/Makefile +++ b/mail/qtools/Makefile @@ -3,7 +3,7 @@ PORTNAME= qtools PORTVERSION= 0.56 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= http://www.superscript.com/qtools/ @@ -33,10 +33,11 @@ do-configure: # Do a dance to stage and keep out of resulting binaries (see r346769 # and r349241) -pre-install: +post-build: + @${ECHO_MSG} "===> Rebuilding DJB installer to respect STAGEDIR" @${MV} -f ${WRKSRC}/conf-home ${WRKSRC}/conf-home.sav @${ECHO_CMD} "${STAGEDIR}${PREFIX}" > ${WRKSRC}/conf-home - @cd ${WRKSRC} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_home.o + @cd ${WRKSRC} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_home.o auto_home.c @cd ${WRKSRC} ; ${MAKE_CMD} install instcheck @${TOUCH} ${WRKSRC}/replier-config @${MV} -f ${WRKSRC}/conf-home.sav ${WRKSRC}/conf-home |