CVS commit: pkgsrc

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Feb  9 00:28:21 UTC 2025

Modified Files:
        pkgsrc/converters/help2man: Makefile
        pkgsrc/devel/SDL2: Makefile
        pkgsrc/emulators/dosbox: Makefile
        pkgsrc/lang/openjdk17: Makefile
        pkgsrc/multimedia/libass: Makefile
        pkgsrc/multimedia/libbluray: Makefile
        pkgsrc/net/SDL_net: Makefile
        pkgsrc/textproc/libxml2: Makefile
        pkgsrc/textproc/libxslt: Makefile
        pkgsrc/textproc/py-libxml2: Makefile
        pkgsrc/www/curl: Makefile.common
        pkgsrc/www/nghttp2: Makefile

Log Message:
don't add unknown configure option for libiconv in a few packages


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/converters/help2man/Makefile
cvs rdiff -u -r1.101 -r1.102 pkgsrc/devel/SDL2/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/emulators/dosbox/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/lang/openjdk17/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/multimedia/libass/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/multimedia/libbluray/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/SDL_net/Makefile
cvs rdiff -u -r1.186 -r1.187 pkgsrc/textproc/libxml2/Makefile
cvs rdiff -u -r1.136 -r1.137 pkgsrc/textproc/libxslt/Makefile
cvs rdiff -u -r1.102 -r1.103 pkgsrc/textproc/py-libxml2/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/curl/Makefile.common
cvs rdiff -u -r1.92 -r1.93 pkgsrc/www/nghttp2/Makefile

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

Modified files:

Index: pkgsrc/converters/help2man/Makefile
diff -u pkgsrc/converters/help2man/Makefile:1.72 pkgsrc/converters/help2man/Makefile:1.73
--- pkgsrc/converters/help2man/Makefile:1.72    Tue Apr 30 12:22:57 2024
+++ pkgsrc/converters/help2man/Makefile Sun Feb  9 00:28:19 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2024/04/30 12:22:57 cheusov Exp $
+# $NetBSD: Makefile,v 1.73 2025/02/09 00:28:19 rillig Exp $
 
 DISTNAME=      help2man-1.49.3
 CATEGORIES=    converters
@@ -16,6 +16,7 @@ USE_GCC_RUNTIME=      yes
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            perl:run gmake
 GNU_CONFIGURE=         yes
+GNU_CONFIGURE_ICONV=   no
 
 SUBST_CLASSES+=                paths
 SUBST_MESSAGE.paths=   Fixing install lib paths.

Index: pkgsrc/devel/SDL2/Makefile
diff -u pkgsrc/devel/SDL2/Makefile:1.101 pkgsrc/devel/SDL2/Makefile:1.102
--- pkgsrc/devel/SDL2/Makefile:1.101    Sun Feb  2 09:33:32 2025
+++ pkgsrc/devel/SDL2/Makefile  Sun Feb  9 00:28:19 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2025/02/02 09:33:32 adam Exp $
+# $NetBSD: Makefile,v 1.102 2025/02/09 00:28:19 rillig Exp $
 
 DISTNAME=      SDL2-2.30.12
 CATEGORIES=    devel
@@ -15,6 +15,7 @@ USE_LANGUAGES=        c c++
 USE_LIBTOOL=   yes
 USE_TOOLS+=    gmake pkg-config
 GNU_CONFIGURE= yes
+GNU_CONFIGURE_ICONV=   no
 
 # See devel/SDL2-legacy-darwin
 NOT_FOR_PLATFORM+=     Darwin-*-powerpc*

Index: pkgsrc/emulators/dosbox/Makefile
diff -u pkgsrc/emulators/dosbox/Makefile:1.51 pkgsrc/emulators/dosbox/Makefile:1.52
--- pkgsrc/emulators/dosbox/Makefile:1.51       Mon Jan  6 21:49:06 2025
+++ pkgsrc/emulators/dosbox/Makefile    Sun Feb  9 00:28:20 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2025/01/06 21:49:06 ktnb Exp $
+# $NetBSD: Makefile,v 1.52 2025/02/09 00:28:20 rillig Exp $
 
 DISTNAME=      dosbox-0.74-3
 PKGNAME=       dosbox-0.74.3
@@ -15,6 +15,7 @@ TOOL_DEPENDS+=        icoutils-[0-9]*:../../gra
 
 USE_LANGUAGES=         c c++
 GNU_CONFIGURE=         yes
+GNU_CONFIGURE_ICONV=   no
 CONFIGURE_ARGS.Darwin+=        --disable-dynrec
 CPPFLAGS.SunOS+=       -DDISABLE_JOYSTICK
 .include "../../mk/compiler.mk"

