diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2014-04-10 20:43:50 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2014-04-10 20:43:50 +0000 |
| commit | 47fccddc36fbae1265a37c7b77bb6c752c8ba4d0 (patch) | |
| tree | 85b7e6cd38afa1e0ab4ec166ccf9b15219776cbd /dns | |
| parent | 9db5d92352c39c9b0140d331e2346a7464183561 (diff) | |
| download | freebsd-ports-47fccddc36fbae1265a37c7b77bb6c752c8ba4d0.zip | |
Two changes to the RC script
- Add a dependency on ldconfig
- Allow people to change the pidfile
PR: 188439
Submitted by: Oliver Lehmann
Sponsored by: Absolight
Diffstat (limited to 'dns')
| -rw-r--r-- | dns/bind910/Makefile | 1 | ||||
| -rw-r--r-- | dns/bind910/files/named.in | 8 | ||||
| -rw-r--r-- | dns/bind98/Makefile | 2 | ||||
| -rw-r--r-- | dns/bind98/files/named.in | 8 | ||||
| -rw-r--r-- | dns/bind99/Makefile | 2 | ||||
| -rw-r--r-- | dns/bind99/files/named.in | 8 |
6 files changed, 15 insertions, 14 deletions
diff --git a/dns/bind910/Makefile b/dns/bind910/Makefile index d1f455bed983..c37d509d01c3 100644 --- a/dns/bind910/Makefile +++ b/dns/bind910/Makefile @@ -2,6 +2,7 @@ PORTNAME= bind PORTVERSION= 9.10.0rc1 +PORTREVISION= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} diff --git a/dns/bind910/files/named.in b/dns/bind910/files/named.in index 45371c2b535a..7dc9329dcd4b 100644 --- a/dns/bind910/files/named.in +++ b/dns/bind910/files/named.in @@ -4,7 +4,7 @@ # # PROVIDE: named -# REQUIRE: FILESYSTEMS defaultroute +# REQUIRE: FILESYSTEMS defaultroute ldconfig # BEFORE: NETWORKING # KEYWORD: shutdown @@ -92,9 +92,9 @@ named_prestart() warn 'named_pidfile: now determined from the conf file' fi - echo ${pidfile%/pid} - if [ ! -d ${pidfile%/pid} ]; then - install -d -o ${named_uid} -g ${named_uid} ${pidfile%/pid} + piddir=`/usr/bin/dirname ${pidfile}` + if [ ! -d ${piddir} ]; then + install -d -o ${named_uid} -g ${named_uid} ${piddir} fi command_args="-u ${named_uid:=root} -c $named_conf $command_args" diff --git a/dns/bind98/Makefile b/dns/bind98/Makefile index 17371432efb2..145f4413d550 100644 --- a/dns/bind98/Makefile +++ b/dns/bind98/Makefile @@ -2,7 +2,7 @@ PORTNAME= bind PORTVERSION= 9.8.7 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} diff --git a/dns/bind98/files/named.in b/dns/bind98/files/named.in index 3fea471bf2c4..1411dfbe59b1 100644 --- a/dns/bind98/files/named.in +++ b/dns/bind98/files/named.in @@ -4,7 +4,7 @@ # # PROVIDE: named -# REQUIRE: FILESYSTEMS defaultroute +# REQUIRE: FILESYSTEMS defaultroute ldconfig # BEFORE: NETWORKING # KEYWORD: shutdown @@ -91,9 +91,9 @@ named_prestart() warn 'named_pidfile: now determined from the conf file' fi - echo ${pidfile%/pid} - if [ ! -d ${pidfile%/pid} ]; then - install -d -o ${named_uid} -g ${named_uid} ${pidfile%/pid} + piddir=`/usr/bin/dirname ${pidfile}` + if [ ! -d ${piddir} ]; then + install -d -o ${named_uid} -g ${named_uid} ${piddir} fi command_args="-u ${named_uid:=root} -c $named_conf $command_args" diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile index 2ba89b3c7305..613c0a1a65c2 100644 --- a/dns/bind99/Makefile +++ b/dns/bind99/Makefile @@ -2,7 +2,7 @@ PORTNAME= bind PORTVERSION= 9.9.5 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} diff --git a/dns/bind99/files/named.in b/dns/bind99/files/named.in index 3fea471bf2c4..1411dfbe59b1 100644 --- a/dns/bind99/files/named.in +++ b/dns/bind99/files/named.in @@ -4,7 +4,7 @@ # # PROVIDE: named -# REQUIRE: FILESYSTEMS defaultroute +# REQUIRE: FILESYSTEMS defaultroute ldconfig # BEFORE: NETWORKING # KEYWORD: shutdown @@ -91,9 +91,9 @@ named_prestart() warn 'named_pidfile: now determined from the conf file' fi - echo ${pidfile%/pid} - if [ ! -d ${pidfile%/pid} ]; then - install -d -o ${named_uid} -g ${named_uid} ${pidfile%/pid} + piddir=`/usr/bin/dirname ${pidfile}` + if [ ! -d ${piddir} ]; then + install -d -o ${named_uid} -g ${named_uid} ${piddir} fi command_args="-u ${named_uid:=root} -c $named_conf $command_args" |