CVS commit: pkgsrc

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Oct  9 12:02:00 UTC 2026

Modified Files:
        pkgsrc/audio/lame: Makefile
        pkgsrc/devel/gettext: Makefile.common
        pkgsrc/security/pinentry: Makefile.common
        pkgsrc/textproc/libunistring: Makefile
        pkgsrc/www/libpsl: Makefile

Log Message:
*: Fix inaccurate comments about iconv detection on macOS

The detection is not faulty; the implementation is rejected with intent.
Issue will need a generic pkgsrc resolution at some point.


To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 pkgsrc/audio/lame/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/gettext/Makefile.common
cvs rdiff -u -r1.24 -r1.25 pkgsrc/security/pinentry/Makefile.common
cvs rdiff -u -r1.22 -r1.23 pkgsrc/textproc/libunistring/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/www/libpsl/Makefile

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

Modified files:

Index: pkgsrc/audio/lame/Makefile
diff -u pkgsrc/audio/lame/Makefile:1.98 pkgsrc/audio/lame/Makefile:1.99
--- pkgsrc/audio/lame/Makefile:1.98     Wed Jul 15 07:09:51 2026
+++ pkgsrc/audio/lame/Makefile  Fri Oct  9 12:02:00 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2026/07/15 07:09:51 adam Exp $
+# $NetBSD: Makefile,v 1.99 2026/10/09 12:02:00 tnn Exp $
 
 DISTNAME=      lame-4.0
 PKGREVISION=   1
@@ -15,8 +15,8 @@ USE_LANGUAGES=                c c++
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake pkg-config
 GNU_CONFIGURE=         yes
-# Fix for faulty detection of iconv.
-CONFIGURE_ENV.Darwin=  am_cv_func_iconv_works=yes
+# Upstream insists on enforcing GNU iconv on macOS.
+CONFIGURE_ENV.Darwin+= am_cv_func_iconv_works=yes
 
 LDFLAGS.SunOS+=                -lm
 LDFLAGS.NetBSD+=       -ltermcap

Index: pkgsrc/devel/gettext/Makefile.common
diff -u pkgsrc/devel/gettext/Makefile.common:1.29 pkgsrc/devel/gettext/Makefile.common:1.30
--- pkgsrc/devel/gettext/Makefile.common:1.29   Tue Jul 21 12:55:53 2026
+++ pkgsrc/devel/gettext/Makefile.common        Fri Oct  9 12:02:00 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2026/07/21 12:55:53 adam Exp $
+# $NetBSD: Makefile.common,v 1.30 2026/10/09 12:02:00 tnn Exp $
 #
 # used by devel/gettext/Makefile
 # used by devel/gettext-asprintf/Makefile
@@ -19,8 +19,8 @@ CONFLICTS=    gettext<=0.10.35
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
 GNU_CONFIGURE_STRICT=  no # several sub-configures
-# Fix for faulty detection of iconv.
-CONFIGURE_ENV.Darwin=  am_cv_func_iconv_works=yes
+# Upstream insists on enforcing GNU iconv on macOS.
+CONFIGURE_ENV.Darwin+= am_cv_func_iconv_works=yes
 
 TEST_TARGET=   check
 

Index: pkgsrc/security/pinentry/Makefile.common
diff -u pkgsrc/security/pinentry/Makefile.common:1.24 pkgsrc/security/pinentry/Makefile.common:1.25
--- pkgsrc/security/pinentry/Makefile.common:1.24       Thu Jul  2 15:38:39 2026
+++ pkgsrc/security/pinentry/Makefile.common    Fri Oct  9 12:02:00 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2026/07/02 15:38:39 tnn Exp $
+# $NetBSD: Makefile.common,v 1.25 2026/10/09 12:02:00 tnn Exp $
 #
 # used by security/pinentry/Makefile
 # used by security/pinentry-fltk/Makefile
@@ -22,8 +22,8 @@ PATCHDIR=     ${.CURDIR}/../../security/pine
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
-# Fix for iconv detection in gettext 1.0.
-CONFIGURE_ENV.Darwin=   am_cv_func_iconv_works=yes
+# Upstream insists on enforcing GNU iconv on macOS.
+CONFIGURE_ENV.Darwin+=   am_cv_func_iconv_works=yes
 INFO_FILES=            yes
 
 CHECK_PORTABILITY_SKIP+=       build-aux/config.rpath

Index: pkgsrc/textproc/libunistring/Makefile
diff -u pkgsrc/textproc/libunistring/Makefile:1.22 pkgsrc/textproc/libunistring/Makefile:1.23
--- pkgsrc/textproc/libunistring/Makefile:1.22  Fri Aug  7 09:03:53 2026
+++ pkgsrc/textproc/libunistring/Makefile       Fri Oct  9 12:02:00 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2026/08/07 09:03:53 adam Exp $
+# $NetBSD: Makefile,v 1.23 2026/10/09 12:02:00 tnn Exp $
 
 DISTNAME=      libunistring-1.4.2
 CATEGORIES=    textproc
@@ -14,8 +14,8 @@ USE_LIBTOOL=  yes
 INFO_FILES=    yes
 TEST_TARGET=   check
 
-# Fix for iconv detection in gettext 1.0.
-CONFIGURE_ENV.Darwin=  am_cv_func_iconv_works=yes
+# Upstream insists on enforcing GNU iconv on macOS.
+CONFIGURE_ENV.Darwin+= am_cv_func_iconv_works=yes
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/libpsl/Makefile
diff -u pkgsrc/www/libpsl/Makefile:1.22 pkgsrc/www/libpsl/Makefile:1.23
--- pkgsrc/www/libpsl/Makefile:1.22     Sun Aug 16 12:13:03 2026
+++ pkgsrc/www/libpsl/Makefile  Fri Oct  9 12:02:00 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2026/08/16 12:13:03 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2026/10/09 12:02:00 tnn Exp $
 
 DISTNAME=      libpsl-0.23.3
 CATEGORIES=    www
@@ -17,8 +17,8 @@ USE_TOOLS+=           gmake msgfmt msgmerge pkg-c
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --disable-gtk-doc
 CONFIGURE_ARGS+=       --enable-runtime=libidn2
-# Fix for iconv detection in gettext 1.0.
-CONFIGURE_ENV.Darwin=  am_cv_func_iconv_works=yes
+# Upstream insists on enforcing GNU iconv on macOS.
+CONFIGURE_ENV.Darwin+= am_cv_func_iconv_works=yes
 PKGCONFIG_OVERRIDE+=   libpsl.pc.in
 TEST_TARGET=           check