[pkgsrc/trunk]: pkgsrc *: Remove hardcoded -liconv / -lintl on SunOS.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5a9959e25f9f
branches:  trunk
changeset: 382944:5a9959e25f9f
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue Aug 09 12:08:27 2022 +0000

description:
*: Remove hardcoded -liconv / -lintl on SunOS.

This is now handled centrally via OPSYS_EXPLICIT_LIBDEPS support in libiconv
and gettext-lib.

diffstat:

 audio/aumix/Makefile.common               |  4 +---
 audio/libifp/Makefile                     |  3 +--
 audio/libmusicbrainz5/Makefile            |  4 +---
 audio/ncmpc/Makefile                      |  4 ++--
 audio/speech-dispatcher/Makefile          |  4 +---
 comms/gammu/Makefile                      |  4 +---
 comms/scmxx/Makefile                      |  3 +--
 converters/odt2txt/Makefile               |  4 +---
 databases/postgresql10/options.mk         |  3 +--
 databases/postgresql11/options.mk         |  3 +--
 databases/postgresql12/options.mk         |  3 +--
 databases/postgresql13/options.mk         |  3 +--
 databases/postgresql14/options.mk         |  3 +--
 devel/at-spi2-core/Makefile               |  4 +---
 devel/cook/Makefile                       |  4 +---
 devel/doc++/Makefile                      |  4 +---
 devel/git-base/Makefile                   |  4 ++--
 devel/glib2/Makefile                      |  4 ++--
 devel/libgsf/Makefile                     |  4 +---
 devel/libmtp/Makefile                     |  3 +--
 devel/log4cplus/Makefile                  |  4 +---
 devel/ucommon/Makefile                    |  4 ++--
 editors/lyx/Makefile                      |  3 +--
 editors/ted/Makefile                      |  3 +--
 editors/xnedit/Makefile                   |  3 +--
 emulators/xcpc/Makefile                   |  4 +---
 games/chromium-bsu/Makefile               |  4 ++--
 games/hex-a-hop/Makefile                  |  4 +---
 games/quarry/Makefile                     |  4 +---
 games/ufoai/Makefile                      |  4 +---
 games/wesnoth/Makefile                    |  4 ++--
 graphics/gnuplot/Makefile                 |  3 +--
 graphics/jpegpixi/Makefile                |  4 +---
 graphics/tuxpaint/Makefile                |  4 ++--
 lang/squeak-vm/Makefile                   |  4 ++--
 mail/gmime3/Makefile                      |  4 +---
 mail/gnarwl/Makefile                      |  4 +---
 mail/milter-manager/Makefile              |  4 +---
 multimedia/mediatomb/Makefile             |  4 +---
 multimedia/mkvtoolnix/Makefile            |  3 +--
 multimedia/totem-pl-parser/Makefile       |  4 +---
 net/gtk-gnutella/Makefile                 |  4 ++--
 net/httping/Makefile                      |  4 ++--
 news/pan/Makefile                         |  4 ++--
 print/fig2dev/Makefile                    |  4 +---
 print/poppler-cpp/Makefile                |  4 +---
 security/gnupg2/Makefile                  |  4 ++--
 security/polkit/Makefile                  |  4 +---
 shells/fish/Makefile                      |  4 +---
 sysutils/bacula-qt5-console/Makefile      |  4 +---
 sysutils/bacula-tray-monitor-qt5/Makefile |  4 +---
 sysutils/cdrtools/Makefile                |  3 +--
 sysutils/desktop-file-utils/Makefile      |  4 +---
 sysutils/fsviewer/Makefile                |  4 ++--
 sysutils/mc/Makefile                      |  4 +---
 textproc/diction/Makefile                 |  4 +---
 textproc/freexl/Makefile                  |  4 +---
 textproc/json-glib/Makefile               |  4 +---
 textproc/sphinxsearch/Makefile            |  4 ++--
 textproc/unac/Makefile                    |  4 +---
 wm/i3/Makefile                            |  4 ++--
 wm/icewm/Makefile                         |  4 +---
 wm/icewm/Makefile.common                  |  3 +--
 wm/wmii/Makefile                          |  4 ++--
 www/dillo/Makefile                        |  4 +---
 www/e2guardian/Makefile                   |  4 +---
 www/neon/Makefile                         |  4 +---
 www/weex/Makefile                         |  4 +---
 x11/gtk2/Makefile                         |  3 +--
 x11/kdelibs4/Makefile                     |  3 +--
 x11/wdm/Makefile                          |  4 ++--
 x11/xclip/Makefile                        |  4 +---
 72 files changed, 89 insertions(+), 182 deletions(-)

diffs (truncated from 1277 to 300 lines):

