CVS commit: pkgsrc/devel/apr-util

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jul  9 09:42:49 UTC 2025

Modified Files:
        pkgsrc/devel/apr-util: Makefile distinfo
        pkgsrc/devel/apr-util/patches: patch-aa

Log Message:
apr-util: Fix hardcoded iconv const setting.

While here add the correct TEST_TARGET.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/devel/apr-util/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/apr-util/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/apr-util/patches/patch-aa

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

Modified files:

Index: pkgsrc/devel/apr-util/Makefile
diff -u pkgsrc/devel/apr-util/Makefile:1.76 pkgsrc/devel/apr-util/Makefile:1.77
--- pkgsrc/devel/apr-util/Makefile:1.76 Thu Apr 17 21:50:16 2025
+++ pkgsrc/devel/apr-util/Makefile      Wed Jul  9 09:42:49 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2025/04/17 21:50:16 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2025/07/09 09:42:49 jperkin Exp $
 
 DISTNAME=      apr-util-1.6.3
 PKGREVISION=   8
@@ -32,6 +32,8 @@ MAKE_ENV+=    WRAPPER_DIR=${WRAPPER_DIR}
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
+TEST_TARGET=   test
+
 .include "../../converters/libiconv/buildlink3.mk"
 BUILDLINK_API_DEPENDS.apr+=    apr>=1.5.0
 .include "../../devel/apr/buildlink3.mk"

Index: pkgsrc/devel/apr-util/distinfo
diff -u pkgsrc/devel/apr-util/distinfo:1.26 pkgsrc/devel/apr-util/distinfo:1.27
--- pkgsrc/devel/apr-util/distinfo:1.26 Sun Feb  5 08:42:04 2023
+++ pkgsrc/devel/apr-util/distinfo      Wed Jul  9 09:42:49 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.26 2023/02/05 08:42:04 wiz Exp $
+$NetBSD: distinfo,v 1.27 2025/07/09 09:42:49 jperkin Exp $
 
 BLAKE2s (apr-util-1.6.3.tar.bz2) = 35c3a9e24f738e70c42bb9040102f838ab51635a88650ab2f13f0b81f3f7ecdc
 SHA512 (apr-util-1.6.3.tar.bz2) = 8050a481eeda7532ef3751dbd8a5aa6c48354d52904a856ef9709484f4b0cc2e022661c49ddf55ec58253db22708ee0607dfa7705d9270e8fee117ae4f06a0fe
 Size (apr-util-1.6.3.tar.bz2) = 432692 bytes
-SHA1 (patch-aa) = 350b4e8fb3097d4df597c284321ca5dc25ce015c
+SHA1 (patch-aa) = c91b22de1f0c99e9fab57117e601bc623da44ce6

Index: pkgsrc/devel/apr-util/patches/patch-aa
diff -u pkgsrc/devel/apr-util/patches/patch-aa:1.7 pkgsrc/devel/apr-util/patches/patch-aa:1.8
--- pkgsrc/devel/apr-util/patches/patch-aa:1.7  Tue Dec 10 08:27:06 2013
+++ pkgsrc/devel/apr-util/patches/patch-aa      Wed Jul  9 09:42:49 2025
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2013/12/10 08:27:06 obache Exp $
+$NetBSD: patch-aa,v 1.8 2025/07/09 09:42:49 jperkin Exp $
+
+* Remove hardcoded iconv const, let the configure test decide.
 
 * Use libtool in the wrapper directory instead of the one installed by
   apr.  Otherwise, dependency_libs in libaprutil-1.la is set incorrectly.
@@ -7,9 +9,20 @@ $NetBSD: patch-aa,v 1.7 2013/12/10 08:27
   doesn't know about all dependencies of apr-util.  Otherwise the final binary
   wouldn't have the proper RPATHs.
 
---- configure.orig     2013-11-13 16:41:32.000000000 +0000
+--- configure.orig     2023-01-31 20:57:52.000000000 +0000
 +++ configure
-@@ -24308,7 +24308,7 @@ case $host in
+@@ -4461,10 +4461,6 @@ if test "x$apu_preload_done" != "xyes" ;
+         ;;
+     *-solaris2*)
+ 
+-  if test -z "$apu_iconv_inbuf_const"; then
+-    test "x$silent" != "xyes" && echo "  setting apu_iconv_inbuf_const to \"1\""
+-    apu_iconv_inbuf_const="1"
+-  fi
+ 
+ 
+   if test -z "$apu_crypt_threadsafe"; then
+@@ -24790,7 +24786,7 @@ case $host in
              < $APR_BUILD_DIR/apr_rules.mk > $abs_builddir/build/rules.mk
          ;;
      *)