Index: pkgsrc/lang/openjdk17/Makefile
diff -u pkgsrc/lang/openjdk17/Makefile:1.29 pkgsrc/lang/openjdk17/Makefile:1.30
--- pkgsrc/lang/openjdk17/Makefile:1.29 Thu Nov 28 19:44:25 2024
+++ pkgsrc/lang/openjdk17/Makefile      Sun Feb  9 00:28:20 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2024/11/28 19:44:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.30 2025/02/09 00:28:20 rillig Exp $
 
 DISTNAME=      jdk17u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=       openjdk17-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
@@ -40,6 +40,7 @@ BUILDLINK_TRANSFORM+= opt:-Wl,--hash-sty
 
 GNU_CONFIGURE=         yes
 GNU_CONFIGURE_STRICT=  no # generates the configure script during the build
+GNU_CONFIGURE_ICONV=   no
 USE_GNU_CONFIGURE_HOST=        no
 CONFIGURE_SCRIPT=      configure
 CONFIG_SHELL=          bash

Index: pkgsrc/multimedia/libass/Makefile
diff -u pkgsrc/multimedia/libass/Makefile:1.37 pkgsrc/multimedia/libass/Makefile:1.38
--- pkgsrc/multimedia/libass/Makefile:1.37      Wed Jul  3 05:25:29 2024
+++ pkgsrc/multimedia/libass/Makefile   Sun Feb  9 00:28:20 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2024/07/03 05:25:29 adam Exp $
+# $NetBSD: Makefile,v 1.38 2025/02/09 00:28:20 rillig Exp $
 
 DISTNAME=      libass-0.17.3
 CATEGORIES=    multimedia
@@ -14,6 +14,7 @@ LICENSE=      isc
 USE_LIBTOOL=           yes
 USE_TOOLS+=            pkg-config
 GNU_CONFIGURE=         yes
+GNU_CONFIGURE_ICONV=   no
 CONFIGURE_ARGS+=       --disable-asm
 PKGCONFIG_OVERRIDE+=   libass.pc.in
 

Index: pkgsrc/multimedia/libbluray/Makefile
diff -u pkgsrc/multimedia/libbluray/Makefile:1.41 pkgsrc/multimedia/libbluray/Makefile:1.42
--- pkgsrc/multimedia/libbluray/Makefile:1.41   Thu Nov 14 22:20:58 2024
+++ pkgsrc/multimedia/libbluray/Makefile        Sun Feb  9 00:28:20 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2024/11/14 22:20:58 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2025/02/09 00:28:20 rillig Exp $
 
 DISTNAME=      libbluray-1.3.4
 PKGREVISION=   8
@@ -14,6 +14,7 @@ LICENSE=      gnu-lgpl-v2.1
 USE_LIBTOOL=           yes
 USE_TOOLS+=            pkg-config
 GNU_CONFIGURE=         yes
+GNU_CONFIGURE_ICONV=   no
 CONFIGURE_ARGS+=       --disable-bdjava-jar
 CONFIGURE_ARGS+=       --disable-optimizations
 PKGCONFIG_OVERRIDE+=   src/libbluray.pc.in

Index: pkgsrc/net/SDL_net/Makefile
diff -u pkgsrc/net/SDL_net/Makefile:1.26 pkgsrc/net/SDL_net/Makefile:1.27
--- pkgsrc/net/SDL_net/Makefile:1.26    Mon Jan  6 21:49:24 2025
+++ pkgsrc/net/SDL_net/Makefile Sun Feb  9 00:28:20 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2025/01/06 21:49:24 ktnb Exp $
+# $NetBSD: Makefile,v 1.27 2025/02/09 00:28:20 rillig Exp $
 
 DISTNAME=      SDL_net-1.2.8
 PKGREVISION=   2
@@ -13,6 +13,7 @@ LICENSE=      zlib
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
+GNU_CONFIGURE_ICONV=   no
 CONFIGURE_ARGS+=       --disable-gui
 PKGCONFIG_OVERRIDE=    SDL_net.pc.in
 

Index: pkgsrc/textproc/libxml2/Makefile
diff -u pkgsrc/textproc/libxml2/Makefile:1.186 pkgsrc/textproc/libxml2/Makefile:1.187
--- pkgsrc/textproc/libxml2/Makefile:1.186      Thu Nov 14 22:21:52 2024
+++ pkgsrc/textproc/libxml2/Makefile    Sun Feb  9 00:28:20 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.186 2024/11/14 22:21:52 wiz Exp $
+# $NetBSD: Makefile,v 1.187 2025/02/09 00:28:20 rillig Exp $
 
 PKGREVISION= 3
 .include "../../textproc/libxml2/Makefile.common"
