mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-29 10:18:30 +00:00
Code Issues Releases Activity

Yet another round of fixes.

Browse Source 
This time, it seems all of REPLACE_BASE, not REPLACE_BASE and post Bind removal
from base seem to work consistently.
This commit is contained in:
Mathieu Arnold 2014-01-06 23:15:20 +00:00
parent 24948703a4
commit 29d398ff32
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=338952
4 changed files with 52 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dns/bind98/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= bind98
PORTVERSION= 9.8.6
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= dns net ipv6
MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= bind9/${ISCVERSION}
@ -22,6 +22,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \
--disable-symtable \
--with-randomdev=/dev/random
ETCDIR= ${PREFIX}/etc/namedb
CONFLICTS= bind9*-9.[45679].* bind9*-sdb-9.[45679].* bind-tools-9.*
@ -106,13 +107,11 @@ GSSAPI_CONFIGURE_WITH= gssapi
ARCH= x86_64
.endif
.if ${PORT_OPTIONS:MLINKS} && empty(${PORT_OPTIONS:MREPLACE_BASE})
PLIST_SUB+= LINKS=""
.else
PLIST_SUB+= LINKS="@comment "
.if !${PORT_OPTIONS:MLINKS} || ${PORT_OPTIONS:MREPLACE_BASE}
PKGINSTALL=${NONEXISTENT}
.endif
.if ${PORT_OPTIONS:MTHREADS} && empty(PORT_OPTIONS:MDLZ_MYSQL)
.if ${PORT_OPTIONS:MTHREADS} && !${PORT_OPTIONS:MDLZ_MYSQL}
CONFIGURE_ARGS+= --enable-threads
.else
CONFIGURE_ARGS+= --disable-threads
@ -139,7 +138,7 @@ BIND_DESTETC= /etc/namedb
PLIST_SUB+= SHARE_MAN=""
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
BIND_DESTETC= ${PREFIX}/etc/namedb
PKGINSTALL= /nonexistent
PKGINSTALL= ${NONEXISTENT}
.else
BIND_DESTETC= ${PREFIX}/etc
.endif

40
dns/bind98/pkg-plist
View File

@ -334,26 +334,26 @@ sbin/rndc
sbin/rndc-confgen
@unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample
%%NOBASE%%etc/rc.d/named
%%NOBASE%%@unexec if cmp -s %%BIND_DESTETC%%/named.conf.sample %%BIND_DESTETC%%/named.conf; then rm -f %%BIND_DESTETC%%/named.conf; fi
%%NOBASE%%%%BIND_DESTETC%%/named.conf.sample
%%NOBASE%%@exec if [ ! -f %%BIND_DESTETC%%/named.conf ] ; then cp -p %D/%F %B/named.conf; fi
%%NOBASE%%%%BIND_DESTETC%%/named.root
%%NOBASE%%%%BIND_DESTETC%%/master/empty.db
%%NOBASE%%%%BIND_DESTETC%%/master/localhost-forward.db
%%NOBASE%%%%BIND_DESTETC%%/master/localhost-reverse.db
%%NOBASE%%@exec mkdir %%BIND_DESTETC%%/dynamic
%%NOBASE%%@exec chown bind:bind %%BIND_DESTETC%%/dynamic
%%NOBASE%%@dirrmtry %%BIND_DESTETC%%/dynamic
%%NOBASE%%@exec mkdir %%BIND_DESTETC%%/master
%%NOBASE%%@exec chown bind:bind %%BIND_DESTETC%%/master
%%NOBASE%%@dirrmtry %%BIND_DESTETC%%/master
%%NOBASE%%@exec mkdir %%BIND_DESTETC%%/slave
%%NOBASE%%@exec chown bind:bind %%BIND_DESTETC%%/slave
%%NOBASE%%@dirrmtry %%BIND_DESTETC%%/slave
%%NOBASE%%@exec mkdir %%BIND_DESTETC%%/working
%%NOBASE%%@exec chown bind:bind %%BIND_DESTETC%%/working
%%NOBASE%%@dirrmtry %%BIND_DESTETC%%/working
%%NOBASE%%@dirrmtry %%BIND_DESTETC%%
%%NOBASE%%@unexec if cmp -s %D/%%ETCDIR%%/named.conf.sample %D/%%ETCDIR%%/named.conf; then rm -f %D/%%ETCDIR%%/named.conf; fi
%%NOBASE%%%%ETCDIR%%/named.conf.sample
%%NOBASE%%@exec if [ ! -f %D/%%ETCDIR%%/named.conf ] ; then cp -p %D/%F %B/named.conf; fi
%%NOBASE%%%%ETCDIR%%/named.root
%%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 chown bind:bind %D/%%ETCDIR%%/dynamic
%%NOBASE%%@dirrmtry %%ETCDIR%%/dynamic
%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/master
%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/master
%%NOBASE%%@dirrmtry %%ETCDIR%%/master
%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/slave
%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/slave
%%NOBASE%%@dirrmtry %%ETCDIR%%/slave
%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/working
%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/working
%%NOBASE%%@dirrmtry %%ETCDIR%%/working
%%NOBASE%%@dirrmtry %%ETCDIR%%
@dirrm include/bind9
@dirrm include/dns
@dirrm include/dst

