CVS commit: pkgsrc/lang/gcc14-gnat

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

Module Name:    pkgsrc
Committed By:   dkazankov
Date:           Sun Jun  1 07:24:36 UTC 2025

Modified Files:
        pkgsrc/lang/gcc14-gnat: Makefile PLIST options.mk

Log Message:
lang/gcc14-gnat: NLS support is back on

* The correct NLS package versions are now used
  using USE_GNU_ICONV=yes and USE_BUILTIN.gettext=no


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc14-gnat/Makefile \
    pkgsrc/lang/gcc14-gnat/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc14-gnat/PLIST

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

Modified files:

Index: pkgsrc/lang/gcc14-gnat/Makefile
diff -u pkgsrc/lang/gcc14-gnat/Makefile:1.1 pkgsrc/lang/gcc14-gnat/Makefile:1.2
--- pkgsrc/lang/gcc14-gnat/Makefile:1.1 Fri Apr 25 19:35:10 2025
+++ pkgsrc/lang/gcc14-gnat/Makefile     Sun Jun  1 07:24:36 2025
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2025/04/25 19:35:10 dkazankov Exp $
+# $NetBSD: Makefile,v 1.2 2025/06/01 07:24:36 dkazankov Exp $
 
 GCC_PKGNAME=           gcc14
 GCC_DIST_VERSION=      14.2.0
 
 PKGNAME=       ${GCC_PKGNAME}-gnat-${GCC_DIST_VERSION}
+PKGREVISION=   1
 COMMENT=       GNAT Compiler and Ada tools
 DISTNAME=      gcc-${GCC_DIST_VERSION}
 CATEGORIES=    lang
Index: pkgsrc/lang/gcc14-gnat/options.mk
diff -u pkgsrc/lang/gcc14-gnat/options.mk:1.1 pkgsrc/lang/gcc14-gnat/options.mk:1.2
--- pkgsrc/lang/gcc14-gnat/options.mk:1.1       Fri Apr 25 19:35:10 2025
+++ pkgsrc/lang/gcc14-gnat/options.mk   Sun Jun  1 07:24:36 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2025/04/25 19:35:10 dkazankov Exp $
+# $NetBSD: options.mk,v 1.2 2025/06/01 07:24:36 dkazankov Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gcc14-gnat
 PKG_SUPPORTED_OPTIONS= nls gcc-inplace-math gcc-graphite
@@ -7,8 +7,7 @@ PKG_SUGGESTED_OPTIONS=  gcc-graphite
 .include "../../mk/bsd.fast.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
-# Turn off until gettext issue fix
-#PKG_SUGGESTED_OPTIONS+=       nls
+PKG_SUGGESTED_OPTIONS+=        nls
 .elif ${OPSYS} == "Linux"
 PKG_SUGGESTED_OPTIONS+=        nls
 .elif ${OPSYS} == "DragonFly"
@@ -46,18 +45,18 @@ PKG_SUGGESTED_OPTIONS+=     gcc-multilib
 ### Native Language Support
 ###
 .if !empty(PKG_OPTIONS:Mnls)
+PLIST_VARS+=           nls
+USE_TOOLS+=            msgfmt
 CONFIGURE_ARGS+=       --enable-nls
 CONFIGURE_ARGS+=       --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
 MAKE_ENV+=             ICONVPREFIX=${BUILDLINK_PREFIX.iconv}
-#PREFER.iconv=         pkgsrc
-BUILDLINK_API_DEPENDS.iconv+=  libiconv>=1.17
+.if ${OPSYS} == "NetBSD"
+USE_GNU_ICONV=         yes
+USE_BUILTIN.gettext=   no
+.endif
 .include "../../converters/libiconv/buildlink3.mk"
-#PREFER.gettext=               pkgsrc
-BUILDLINK_API_DEPENDS.gettext+=        gettext-lib>=0.22.0
 .include "../../devel/gettext-lib/buildlink3.mk"
-#PLIST_VARS+=  nls
-#PLIST.nls=    yes
-.include "../../devel/gettext-tools/msgfmt-desktop.mk"
+PLIST.nls=     yes
 .else
 CONFIGURE_ARGS+=       --disable-nls
 .endif

Index: pkgsrc/lang/gcc14-gnat/PLIST
diff -u pkgsrc/lang/gcc14-gnat/PLIST:1.2 pkgsrc/lang/gcc14-gnat/PLIST:1.3
--- pkgsrc/lang/gcc14-gnat/PLIST:1.2    Mon Apr 28 05:24:24 2025
+++ pkgsrc/lang/gcc14-gnat/PLIST        Sun Jun  1 07:24:36 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2025/04/28 05:24:24 dkazankov Exp $
+@comment $NetBSD: PLIST,v 1.3 2025/06/01 07:24:36 dkazankov Exp $
 gcc14-gnat/bin/ada
 gcc14-gnat/bin/c++
 gcc14-gnat/bin/cpp
@@ -4060,3 +4060,22 @@ gcc14-gnat/share/gcc-${PKGVERSION}/pytho
 gcc14-gnat/share/gcc-${PKGVERSION}/python/libstdcxx/v6/__init__.py
 gcc14-gnat/share/gcc-${PKGVERSION}/python/libstdcxx/v6/printers.py
 gcc14-gnat/share/gcc-${PKGVERSION}/python/libstdcxx/v6/xmethods.py
+gcc14-gnat/share/locale/be/LC_MESSAGES/gcc.mo
+gcc14-gnat/share/locale/da/LC_MESSAGES/gcc.mo
+gcc14-gnat/share/locale/de/LC_MESSAGES/gcc.mo
+gcc14-gnat/share/locale/el/LC_MESSAGES/gcc.mo
+gcc14-gnat/share/locale/es/LC_MESSAGES/gcc.mo
+gcc14-gnat/share/locale/fi/LC_MESSAGES/gcc.mo
+gcc14-gnat/share/locale/fr/LC_MESSAGES/gcc.mo
+gcc14-gnat/share/locale/hr/LC_MESSAGES/gcc.mo
+gcc14-gnat/share/locale/id/LC_MESSAGES/gcc.mo
+gcc14-gnat/share/locale/ja/LC_MESSAGES/gcc.mo
+gcc14-gnat/share/locale/nl/LC_MESSAGES/gcc.mo
+gcc14-gnat/share/locale/ru/LC_MESSAGES/gcc.mo
+gcc14-gnat/share/locale/sr/LC_MESSAGES/gcc.mo
+gcc14-gnat/share/locale/sv/LC_MESSAGES/gcc.mo
+gcc14-gnat/share/locale/tr/LC_MESSAGES/gcc.mo
+gcc14-gnat/share/locale/uk/LC_MESSAGES/gcc.mo
+gcc14-gnat/share/locale/vi/LC_MESSAGES/gcc.mo
+gcc14-gnat/share/locale/zh_CN/LC_MESSAGES/gcc.mo
+gcc14-gnat/share/locale/zh_TW/LC_MESSAGES/gcc.mo