CVS commit: pkgsrc/textproc/expat

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Dec  7 08:40:04 UTC 2025

Modified Files:
        pkgsrc/textproc/expat: builtin.mk

Log Message:
expat: improve builtin.mk

To fix configure step in abiword:
- do not remove too much before scanning before 'pkg-config' in USE_TOOLS
- hook to pre-configure to make sure to be called even when pre-configure
  is overridden


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/textproc/expat/builtin.mk

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

Modified files:

Index: pkgsrc/textproc/expat/builtin.mk
diff -u pkgsrc/textproc/expat/builtin.mk:1.24 pkgsrc/textproc/expat/builtin.mk:1.25
--- pkgsrc/textproc/expat/builtin.mk:1.24       Thu Sep 25 07:03:33 2025
+++ pkgsrc/textproc/expat/builtin.mk    Sun Dec  7 08:40:04 2025
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.24 2025/09/25 07:03:33 adam Exp $
+# $NetBSD: builtin.mk,v 1.25 2025/12/07 08:40:04 wiz Exp $
 
 BUILTIN_PKG:=  expat
 
@@ -88,8 +88,8 @@ BUILDLINK_PREFIX.expat=       /boot/common
 # Fake pkg-config for builtin expat on NetBSD
 
 .if ${USE_BUILTIN.expat:tl} == yes
-.  if !empty(USE_TOOLS:C/:.*//:Mpkg-config)
-do-configure-pre-hook: override-expat-pkgconfig
+.  if !empty(USE_TOOLS:C/:[A-z]*//:Mpkg-config)
+pre-configure: override-expat-pkgconfig
 
 BLKDIR_PKGCFG= ${BUILDLINK_DIR}/lib/pkgconfig
 EXPAT_PKGCFGF= expat.pc