Sat May 30 14:21:32 2020 UTC ()
net/bind914: fix build problem if PKG_DEVELOPER is enabled

There was build problem after pkg-config was aded to USE_TOOLS if
PKG_DEVELOPER is enabled, causing WRKDIR reference.

Fix method is dirty (or quick) hack.


(taca)
diff -r1.22 -r1.23 pkgsrc/net/bind914/Makefile
diff -r1.15 -r1.16 pkgsrc/net/bind914/distinfo
diff -r1.2 -r1.3 pkgsrc/net/bind914/patches/patch-bin_named_Makefile.in
cvs diff -r1.22 -r1.23 pkgsrc/net/bind914/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/bind914/Attic/Makefile 2020/05/21 12:45:47 1.22
+++ pkgsrc/net/bind914/Attic/Makefile 2020/05/30 14:21:31 1.23
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1# $NetBSD: Makefile,v 1.22 2020/05/21 12:45:47 jperkin Exp $ 1# $NetBSD: Makefile,v 1.23 2020/05/30 14:21:31 taca Exp $
2 2
3DISTNAME= bind-${BIND_VERSION} 3DISTNAME= bind-${BIND_VERSION}
4PKGNAME= ${DISTNAME:S/-P/pl/} 4PKGNAME= ${DISTNAME:S/-P/pl/}
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ 6MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.isc.org/software/bind/ 9HOMEPAGE= https://www.isc.org/software/bind/
10COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.14 10COMMENT= Berkeley Internet Name Daemon implementation of DNS, version 9.14
11LICENSE= mpl-2.0 11LICENSE= mpl-2.0
12 12
13CONFLICTS+= host-[0-9]* 13CONFLICTS+= host-[0-9]*
14 14
15MAKE_JOBS_SAFE= no 15MAKE_JOBS_SAFE= no
16 16
17BIND_VERSION= 9.14.12 17BIND_VERSION= 9.14.12
18 18
19.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
20 20
21BUILD_DEFS+= BIND_DIR VARBASE 21BUILD_DEFS+= BIND_DIR VARBASE
22 22
23.include "options.mk" 23.include "options.mk"
24 24
25USE_TOOLS+= pax perl pkg-config 25USE_TOOLS+= pax perl pkg-config
26USE_LIBTOOL= yes 26USE_LIBTOOL= yes
27GNU_CONFIGURE= yes 27GNU_CONFIGURE= yes
 28MAKE_ENV+= WRKDIR=${WRKDIR} PREFIX=${PREFIX}