diff -r 989016b82bdc -r 5a9959e25f9f audio/aumix/Makefile.common
--- a/audio/aumix/Makefile.common       Tue Aug 09 12:06:40 2022 +0000
+++ b/audio/aumix/Makefile.common       Tue Aug 09 12:08:27 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2017/01/21 23:38:19 rillig Exp $
+# $NetBSD: Makefile.common,v 1.13 2022/08/09 12:08:32 jperkin Exp $
 # used by audio/aumix/Makefile
 # used by audio/aumix-gtk/Makefile
 
@@ -26,8 +26,6 @@
 CONFIGURE_ARGS+=       --enable-nls
 CONFIGURE_ARGS+=       --without-gtk
 
-LIBS.SunOS+=           -lintl
-
 REPLACE_SH+=           src/mute src/xaumix
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff -r 989016b82bdc -r 5a9959e25f9f audio/libifp/Makefile
--- a/audio/libifp/Makefile     Tue Aug 09 12:06:40 2022 +0000
+++ b/audio/libifp/Makefile     Tue Aug 09 12:08:27 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/01/26 05:26:11 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2022/08/09 12:08:33 jperkin Exp $
 #
 
 DISTNAME=      libifp-1.0.0.2
@@ -18,7 +18,6 @@
 USE_FEATURES+=         fts_open
 
 CFLAGS.SunOS+= -fPIC
-LIBS.SunOS+=   -liconv
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/libusb.buildlink3.mk"
diff -r 989016b82bdc -r 5a9959e25f9f audio/libmusicbrainz5/Makefile
--- a/audio/libmusicbrainz5/Makefile    Tue Aug 09 12:06:40 2022 +0000
+++ b/audio/libmusicbrainz5/Makefile    Tue Aug 09 12:08:27 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2022/04/18 19:09:40 adam Exp $
+# $NetBSD: Makefile,v 1.21 2022/08/09 12:08:32 jperkin Exp $
 
 DISTNAME=      libmusicbrainz-5.1.0
 PKGNAME=       ${DISTNAME:S/brainz/brainz5/}
@@ -19,8 +19,6 @@
 USE_TOOLS+=            pkg-config
 PKGCONFIG_OVERRIDE=    libmusicbrainz5.pc.cmake
 
-LDFLAGS.SunOS+=        -lintl
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.neon+=   neon>=0.25.0
 .include "../../www/neon/buildlink3.mk"
diff -r 989016b82bdc -r 5a9959e25f9f audio/ncmpc/Makefile
--- a/audio/ncmpc/Makefile      Tue Aug 09 12:06:40 2022 +0000
+++ b/audio/ncmpc/Makefile      Tue Aug 09 12:08:27 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2022/07/08 22:11:33 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2022/08/09 12:08:32 jperkin Exp $
 
 DISTNAME=      ncmpc-0.46
 CATEGORIES=    audio
@@ -29,7 +29,7 @@
 
 LDFLAGS+=      ${BUILDLINK_LDADD.curses}
 
-LDFLAGS.SunOS+=                -lintl -liconv -lsocket -lnsl
+LDFLAGS.SunOS+=                -lsocket -lnsl
 LDFLAGS.NetBSD+=       -lintl
 
 PYTHON_FOR_BUILD_ONLY= tool
diff -r 989016b82bdc -r 5a9959e25f9f audio/speech-dispatcher/Makefile
--- a/audio/speech-dispatcher/Makefile  Tue Aug 09 12:06:40 2022 +0000
+++ b/audio/speech-dispatcher/Makefile  Tue Aug 09 12:08:27 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2022/07/29 16:29:08 jperkin Exp $
+# $NetBSD: Makefile,v 1.28 2022/08/09 12:08:33 jperkin Exp $
 
 DISTNAME=      speech-dispatcher-0.10.2
 PKGREVISION=   5
@@ -33,8 +33,6 @@
 CONFIGURE_ARGS+=       --without-oss
 CONFIGURE_ARGS+=       --without-pulse
 
-LIBS.SunOS+=   -lintl
-
 .include "../../mk/bsd.prefs.mk"
 
 PKGCONFIG_OVERRIDE+=   speech-dispatcher.pc.in
diff -r 989016b82bdc -r 5a9959e25f9f comms/gammu/Makefile
--- a/comms/gammu/Makefile      Tue Aug 09 12:06:40 2022 +0000
+++ b/comms/gammu/Makefile      Tue Aug 09 12:08:27 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2021/12/08 16:03:34 adam Exp $
+# $NetBSD: Makefile,v 1.48 2022/08/09 12:08:31 jperkin Exp $
 #
 
 DISTNAME=      gammu-1.41.0
@@ -48,8 +48,6 @@
 SUBST_FILES.cmakelists=                CMakeLists.txt
 SUBST_SED.cmakelists=          -e 's/LIB_SUFFIX "64"/LIB_SUFFIX ""/'
 
