CVS commit: pkgsrc/net/bind914

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sat May 30 14:21:32 UTC 2020

Modified Files:
        pkgsrc/net/bind914: Makefile distinfo
        pkgsrc/net/bind914/patches: patch-bin_named_Makefile.in

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/bind914/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/bind914/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/net/bind914/patches/patch-bin_named_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/bind914/Makefile
diff -u pkgsrc/net/bind914/Makefile:1.22 pkgsrc/net/bind914/Makefile:1.23
--- pkgsrc/net/bind914/Makefile:1.22    Thu May 21 12:45:47 2020
+++ pkgsrc/net/bind914/Makefile Sat May 30 14:21:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2020/05/21 12:45:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.23 2020/05/30 14:21:31 taca Exp $
 
 DISTNAME=      bind-${BIND_VERSION}
 PKGNAME=       ${DISTNAME:S/-P/pl/}
@@ -25,6 +25,7 @@ BUILD_DEFS+=  BIND_DIR VARBASE
 USE_TOOLS+=            pax perl pkg-config
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
+MAKE_ENV+=             WRKDIR=${WRKDIR} PREFIX=${PREFIX}
 
 .if ${OPSYS} == "Linux" && !exists(/usr/include/sys/capability.h)
 CONFIGURE_ARGS+=               --disable-linux-caps

Index: pkgsrc/net/bind914/distinfo
diff -u pkgsrc/net/bind914/distinfo:1.15 pkgsrc/net/bind914/distinfo:1.16
--- pkgsrc/net/bind914/distinfo:1.15    Tue May 19 10:23:03 2020
+++ pkgsrc/net/bind914/distinfo Sat May 30 14:21:31 2020
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.15 2020/05/19 10:23:03 taca Exp $
+$NetBSD: distinfo,v 1.16 2020/05/30 14:21:31 taca Exp $
 
 SHA1 (bind-9.14.12.tar.gz) = 20fd9f09f251dcd367b6221a954ef68ac501de51
 RMD160 (bind-9.14.12.tar.gz) = 82ac9214698eee669f658e3d833727b431b8579a
 SHA512 (bind-9.14.12.tar.gz) = f4e6c50cbe8fdb44cdd8e30b4560b6fe2fccd0fd5bde527a897a66e85065265da0d0aceb95af42d5568dea95d59e68574e5a486bbb7e6c5d0af275538c353ddf
 Size (bind-9.14.12.tar.gz) = 6318913 bytes
-SHA1 (patch-bin_named_Makefile.in) = 741e3708c670baaec45446f6bb364ada448ae330
+SHA1 (patch-bin_named_Makefile.in) = 530511e833ee72b2d53e0de77301ebf6bbc81aaf
 SHA1 (patch-bin_named_main.c) = 51c8ab464a009575b6513c7ed4b79f89446eb7d0
 SHA1 (patch-bin_named_pfilter.c) = b54f872c883c8fbc2d9c04df65c185dc057cc36b
 SHA1 (patch-bin_named_pfilter.h) = c14617cb266a4b5d33ba6e5db98562e806792833

Index: pkgsrc/net/bind914/patches/patch-bin_named_Makefile.in
diff -u pkgsrc/net/bind914/patches/patch-bin_named_Makefile.in:1.2 pkgsrc/net/bind914/patches/patch-bin_named_Makefile.in:1.3
--- pkgsrc/net/bind914/patches/patch-bin_named_Makefile.in:1.2  Thu Jul 18 03:02:02 2019
+++ pkgsrc/net/bind914/patches/patch-bin_named_Makefile.in      Sat May 30 14:21:32 2020
@@ -1,8 +1,9 @@
-$NetBSD: patch-bin_named_Makefile.in,v 1.2 2019/07/18 03:02:02 taca Exp $
+$NetBSD: patch-bin_named_Makefile.in,v 1.3 2020/05/30 14:21:32 taca Exp $
 
 * Add support for blacklistd.
+* Dirty hack to prevent WRKDIR reference.
 
---- bin/named/Makefile.in.orig 2019-07-09 18:15:48.000000000 +0000
+--- bin/named/Makefile.in.orig 2020-05-06 10:32:33.000000000 +0000
 +++ bin/named/Makefile.in
 @@ -85,6 +85,7 @@ SUBDIRS =    unix
  
@@ -36,3 +37,12 @@ $NetBSD: patch-bin_named_Makefile.in,v 1
  
  MANPAGES =    named.8 named.conf.5
  
+@@ -125,7 +127,7 @@ main.@O@: main.c
+               -DPRODUCT=\"${PRODUCT}\" \
+               -DDESCRIPTION=\"${DESCRIPTION}\" \
+               -DSRCID=\"${SRCID}\" \
+-              -DCONFIGARGS="\"${CONFIGARGS}\"" \
++              -DCONFIGARGS="\"${CONFIGARGS:S/${WRKDIR}\/.tools/${PREFIX}/g:S/${WRKDIR}\/.buildlink/${PREFIX}/g}\"" \
+               -DBUILDER="\"make\"" \
+               -DNAMED_LOCALSTATEDIR=\"${localstatedir}\" \
+               -DNAMED_SYSCONFDIR=\"${sysconfdir}\" -c ${srcdir}/main.c