svn commit: r357127 - in head/dns: bind98 bind99
Mathieu Arnold
mat at FreeBSD.org
Mon Jun 9 10:24:25 UTC 2014
Author: mat
Date: Mon Jun 9 10:24:23 2014
New Revision: 357127
URL: http://svnweb.freebsd.org/changeset/ports/357127
QAT: https://qat.redports.org/buildarchive/r357127/
Log:
Unbreak, it seems not everybody as switched to pkg yet...
Sponsored by: Absolight
Modified:
head/dns/bind98/Makefile
head/dns/bind98/pkg-plist
head/dns/bind99/Makefile
head/dns/bind99/pkg-plist
Modified: head/dns/bind98/Makefile
==============================================================================
--- head/dns/bind98/Makefile Mon Jun 9 10:19:48 2014 (r357126)
+++ head/dns/bind98/Makefile Mon Jun 9 10:24:23 2014 (r357127)
@@ -2,7 +2,7 @@
PORTNAME= bind
PORTVERSION= 9.8.7
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= dns net ipv6
MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= bind9/${ISCVERSION}
@@ -129,27 +129,26 @@ CONFIGURE_ARGS+= --disable-threads
.if ${PORT_OPTIONS:MREPLACE_BASE}
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
IGNORE= REPLACE_BASE option is not supported on this release
-.endif
+.endif # >= 10.0
PKGNAMESUFFIX= -base
PREFIX= /usr
PLIST_SUB+= SHARE_MAN="share/"
NO_MTREE= yes
BIND_DESTETC= /etc/namedb
-.else
+.else # REPLACE_BASE
PLIST_SUB+= SHARE_MAN=""
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
BIND_DESTETC= ${PREFIX}/etc/namedb
PKGINSTALL= ${NONEXISTENT}
-.else
+.else # >= 10.0
BIND_DESTETC= ${PREFIX}/etc
-.endif
-.endif
+.endif # >= 10.0
+.endif # REPLACE_BASE
PKGDEINSTALL= ${PKGINSTALL}
CONFIGURE_ARGS+= --prefix=${PREFIX} \
--sysconfdir=${BIND_DESTETC}
-PLIST_SUB+= BIND_DESTETC="${BIND_DESTETC}"
SUB_LIST+= BIND_DESTETC="${BIND_DESTETC}"
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
@@ -197,17 +196,15 @@ post-install:
.endif
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
- ${MKDIR} ${STAGEDIR}${BIND_DESTETC}
+ ${MKDIR} ${STAGEDIR}${ETCDIR}
.for i in dynamic master slave working
- @${MKDIR} ${STAGEDIR}${BIND_DESTETC}/$i
+ @${MKDIR} ${STAGEDIR}${ETCDIR}/$i
.endfor
- ${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${BIND_DESTETC}/named.conf.sample
- ${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${BIND_DESTETC}
- ${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${BIND_DESTETC}/master
- ${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${BIND_DESTETC}/master
- ${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${BIND_DESTETC}/master
+ ${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${ETCDIR}/named.conf.sample
+ ${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${ETCDIR}
+ ${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/master
+ ${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/master
+ ${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master
.endif
- ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \
- ${STAGEDIR}${BIND_DESTETC}/rndc.conf.sample
.include <bsd.port.mk>
Modified: head/dns/bind98/pkg-plist
==============================================================================
--- head/dns/bind98/pkg-plist Mon Jun 9 10:19:48 2014 (r357126)
+++ head/dns/bind98/pkg-plist Mon Jun 9 10:24:23 2014 (r357127)
@@ -336,12 +336,12 @@ sbin/named-journalprint
sbin/nsec3hash
sbin/rndc
sbin/rndc-confgen
-%%BIND_DESTETC%%/rndc.conf.sample
%%NOBASE%%@sample %%ETCDIR%%/named.conf.sample
%%NOBASE%%%%ETCDIR%%/named.root
%%NOBASE%%%%ETCDIR%%/master/empty.db
%%NOBASE%%%%ETCDIR%%/master/localhost-forward.db
%%NOBASE%%%%ETCDIR%%/master/localhost-reverse.db
+%%NOBASE%%%%ETCDIR%%/rndc.conf.sample
%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/dynamic
%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/dynamic
%%NOBASE%%@dirrmtry %%ETCDIR%%/dynamic
Modified: head/dns/bind99/Makefile
==============================================================================
--- head/dns/bind99/Makefile Mon Jun 9 10:19:48 2014 (r357126)
+++ head/dns/bind99/Makefile Mon Jun 9 10:24:23 2014 (r357127)
@@ -2,7 +2,7 @@
PORTNAME= bind
PORTVERSION= 9.9.5
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES= dns net ipv6
MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= bind9/${ISCVERSION}
@@ -141,27 +141,26 @@ CONFIGURE_ARGS+= --disable-threads
.if ${PORT_OPTIONS:MREPLACE_BASE}
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
IGNORE= REPLACE_BASE option is not supported on this release
-.endif
+.endif # >= 10.0
PKGNAMESUFFIX= -base
PREFIX= /usr
PLIST_SUB+= SHARE_MAN="share/"
NO_MTREE= yes
BIND_DESTETC= /etc/namedb
-.else
+.else # REPLACE_BASE
PLIST_SUB+= SHARE_MAN=""
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
BIND_DESTETC= ${PREFIX}/etc/namedb
PKGINSTALL= ${NONEXISTENT}
-.else
+.else # >= 10.0
BIND_DESTETC= ${PREFIX}/etc
-.endif
-.endif
+.endif # >= 10.0
+.endif # REPLACE_BASE
PKGDEINSTALL= ${PKGINSTALL}
CONFIGURE_ARGS+= --prefix=${PREFIX} \
--sysconfdir=${BIND_DESTETC}
-PLIST_SUB+= BIND_DESTETC="${BIND_DESTETC}"
SUB_LIST+= BIND_DESTETC="${BIND_DESTETC}"
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
@@ -210,19 +209,17 @@ post-install:
.endif
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
- ${MKDIR} ${STAGEDIR}${BIND_DESTETC}
+ ${MKDIR} ${STAGEDIR}${ETCDIR}
.for i in dynamic master slave working
- @${MKDIR} ${STAGEDIR}${BIND_DESTETC}/$i
+ @${MKDIR} ${STAGEDIR}${ETCDIR}/$i
.endfor
- ${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${BIND_DESTETC}/named.conf.sample
- ${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${BIND_DESTETC}
- ${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${BIND_DESTETC}/master
- ${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${BIND_DESTETC}/master
- ${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${BIND_DESTETC}/master
+ ${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${ETCDIR}/named.conf.sample
+ ${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${ETCDIR}
+ ${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/master
+ ${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/master
+ ${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master
+ ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf ${STAGEDIR}${ETCDIR}/rndc.conf.sample
.endif
- ${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \
- ${STAGEDIR}${BIND_DESTETC}/rndc.conf.sample
-
.endif # BIND_TOOLS_SLAVE
.include <bsd.port.mk>
Modified: head/dns/bind99/pkg-plist
==============================================================================
--- head/dns/bind99/pkg-plist Mon Jun 9 10:19:48 2014 (r357126)
+++ head/dns/bind99/pkg-plist Mon Jun 9 10:24:23 2014 (r357127)
@@ -342,12 +342,12 @@ sbin/named-journalprint
sbin/nsec3hash
sbin/rndc
sbin/rndc-confgen
-%%BIND_DESTETC%%/rndc.conf.sample
%%NOBASE%%@sample %%ETCDIR%%/named.conf.sample
%%NOBASE%%%%ETCDIR%%/named.root
%%NOBASE%%%%ETCDIR%%/master/empty.db
%%NOBASE%%%%ETCDIR%%/master/localhost-forward.db
%%NOBASE%%%%ETCDIR%%/master/localhost-reverse.db
+%%NOBASE%%%%ETCDIR%%/rndc.conf.sample
%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/dynamic
%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/dynamic
%%NOBASE%%@dirrmtry %%ETCDIR%%/dynamic
More information about the svn-ports-head
mailing list