summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2014-05-30 18:57:31 +0000
committerbdrewery <bdrewery@FreeBSD.org>2014-05-30 18:57:31 +0000
commit71f3c101db0eb10eb24cfa7a19b455e62fdc0e0c (patch)
tree1dee119d0a55493f5b9aab29cc6b8c69befe4296
parent6712492ec51e8884b3aaa1ce7448ac244b65e458 (diff)
downloadFreeBSD-ports-71f3c101db0eb10eb24cfa7a19b455e62fdc0e0c.zip
FreeBSD-ports-71f3c101db0eb10eb24cfa7a19b455e62fdc0e0c.tar.gz
- Fix dnscache-conf referring to STAGEDIR when IP6 option is selected.
Something in the dependency chain for dnsip6 rebuilds when conf-home is updated. By creating it before the build and then moving it over later the timestamp is before all the built binaries. Since we purposely remove all installer-related files, only those will be rebuilt. Reported by: brd
-rw-r--r--dns/djbdns/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/dns/djbdns/Makefile b/dns/djbdns/Makefile
index 9b0e982..53aeace 100644
--- a/dns/djbdns/Makefile
+++ b/dns/djbdns/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= djbdns
PORTVERSION?= ${DJBDNS_VER}
-PORTREVISION?= 19
+PORTREVISION?= 20
PORTEPOCH?= 1
CATEGORIES?= dns
MASTER_SITES= http://cr.yp.to/djbdns/ \
@@ -129,12 +129,13 @@ PLIST_SUB+= WITH_IP6="@comment "
post-patch:
@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
@${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
+ @${ECHO_CMD} "${STAGEDIR}${PREFIX}" > ${WRKSRC}/conf-home.stage
@${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/conf-home
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
+ @${MV} -f ${WRKSRC}/conf-home.stage ${WRKSRC}/conf-home
@cd ${WRKSRC} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_home.o auto_home.c
@cd ${WRKSRC} ; ${DO_MAKE_BUILD} install instcheck
@${TOUCH} ${WRKSRC}/*-conf
OpenPOWER on IntegriCloud