diff options
Diffstat (limited to 'dns/bind94')
| -rw-r--r-- | dns/bind94/Makefile | 33 | ||||
| -rw-r--r-- | dns/bind94/distinfo | 12 | ||||
| -rw-r--r-- | dns/bind94/files/patch-bin_named_Makefile.in | 10 |
3 files changed, 23 insertions, 32 deletions
diff --git a/dns/bind94/Makefile b/dns/bind94/Makefile index 6b430e2..bc12091 100644 --- a/dns/bind94/Makefile +++ b/dns/bind94/Makefile @@ -12,21 +12,19 @@ # release you can generally build it cleanly from the source - Doug PORTNAME= bind9 -PORTVERSION= 9.3.0 -PORTREVISION= 1 +PORTVERSION= 9.3.1 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} DISTNAME= bind-${ISCVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc \ - 9.3.0-patch1 9.3.0-patch1.asc +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= DougB@FreeBSD.org COMMENT= Completely new version of the BIND DNS suite with updated DNSSEC # ISC releases things like 9.3.0rc1, which our versioning doesn't like -ISCVERSION= 9.3.0 +ISCVERSION= 9.3.1 GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps --with-openssl \ @@ -34,15 +32,16 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps --with-openssl \ USE_OPENSSL= yes -.include <bsd.port.pre.mk> +OPTIONS= BIND9_THREADS "Support in 9.3.x is much improved" on \ + PORT_REPLACES_BASE_BIND9 "Completely replace system BIND" off -.if ${OSVERSION} >= 503000 +.if defined(WITH_BIND9_THREADS) || defined(PACKAGE_BUILDING) CONFIGURE_ARGS+= --enable-threads .else CONFIGURE_ARGS+= --disable-threads .endif -.if defined(PORT_REPLACES_BASE_BIND9) +.if defined(WITH_PORT_REPLACES_BASE_BIND9) PKGNAMESUFFIX= -base PREFIX= /usr BIND_DESTETC= /etc/namedb @@ -93,11 +92,17 @@ MAN5= named.conf.5 rndc.conf.5 MAN8= dnssec-keygen.8 dnssec-signzone.8 lwresd.8 named-checkconf.8 \ named-checkzone.8 named.8 nsupdate.8 rndc-confgen.8 rndc.8 -pre-patch: - @${SED} -e 's#bind9/lib/dns/validator.c#lib/dns/validator.c#g' \ - ${DISTDIR}/9.3.0-patch1 > ${WRKDIR}/9.3.0-patch1 - -EXTRA_PATCHES= ${WRKDIR}/9.3.0-patch1 +pre-fetch: +.if defined(PORT_REPLACES_BASE_BIND9) + @${ECHO} "" + @${ECHO} "***************************************************" + @${ECHO} "Support for the old PORT_REPLACES_BASE_BIND9 option" + @${ECHO} "will be removed in future versions of the port." + @${ECHO} "***************************************************" + @${ECHO} "" + @/bin/sleep 5 +WITH_PORT_REPLACES_BASE_BIND9= true +.endif post-patch: .for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.8 \ @@ -121,4 +126,4 @@ post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/dns/bind94/distinfo b/dns/bind94/distinfo index e9a0f2c..9ef13fa 100644 --- a/dns/bind94/distinfo +++ b/dns/bind94/distinfo @@ -1,8 +1,4 @@ -MD5 (bind-9.3.0.tar.gz) = fdb42fff7e345372ac52a4493b77b694 -SIZE (bind-9.3.0.tar.gz) = 4730656 -MD5 (bind-9.3.0.tar.gz.asc) = 131e73f617c649652c6218826bdc92f8 -SIZE (bind-9.3.0.tar.gz.asc) = 186 -MD5 (9.3.0-patch1) = 90733dadf1487e035a8b94951e55fbb7 -SIZE (9.3.0-patch1) = 1019 -MD5 (9.3.0-patch1.asc) = 4c8072f375fa53e5ada4e0e4f67402c0 -SIZE (9.3.0-patch1.asc) = 187 +MD5 (bind-9.3.1.tar.gz) = 9ff3204eea27184ea0722f37e43fc95d +SIZE (bind-9.3.1.tar.gz) = 4673603 +MD5 (bind-9.3.1.tar.gz.asc) = b2077443ade50ed778aa78a8014affaa +SIZE (bind-9.3.1.tar.gz.asc) = 186 diff --git a/dns/bind94/files/patch-bin_named_Makefile.in b/dns/bind94/files/patch-bin_named_Makefile.in deleted file mode 100644 index dad8893..0000000 --- a/dns/bind94/files/patch-bin_named_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- bin/named/Makefile.in.orig Sat Aug 21 07:22:40 2004 -+++ bin/named/Makefile.in Fri Sep 24 04:04:57 2004 -@@ -128,4 +128,6 @@ - install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs - ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir} - (cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@) -- for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8; done -+ ${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8 -+ ${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8 -+ ${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5 |