28 29
29.if ${OPSYS} == "Linux" && !exists(/usr/include/sys/capability.h) 30.if ${OPSYS} == "Linux" && !exists(/usr/include/sys/capability.h)
30CONFIGURE_ARGS+= --disable-linux-caps 31CONFIGURE_ARGS+= --disable-linux-caps
31.endif 32.endif
32 33
33CONFIGURE_ARGS+= --with-libtool 34CONFIGURE_ARGS+= --with-libtool
34CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 35CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
35CONFIGURE_ARGS+= --localstatedir=${VARBASE} 36CONFIGURE_ARGS+= --localstatedir=${VARBASE}
36CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} 37CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
37CONFIGURE_ARGS+= --with-python=no 38CONFIGURE_ARGS+= --with-python=no
38.if !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) || \ 39.if !empty(MACHINE_PLATFORM:MNetBSD-*-m68k) || \
39 !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \ 40 !empty(MACHINE_PLATFORM:MNetBSD-*-mipsel) || \
40 !empty(MACHINE_PLATFORM:MNetBSD-*-vax) 41 !empty(MACHINE_PLATFORM:MNetBSD-*-vax)
cvs diff -r1.15 -r1.16 pkgsrc/net/bind914/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/bind914/Attic/distinfo 2020/05/19 10:23:03 1.15
+++ pkgsrc/net/bind914/Attic/distinfo 2020/05/30 14:21:31 1.16
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1$NetBSD: distinfo,v 1.15 2020/05/19 10:23:03 taca Exp $ 1$NetBSD: distinfo,v 1.16 2020/05/30 14:21:31 taca Exp $
2 2
3SHA1 (bind-9.14.12.tar.gz) = 20fd9f09f251dcd367b6221a954ef68ac501de51 3SHA1 (bind-9.14.12.tar.gz) = 20fd9f09f251dcd367b6221a954ef68ac501de51
4RMD160 (bind-9.14.12.tar.gz) = 82ac9214698eee669f658e3d833727b431b8579a 4RMD160 (bind-9.14.12.tar.gz) = 82ac9214698eee669f658e3d833727b431b8579a
5SHA512 (bind-9.14.12.tar.gz) = f4e6c50cbe8fdb44cdd8e30b4560b6fe2fccd0fd5bde527a897a66e85065265da0d0aceb95af42d5568dea95d59e68574e5a486bbb7e6c5d0af275538c353ddf 5SHA512 (bind-9.14.12.tar.gz) = f4e6c50cbe8fdb44cdd8e30b4560b6fe2fccd0fd5bde527a897a66e85065265da0d0aceb95af42d5568dea95d59e68574e5a486bbb7e6c5d0af275538c353ddf
6Size (bind-9.14.12.tar.gz) = 6318913 bytes 6Size (bind-9.14.12.tar.gz) = 6318913 bytes
7SHA1 (patch-bin_named_Makefile.in) = 741e3708c670baaec45446f6bb364ada448ae330 7SHA1 (patch-bin_named_Makefile.in) = 530511e833ee72b2d53e0de77301ebf6bbc81aaf
8SHA1 (patch-bin_named_main.c) = 51c8ab464a009575b6513c7ed4b79f89446eb7d0 8SHA1 (patch-bin_named_main.c) = 51c8ab464a009575b6513c7ed4b79f89446eb7d0
9SHA1 (patch-bin_named_pfilter.c) = b54f872c883c8fbc2d9c04df65c185dc057cc36b 9SHA1 (patch-bin_named_pfilter.c) = b54f872c883c8fbc2d9c04df65c185dc057cc36b
10SHA1 (patch-bin_named_pfilter.h) = c14617cb266a4b5d33ba6e5db98562e806792833 10SHA1 (patch-bin_named_pfilter.h) = c14617cb266a4b5d33ba6e5db98562e806792833
11SHA1 (patch-bin_named_server.c) = 558088a1e1128e7a69394d66bfff03a5b3b62ee8 11SHA1 (patch-bin_named_server.c) = 558088a1e1128e7a69394d66bfff03a5b3b62ee8
12SHA1 (patch-bin_nsupdate_nsupdate.c) = f71213385ec7c78243c1f93a6940caa111cb5072 12SHA1 (patch-bin_nsupdate_nsupdate.c) = f71213385ec7c78243c1f93a6940caa111cb5072
13SHA1 (patch-bin_pkcs11_pkcs11-keygen.c) = d953bf48aadcdf7e95975d335167cc50f54ef91e 13SHA1 (patch-bin_pkcs11_pkcs11-keygen.c) = d953bf48aadcdf7e95975d335167cc50f54ef91e
14SHA1 (patch-bin_tests_system_metadata_tests.sh) = d01a492d0b7738760bdbff714248e279a78fef28 14SHA1 (patch-bin_tests_system_metadata_tests.sh) = d01a492d0b7738760bdbff714248e279a78fef28
15SHA1 (patch-bin_tests_system_rpz_tests.sh) = 1bc5e0d5c0cc50608e6314c2d2664bd1dc3f6e34 15SHA1 (patch-bin_tests_system_rpz_tests.sh) = 1bc5e0d5c0cc50608e6314c2d2664bd1dc3f6e34
16SHA1 (patch-bin_tools_arpaname.c) = 2bf3ccf81a0f89ced34f5e32419dee314601e0c0 16SHA1 (patch-bin_tools_arpaname.c) = 2bf3ccf81a0f89ced34f5e32419dee314601e0c0
17SHA1 (patch-bin_tools_nsec3hash.c) = 87c3891db62c45cd8ed2b484b17f7bf2e319bef3 17SHA1 (patch-bin_tools_nsec3hash.c) = 87c3891db62c45cd8ed2b484b17f7bf2e319bef3
18SHA1 (patch-config.h.in) = 0720dd6303293b32c1e5f0357fa3cd02f00068e4 18SHA1 (patch-config.h.in) = 0720dd6303293b32c1e5f0357fa3cd02f00068e4
19SHA1 (patch-config.threads.in) = fc5cc7097d87523a34c0e630cb8dd1d081d859e5 19SHA1 (patch-config.threads.in) = fc5cc7097d87523a34c0e630cb8dd1d081d859e5
20SHA1 (patch-configure) = 2fc0d22ee8cc2cf2e1f48ff87ca8d69a7cc6db81 20SHA1 (patch-configure) = 2fc0d22ee8cc2cf2e1f48ff87ca8d69a7cc6db81
cvs diff -r1.2 -r1.3 pkgsrc/net/bind914/patches/Attic/patch-bin_named_Makefile.in (expand / switch to unified diff)

