diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2015-02-26 02:03:15 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2015-02-26 02:03:15 +0000 |
| commit | 43e54a5f1b702a47ecbb3ad1fb881bf9b53f1f9f (patch) | |
| tree | 92a1a2e70ec645a9bd4f525da77444685ac76e6f /dns/bind99 | |
| parent | 7df686eb3b2c4392542a45e16e5dbb38047c2bdb (diff) | |
Notes
Diffstat (limited to 'dns/bind99')
| -rw-r--r-- | dns/bind99/Makefile | 9 | ||||
| -rw-r--r-- | dns/bind99/distinfo | 8 | ||||
| -rw-r--r-- | dns/bind99/pkg-install | 16 |
3 files changed, 18 insertions, 15 deletions
diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile index 36a73c65f072..ce529681b084 100644 --- a/dns/bind99/Makefile +++ b/dns/bind99/Makefile @@ -14,7 +14,7 @@ COMMENT= BIND DNS suite with updated DNSSEC and DNS64 LICENSE= ISCL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.9.6-P2 +ISCVERSION= 9.9.7 MAKE_JOBS_UNSAFE= yes @@ -32,7 +32,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --disable-symtable \ --with-randomdev=/dev/random \ - --with-libxml2=${LOCALBASE} + --with-libxml2=${LOCALBASE} \ + --sysconfdir=${ETCDIR} ETCDIR= ${PREFIX}/etc/namedb CONFLICTS= bind9*-9.[45678].* bind9*-sdb-9.[45678].* bind-tools-9.* @@ -166,7 +167,6 @@ SUB_FILES+= named.conf WITH_OPENSSL_PORT=yes .endif .else -ETCDIR= ${PREFIX}/etc PLIST_SUB+= NOBASE="@comment " BASE="" SUB_LIST+= NOBASE="@comment " BASE="" .if ${PORT_OPTIONS:MSSL} @@ -176,9 +176,6 @@ WITH_OPENSSL_PORT= yes PKGDEINSTALL= ${PKGINSTALL} -CONFIGURE_ARGS+= --prefix=${PREFIX} \ - --sysconfdir=${ETCDIR} - PORTDOCS= * post-patch: diff --git a/dns/bind99/distinfo b/dns/bind99/distinfo index c8dca30964fa..4eb3bdee2967 100644 --- a/dns/bind99/distinfo +++ b/dns/bind99/distinfo @@ -1,4 +1,4 @@ -SHA256 (bind-9.9.6-P2.tar.gz) = 5e882f453a8c799a121272f68bdb90936ce97bb857f8c2b3af1c8ba3d1b749ed -SIZE (bind-9.9.6-P2.tar.gz) = 7816640 -SHA256 (9.9.6-P2-rpz2+rl.14038.05.patch.xz) = b69825ddee742dbb342f2da4265ff2139256ad79bd0d029ba010b7bf98f2d1e5 -SIZE (9.9.6-P2-rpz2+rl.14038.05.patch.xz) = 38792 +SHA256 (bind-9.9.7.tar.gz) = 3f23e7fcb363a2594ed1f065868c2c1080a93636a4fcb4c47f9e164e2cd74c66 +SIZE (bind-9.9.7.tar.gz) = 7960032 +SHA256 (9.9.7-rpz2+rl.14038.05.patch.xz) = 24922363fa4ff1c6d90c57a681c3616701c14ace9ea5eb7589abb420d3745000 +SIZE (9.9.7-rpz2+rl.14038.05.patch.xz) = 39124 diff --git a/dns/bind99/pkg-install b/dns/bind99/pkg-install index df1fc8ad7639..12b2f98aaf25 100644 --- a/dns/bind99/pkg-install +++ b/dns/bind99/pkg-install @@ -1,15 +1,21 @@ #!/bin/sh +# ex:sw=8 sts=8 if [ "$2" = 'POST-INSTALL' ] then - /bin/mkdir -p /var/named${PKG_PREFIX}/etc + /bin/mkdir -p /var/named${PKG_PREFIX}/etc/namedb fi -for DIR in ${PKG_PREFIX}/etc /var/named${PKG_PREFIX}/etc; do - for FILE in named.conf rndc.key; do +for DIR in ${PKG_PREFIX}/etc/namedb /var/named${PKG_PREFIX}/etc/namedb; do + for FILE in named.conf rndc.conf rndc.key; do if [ "$2" = 'POST-INSTALL' ] then - /bin/ln -sf /etc/namedb/${FILE} ${DIR}/${FILE} + if [ -e ${PKG_PREFIX}/etc/${FILE} ] + then + /bin/cp -a ${PKG_PREFIX}/etc/${FILE} ${DIR}/${FILE} + else + /bin/ln -sf /etc/namedb/${FILE} ${DIR}/${FILE} + fi fi if [ "$2" = 'POST-DEINSTALL' ] then @@ -20,7 +26,7 @@ done if [ "$2" = 'POST-DEINSTALL' ] then - cd /var/named && /bin/rmdir -p ./${PKG_PREFIX}/etc > /dev/null 2>&1 || : + cd /var/named && /bin/rmdir -p ./${PKG_PREFIX}/etc/namedb > /dev/null 2>&1 || : fi exit 0 |