-LDFLAGS.SunOS+=        -lintl
-
 .include "../../databases/unixodbc/buildlink3.mk"
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
diff -r 989016b82bdc -r 5a9959e25f9f comms/scmxx/Makefile
--- a/comms/scmxx/Makefile      Tue Aug 09 12:06:40 2022 +0000
+++ b/comms/scmxx/Makefile      Tue Aug 09 12:08:27 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2019/11/03 12:04:13 rillig Exp $
+# $NetBSD: Makefile,v 1.53 2022/08/09 12:08:31 jperkin Exp $
 #
 
 DISTNAME=              scmxx-0.9.0
@@ -13,7 +13,6 @@
 
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            gmake msgfmt
-LDFLAGS.SunOS+=                -lintl
 
 INSTALLATION_DIRS+=    share/doc/scmxx share/examples/scmxx
 
diff -r 989016b82bdc -r 5a9959e25f9f converters/odt2txt/Makefile
--- a/converters/odt2txt/Makefile       Tue Aug 09 12:06:40 2022 +0000
+++ b/converters/odt2txt/Makefile       Tue Aug 09 12:08:27 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/07/30 22:32:10 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2022/08/09 12:08:31 jperkin Exp $
 #
 
 DISTNAME=      odt2txt-0.5
@@ -15,8 +15,6 @@
 
 INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1
 
-LDFLAGS.SunOS+=        -liconv
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 989016b82bdc -r 5a9959e25f9f databases/postgresql10/options.mk
--- a/databases/postgresql10/options.mk Tue Aug 09 12:06:40 2022 +0000
+++ b/databases/postgresql10/options.mk Tue Aug 09 12:08:27 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2022/07/18 22:13:20 tnn Exp $
+# $NetBSD: options.mk,v 1.5 2022/08/09 12:08:29 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.postgresql10
 PKG_SUPPORTED_OPTIONS= bonjour dtrace icu gssapi ldap nls pam
@@ -50,7 +50,6 @@
 PLIST.nls=             yes
 BROKEN_GETTEXT_DETECTION=      yes
 .  include "../../devel/gettext-lib/buildlink3.mk"
-LIBS.SunOS+=           -lintl
 .  if !empty(USE_BUILTIN.gettext:M[nN][oO])
 CPPFLAGS+=             -I${PREFIX}/include/gettext
 .  endif
diff -r 989016b82bdc -r 5a9959e25f9f databases/postgresql11/options.mk
--- a/databases/postgresql11/options.mk Tue Aug 09 12:06:40 2022 +0000
+++ b/databases/postgresql11/options.mk Tue Aug 09 12:08:27 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2022/07/18 22:13:20 tnn Exp $
+# $NetBSD: options.mk,v 1.8 2022/08/09 12:08:29 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.postgresql11
 PKG_SUPPORTED_OPTIONS= bonjour dtrace icu llvm gssapi ldap nls pam
@@ -58,7 +58,6 @@
 PLIST.nls=        yes
 BROKEN_GETTEXT_DETECTION=      yes
 .  include "../../devel/gettext-lib/buildlink3.mk"
-LIBS.SunOS+=           -lintl
 .  if !empty(USE_BUILTIN.gettext:M[nN][oO])
 CPPFLAGS+=             -I${PREFIX}/include/gettext
 .  endif
diff -r 989016b82bdc -r 5a9959e25f9f databases/postgresql12/options.mk
--- a/databases/postgresql12/options.mk Tue Aug 09 12:06:40 2022 +0000
+++ b/databases/postgresql12/options.mk Tue Aug 09 12:08:27 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2022/07/18 22:13:20 tnn Exp $
+# $NetBSD: options.mk,v 1.7 2022/08/09 12:08:29 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.postgresql12
 PKG_SUPPORTED_OPTIONS= bonjour dtrace icu llvm gssapi ldap nls pam
@@ -58,7 +58,6 @@
 PLIST.nls=             yes
 BROKEN_GETTEXT_DETECTION=      yes
 .  include "../../devel/gettext-lib/buildlink3.mk"
-LIBS.SunOS+=           -lintl
 .  if !empty(USE_BUILTIN.gettext:M[nN][oO])
 CPPFLAGS+=             -I${PREFIX}/include/gettext
 .  endif
diff -r 989016b82bdc -r 5a9959e25f9f databases/postgresql13/options.mk
--- a/databases/postgresql13/options.mk Tue Aug 09 12:06:40 2022 +0000
+++ b/databases/postgresql13/options.mk Tue Aug 09 12:08:27 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2022/07/18 22:13:21 tnn Exp $
+# $NetBSD: options.mk,v 1.4 2022/08/09 12:08:29 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.postgresql13
 PKG_SUPPORTED_OPTIONS= bonjour dtrace icu llvm gssapi ldap nls pam
