aboutsummaryrefslogtreecommitdiffstats
path: root/dns
diff options
context:
space:
mode:
authormat <mat@FreeBSD.org>2014-03-18 02:46:47 +0800
committermat <mat@FreeBSD.org>2014-03-18 02:46:47 +0800
commit5d43d6abda9bf58b0b7502fb3c6a9ada98a42dc7 (patch)
treeeee12082792eef464013f451b74131437ba77d95 /dns
parent5224875295e089482592a62fa7a8bbe63398deb6 (diff)
downloadfreebsd-ports-gnome-5d43d6abda9bf58b0b7502fb3c6a9ada98a42dc7.tar.gz
freebsd-ports-gnome-5d43d6abda9bf58b0b7502fb3c6a9ada98a42dc7.tar.zst
freebsd-ports-gnome-5d43d6abda9bf58b0b7502fb3c6a9ada98a42dc7.zip
- Use SUB_FILES for named.conf and the rc script
- Fix some package installation warnings Sponsored by: Absolight
Diffstat (limited to 'dns')
-rw-r--r--dns/bind98/Makefile11
-rw-r--r--dns/bind98/files/named.conf.in (renamed from dns/bind98/files/named.conf)0
-rw-r--r--dns/bind98/files/named.in (renamed from dns/bind98/files/named)0
-rw-r--r--dns/bind98/pkg-plist9
-rw-r--r--dns/bind99/Makefile11
-rw-r--r--dns/bind99/files/named.conf.in (renamed from dns/bind99/files/named.conf)0
-rw-r--r--dns/bind99/files/named.in (renamed from dns/bind99/files/named)0
-rw-r--r--dns/bind99/pkg-plist9
8 files changed, 16 insertions, 24 deletions
diff --git a/dns/bind98/Makefile b/dns/bind98/Makefile
index 3dc3a69d5765..8c9b66715a48 100644
--- a/dns/bind98/Makefile
+++ b/dns/bind98/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bind
PORTVERSION= 9.8.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= dns net ipv6
MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= bind9/${ISCVERSION}
@@ -147,9 +147,12 @@ 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
PLIST_SUB+= NOBASE="" BASE="@comment "
+USE_RC_SUBR+= named
+SUB_FILES+= named.conf
.else
PLIST_SUB+= NOBASE="@comment " BASE=""
.endif
@@ -185,12 +188,6 @@ post-install:
.endif
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
-.for FILE in named named.conf
- ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' \
- -e 's#%%BIND_DESTETC%%#${BIND_DESTETC}#g' \
- ${FILESDIR}/${FILE} > ${WRKDIR}/${FILE}
-.endfor
- ${INSTALL_SCRIPT} ${WRKDIR}/named ${STAGEDIR}${PREFIX}/etc/rc.d
${MKDIR} ${STAGEDIR}${BIND_DESTETC}
.for i in dynamic master slave working
@${MKDIR} ${STAGEDIR}${BIND_DESTETC}/$i
diff --git a/dns/bind98/files/named.conf b/dns/bind98/files/named.conf.in
index 6c3215883552..6c3215883552 100644
--- a/dns/bind98/files/named.conf
+++ b/dns/bind98/files/named.conf.in
diff --git a/dns/bind98/files/named b/dns/bind98/files/named.in
index 3488f2d2af1d..3488f2d2af1d 100644
--- a/dns/bind98/files/named
+++ b/dns/bind98/files/named.in
diff --git a/dns/bind98/pkg-plist b/dns/bind98/pkg-plist
index fb00b4448b0a..4b3ff5fdfaee 100644
--- a/dns/bind98/pkg-plist
+++ b/dns/bind98/pkg-plist
@@ -337,7 +337,6 @@ sbin/nsec3hash
sbin/rndc
sbin/rndc-confgen
%%BASE%%@unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample
-%%NOBASE%%etc/rc.d/named
%%NOBASE%%@unexec if cmp -s %D/%%ETCDIR%%/rndc.conf.sample %D/%%ETCDIR%%/rndc.conf; then rm -f %D/%%ETCDIR%%/rndc.conf; fi
%%NOBASE%%%%ETCDIR%%/rndc.conf.sample
%%NOBASE%%@exec if [ ! -f %D/%%ETCDIR%%/rndc.conf ] ; then cp -p %D/%F %B/rndc.conf; fi
@@ -348,16 +347,16 @@ sbin/rndc-confgen
%%NOBASE%%%%ETCDIR%%/master/empty.db
%%NOBASE%%%%ETCDIR%%/master/localhost-forward.db
%%NOBASE%%%%ETCDIR%%/master/localhost-reverse.db
-%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/dynamic
+%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/dynamic
%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/dynamic
%%NOBASE%%@dirrmtry %%ETCDIR%%/dynamic
-%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/master
+%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/master
%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/master
%%NOBASE%%@dirrmtry %%ETCDIR%%/master
-%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/slave
+%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/slave
%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/slave
%%NOBASE%%@dirrmtry %%ETCDIR%%/slave
-%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/working
+%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/working
%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/working
%%NOBASE%%@dirrmtry %%ETCDIR%%/working
%%NOBASE%%@dirrmtry %%ETCDIR%%
diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile
index cd4b36d5c553..ae0fe49b9f4d 100644
--- a/dns/bind99/Makefile
+++ b/dns/bind99/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bind
PORTVERSION= 9.9.5
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= dns net ipv6
MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= bind9/${ISCVERSION}
@@ -159,9 +159,12 @@ 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
PLIST_SUB+= NOBASE="" BASE="@comment "
+USE_RC_SUBR+= named
+SUB_FILES+= named.conf
.else
PLIST_SUB+= NOBASE="@comment " BASE=""
.endif
@@ -198,12 +201,6 @@ post-install:
.endif
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
-.for FILE in named named.conf
- ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' \
- -e 's#%%BIND_DESTETC%%#${BIND_DESTETC}#g' \
- ${FILESDIR}/${FILE} > ${WRKDIR}/${FILE}
-.endfor
- ${INSTALL_SCRIPT} ${WRKDIR}/named ${STAGEDIR}${PREFIX}/etc/rc.d
${MKDIR} ${STAGEDIR}${BIND_DESTETC}
.for i in dynamic master slave working
@${MKDIR} ${STAGEDIR}${BIND_DESTETC}/$i
diff --git a/dns/bind99/files/named.conf b/dns/bind99/files/named.conf.in
index 6c3215883552..6c3215883552 100644
--- a/dns/bind99/files/named.conf
+++ b/dns/bind99/files/named.conf.in
diff --git a/dns/bind99/files/named b/dns/bind99/files/named.in
index 3488f2d2af1d..3488f2d2af1d 100644
--- a/dns/bind99/files/named
+++ b/dns/bind99/files/named.in
diff --git a/dns/bind99/pkg-plist b/dns/bind99/pkg-plist
index b6d12fe843f8..667670f94280 100644
--- a/dns/bind99/pkg-plist
+++ b/dns/bind99/pkg-plist
@@ -342,7 +342,6 @@ sbin/nsec3hash
sbin/rndc
sbin/rndc-confgen
%%BASE%%@unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample
-%%NOBASE%%etc/rc.d/named
%%NOBASE%%@unexec if cmp -s %D/%%ETCDIR%%/rndc.conf.sample %D/%%ETCDIR%%/rndc.conf; then rm -f %D/%%ETCDIR%%/rndc.conf; fi
%%NOBASE%%%%ETCDIR%%/rndc.conf.sample
%%NOBASE%%@exec if [ ! -f %D/%%ETCDIR%%/rndc.conf ] ; then cp -p %D/%F %B/rndc.conf; fi
@@ -353,16 +352,16 @@ sbin/rndc-confgen
%%NOBASE%%%%ETCDIR%%/master/empty.db
%%NOBASE%%%%ETCDIR%%/master/localhost-forward.db
%%NOBASE%%%%ETCDIR%%/master/localhost-reverse.db
-%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/dynamic
+%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/dynamic
%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/dynamic
%%NOBASE%%@dirrmtry %%ETCDIR%%/dynamic
-%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/master
+%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/master
%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/master
%%NOBASE%%@dirrmtry %%ETCDIR%%/master
-%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/slave
+%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/slave
%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/slave
%%NOBASE%%@dirrmtry %%ETCDIR%%/slave
-%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/working
+%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/working
%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/working
%%NOBASE%%@dirrmtry %%ETCDIR%%/working
%%NOBASE%%@dirrmtry %%ETCDIR%%
generated by cgit (git 2.34.1) at 2024-11-28 09:57:59 +0800