CVS commit: pkgsrc/devel/ada-gnatcoll-bindings-25

["Dmytro Kazankov" <dkazankov%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dkazankov
Date:           Tue Nov  4 20:31:27 UTC 2025

Modified Files:
        pkgsrc/devel/ada-gnatcoll-bindings-25: Makefile distinfo inplace.mk
            options.mk
        pkgsrc/devel/ada-gnatcoll-bindings-25/patches: patch-Makefile
Added Files:
        pkgsrc/devel/ada-gnatcoll-bindings-25/patches: patch-iconv_setup.py

Log Message:
ada-gnatcoll-bindings-25: unbind from GNU iconv - fix child packages link error


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ada-gnatcoll-bindings-25/Makefile \
    pkgsrc/devel/ada-gnatcoll-bindings-25/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ada-gnatcoll-bindings-25/inplace.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ada-gnatcoll-bindings-25/options.mk
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/ada-gnatcoll-bindings-25/patches/patch-Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/ada-gnatcoll-bindings-25/patches/patch-iconv_setup.py

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

Modified files:

Index: pkgsrc/devel/ada-gnatcoll-bindings-25/Makefile
diff -u pkgsrc/devel/ada-gnatcoll-bindings-25/Makefile:1.4 pkgsrc/devel/ada-gnatcoll-bindings-25/Makefile:1.5
--- pkgsrc/devel/ada-gnatcoll-bindings-25/Makefile:1.4  Thu Oct  9 18:30:02 2025
+++ pkgsrc/devel/ada-gnatcoll-bindings-25/Makefile      Tue Nov  4 20:31:27 2025
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2025/10/09 18:30:02 dkazankov Exp $
+# $NetBSD: Makefile,v 1.5 2025/11/04 20:31:27 dkazankov Exp $
 
 DISTNAME=      ${GITHUB_PROJECT}-${GITHUB_TAG}
 PKGNAME=       ${GITHUB_PROJECT}-${GNAT_NAME}-${GITHUB_TAG}.0
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=AdaCore/}
 GITHUB_PROJECT=        gnatcoll-bindings
Index: pkgsrc/devel/ada-gnatcoll-bindings-25/distinfo
diff -u pkgsrc/devel/ada-gnatcoll-bindings-25/distinfo:1.4 pkgsrc/devel/ada-gnatcoll-bindings-25/distinfo:1.5
--- pkgsrc/devel/ada-gnatcoll-bindings-25/distinfo:1.4  Thu Oct  9 18:30:02 2025
+++ pkgsrc/devel/ada-gnatcoll-bindings-25/distinfo      Tue Nov  4 20:31:27 2025
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2025/10/09 18:30:02 dkazankov Exp $
+$NetBSD: distinfo,v 1.5 2025/11/04 20:31:27 dkazankov Exp $
 
 BLAKE2s (gnatcoll-bindings-25.2.tar.gz) = 1c262252e1235aac289347de872783d61ddf85d4cf956aff44743088a5fdcfcc
 SHA512 (gnatcoll-bindings-25.2.tar.gz) = f4e2fbc21c2d7b05fbb760cf22b07188236dddf1de77bd60d44ed3ba18303d588550a15e227232ea5bc6646c5049edaea51a3f4e7936762c56def41c7d6be6ea
 Size (gnatcoll-bindings-25.2.tar.gz) = 299425 bytes
-SHA1 (patch-Makefile) = 26846a3ea97049f543e7c35bdf0565c94ea6afc4
+SHA1 (patch-Makefile) = c2a6ba571cd2df0a5efa731f13e4514c7232d0da
+SHA1 (patch-iconv_setup.py) = a4822128df4c030588939df6b48caba1c32b8a6a
 SHA1 (patch-setup__support.py) = c91171307d3d7781111c89ba3a38ced019eab4e2

Index: pkgsrc/devel/ada-gnatcoll-bindings-25/inplace.mk
diff -u pkgsrc/devel/ada-gnatcoll-bindings-25/inplace.mk:1.2 pkgsrc/devel/ada-gnatcoll-bindings-25/inplace.mk:1.3
--- pkgsrc/devel/ada-gnatcoll-bindings-25/inplace.mk:1.2        Thu Sep  4 09:24:55 2025
+++ pkgsrc/devel/ada-gnatcoll-bindings-25/inplace.mk    Tue Nov  4 20:31:27 2025
@@ -1,4 +1,4 @@
-# $NetBSD: inplace.mk,v 1.2 2025/09/04 09:24:55 dkazankov Exp $
+# $NetBSD: inplace.mk,v 1.3 2025/11/04 20:31:27 dkazankov Exp $
 #
 # Include this file to extract library source into the WRKSRC of
 # another package.
@@ -51,7 +51,6 @@ USE_TOOLS+=           gmake sed
 
 .include "../../devel/gmp/buildlink3.mk"
 
