aboutsummaryrefslogtreecommitdiff
path: root/dns/bind8
diff options
context:
space:
mode:
Diffstat (limited to 'dns/bind8')
-rw-r--r--dns/bind8/Makefile32
-rw-r--r--dns/bind8/distinfo4
-rw-r--r--dns/bind8/pkg-plist55
3 files changed, 60 insertions, 31 deletions
diff --git a/dns/bind8/Makefile b/dns/bind8/Makefile
index 4e616d0e67d8..57149418f0ec 100644
--- a/dns/bind8/Makefile
+++ b/dns/bind8/Makefile
@@ -11,7 +11,7 @@
# you can generally build it cleanly from the source. - Doug
PORTNAME= bind
-PORTVERSION= 8.3.4
+PORTVERSION= 8.3.5
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= bind/src/${PORTVERSION}
@@ -20,14 +20,18 @@ DISTFILES= bind-src.tar.gz bind-doc.tar.gz
DIST_SUBDIR= bind-${PORTVERSION}
MAINTAINER= DougB@FreeBSD.org
-COMMENT= The Berkeley Internet Name Daemon, an implementation of DNS
+COMMENT= The Berkeley Internet Name Domain, an implementation of DNS
.if defined(PORT_REPLACES_BASE_BIND8)
PKGNAMESUFFIX= -base
PREFIX= /usr
BIND_DESTETC= /etc/namedb
+INCLUDE_PATH= include
+PLIST_SUB= INCLUDE_PATH=${INCLUDE_PATH} FAKE_SBIN=sbin
.else
BIND_DESTETC= ${PREFIX}/etc
+INCLUDE_PATH= include/bind
+PLIST_SUB= INCLUDE_PATH=${INCLUDE_PATH} FAKE_SBIN=bin
.endif
WRKSRC= ${WRKDIR}/src
@@ -51,6 +55,26 @@ post-patch:
${WRKSRC}/port/freebsd/Makefile.set.sed
@${MV} ${WRKSRC}/port/freebsd/Makefile.set.sed \
${WRKSRC}/port/freebsd/Makefile.set
+
+ @${SED} -e "s#{DESTEXEC}#{DESTBIN}#g" \
+ ${WRKSRC}/bin/dnskeygen/Makefile > \
+ ${WRKSRC}/bin/dnskeygen/Makefile.sed
+ @${MV} ${WRKSRC}/bin/dnskeygen/Makefile.sed \
+ ${WRKSRC}/bin/dnskeygen/Makefile
+
+.if defined(PORT_REPLACES_BASE_BIND8)
+ @${SED} -e "s#\'DESTINC=.*#'DESTINC=${PREFIX}/include'#" \
+ ${WRKSRC}/port/freebsd/Makefile.set > \
+ ${WRKSRC}/port/freebsd/Makefile.set.sed
+ @${MV} ${WRKSRC}/port/freebsd/Makefile.set.sed \
+ ${WRKSRC}/port/freebsd/Makefile.set
+.for dir in nslookup nsupdate
+ @${SED} -e "s#{DESTBIN}#{DESTSBIN}#g" \
+ ${WRKSRC}/bin/${dir}/Makefile > ${WRKSRC}/bin/${dir}/Makefile.sed
+ @${MV} ${WRKSRC}/bin/${dir}/Makefile.sed ${WRKSRC}/bin/${dir}/Makefile
+.endfor
+.endif
+
.for file in named.conf.5 named.8
@${SED} -e "s#/etc/named.conf#${BIND_DESTETC}/named.conf#g" \
${WRKDIR}/doc/man/${file} > ${WRKDIR}/doc/man/${file}.sed
@@ -60,6 +84,10 @@ post-patch:
post-install:
cd ${WRKDIR}/doc/man && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
${MAKEFILE} clean all ${INSTALL_TARGET}
+
+ ${INSTALL_DATA} ${WRKSRC}/include/isc/ctl.h \
+ ${PREFIX}/${INCLUDE_PATH}/isc
+
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}/html ${DOCSDIR}/misc
${INSTALL_DATA} ${WRKDIR}/doc/html/*.html ${DOCSDIR}/html
diff --git a/dns/bind8/distinfo b/dns/bind8/distinfo
index c74316625a63..09f881b4ee96 100644
--- a/dns/bind8/distinfo
+++ b/dns/bind8/distinfo
@@ -1,2 +1,2 @@
-MD5 (bind-8.3.4/bind-src.tar.gz) = 214a5116782f439534b9d47cba88d44b
-MD5 (bind-8.3.4/bind-doc.tar.gz) = d1c7b87c2575e14e76223d1e89c5568a
+MD5 (bind-8.3.5/bind-src.tar.gz) = 38ebddba14dd99a194d0ad866d92ba80
+MD5 (bind-8.3.5/bind-doc.tar.gz) = 7323a28e682faed324dbf4ffe0c98b8f
diff --git a/dns/bind8/pkg-plist b/dns/bind8/pkg-plist
index 77fa0067f090..69b4fbdd2082 100644
--- a/dns/bind8/pkg-plist
+++ b/dns/bind8/pkg-plist
@@ -1,33 +1,34 @@
bin/addr
bin/dig
+bin/dnskeygen
bin/dnsquery
bin/host
bin/mkservdb
-bin/nslookup
-bin/nsupdate
-include/bind/arpa/inet.h
-include/bind/arpa/nameser.h
-include/bind/arpa/nameser_compat.h
-include/bind/hesiod.h
-include/bind/irp.h
-include/bind/irs.h
-include/bind/isc/assertions.h
-include/bind/isc/dst.h
-include/bind/isc/eventlib.h
-include/bind/isc/heap.h
-include/bind/isc/irpmarshall.h
-include/bind/isc/list.h
-include/bind/isc/logging.h
-include/bind/isc/memcluster.h
-include/bind/isc/misc.h
-include/bind/isc/tree.h
-include/bind/netdb.h
-include/bind/res_update.h
-include/bind/resolv.h
-include/bind/sys/bitypes.h
+%%FAKE_SBIN%%/nslookup
+%%FAKE_SBIN%%/nsupdate
+%%INCLUDE_PATH%%/arpa/inet.h
+%%INCLUDE_PATH%%/arpa/nameser.h
+%%INCLUDE_PATH%%/arpa/nameser_compat.h
+%%INCLUDE_PATH%%/hesiod.h
+%%INCLUDE_PATH%%/irp.h
+%%INCLUDE_PATH%%/irs.h
+%%INCLUDE_PATH%%/isc/assertions.h
+%%INCLUDE_PATH%%/isc/ctl.h
+%%INCLUDE_PATH%%/isc/dst.h
+%%INCLUDE_PATH%%/isc/eventlib.h
+%%INCLUDE_PATH%%/isc/heap.h
+%%INCLUDE_PATH%%/isc/irpmarshall.h
+%%INCLUDE_PATH%%/isc/list.h
+%%INCLUDE_PATH%%/isc/logging.h
+%%INCLUDE_PATH%%/isc/memcluster.h
+%%INCLUDE_PATH%%/isc/misc.h
+%%INCLUDE_PATH%%/isc/tree.h
+%%INCLUDE_PATH%%/netdb.h
+%%INCLUDE_PATH%%/res_update.h
+%%INCLUDE_PATH%%/resolv.h
+%%INCLUDE_PATH%%/sys/bitypes.h
lib/libbind.a
lib/libbind_r.a
-libexec/dnskeygen
libexec/named-xfer
sbin/irpd
sbin/named
@@ -74,10 +75,10 @@ sbin/ndc
%%PORTDOCS%%share/doc/bind/misc/rfc2317-notes.txt
%%PORTDOCS%%share/doc/bind/misc/style.txt
share/misc/nslookup.help
-@dirrm include/bind/arpa
-@dirrm include/bind/isc
-@dirrm include/bind/sys
-@dirrm include/bind
+@unexec rmdir %D/%%INCLUDE_PATH%%/arpa 2>/dev/null || true
+@unexec rmdir %D/%%INCLUDE_PATH%%/isc 2>/dev/null || true
+@unexec rmdir %D/%%INCLUDE_PATH%%/sys 2>/dev/null || true
+@unexec rmdir %D/%%INCLUDE_PATH%% 2>/dev/null || true
%%PORTDOCS%%@dirrm share/doc/bind/conf/recursive/pri
%%PORTDOCS%%@dirrm share/doc/bind/conf/recursive
%%PORTDOCS%%@dirrm share/doc/bind/conf/workstation/pri