@@ -59,7 +59,6 @@
 PLIST.nls=             yes
 BROKEN_GETTEXT_DETECTION=      yes
 .  include "../../devel/gettext-lib/buildlink3.mk"
-LIBS.SunOS+=           -lintl
 .  if !empty(USE_BUILTIN.gettext:M[nN][oO])
 CPPFLAGS+=             -I${PREFIX}/include/gettext
 .  endif
diff -r 989016b82bdc -r 5a9959e25f9f databases/postgresql14/options.mk
--- a/databases/postgresql14/options.mk Tue Aug 09 12:06:40 2022 +0000
+++ b/databases/postgresql14/options.mk Tue Aug 09 12:08:27 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2022/07/18 22:13:21 tnn Exp $
+# $NetBSD: options.mk,v 1.4 2022/08/09 12:08:28 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.postgresql14
 PKG_SUPPORTED_OPTIONS= bonjour dtrace icu llvm gssapi ldap nls pam lz4
@@ -66,7 +66,6 @@
 PLIST.nls=             yes
 BROKEN_GETTEXT_DETECTION=      yes
 .  include "../../devel/gettext-lib/buildlink3.mk"
-LIBS.SunOS+=           -lintl
 .  if !empty(USE_BUILTIN.gettext:M[nN][oO])
 CPPFLAGS+=             -I${PREFIX}/include/gettext
 .  endif
diff -r 989016b82bdc -r 5a9959e25f9f devel/at-spi2-core/Makefile
--- a/devel/at-spi2-core/Makefile       Tue Aug 09 12:06:40 2022 +0000
+++ b/devel/at-spi2-core/Makefile       Tue Aug 09 12:08:27 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2022/07/29 16:29:08 jperkin Exp $
+# $NetBSD: Makefile,v 1.44 2022/08/09 12:08:27 jperkin Exp $
 
 DISTNAME=      at-spi2-core-2.40.3
 PKGREVISION=   2
@@ -17,8 +17,6 @@
 PKGCONFIG_OVERRIDE_STAGE=      pre-install
 MAKE_ENV+=                     LD_LIBRARY_PATH=${WRKSRC}/output/atspi
 
-LIBS.SunOS+=   -lintl
-
 BUILD_DEFS+=           PKG_SYSCONFBASE
 
 EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}
diff -r 989016b82bdc -r 5a9959e25f9f devel/cook/Makefile
--- a/devel/cook/Makefile       Tue Aug 09 12:06:40 2022 +0000
+++ b/devel/cook/Makefile       Tue Aug 09 12:08:27 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2022/06/28 11:31:41 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2022/08/09 12:08:28 jperkin Exp $
 
 DISTNAME=      cook-2.26
 PKGREVISION=   12
@@ -13,8 +13,6 @@
 GNU_CONFIGURE= yes
 MAKE_JOBS_SAFE=        no
 
-LIBS.SunOS+=   -lintl
-
 INSTALLATION_DIRS=     ${PKGMANDIR}/man1
 INSTALL_MAKE_FLAGS+=   bindir=${DESTDIR}${PREFIX}/bin \
                        datadir=${DESTDIR}${PREFIX}/share/cook \
diff -r 989016b82bdc -r 5a9959e25f9f devel/doc++/Makefile
--- a/devel/doc++/Makefile      Tue Aug 09 12:06:40 2022 +0000
+++ b/devel/doc++/Makefile      Tue Aug 09 12:08:27 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2020/01/26 05:26:23 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2022/08/09 12:08:28 jperkin Exp $
 
 DISTNAME=      doc++-3.4.10
 PKGREVISION=   3
@@ -14,8 +14,6 @@
 GNU_CONFIGURE=         yes
 USE_LANGUAGES=         c c++
 
-LIBS.SunOS+=           -lintl
-
 INSTALLATION_DIRS+=    share/doc/doc++
 
 #post-extract:
diff -r 989016b82bdc -r 5a9959e25f9f devel/git-base/Makefile
--- a/devel/git-base/Makefile   Tue Aug 09 12:06:40 2022 +0000
+++ b/devel/git-base/Makefile   Tue Aug 09 12:08:27 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2022/07/06 11:53:59 adam Exp $
+# $NetBSD: Makefile,v 1.98 2022/08/09 12:08:28 jperkin Exp $
 
 .include "../../devel/git/Makefile.common"
 
@@ -88,7 +88,7 @@
 SUBST_STAGE.test-shell=                pre-build
 SUBST_SED.test-shell=          -e '/^TEST_SHELL_PATH/ s;$$(SHELL_PATH);${TOOLS_BASH};'
 
-LDFLAGS.SunOS+=                -lintl -lnsl
+LDFLAGS.SunOS+=                -lnsl
 
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
diff -r 989016b82bdc -r 5a9959e25f9f devel/glib2/Makefile