Fix build for PKG_DEVELOPER=yes (from taca@)

Bump pkgsrc version.

3 files changed, 30 insertions, 12 deletions

diff --git a/net/bind918/Makefile b/net/bind918/Makefile
index 0486588dc34..d7a57b76cd3 100644
--- a/net/bind918/Makefile
+++ b/net/bind918/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2022/12/11 01:57:55 sekiya Exp $
+# $NetBSD: Makefile,v 1.2 2022/12/12 22:07:04 sekiya Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
-#PKGNAME=	bind-9.18
 PKGNAME=	${DISTNAME:S/-P/pl/}
-#PKGREVISION=	1
+PKGREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
+MASTER_SITES=	https://downloads.isc.org/isc/bind9/${BIND_VERSION}/${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	sekiya@NetBSD.org
@@ -39,6 +38,13 @@ CONFIGURE_ARGS+=		--with-openssl=${SSLBASE:Q}
 CONFIGURE_ARGS.DragonFly+=	--disable-kqueue
 CONFIGURE_ARGS.SunOS+=		--disable-epoll
 
+# Remove WRKDIR reference by modifying pkg-config related path.
+SUBST_CLASSES+=		pkgconf
+SUBST_STAGE.pkgconf=	pre-configure
+SUBST_FILES.pkgconf=	configure.ac
+SUBST_MESSAGE.pkgconf=	Fixing pkg-config path.
+SUBST_VARS.pkgconf+=	BUILDLINK_DIR PREFIX TOOLS_DIR
+
 BUILDLINK_TRANSFORM.SunOS+=	rm:-zrelax=transtls
 
 PKG_GROUPS_VARS+=	BIND_GROUP
diff --git a/net/bind918/distinfo b/net/bind918/distinfo
index 74ee7ebaf3d..03a87142f04 100644
--- a/net/bind918/distinfo
+++ b/net/bind918/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2022/12/11 21:17:53 sekiya Exp $
+$NetBSD: distinfo,v 1.3 2022/12/12 22:07:04 sekiya Exp $
 
 BLAKE2s (bind-9.18.9.tar.xz) = 8c3f2dcb57205959f78c02fd32a12d0897050897af9136b58972fde41468ec55
 SHA512 (bind-9.18.9.tar.xz) = 7d9bca47e29e8634416ab52819d78ce4ec6196c0dcbd9fe95a24687337f71c69b6472cf20bf49ea0ae1751a861944f354f9122acfb01780f51278ad4a3fdd817
@@ -8,7 +8,7 @@ SHA1 (patch-bin_named_os.c) = 5ecb0883076575d8ac5fcad68f9daad6c9be0d0b
 SHA1 (patch-bin_named_server.c) = 6e59d3f637ebb829eec2f76ba7c350fb5cf9be6d
 SHA1 (patch-bin_tests_system_keyfromlabel_tests.sh) = 63a1516b573adabe6ff2719532fd58bcf3ecd65b
 SHA1 (patch-config.h.in) = 6072793048cdf590863046355eeffa1d93524c36
-SHA1 (patch-configure.ac) = 7eecb2c390168566b2320791cd185530c7896c21
+SHA1 (patch-configure.ac) = a6f10aec356691ca1075262a3e87c809cd3a558a
 SHA1 (patch-lib_dns_byaddr.c) = 647ddaaaf040233e18d1a87d83bc2bd63d2a20e3
 SHA1 (patch-lib_dns_gssapi__link.c) = 72296598b0bdd2a57d0f38ecf1775e2898a041c6
 SHA1 (patch-lib_dns_include_dns_zone.h) = e6dfcd43430538ac2a39b217fcae0d81e4c4d163
diff --git a/net/bind918/patches/patch-configure.ac b/net/bind918/patches/patch-configure.ac
index 990e0376d42..0328241755f 100644
--- a/net/bind918/patches/patch-configure.ac
+++ b/net/bind918/patches/patch-configure.ac
@@ -1,10 +1,22 @@
-$NetBSD: patch-configure.ac,v 1.1 2022/12/11 01:57:55 sekiya Exp $
+$NetBSD: patch-configure.ac,v 1.2 2022/12/12 22:07:05 sekiya Exp $
 
-Add support for blocklist(blacklist).
+* Add support for blocklist(blacklist).
+* Remove WRKDIR reference from config.h.
 
---- configure.ac.orig	2022-11-08 07:17:42.020258069 +0900
-+++ configure.ac	2022-12-10 11:45:02.065611825 +0900
-@@ -540,6 +540,16 @@
+--- configure.ac.orig	2022-11-07 22:17:42.020258069 +0000
++++ configure.ac
+@@ -36,7 +36,9 @@ AC_DEFINE([PACKAGE_DESCRIPTION], [m4_ifn
+ AC_DEFINE([PACKAGE_SRCID], ["][bind_SRCID]["], [A short hash from git])
+ 
+ bind_CONFIGARGS="${ac_configure_args:-default}"
+-AC_DEFINE_UNQUOTED([PACKAGE_CONFIGARGS], ["$bind_CONFIGARGS"], [Either 'defaults' or used ./configure options])
++faked_CONFIGARGS=$(echo ${bind_CONFIGARGS} | \
++	sed -e 's|@TOOLS_DIR@|@PREFIX@|g' -e 's|@BUILDLINK_DIR@|@PREFIX@|g')
++AC_DEFINE_UNQUOTED([PACKAGE_CONFIGARGS], ["$faked_CONFIGARGS"], [Either 'defaults' or used ./configure options])
+ 
+ AC_DEFINE([PACKAGE_BUILDER], ["make"], [make or Visual Studio])
+ 
+@@ -540,6 +542,16 @@ AC_CHECK_FUNCS([sched_yield pthread_yiel
  AC_CHECK_FUNCS([pthread_setname_np pthread_set_name_np])
  AC_CHECK_HEADERS([pthread_np.h], [], [], [#include <pthread.h>])
  
@@ -21,7 +33,7 @@ Add support for blocklist(blacklist).
  # libuv
  AC_MSG_CHECKING([for libuv])
  PKG_CHECK_MODULES([LIBUV], [libuv >= 1.0.0], [],
-@@ -1212,6 +1222,18 @@
+@@ -1212,6 +1224,18 @@ AS_IF([test "$enable_fixed_rrset" = "yes
        [AC_DEFINE([DNS_RDATASET_FIXED], [1],
  		 [Define to enable "rrset-order fixed" syntax.])])