@@ -12,6 +12,7 @@ FORCE_C_STD=          c99
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake
 GNU_CONFIGURE=         yes
+GNU_CONFIGURE_ICONV=   no
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-zlib=${BUILDLINK_PREFIX.zlib}
 CONFIGURE_ARGS+=       --with-lzma=${BUILDLINK_PREFIX.xz}

Index: pkgsrc/textproc/libxslt/Makefile
diff -u pkgsrc/textproc/libxslt/Makefile:1.136 pkgsrc/textproc/libxslt/Makefile:1.137
--- pkgsrc/textproc/libxslt/Makefile:1.136      Thu Nov 14 22:21:52 2024
+++ pkgsrc/textproc/libxslt/Makefile    Sun Feb  9 00:28:20 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.136 2024/11/14 22:21:52 wiz Exp $
+# $NetBSD: Makefile,v 1.137 2025/02/09 00:28:20 rillig Exp $
 
 PKGREVISION= 3
 .include "Makefile.common"
@@ -9,6 +9,7 @@ TOOL_DEPENDS+=  docbook-xsl-[0-9]*:../../
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake perl
 GNU_CONFIGURE=         yes
+GNU_CONFIGURE_ICONV=   no
 CONFIGURE_ARGS+=       --with-libxml-prefix=${BUILDLINK_PREFIX.libxml2}
 CONFIGURE_ARGS+=       --without-python
 

Index: pkgsrc/textproc/py-libxml2/Makefile
diff -u pkgsrc/textproc/py-libxml2/Makefile:1.102 pkgsrc/textproc/py-libxml2/Makefile:1.103
--- pkgsrc/textproc/py-libxml2/Makefile:1.102   Thu Nov 14 22:21:54 2024
+++ pkgsrc/textproc/py-libxml2/Makefile Sun Feb  9 00:28:20 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2024/11/14 22:21:54 wiz Exp $
+# $NetBSD: Makefile,v 1.103 2025/02/09 00:28:20 rillig Exp $
 
 PYTHON_27_ACCEPTED=    yes
 
@@ -14,6 +14,7 @@ USE_GCC_RUNTIME=      yes
 
 PYSETUPSUBDIR= python
 GNU_CONFIGURE= yes
+GNU_CONFIGURE_ICONV=   no
 USE_TOOLS+=    pkg-config
 
 # python/setup.py looks in various places for libxml2 and libiconv,

Index: pkgsrc/www/curl/Makefile.common
diff -u pkgsrc/www/curl/Makefile.common:1.20 pkgsrc/www/curl/Makefile.common:1.21
--- pkgsrc/www/curl/Makefile.common:1.20        Wed Feb  5 08:51:31 2025
+++ pkgsrc/www/curl/Makefile.common     Sun Feb  9 00:28:21 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2025/02/05 08:51:31 wiz Exp $
+# $NetBSD: Makefile.common,v 1.21 2025/02/09 00:28:21 rillig Exp $
 # used by www/libcurl-gnutls/Makefile
 
 DISTNAME=      curl-8.12.0
@@ -22,6 +22,7 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-impacket-[
 USE_TOOLS+=            nroff perl
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
+GNU_CONFIGURE_ICONV=   no
 # Some systems use bundles instead of directories; this needs configuring
 # because curl doesn't use default validation.
 .if !empty(SSLCERTBUNDLE)

Index: pkgsrc/www/nghttp2/Makefile
diff -u pkgsrc/www/nghttp2/Makefile:1.92 pkgsrc/www/nghttp2/Makefile:1.93
--- pkgsrc/www/nghttp2/Makefile:1.92    Thu Nov 14 22:22:08 2024
+++ pkgsrc/www/nghttp2/Makefile Sun Feb  9 00:28:21 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2024/11/14 22:22:08 wiz Exp $
+# $NetBSD: Makefile,v 1.93 2025/02/09 00:28:21 rillig Exp $
 
 PKGREVISION= 3
 .include "Makefile.common"
@@ -12,6 +12,7 @@ USE_LANGUAGES=                c
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake pkg-config
 GNU_CONFIGURE=         yes
+GNU_CONFIGURE_ICONV=   no
 CONFIGURE_ARGS+=       --enable-lib-only
 PKGCONFIG_OVERRIDE+=   lib/libnghttp2.pc.in
 PKGCONFIG_OVERRIDE+=   src/libnghttp2_asio.pc.in