diff options
| author | erwin <erwin@FreeBSD.org> | 2014-01-07 17:55:06 +0800 |
|---|---|---|
| committer | erwin <erwin@FreeBSD.org> | 2014-01-07 17:55:06 +0800 |
| commit | 7069cc73d91aec22546117140baf027188258f92 (patch) | |
| tree | 9598ccf8b8cbacb82bc13dae0ff9721d362b4a5b /dns | |
| parent | ac0447be5651b8f7e3f13d62925d64e1c81c3b9f (diff) | |
| download | freebsd-ports-gnome-7069cc73d91aec22546117140baf027188258f92.tar.gz freebsd-ports-gnome-7069cc73d91aec22546117140baf027188258f92.tar.zst freebsd-ports-gnome-7069cc73d91aec22546117140baf027188258f92.zip | |
There's always a default value for named_conf now, so no need to
check for it, and espcially not for a wrong value.
Noticed by: Stefan Bethke <stb@lassitu.de>
Approved by: mat (maintainer)
Diffstat (limited to 'dns')
| -rw-r--r-- | dns/bind96/Makefile | 2 | ||||
| -rw-r--r-- | dns/bind96/files/named | 9 | ||||
| -rw-r--r-- | dns/bind98/Makefile | 2 | ||||
| -rw-r--r-- | dns/bind98/files/named | 9 | ||||
| -rw-r--r-- | dns/bind99/Makefile | 2 | ||||
| -rw-r--r-- | dns/bind99/files/named | 9 |
6 files changed, 6 insertions, 27 deletions
diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile index 566ff00576cb..019868ed9aa9 100644 --- a/dns/bind96/Makefile +++ b/dns/bind96/Makefile @@ -2,7 +2,7 @@ PORTNAME= bind96 PORTVERSION= 9.6.3.2.ESV.R10 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} diff --git a/dns/bind96/files/named b/dns/bind96/files/named index cc267553ad1c..14cc340fbd54 100644 --- a/dns/bind96/files/named +++ b/dns/bind96/files/named @@ -98,14 +98,7 @@ named_prestart() chown ${named_uid}:${named_uid} ${pidfile%/pid} fi - command_args="-u ${named_uid:=root}" - - if [ ! "$named_conf" = '/etc/namedb/named.conf' ]; then - case "$named_flags" in - -c*|*' -c'*) ;; # No need to add it - *) command_args="-c $named_conf $command_args" ;; - esac - fi + command_args="-u ${named_uid:=root} -c $named_conf $command_args" local line nsip firstns diff --git a/dns/bind98/Makefile b/dns/bind98/Makefile index c29000cae098..12be4645f25b 100644 --- a/dns/bind98/Makefile +++ b/dns/bind98/Makefile @@ -2,7 +2,7 @@ PORTNAME= bind98 PORTVERSION= 9.8.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} diff --git a/dns/bind98/files/named b/dns/bind98/files/named index cc267553ad1c..14cc340fbd54 100644 --- a/dns/bind98/files/named +++ b/dns/bind98/files/named @@ -98,14 +98,7 @@ named_prestart() chown ${named_uid}:${named_uid} ${pidfile%/pid} fi - command_args="-u ${named_uid:=root}" - - if [ ! "$named_conf" = '/etc/namedb/named.conf' ]; then - case "$named_flags" in - -c*|*' -c'*) ;; # No need to add it - *) command_args="-c $named_conf $command_args" ;; - esac - fi + command_args="-u ${named_uid:=root} -c $named_conf $command_args" local line nsip firstns diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile index c7c46a9b74ce..28b3a615e966 100644 --- a/dns/bind99/Makefile +++ b/dns/bind99/Makefile @@ -2,7 +2,7 @@ PORTNAME?= bind99 PORTVERSION= 9.9.4 -PORTREVISION?= 7 +PORTREVISION?= 8 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} diff --git a/dns/bind99/files/named b/dns/bind99/files/named index cc267553ad1c..14cc340fbd54 100644 --- a/dns/bind99/files/named +++ b/dns/bind99/files/named @@ -98,14 +98,7 @@ named_prestart() chown ${named_uid}:${named_uid} ${pidfile%/pid} fi - command_args="-u ${named_uid:=root}" - - if [ ! "$named_conf" = '/etc/namedb/named.conf' ]; then - case "$named_flags" in - -c*|*' -c'*) ;; # No need to add it - *) command_args="-c $named_conf $command_args" ;; - esac - fi + command_args="-u ${named_uid:=root} -c $named_conf $command_args" local line nsip firstns |