aboutsummaryrefslogtreecommitdiffstats
path: root/dns/bind98
diff options
context:
space:
mode:
authormat <mat@FreeBSD.org>2014-01-09 06:52:19 +0800
committermat <mat@FreeBSD.org>2014-01-09 06:52:19 +0800
commitfc6130506071793536193cc6383de0d4ebaea5cd (patch)
treea031fd3e68cc16facae7350c8304f007aa7ef87b /dns/bind98
parent5192371e75eaf07e6aaffa90feda9731256288d8 (diff)
downloadfreebsd-ports-gnome-fc6130506071793536193cc6383de0d4ebaea5cd.tar.gz
freebsd-ports-gnome-fc6130506071793536193cc6383de0d4ebaea5cd.tar.zst
freebsd-ports-gnome-fc6130506071793536193cc6383de0d4ebaea5cd.zip
Fixup rndc.conf.sample installation
Spotted by: antoine
Diffstat (limited to 'dns/bind98')
-rw-r--r--dns/bind98/Makefile6
-rw-r--r--dns/bind98/pkg-plist5
2 files changed, 7 insertions, 4 deletions
diff --git a/dns/bind98/Makefile b/dns/bind98/Makefile
index 12be4645f25b..2bc1c440a64e 100644
--- a/dns/bind98/Makefile
+++ b/dns/bind98/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bind98
PORTVERSION= 9.8.6
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= dns net ipv6
MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= bind9/${ISCVERSION}
@@ -151,9 +151,9 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} \
PLIST_SUB+= BIND_DESTETC="${BIND_DESTETC}"
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100
-PLIST_SUB+= NOBASE=""
+PLIST_SUB+= NOBASE="" BASE="@comment "
.else
-PLIST_SUB+= NOBASE="@comment "
+PLIST_SUB+= NOBASE="@comment " BASE=""
.endif
post-patch:
diff --git a/dns/bind98/pkg-plist b/dns/bind98/pkg-plist
index a63c5308ac38..c71aabffa11a 100644
--- a/dns/bind98/pkg-plist
+++ b/dns/bind98/pkg-plist
@@ -332,8 +332,11 @@ sbin/named-journalprint
sbin/nsec3hash
sbin/rndc
sbin/rndc-confgen
-@unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample
+%%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
%%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
rtions'>+12 * Re-commit ofnetchild2015-08-104-4/+18 * - Add new port: print/R-cran-knitrtota2015-08-084-0/+32 * Add missing dependency.hrs2015-08-081-0/+6 * Update to 2.1.4.rakuco2015-08-043-4/+24 * Part 1 of adding USE_GNOME=intltool to ports that require it.kwm2015-08-031-1/+2 * Update poppler to 0.34.0. [1]kwm2015-08-038-5/+55 * - Add LICENSEamdmi32015-07-312-0/+8 * print/scribus: The release was packed by bzip2 but named after xz.bsam2015-07-312-3/+3 * - Fix shebangsamdmi32015-07-301-1/+4 * Fix to use ${OPTIONS_NAME}_UNSET_FORCE.hrs2015-07-274-4/+4 * Revert r392959 for now, but those ports are still broken...antoine2015-07-274-4/+4 * Fix duplicate pkgnamesantoine2015-07-274-4/+4 * - Fix -nox11 packages and ghostscript:nox11 in ghostscript.mk.hrs2015-07-274-4/+4 * - Fix dependency due to change in r392909.hrs2015-07-272-2/+2 * Fix build on 8.x and 9.x.hrs2015-07-271-1/+1 * Unbreak INDEX, reverting r392921antoine2015-07-264-18/+4 * 64 bit linuxulator support (not activated by default):netchild2015-07-264-4/+18 * Revert an unintentional change.hrs2015-07-261-1/+1 * - Separate libsynctex from tex-web2c to devel/tex-synctex.hrs2015-07-2617-66/+994 * - Add iconv support.hrs2015-07-262-7/+50 * Revert a upstream commit that causes text getting cut off, while upstreamkwm2015-07-263-1/+165 * - Allow comma-separated multiple arguments in USE_TEX like "foo:arg1,arg2".hrs2015-07-251-2/+2 * Fix a missing dependency.hrs2015-07-251-1/+3 * Bump PORTREVISION due to update of texlive-texmf.hrs2015-07-241-0/+1 * - Update LaTeX2e to 20150101pl2.hrs2015-07-243-7/+95 * Add CONFLICTS with texlive-infra-[0-9]*.hrs2015-07-241-0/+3 * - Use CTAN mirrors in MASTER_SITES.hrs2015-07-242-19/+14 * print/foo2zjs: Upgrade to version 20150511.bsam2015-07-223-4/+6 * - Changed qt4-linguist to qt4-linguisttoolsvg2015-07-211-2/+2 * Fix build with GCC. GCC does now allow const type qualifier forhrs2015-07-211-0/+14 * Add missing dependency.hrs2015-07-211-2/+2 * Fix dependency.hrs2015-07-201-1/+2 * Remove print/cm-super. This font is now included in TeXLive.hrs2015-07-205-952/+0 * Fix dependency.hrs2015-07-201-2/+3 * Fix dependency.hrs2015-07-201-1/+2 * - Add print/latex-biber, a biblatex replacement which supports Unicode.hrs2015-07-205-0/+122 * Update TeXLive to TL2015.hrs2015-07-20148-4719/+13928 * - Fix build breakage due to _XOPEN_VERSION macro.hrs2015-07-192-4/+30 * - Update RUN_DEPENDSsunpoet2015-07-171-2/+1 * - Update to 2.0.2sunpoet2015-07-172-4/+4 * - Update to 0.6.0sunpoet2015-07-172-3/+3 * Fix index after ghostscript USES addition.kwm2015-07-171-4/+4 * Convert code in bsd.port.mk for USE_GHOSTSCRIPT* to USES=ghostscript.kwm2015-07-1734-58/+40 * Remove an extra dependency.hrs2015-07-162-2/+2 * Update to cups-libs-1.4.2-67.el6_6.1tijl2015-07-162-7/+7 * Remove a printer configuration tool that is not usable anymorebapt2015-07-154-49/+0 * Disconnect latex-beamer for now to fix INDEX.erwin2015-07-141-1/+0 * Resurrect print/latex-beamer and update it to 3.36.hrs2015-07-145-0/+269 * Sort variables. No functional change.hrs2015-07-141-7/+4 * Update to 9.16.hrs2015-07-145-60/+45 * Convert to USES=metaportbapt2015-07-131-7/+2 * Update freetype2 to 2.6.kwm2015-07-064-13/+19 * print/foomatic-db-engine is not jobs safemarino2015-07-061-0/+2 * Update to 1.0.71feld2015-07-042-3/+3 * Set NO_ARCH for remaining rubygem-* ports with no arch dependent filespgollucci2015-07-0315-0/+30 * Update harfbuzz to 0.9.41.kwm2015-07-023-6/+5 * - Update to texinfo 6.0johans2015-07-014-123/+38 * - Update to 1.0.70amdmi32015-07-012-3/+3 * - Update to 0.21.0sunpoet2015-06-282-3/+3 * - Update to 20150612amdmi32015-06-253-5/+5 * Convert to USES=jpegantoine2015-06-2313-31/+19 * - Update to 0.20.0sunpoet2015-06-212-3/+3 * - Update to 1.18.6sunpoet2015-06-212-4/+5 * - Strip binariesamdmi32015-06-191-1/+3 * - Strip binariesamdmi32015-06-191-1/+3 * - Strip binaryamdmi32015-06-191-2/+5 * Mark BROKEN: Fails to configure or buildantoine2015-06-181-0/+2 * - Add LICENSE_FILEamdmi32015-06-171-3/+3 * - Mark BROKEN on < 10.x:amdmi32015-06-171-3/+4 * - Convert to USES=metaportamdmi32015-06-152-7/+5 * - Update to 1.0.69amdmi32015-06-153-4/+4 * Attempt to fix runtime on FreeBSD 10antoine2015-06-131-7/+11 * Add USES+=iconv to fix linker issues on FreeBSD 10 amd64 poudriere jail.mandree2015-06-121-1/+1 * Add missing iconv library.girgen2015-06-111-0/+1 * - Update to 0.19.0sunpoet2015-06-112-3/+4 * Remove expired ports:rene2015-06-116-86/+0 * print/py-reportlab: Fix PORTDOCSbofh2015-06-104-12/+13 * Add a missing file to plist when Avahi is selected.delphij2015-06-102-1/+2 * CUPS 2.x does not support OpenSSL any more. Switch to GNU TLS by default.jkim2015-06-105-24/+9 * Bump version after cups-base update.delphij2015-06-101-2/+1 * Security update to 2.0.3.delphij2015-06-1011-474/+107 * - Fix shebangsamdmi32015-06-061-2/+4 * - Add license, switch from NO_CDROM to LICENSE permissionsamdmi32015-06-041-8/+12 * print/py-fonttools: drop pyxml dependencyrm2015-06-021-4/+2 * - Update to 2.5amdmi32015-06-023-11/+11 * - Use ${CC} instead of CC, ${CC} was intented hereantoine2015-05-302-0/+10 * print/libpaper: update to 1.1.24.4xmj2015-05-292-3/+3 * - Clarify LICENSEamdmi32015-05-291-3/+3 * - Don't cat pkg-message from Makefilesamdmi32015-05-272