Date: Mon, 17 Feb 2014 08:08:45 -0600 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Baptiste Daroussin <bapt@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r344724 - head/dns/djbdns Message-ID: <530217ED.9060305@FreeBSD.org> In-Reply-To: <201402171044.s1HAibMI093798@svn.freebsd.org> References: <201402171044.s1HAibMI093798@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --PhHhXBXHhsXURoJbRGUHqmqmVe57r9eWS Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Nice! I will try this on the qmail ones too. On 2/17/2014 4:44 AM, Baptiste Daroussin wrote: > 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/ >=20 > Log: > Readd stage support > =20 > Build the port as if it didn't support stage, > Just before installing, rebuild the install and instcheck binaries wi= th 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 > =20 > This is the trick used in debian > =20 > Obtained from: debian >=20 > Modified: > head/dns/djbdns/Makefile > head/dns/djbdns/pkg-plist >=20 > Modified: head/dns/djbdns/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 @@ > =20 > PORTNAME?=3D djbdns > PORTVERSION?=3D ${DJBDNS_VER} > -PORTREVISION?=3D 15 > +PORTREVISION?=3D 16 > CATEGORIES?=3D dns > MASTER_SITES=3D http://cr.yp.to/djbdns/ \ > ftp://cr.yp.to/djbdns/ > @@ -11,7 +11,7 @@ DISTNAME=3D djbdns-${DJBDNS_VER} > DISTFILES=3D ${DISTNAME}${EXTRACT_SUFX} > =20 > MAINTAINER?=3D lx@FreeBSD.org > -COMMENT?=3D A collection of secure and reliable DNS tools > +COMMENT?=3D Collection of secure and reliable DNS tools > =20 > RUN_DEPENDS=3D setuidgid:${PORTSDIR}/sysutils/daemontools \ > tcpserver:${PORTSDIR}/sysutils/ucspi-tcp > @@ -21,6 +21,8 @@ LEGAL_TEXT=3D No license -- see http://cr. > =20 > OPTIONS_DEFINE=3D DUMPCACHE IP6 IGNOREIP JUMBO MAN PERSISTENT_MMAP SRV= DNSCURVE ADD_USERS > OPTIONS_DEFAULT=3D MAN > +OPTIONS_SUB=3D yes > + > DUMPCACHE_DESC=3D persistent cache for dnscache > IP6_DESC=3D IPv6 support by Felix von Leitner > IGNOREIP_DESC=3D ignoreip2 patch by Russell Nelson > @@ -31,7 +33,6 @@ SRV_DESC=3D SRV record patch by Michael Ha > DNSCURVE_DESC=3D DNSCurve support by Matthew Dempsky > ADD_USERS_DESC=3D Add dnscache, tinydns and dnslog users/groups > =20 > -NO_STAGE=3D yes > .include <bsd.port.options.mk> > =20 > .if ${PORT_OPTIONS:MADD_USERS} > @@ -58,15 +59,6 @@ CFLAGS+=3D -DDUMPCACHE > MANDATE=3D -20031023 > MASTER_SITES+=3D http://smarden.org/pape/djb/manpages/:manpages > DISTFILES+=3D ${DISTNAME}-man${MANDATE}.tar.gz:manpages > - > -MAN1=3D dnsfilter.1 dnsip.1 dnsipq.1 dnsmx.1 dnsname.1 \ > - dnsq.1 dnsqr.1 dnstrace.1 dnstracesort.1 dnstxt.1 \ > - tinydns-get.1 > -MAN8=3D 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=3D no > .endif > =20 > .if ${PORT_OPTIONS:MIP6} > @@ -138,10 +130,17 @@ post-patch: > @echo "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld > @echo "${PREFIX}" > ${WRKSRC}/conf-home > =20 > +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= =2Eo 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 > =20 > .include <bsd.port.mk> >=20 > Modified: head/dns/djbdns/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 >=20 --=20 Regards, Bryan Drewery --PhHhXBXHhsXURoJbRGUHqmqmVe57r9eWS Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJTAhftAAoJEDXXcbtuRpfPhH8H/25MvmgP+KnQ3MEQOu3at1PG hQ583ciVOom4ApmHIH3CXyrXp7k85TjDUJyS2dUvFAR3/J+J5TmnZe4V3UmMjofJ 0AgpSzDlUrkTXEdBftJX9MbVgn2HUtoC/Ail0vTxJByIqLkQy1ojEqJy813OQj+t vG55XUxClFo0AwpuWzVyf3Hgropwgm4yprYuqOH2DupMPWDs1rDW2xupwE+ccXCr 8xJgBhQsielqHIc/Sa6w+Qa6ex4k7C6DlldAngBYUxwEsgdmhxzoNwTExq94vQAx Ej2pvOPvh4P28l8HN/Vd+hmrAkPQU1wjFyXBeQDtJwpGoLxDYUmSA9GWoa97tlI= =6WIu -----END PGP SIGNATURE----- --PhHhXBXHhsXURoJbRGUHqmqmVe57r9eWS--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?530217ED.9060305>