--- pkgsrc/net/bind914/patches/Attic/patch-bin_named_Makefile.in 2019/07/18 03:02:02 1.2
+++ pkgsrc/net/bind914/patches/Attic/patch-bin_named_Makefile.in 2020/05/30 14:21:32 1.3
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1$NetBSD: patch-bin_named_Makefile.in,v 1.2 2019/07/18 03:02:02 taca Exp $ 1$NetBSD: patch-bin_named_Makefile.in,v 1.3 2020/05/30 14:21:32 taca Exp $
2 2
3* Add support for blacklistd. 3* Add support for blacklistd.
 4* Dirty hack to prevent WRKDIR reference.
4 5
5--- bin/named/Makefile.in.orig 2019-07-09 18:15:48.000000000 +0000 6--- bin/named/Makefile.in.orig 2020-05-06 10:32:33.000000000 +0000
6+++ bin/named/Makefile.in 7+++ bin/named/Makefile.in
7@@ -85,6 +85,7 @@ SUBDIRS = unix 8@@ -85,6 +85,7 @@ SUBDIRS = unix
8  9
9 TARGETS = named@EXEEXT@ 10 TARGETS = named@EXEEXT@
10  11
11+BLACKLISTLINKOBJS= pfilter.@O@ 12+BLACKLISTLINKOBJS= pfilter.@O@
12 GEOIPLINKOBJS = geoip.@O@ 13 GEOIPLINKOBJS = geoip.@O@
13 GEOIP2LINKOBJS = geoip.@O@ 14 GEOIP2LINKOBJS = geoip.@O@
14  15
15@@ -94,12 +95,13 @@ OBJS = builtin.@O@ config.@O@ control.@ 16@@ -94,12 +95,13 @@ OBJS = builtin.@O@ config.@O@ control.@
16 log.@O@ logconf.@O@ main.@O@ \ 17 log.@O@ logconf.@O@ main.@O@ \
17 server.@O@ statschannel.@O@ \ 18 server.@O@ statschannel.@O@ \
18 tkeyconf.@O@ tsigconf.@O@ zoneconf.@O@ \ 19 tkeyconf.@O@ tsigconf.@O@ zoneconf.@O@ \
@@ -26,13 +27,22 @@ $NetBSD: patch-bin_named_Makefile.in,v 1 @@ -26,13 +27,22 @@ $NetBSD: patch-bin_named_Makefile.in,v 1
26+BLACKLISTLINKSRCS= pfilter.c 27+BLACKLISTLINKSRCS= pfilter.c
27 GEOIPLINKSRCS = geoip.c 28 GEOIPLINKSRCS = geoip.c
28 GEOIP2LINKSRCS = geoip.c 29 GEOIP2LINKSRCS = geoip.c
29  30
30@@ -109,7 +111,7 @@ SRCS = builtin.c config.c control.c \ 31@@ -109,7 +111,7 @@ SRCS = builtin.c config.c control.c \
31 log.c logconf.c main.c \ 32 log.c logconf.c main.c \
32 server.c statschannel.c \ 33 server.c statschannel.c \
33 tkeyconf.c tsigconf.c zoneconf.c \ 34 tkeyconf.c tsigconf.c zoneconf.c \
34- ${DLZDRIVER_SRCS} ${DBDRIVER_SRCS} 35- ${DLZDRIVER_SRCS} ${DBDRIVER_SRCS}
35+ ${BLACKLISTLINKSRCS} ${DLZDRIVER_SRCS} ${DBDRIVER_SRCS} 36+ ${BLACKLISTLINKSRCS} ${DLZDRIVER_SRCS} ${DBDRIVER_SRCS}
36  37
37 MANPAGES = named.8 named.conf.5 38 MANPAGES = named.8 named.conf.5
38  39
 40@@ -125,7 +127,7 @@ main.@O@: main.c
 41 -DPRODUCT=\"${PRODUCT}\" \
 42 -DDESCRIPTION=\"${DESCRIPTION}\" \
 43 -DSRCID=\"${SRCID}\" \
 44- -DCONFIGARGS="\"${CONFIGARGS}\"" \
 45+ -DCONFIGARGS="\"${CONFIGARGS:S/${WRKDIR}\/.tools/${PREFIX}/g:S/${WRKDIR}\/.buildlink/${PREFIX}/g}\"" \
 46 -DBUILDER="\"make\"" \
 47 -DNAMED_LOCALSTATEDIR=\"${localstatedir}\" \
 48 -DNAMED_SYSCONFDIR=\"${sysconfdir}\" -c ${srcdir}/main.c