13
dns/bind99/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME?= bind99
PORTVERSION= 9.9.4
PORTREVISION?= 6
PORTREVISION?= 7
CATEGORIES= dns net ipv6
MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= bind9/${ISCVERSION}
@ -23,6 +23,7 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \
--disable-symtable \
--with-randomdev=/dev/random \
--without-python
ETCDIR= ${PREFIX}/etc/namedb
CONFLICTS= bind9*-9.[45678].* bind9*-sdb-9.[45678].* bind-tools-9.*
@ -113,13 +114,11 @@ GSSAPI_CONFIGURE_WITH= gssapi
ARCH= x86_64
.endif
.if ${PORT_OPTIONS:MLINKS} && empty(PORT_OPTIONS:MREPLACE_BASE)
PLIST_SUB+= LINKS=""
.else
PLIST_SUB+= LINKS="@comment "
.if !${PORT_OPTIONS:MLINKS} || ${PORT_OPTIONS:MREPLACE_BASE}
PKGINSTALL=${NONEXISTENT}
.endif
.if ${PORT_OPTIONS:MTHREADS} && empty(PORT_OPTIONS:MDLZ_MYSQL)
.if ${PORT_OPTIONS:MTHREADS} && !${PORT_OPTIONS:MDLZ_MYSQL}
CONFIGURE_ARGS+= --enable-threads
.else
CONFIGURE_ARGS+= --disable-threads
@ -146,7 +145,7 @@ BIND_DESTETC= /etc/namedb
PLIST_SUB+= SHARE_MAN=""
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
BIND_DESTETC= ${PREFIX}/etc/namedb
PKGINSTALL= /nonexistent
PKGINSTALL= ${NONEXISTENT}
.else
BIND_DESTETC= ${PREFIX}/etc
.endif

40
dns/bind99/pkg-plist
View File

@ -337,26 +337,26 @@ sbin/rndc
sbin/rndc-confgen
@unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample
%%NOBASE%%etc/rc.d/named
%%NOBASE%%@unexec if cmp -s %%BIND_DESTETC%%/named.conf.sample %%BIND_DESTETC%%/named.conf; then rm -f %%BIND_DESTETC%%/named.conf; fi
%%NOBASE%%%%BIND_DESTETC%%/named.conf.sample
%%NOBASE%%@exec if [ ! -f %%BIND_DESTETC%%/named.conf ] ; then cp -p %D/%F %B/named.conf; fi
%%NOBASE%%%%BIND_DESTETC%%/named.root
%%NOBASE%%%%BIND_DESTETC%%/master/empty.db
%%NOBASE%%%%BIND_DESTETC%%/master/localhost-forward.db
%%NOBASE%%%%BIND_DESTETC%%/master/localhost-reverse.db
%%NOBASE%%@exec mkdir %%BIND_DESTETC%%/dynamic
%%NOBASE%%@exec chown bind:bind %%BIND_DESTETC%%/dynamic
%%NOBASE%%@dirrmtry %%BIND_DESTETC%%/dynamic
%%NOBASE%%@exec mkdir %%BIND_DESTETC%%/master
%%NOBASE%%@exec chown bind:bind %%BIND_DESTETC%%/master
%%NOBASE%%@dirrmtry %%BIND_DESTETC%%/master
%%NOBASE%%@exec mkdir %%BIND_DESTETC%%/slave
%%NOBASE%%@exec chown bind:bind %%BIND_DESTETC%%/slave
%%NOBASE%%@dirrmtry %%BIND_DESTETC%%/slave
%%NOBASE%%@exec mkdir %%BIND_DESTETC%%/working
%%NOBASE%%@exec chown bind:bind %%BIND_DESTETC%%/working
%%NOBASE%%@dirrmtry %%BIND_DESTETC%%/working
%%NOBASE%%@dirrmtry %%BIND_DESTETC%%
%%NOBASE%%@unexec if cmp -s %D/%%ETCDIR%%/named.conf.sample %D/%%ETCDIR%%/named.conf; then rm -f %D/%%ETCDIR%%/named.conf; fi
%%NOBASE%%%%ETCDIR%%/named.conf.sample
%%NOBASE%%@exec if [ ! -f %D/%%ETCDIR%%/named.conf ] ; then cp -p %D/%F %B/named.conf; fi
%%NOBASE%%%%ETCDIR%%/named.root
%%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 chown bind:bind %D/%%ETCDIR%%/dynamic
%%NOBASE%%@dirrmtry %%ETCDIR%%/dynamic
%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/master
%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/master
%%NOBASE%%@dirrmtry %%ETCDIR%%/master
%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/slave
%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/slave
%%NOBASE%%@dirrmtry %%ETCDIR%%/slave
%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/working
%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/working
%%NOBASE%%@dirrmtry %%ETCDIR%%/working
%%NOBASE%%@dirrmtry %%ETCDIR%%
@dirrm include/bind9
@dirrm include/dns
@dirrm include/dst