>Number:         16202
>Category:       pkg
>Synopsis:       some fixes to ease maintenance of net/bind8
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Apr 04 11:35:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Greg A. Woods
>Release:        pkgsrc 2002/04/02
>Organization:
Planix, Inc.; Toronto, Ontario; Canada
>Environment:
NetBSD
>Description:

	net/bind8/Makefile contains a number of repetitions of the
	version number -- if this is changed into a Make macro then
	updating the package is much easier and less error prone.

	there's also a need to implement a conflict against BIND-9 as
	they install some of the same files, and of course by default
	their daemons do the same job and would try to listen on the
	same port....

	Note also that this package (and net/bind9* too of course)
	should be modified not to build dig and host -- those
	contributed utilities would be properly maintained more up to
	date in separate packages (indeed the BIND distribution often
	contains out-of-date contributed sources for DIG, and the
	default version of host built in BIND is drastically out of date
	and rather broken)

>How-To-Repeat:

	go through several iterations of local upgrades, only to end up
	with silly conflicts on the next 'cvs update' as the official
	version is also upgraded.

>Fix:

	apply the following patch to pkgsrc/net/bind8/Makefile

Index: Makefile
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/net/bind8/Makefile,v
retrieving revision 1.11
diff -c -u -r1.11 Makefile
--- Makefile	23 Mar 2002 05:34:54 -0000	1.11
+++ Makefile	3 Apr 2002 21:19:59 -0000
@@ -5,19 +5,24 @@
 #
 
 DISTNAME=	bind
-PKGNAME=	bind-8.3.1
+PKGNAME=	bind-${BIND_VERSION}
+#PKGREVISION=	1
 WRKSRC=		${WRKDIR}/src
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.isc.org/isc/bind/src/8.3.1/
+MASTER_SITES=	ftp://ftp.isc.org/isc/bind/src/${BIND_VERSION}/
 DISTFILES=	${DISTNAME}-src.tar.gz ${DISTNAME}-doc.tar.gz
 
 MAINTAINER=	packages@NetBSD.org
 HOMEPAGE=	http://www.isc.org/products/BIND/
 COMMENT=	The Berkeley Internet Name Daemon, an implementation of DNS
 
+BIND_VERSION=	8.3.1
+
+CONFLICTS+=	bind-[0-9]*
+
 Y2K=		http://www.isc.org/ISC/y2k.html
 
-DIST_SUBDIR=	bind/8.3.1
+DIST_SUBDIR=	bind/${BIND_VERSION}
 EXTRACT_ONLY=	${DISTNAME}-src.tar.gz ${DISTNAME}-doc.tar.gz
 
 .include "../../mk/bsd.prefs.mk"



	this patch removes the build of dig and host:

$NetBSD$

--- bin/Makefile.orig	Sat Dec 23 03:02:48 2000
+++ bin/Makefile	Mon Jan 29 17:10:24 2001
@@ -61,7 +61,7 @@
 CFLAGS=	${CDEBUG}
 CPPFLAGS= -I${PORTINCL} -I${INCL}
 
-SUBDIRS = addr nslookup dig dnsquery host named named-xfer ndc nsupdate \
+SUBDIRS = addr nslookup dnsquery named named-xfer ndc nsupdate \
 	mkservdb irpd dnskeygen named-bootconf
 
 all: ${SUBDIRS}
>Release-Note:
>Audit-Trail:
>Unformatted: