svn commit: r344724 - head/dns/djbdns

[Baptiste Daroussin]

Author: bapt
Date: Mon Feb 17 10:44:36 2014
New Revision: 344724
URL: http://svnweb.freebsd.org/changeset/ports/344724
QAT: https://qat.redports.org/buildarchive/r344724/

Log:
  Readd stage support
  
  Build the port as if it didn't support stage,
  Just before installing, rebuild the install and instcheck binaries with a different prefix including the destdir prefix
  To avoid everything to be rebuilt again becore conf-home has changed save the original files before building
  install and instcheck with the new prefix and restore the file again before the do-install target is run
  
  This is the trick used in debian
  
  Obtained from:	debian

Modified:
  head/dns/djbdns/Makefile
  head/dns/djbdns/pkg-plist

Modified: head/dns/djbdns/Makefile
==============================================================================
--- head/dns/djbdns/Makefile	Mon Feb 17 10:35:53 2014	(r344723)
+++ head/dns/djbdns/Makefile	Mon Feb 17 10:44:36 2014	(r344724)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	djbdns
 PORTVERSION?=	${DJBDNS_VER}
-PORTREVISION?=	15
+PORTREVISION?=	16
 CATEGORIES?=	dns
 MASTER_SITES=	http://cr.yp.to/djbdns/ \
 		ftp://cr.yp.to/djbdns/
@@ -11,7 +11,7 @@ DISTNAME=	djbdns-${DJBDNS_VER}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	lx at FreeBSD.org
-COMMENT?=	A collection of secure and reliable DNS tools
+COMMENT?=	Collection of secure and reliable DNS tools
 
 RUN_DEPENDS=	setuidgid:${PORTSDIR}/sysutils/daemontools \
 		tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
@@ -21,6 +21,8 @@ LEGAL_TEXT=	No license -- see http://cr.
 
 OPTIONS_DEFINE=	DUMPCACHE IP6 IGNOREIP JUMBO MAN PERSISTENT_MMAP SRV DNSCURVE ADD_USERS
 OPTIONS_DEFAULT=	MAN
+OPTIONS_SUB=	yes
+
 DUMPCACHE_DESC=	persistent cache for dnscache
 IP6_DESC=	IPv6 support by Felix von Leitner
 IGNOREIP_DESC=	ignoreip2 patch by Russell Nelson
@@ -31,7 +33,6 @@ SRV_DESC=	SRV record patch by Michael Ha
 DNSCURVE_DESC=	DNSCurve support by Matthew Dempsky
 ADD_USERS_DESC=	Add dnscache, tinydns and dnslog users/groups
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MADD_USERS}
@@ -58,15 +59,6 @@ CFLAGS+=	-DDUMPCACHE
 MANDATE=	-20031023
 MASTER_SITES+=	http://smarden.org/pape/djb/manpages/:manpages
 DISTFILES+=	${DISTNAME}-man${MANDATE}.tar.gz:manpages
-
-MAN1=		dnsfilter.1 dnsip.1 dnsipq.1 dnsmx.1 dnsname.1 \
-		dnsq.1 dnsqr.1 dnstrace.1 dnstracesort.1 dnstxt.1 \
-		tinydns-get.1
-MAN8=		axfr-get.8 axfrdns.8 axfrdns-conf.8 dnscache-conf.8 \
-		dnscache.8 rbldns-conf.8 \
-		rbldns-data.8 rbldns.8 tinydns-conf.8 tinydns-data.8 \
-		tinydns-edit.8 tinydns.8 walldns-conf.8 walldns.8
-MANCOMPRESSED=	no
 .endif
 
 .if ${PORT_OPTIONS:MIP6}
@@ -138,10 +130,17 @@ post-patch:
 	@echo "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
 	@echo "${PREFIX}" > ${WRKSRC}/conf-home
 
+pre-install:
+	@${MV} -f ${WRKSRC}/conf-home ${WRKSRC}/conf-home.sav
+	@echo "${STAGEDIR}${PREFIX}" > ${WRKSRC}/conf-home
+	@cd ${WRKSRC} ; ${RM} -f install instcheck install.o instcheck.o hier.o auto_home.o
+	@cd ${WRKSRC} ; ${MAKE_CMD} install instcheck
+	@${MV} -f ${WRKSRC}/conf-home.sav ${WRKSRC}/conf-home
+
 .if ${PORT_OPTIONS:MMAN}
 post-install:
-	@${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.1 ${PREFIX}/man/man1/
-	@${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.8 ${PREFIX}/man/man8/
+	@${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
+	@${INSTALL_MAN} ${WRKDIR}/djbdns-man/*.8 ${STAGEDIR}${MAN8PREFIX}/man/man8/
 .endif
 
 .include <bsd.port.mk>

Modified: head/dns/djbdns/pkg-plist
==============================================================================
--- head/dns/djbdns/pkg-plist	Mon Feb 17 10:35:53 2014	(r344723)
+++ head/dns/djbdns/pkg-plist	Mon Feb 17 10:44:36 2014	(r344724)
@@ -30,3 +30,28 @@ bin/tinydns-get
 bin/walldns
 bin/walldns-conf
 etc/dnsroots.global
+%%MAN%%man/man1/dnsfilter.1.gz
+%%MAN%%man/man1/dnsip.1.gz
+%%MAN%%man/man1/dnsipq.1.gz
+%%MAN%%man/man1/dnsmx.1.gz
+%%MAN%%man/man1/dnsname.1.gz
+%%MAN%%man/man1/dnsq.1.gz
+%%MAN%%man/man1/dnsqr.1.gz
+%%MAN%%man/man1/dnstrace.1.gz
+%%MAN%%man/man1/dnstracesort.1.gz
+%%MAN%%man/man1/dnstxt.1.gz
+%%MAN%%man/man1/tinydns-get.1.gz
+%%MAN%%man/man8/axfr-get.8.gz
+%%MAN%%man/man8/axfrdns-conf.8.gz
+%%MAN%%man/man8/axfrdns.8.gz
+%%MAN%%man/man8/dnscache-conf.8.gz
+%%MAN%%man/man8/dnscache.8.gz
+%%MAN%%man/man8/rbldns-conf.8.gz
+%%MAN%%man/man8/rbldns-data.8.gz
+%%MAN%%man/man8/rbldns.8.gz
+%%MAN%%man/man8/tinydns-conf.8.gz
+%%MAN%%man/man8/tinydns-data.8.gz
+%%MAN%%man/man8/tinydns-edit.8.gz
+%%MAN%%man/man8/tinydns.8.gz
+%%MAN%%man/man8/walldns.8.gz
+%%MAN%%man/man8/walldns-conf.8.gz