-USE_GNU_ICONV= yes
 .include "../../converters/libiconv/buildlink3.mk"
 
 .  if !empty(CREATE_INPLACE_BUILD_TARGETS:Mrelocatable)

Index: pkgsrc/devel/ada-gnatcoll-bindings-25/options.mk
diff -u pkgsrc/devel/ada-gnatcoll-bindings-25/options.mk:1.5 pkgsrc/devel/ada-gnatcoll-bindings-25/options.mk:1.6
--- pkgsrc/devel/ada-gnatcoll-bindings-25/options.mk:1.5        Thu Oct  9 18:30:02 2025
+++ pkgsrc/devel/ada-gnatcoll-bindings-25/options.mk    Tue Nov  4 20:31:27 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2025/10/09 18:30:02 dkazankov Exp $
+# $NetBSD: options.mk,v 1.6 2025/11/04 20:31:27 dkazankov Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.gnatcoll-bindings-25
 PKG_SUPPORTED_OPTIONS=         gnatcoll-cpp gmp iconv lzma openmp \
@@ -21,9 +21,8 @@ BINDINGS+=    gmp
 .endif
 
 .if !empty(PKG_OPTIONS:Miconv)
-#USE_GNU_ICONV=        yes
-.  include "../../converters/libiconv/buildlink3.mk"
 BINDINGS+=     iconv
+.  include "../../converters/libiconv/buildlink3.mk"
 .  if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 099982
 SUBST_CLASSES+=                iconv
 SUBST_STAGE.iconv=     post-extract

Index: pkgsrc/devel/ada-gnatcoll-bindings-25/patches/patch-Makefile
diff -u pkgsrc/devel/ada-gnatcoll-bindings-25/patches/patch-Makefile:1.1 pkgsrc/devel/ada-gnatcoll-bindings-25/patches/patch-Makefile:1.2
--- pkgsrc/devel/ada-gnatcoll-bindings-25/patches/patch-Makefile:1.1    Fri Jul 11 12:46:50 2025
+++ pkgsrc/devel/ada-gnatcoll-bindings-25/patches/patch-Makefile        Tue Nov  4 20:31:27 2025
@@ -1,16 +1,17 @@
-$NetBSD: patch-Makefile,v 1.1 2025/07/11 12:46:50 dkazankov Exp $
+$NetBSD: patch-Makefile,v 1.2 2025/11/04 20:31:27 dkazankov Exp $
 
 Create Makefile for build
 
 --- /dev/null
 +++ Makefile
-@@ -0,0 +1,69 @@
+@@ -0,0 +1,71 @@
 +prefix ?= $(dir $(shell $(WHICH) gnatls))..
 +ENABLE_SHARED ?= yes
 +BUILD         ?= PROD
 +PROCESSORS    ?= 0
 +TARGET ?= $(shell gcc -dumpmachine)
 +INTEGRATED    ?= no
++FORCE_LIBICONV    ?= no
 +
 +BINDINGS ?= gmp iconv lzma omp python python3 readline syslog zlib
 +
@@ -44,6 +45,7 @@ Create Makefile for build
 +          $(if $(filter yes, $(INTEGRATED)),--integrated,) \
 +          $(if $(filter DEBUG, $(BUILD_OPTIONS)),--debug,) \
 +          $(if $(filter readline, $*),--accept-gpl,) \
++          $(if $(and $(filter iconv, $*),$(filter yes, $(FORCE_LIBICONV))),--force-libiconv,) \
 +          $(if $(GPRBUILD_OPTIONS),--gpr-opts $(GPRBUILD_OPTIONS),)
 +      cd ..
 +

Added files:

Index: pkgsrc/devel/ada-gnatcoll-bindings-25/patches/patch-iconv_setup.py
diff -u /dev/null pkgsrc/devel/ada-gnatcoll-bindings-25/patches/patch-iconv_setup.py:1.1
--- /dev/null   Tue Nov  4 20:31:27 2025
+++ pkgsrc/devel/ada-gnatcoll-bindings-25/patches/patch-iconv_setup.py  Tue Nov  4 20:31:27 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-iconv_setup.py,v 1.1 2025/11/04 20:31:27 dkazankov Exp $
+
+Use C stdlib's libiconv by default on NetBSD
+
+--- iconv/setup.py.orig        2024-07-11 11:49:55.000000000 +0000
++++ iconv/setup.py
+@@ -55,6 +55,9 @@
+         if 'linux' in config.data['canonical_target'] and \
+                 not args.force_libiconv:
+             config.set_data('GNATCOLL_ICONV_OPT', '', sub='gprbuild')
++        elif 'netbsd' in config.data['canonical_target'] and \
++                not args.force_libiconv:
++            config.set_data('GNATCOLL_ICONV_OPT', '', sub='gprbuild')
+         else:
+             config.set_data('GNATCOLL_ICONV_OPT', '-liconv', sub='gprbuild')
+