From 2e35f75f8bb36d4a9c947f21f4ead7153e1b7c98 Mon Sep 17 00:00:00 2001
From: dougb <dougb@FreeBSD.org>
Date: Fri, 4 Jul 2008 15:41:15 +0000
Subject: Make CONFLICTS a little cleaner Add README.idnkit to PORTDOCS

---
 dns/bind96/Makefile  | 5 +++--
 dns/bind96/pkg-plist | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'dns/bind96')

diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile
index 88e0d4e08a35..059ebbc07553 100644
--- a/dns/bind96/Makefile
+++ b/dns/bind96/Makefile
@@ -33,7 +33,7 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 
 USE_OPENSSL=	yes
 
-CONFLICTS=	bind9-9.3.* bind9-9.4.* bind9-dlz-* bind9-sdb-mysql-* host-*
+CONFLICTS=	bind9-9.[34].* bind9-dlz-* bind9-sdb-ldap-* host-*
 
 OPTIONS=	XML "Support for xml statistics output" on \
 		IDN "Add IDN support to dig, host, etc." off \
@@ -156,7 +156,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/doc/misc/[a-z]* ${DOCSDIR}/misc
 	${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \
-		${WRKSRC}/README ${WRKSRC}/KNOWN-DEFECTS ${DOCSDIR}/
+	${WRKSRC}/README ${WRKSRC}/README.idnkit ${WRKSRC}/KNOWN-DEFECTS \
+	    ${DOCSDIR}/
 .endif
 
 	@${CAT} ${PKGMESSAGE}
diff --git a/dns/bind96/pkg-plist b/dns/bind96/pkg-plist
index 97e8bd9eb733..fb5b1606df83 100644
--- a/dns/bind96/pkg-plist
+++ b/dns/bind96/pkg-plist
@@ -205,6 +205,7 @@ sbin/rndc-confgen
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/KNOWN-DEFECTS
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.idnkit
 %%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch01.html
 %%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch02.html
 %%PORTDOCS%%%%DOCSDIR%%/arm/Bv9ARM.ch03.html
-- 
cgit