pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc



Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Aug  9 12:08:36 UTC 2022

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

Log Message:
*: Remove hardcoded -liconv / -lintl on SunOS.

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


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/audio/aumix/Makefile.common
cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/libifp/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/audio/libmusicbrainz5/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/audio/ncmpc/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/audio/speech-dispatcher/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/comms/gammu/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/comms/scmxx/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/converters/odt2txt/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/postgresql10/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/postgresql11/options.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/postgresql12/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql13/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql14/options.mk
cvs rdiff -u -r1.43 -r1.44 pkgsrc/devel/at-spi2-core/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/cook/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/doc++/Makefile
cvs rdiff -u -r1.97 -r1.98 pkgsrc/devel/git-base/Makefile
cvs rdiff -u -r1.289 -r1.290 pkgsrc/devel/glib2/Makefile
cvs rdiff -u -r1.104 -r1.105 pkgsrc/devel/libgsf/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/libmtp/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/log4cplus/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/ucommon/Makefile
cvs rdiff -u -r1.108 -r1.109 pkgsrc/editors/lyx/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/editors/ted/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/editors/xnedit/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/xcpc/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/games/chromium-bsu/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/games/hex-a-hop/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/games/quarry/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/games/ufoai/Makefile
cvs rdiff -u -r1.183 -r1.184 pkgsrc/games/wesnoth/Makefile
cvs rdiff -u -r1.159 -r1.160 pkgsrc/graphics/gnuplot/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/graphics/jpegpixi/Makefile
cvs rdiff -u -r1.105 -r1.106 pkgsrc/graphics/tuxpaint/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/lang/squeak-vm/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/gmime3/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/mail/gnarwl/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/mail/milter-manager/Makefile
cvs rdiff -u -r1.83 -r1.84 pkgsrc/multimedia/mediatomb/Makefile
cvs rdiff -u -r1.197 -r1.198 pkgsrc/multimedia/mkvtoolnix/Makefile
cvs rdiff -u -r1.82 -r1.83 pkgsrc/multimedia/totem-pl-parser/Makefile
cvs rdiff -u -r1.115 -r1.116 pkgsrc/net/gtk-gnutella/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/net/httping/Makefile
cvs rdiff -u -r1.123 -r1.124 pkgsrc/news/pan/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/fig2dev/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/print/poppler-cpp/Makefile
cvs rdiff -u -r1.135 -r1.136 pkgsrc/security/gnupg2/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/security/polkit/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/shells/fish/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/bacula-qt5-console/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/bacula-tray-monitor-qt5/Makefile
cvs rdiff -u -r1.125 -r1.126 pkgsrc/sysutils/cdrtools/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/sysutils/desktop-file-utils/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/sysutils/fsviewer/Makefile
cvs rdiff -u -r1.128 -r1.129 pkgsrc/sysutils/mc/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/textproc/diction/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/freexl/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/textproc/json-glib/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/textproc/sphinxsearch/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/unac/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/wm/i3/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/wm/icewm/Makefile
cvs rdiff -u -r1.73 -r1.74 pkgsrc/wm/icewm/Makefile.common
cvs rdiff -u -r1.41 -r1.42 pkgsrc/wm/wmii/Makefile
cvs rdiff -u -r1.85 -r1.86 pkgsrc/www/dillo/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/e2guardian/Makefile
cvs rdiff -u -r1.86 -r1.87 pkgsrc/www/neon/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/weex/Makefile
cvs rdiff -u -r1.326 -r1.327 pkgsrc/x11/gtk2/Makefile
cvs rdiff -u -r1.131 -r1.132 pkgsrc/x11/kdelibs4/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/x11/wdm/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/xclip/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/aumix/Makefile.common
diff -u pkgsrc/audio/aumix/Makefile.common:1.12 pkgsrc/audio/aumix/Makefile.common:1.13
--- pkgsrc/audio/aumix/Makefile.common:1.12     Sat Jan 21 23:38:19 2017
+++ pkgsrc/audio/aumix/Makefile.common  Tue Aug  9 12:08:32 2022
@@ -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-own-labels
 CONFIGURE_ARGS+=       --enable-nls
 CONFIGURE_ARGS+=       --without-gtk
 
-LIBS.SunOS+=           -lintl
-
 REPLACE_SH+=           src/mute src/xaumix
 
 .include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/audio/libifp/Makefile
diff -u pkgsrc/audio/libifp/Makefile:1.9 pkgsrc/audio/libifp/Makefile:1.10
--- pkgsrc/audio/libifp/Makefile:1.9    Sun Jan 26 05:26:11 2020
+++ pkgsrc/audio/libifp/Makefile        Tue Aug  9 12:08:33 2022
@@ -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_LANGUAGES=                c c++
 USE_FEATURES+=         fts_open
 
 CFLAGS.SunOS+= -fPIC
-LIBS.SunOS+=   -liconv
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/libusb.buildlink3.mk"

Index: pkgsrc/audio/libmusicbrainz5/Makefile
diff -u pkgsrc/audio/libmusicbrainz5/Makefile:1.20 pkgsrc/audio/libmusicbrainz5/Makefile:1.21
--- pkgsrc/audio/libmusicbrainz5/Makefile:1.20  Mon Apr 18 19:09:40 2022
+++ pkgsrc/audio/libmusicbrainz5/Makefile       Tue Aug  9 12:08:32 2022
@@ -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_LANGUAGES=                c c++
 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"

Index: pkgsrc/audio/ncmpc/Makefile
diff -u pkgsrc/audio/ncmpc/Makefile:1.47 pkgsrc/audio/ncmpc/Makefile:1.48
--- pkgsrc/audio/ncmpc/Makefile:1.47    Fri Jul  8 22:11:33 2022
+++ pkgsrc/audio/ncmpc/Makefile Tue Aug  9 12:08:32 2022
@@ -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 @@ CXXFLAGS+=    -Wno-undef
 
 LDFLAGS+=      ${BUILDLINK_LDADD.curses}
 
-LDFLAGS.SunOS+=                -lintl -liconv -lsocket -lnsl
+LDFLAGS.SunOS+=                -lsocket -lnsl
 LDFLAGS.NetBSD+=       -lintl
 
 PYTHON_FOR_BUILD_ONLY= tool

Index: pkgsrc/audio/speech-dispatcher/Makefile
diff -u pkgsrc/audio/speech-dispatcher/Makefile:1.27 pkgsrc/audio/speech-dispatcher/Makefile:1.28
--- pkgsrc/audio/speech-dispatcher/Makefile:1.27        Fri Jul 29 16:29:08 2022
+++ pkgsrc/audio/speech-dispatcher/Makefile     Tue Aug  9 12:08:33 2022
@@ -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-nas
 CONFIGURE_ARGS+=       --without-oss
 CONFIGURE_ARGS+=       --without-pulse
 
-LIBS.SunOS+=   -lintl
-
 .include "../../mk/bsd.prefs.mk"
 
 PKGCONFIG_OVERRIDE+=   speech-dispatcher.pc.in

Index: pkgsrc/comms/gammu/Makefile
diff -u pkgsrc/comms/gammu/Makefile:1.47 pkgsrc/comms/gammu/Makefile:1.48
--- pkgsrc/comms/gammu/Makefile:1.47    Wed Dec  8 16:03:34 2021
+++ pkgsrc/comms/gammu/Makefile Tue Aug  9 12:08:31 2022
@@ -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_MESSAGE.cmakelists=     Fixing CMakeLi
 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"

Index: pkgsrc/comms/scmxx/Makefile
diff -u pkgsrc/comms/scmxx/Makefile:1.52 pkgsrc/comms/scmxx/Makefile:1.53
--- pkgsrc/comms/scmxx/Makefile:1.52    Sun Nov  3 12:04:13 2019
+++ pkgsrc/comms/scmxx/Makefile Tue Aug  9 12:08:31 2022
@@ -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 @@ COMMENT=              Data exchange utility for Siem
 
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            gmake msgfmt
-LDFLAGS.SunOS+=                -lintl
 
 INSTALLATION_DIRS+=    share/doc/scmxx share/examples/scmxx
 

Index: pkgsrc/converters/odt2txt/Makefile
diff -u pkgsrc/converters/odt2txt/Makefile:1.8 pkgsrc/converters/odt2txt/Makefile:1.9
--- pkgsrc/converters/odt2txt/Makefile:1.8      Sun Jul 30 22:32:10 2017
+++ pkgsrc/converters/odt2txt/Makefile  Tue Aug  9 12:08:31 2022
@@ -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 @@ USE_TOOLS+=   gmake
 
 INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man1
 
-LDFLAGS.SunOS+=        -liconv
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/postgresql10/options.mk
diff -u pkgsrc/databases/postgresql10/options.mk:1.4 pkgsrc/databases/postgresql10/options.mk:1.5
--- pkgsrc/databases/postgresql10/options.mk:1.4        Mon Jul 18 22:13:20 2022
+++ pkgsrc/databases/postgresql10/options.mk    Tue Aug  9 12:08:29 2022
@@ -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 @@ CONFIGURE_ARGS+=      --enable-nls
 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

Index: pkgsrc/databases/postgresql11/options.mk
diff -u pkgsrc/databases/postgresql11/options.mk:1.7 pkgsrc/databases/postgresql11/options.mk:1.8
--- pkgsrc/databases/postgresql11/options.mk:1.7        Mon Jul 18 22:13:20 2022
+++ pkgsrc/databases/postgresql11/options.mk    Tue Aug  9 12:08:29 2022
@@ -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 @@ CONFIGURE_ARGS+=    --enable-nls
 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

Index: pkgsrc/databases/postgresql12/options.mk
diff -u pkgsrc/databases/postgresql12/options.mk:1.6 pkgsrc/databases/postgresql12/options.mk:1.7
--- pkgsrc/databases/postgresql12/options.mk:1.6        Mon Jul 18 22:13:20 2022
+++ pkgsrc/databases/postgresql12/options.mk    Tue Aug  9 12:08:29 2022
@@ -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 @@ CONFIGURE_ARGS+=      --enable-nls
 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

Index: pkgsrc/databases/postgresql13/options.mk
diff -u pkgsrc/databases/postgresql13/options.mk:1.3 pkgsrc/databases/postgresql13/options.mk:1.4
--- pkgsrc/databases/postgresql13/options.mk:1.3        Mon Jul 18 22:13:21 2022
+++ pkgsrc/databases/postgresql13/options.mk    Tue Aug  9 12:08:29 2022
@@ -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 @@ CONFIGURE_ARGS+=      --enable-nls
 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

Index: pkgsrc/databases/postgresql14/options.mk
diff -u pkgsrc/databases/postgresql14/options.mk:1.3 pkgsrc/databases/postgresql14/options.mk:1.4
--- pkgsrc/databases/postgresql14/options.mk:1.3        Mon Jul 18 22:13:21 2022
+++ pkgsrc/databases/postgresql14/options.mk    Tue Aug  9 12:08:28 2022
@@ -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 @@ CONFIGURE_ARGS+=      --enable-nls
 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

Index: pkgsrc/devel/at-spi2-core/Makefile
diff -u pkgsrc/devel/at-spi2-core/Makefile:1.43 pkgsrc/devel/at-spi2-core/Makefile:1.44
--- pkgsrc/devel/at-spi2-core/Makefile:1.43     Fri Jul 29 16:29:08 2022
+++ pkgsrc/devel/at-spi2-core/Makefile  Tue Aug  9 12:08:27 2022
@@ -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=           output/meson-privat
 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}

Index: pkgsrc/devel/cook/Makefile
diff -u pkgsrc/devel/cook/Makefile:1.35 pkgsrc/devel/cook/Makefile:1.36
--- pkgsrc/devel/cook/Makefile:1.35     Tue Jun 28 11:31:41 2022
+++ pkgsrc/devel/cook/Makefile  Tue Aug  9 12:08:28 2022
@@ -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 @@ USE_TOOLS+=   groff msgfmt yacc perl:run
 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 \

Index: pkgsrc/devel/doc++/Makefile
diff -u pkgsrc/devel/doc++/Makefile:1.26 pkgsrc/devel/doc++/Makefile:1.27
--- pkgsrc/devel/doc++/Makefile:1.26    Sun Jan 26 05:26:23 2020
+++ pkgsrc/devel/doc++/Makefile Tue Aug  9 12:08:28 2022
@@ -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 @@ USE_PKGLOCALEDIR=     yes
 GNU_CONFIGURE=         yes
 USE_LANGUAGES=         c c++
 
-LIBS.SunOS+=           -lintl
-
 INSTALLATION_DIRS+=    share/doc/doc++
 
 #post-extract:

Index: pkgsrc/devel/git-base/Makefile
diff -u pkgsrc/devel/git-base/Makefile:1.97 pkgsrc/devel/git-base/Makefile:1.98
--- pkgsrc/devel/git-base/Makefile:1.97 Wed Jul  6 11:53:59 2022
+++ pkgsrc/devel/git-base/Makefile      Tue Aug  9 12:08:28 2022
@@ -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_MESSAGE.test-shell=     Use bash as TE
 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)

Index: pkgsrc/devel/glib2/Makefile
diff -u pkgsrc/devel/glib2/Makefile:1.289 pkgsrc/devel/glib2/Makefile:1.290
--- pkgsrc/devel/glib2/Makefile:1.289   Sun Apr  3 23:49:29 2022
+++ pkgsrc/devel/glib2/Makefile Tue Aug  9 12:08:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.289 2022/04/03 23:49:29 riastradh Exp $
+# $NetBSD: Makefile,v 1.290 2022/08/09 12:08:28 jperkin Exp $
 
 .include "Makefile.common"
 
@@ -20,7 +20,7 @@ MAKE_ENV+=    LD_LIBRARY_PATH=${WRKSRC}/out
 MAKE_ENV+=     DYLD_LIBRARY_PATH=${WRKSRC}/output/gio:${WRKSRC}/output/glib:${WRKSRC}/output/gobject:${WRKSRC}/output/gmodule
 
 CPPFLAGS.SunOS+=       -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ -D__stub_epoll_create
-LDFLAGS.SunOS+=                -liconv -lintl -lnsl -lsocket
+LDFLAGS.SunOS+=                -lnsl -lsocket
 LDFLAGS.FreeBSD+=      -liconv
 
 .include "../../mk/bsd.prefs.mk"

Index: pkgsrc/devel/libgsf/Makefile
diff -u pkgsrc/devel/libgsf/Makefile:1.104 pkgsrc/devel/libgsf/Makefile:1.105
--- pkgsrc/devel/libgsf/Makefile:1.104  Fri Jul 29 16:29:09 2022
+++ pkgsrc/devel/libgsf/Makefile        Tue Aug  9 12:08:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2022/07/29 16:29:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.105 2022/08/09 12:08:28 jperkin Exp $
 
 DISTNAME=      libgsf-1.14.47
 PKGREVISION=   5
@@ -18,8 +18,6 @@ USE_PKGLOCALEDIR=     yes
 
 PKGCONFIG_OVERRIDE=    libgsf-1.pc.in
 
-LIBS.SunOS+=   -lintl
-
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/devel/libmtp/Makefile
diff -u pkgsrc/devel/libmtp/Makefile:1.22 pkgsrc/devel/libmtp/Makefile:1.23
--- pkgsrc/devel/libmtp/Makefile:1.22   Sat Nov 13 10:20:12 2021
+++ pkgsrc/devel/libmtp/Makefile        Tue Aug  9 12:08:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/11/13 10:20:12 nia Exp $
+# $NetBSD: Makefile,v 1.23 2022/08/09 12:08:28 jperkin Exp $
 
 DISTNAME=      libmtp-1.1.19
 CATEGORIES=    devel
@@ -20,7 +20,6 @@ REPLACE_SH=           hotplug.sh.in
 REPLACE_SH+=           libmtp.sh.in
 
 LDFLAGS.FreeBSD+=      -liconv
-LDFLAGS.SunOS=         -liconv
 
 .include "options.mk"
 

Index: pkgsrc/devel/log4cplus/Makefile
diff -u pkgsrc/devel/log4cplus/Makefile:1.11 pkgsrc/devel/log4cplus/Makefile:1.12
--- pkgsrc/devel/log4cplus/Makefile:1.11        Sun Jan 26 05:26:24 2020
+++ pkgsrc/devel/log4cplus/Makefile     Tue Aug  9 12:08:27 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/01/26 05:26:24 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2022/08/09 12:08:27 jperkin Exp $
 #
 
 DISTNAME=      log4cplus-2.0.3
@@ -23,8 +23,6 @@ CONFIGURE_ARGS+=      --without-qt
 CONFIGURE_ARGS+=       --without-qt5
 CONFIGURE_ARGS+=       --without-python
 
-LDFLAGS.SunOS+=        -liconv
-
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 CPPFLAGS+=     -Werror=ignored-attributes

Index: pkgsrc/devel/ucommon/Makefile
diff -u pkgsrc/devel/ucommon/Makefile:1.22 pkgsrc/devel/ucommon/Makefile:1.23
--- pkgsrc/devel/ucommon/Makefile:1.22  Wed Dec  8 16:02:03 2021
+++ pkgsrc/devel/ucommon/Makefile       Tue Aug  9 12:08:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/12/08 16:02:03 adam Exp $
+# $NetBSD: Makefile,v 1.23 2022/08/09 12:08:28 jperkin Exp $
 
 DISTNAME=      ucommon-7.0.0
 PKGREVISION=   8
@@ -20,7 +20,7 @@ CMAKE_ARGS+=  -DCRYPTO_OPENSSL=OFF
 PKGCONFIG_OVERRIDE+=   commoncpp.pc.in
 PKGCONFIG_OVERRIDE+=   ucommon.pc.in
 
-LDFLAGS.SunOS+=                -lsocket -lnsl -lintl
+LDFLAGS.SunOS+=                -lsocket -lnsl
 
 .include "options.mk"
 .include "../../mk/dlopen.buildlink3.mk"

Index: pkgsrc/editors/lyx/Makefile
diff -u pkgsrc/editors/lyx/Makefile:1.108 pkgsrc/editors/lyx/Makefile:1.109
--- pkgsrc/editors/lyx/Makefile:1.108   Thu Jun 30 11:18:20 2022
+++ pkgsrc/editors/lyx/Makefile Tue Aug  9 12:08:30 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2022/06/30 11:18:20 nia Exp $
+# $NetBSD: Makefile,v 1.109 2022/08/09 12:08:30 jperkin Exp $
 
 DISTNAME=              lyx-2.3.6.1
 PKGREVISION=           6
@@ -66,7 +66,6 @@ USE_PKGLOCALEDIR=             YES
 PYTHON_VERSIONS_ACCEPTED=      27 # not yet ported as of 1.6.10
 
 CXXFLAGS.Linux+=       -fpermissive
-LDFLAGS.SunOS+=                -liconv
 
 CONFIGURE_ARGS+=       --without-included-mythes
 CONFIGURE_ARGS+=       --without-included-boost

Index: pkgsrc/editors/ted/Makefile
diff -u pkgsrc/editors/ted/Makefile:1.69 pkgsrc/editors/ted/Makefile:1.70
--- pkgsrc/editors/ted/Makefile:1.69    Thu Jul  7 20:17:47 2022
+++ pkgsrc/editors/ted/Makefile Tue Aug  9 12:08:30 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2022/07/07 20:17:47 nia Exp $
+# $NetBSD: Makefile,v 1.70 2022/08/09 12:08:30 jperkin Exp $
 
 DISTNAME=      ted-2.23.src
 PKGNAME=       ${DISTNAME:S/.src//}
@@ -20,7 +20,6 @@ AFMDIR=               ${PREFIX}/share/Ted/afm
 INDDIR=                ${PREFIX}/share/Ted/dfa
 INFODIR=       ${PREFIX}/share/doc/Ted
 
-LDFLAGS.SunOS+=                -liconv
 LDFLAGS.Darwin+=       -liconv
 
 MAKE_FLAGS+=   CONFIGURE_OPTIONS=--x-libraries=${X11BASE}/lib\ --with-MOTIF

Index: pkgsrc/editors/xnedit/Makefile
diff -u pkgsrc/editors/xnedit/Makefile:1.6 pkgsrc/editors/xnedit/Makefile:1.7
--- pkgsrc/editors/xnedit/Makefile:1.6  Mon Jul 11 12:34:58 2022
+++ pkgsrc/editors/xnedit/Makefile      Tue Aug  9 12:08:30 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/07/11 12:34:58 micha Exp $
+# $NetBSD: Makefile,v 1.7 2022/08/09 12:08:30 jperkin Exp $
 
 DISTNAME=      xnedit-1.4.1
 CATEGORIES=    editors
@@ -24,7 +24,6 @@ CFLAGS.IRIX+= -DNO_XMIM
 CFLAGS.SunOS+= -DROWCOLPATCH
 
 LDFLAGS.Darwin+=       -liconv
-LDFLAGS.SunOS+=                -liconv
 
 # Honor external CFLAGS
 SUBST_CLASSES+=                        fix-cflags

Index: pkgsrc/emulators/xcpc/Makefile
diff -u pkgsrc/emulators/xcpc/Makefile:1.3 pkgsrc/emulators/xcpc/Makefile:1.4
--- pkgsrc/emulators/xcpc/Makefile:1.3  Fri Jul 29 16:29:09 2022
+++ pkgsrc/emulators/xcpc/Makefile      Tue Aug  9 12:08:31 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/07/29 16:29:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.4 2022/08/09 12:08:31 jperkin Exp $
 
 DISTNAME=      xcpc-20070122
 PKGREVISION=   1
@@ -16,8 +16,6 @@ USE_TOOLS+=   automake pkg-config
 USE_LIBTOOL=   yes
 GNU_CONFIGURE= yes
 
-LIBS.SunOS+=   -lintl
-
 pre-configure:
        set -e; cd ${WRKSRC}; \
        libtoolize; aclocal; autoheader; automake -a --foreign -i; autoconf

Index: pkgsrc/games/chromium-bsu/Makefile
diff -u pkgsrc/games/chromium-bsu/Makefile:1.26 pkgsrc/games/chromium-bsu/Makefile:1.27
--- pkgsrc/games/chromium-bsu/Makefile:1.26     Fri Jul 29 16:29:08 2022
+++ pkgsrc/games/chromium-bsu/Makefile  Tue Aug  9 12:08:36 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2022/07/29 16:29:08 jperkin Exp $
+# $NetBSD: Makefile,v 1.27 2022/08/09 12:08:36 jperkin Exp $
 
 DISTNAME=              chromium-bsu-0.9.16.1
 PKGREVISION=           6
@@ -19,7 +19,7 @@ GNU_CONFIGURE=                yes
 
 LDFLAGS+=              ${BUILDLINK_LDADD.gettext}
 LDFLAGS.DragonFly=     -lSDL2
-LDFLAGS.SunOS=         -lSDL2 -lintl
+LDFLAGS.SunOS=         -lSDL2
 
 CONFIGURE_ARGS+=       --disable-ftgl
 CONFIGURE_ARGS+=       --disable-glut

Index: pkgsrc/games/hex-a-hop/Makefile
diff -u pkgsrc/games/hex-a-hop/Makefile:1.11 pkgsrc/games/hex-a-hop/Makefile:1.12
--- pkgsrc/games/hex-a-hop/Makefile:1.11        Fri Mar 20 11:57:42 2020
+++ pkgsrc/games/hex-a-hop/Makefile     Tue Aug  9 12:08:36 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/03/20 11:57:42 nia Exp $
+# $NetBSD: Makefile,v 1.12 2022/08/09 12:08:36 jperkin Exp $
 #
 
 DISTNAME=      hex-a-hop-1.1.0
@@ -14,8 +14,6 @@ LICENSE=      gnu-gpl-v2
 GNU_CONFIGURE= yes
 USE_LANGUAGES= c c++03
 
-LIBS.SunOS+=   -liconv
-
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../devel/SDL_ttf/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"

Index: pkgsrc/games/quarry/Makefile
diff -u pkgsrc/games/quarry/Makefile:1.50 pkgsrc/games/quarry/Makefile:1.51
--- pkgsrc/games/quarry/Makefile:1.50   Mon Apr 18 19:11:10 2022
+++ pkgsrc/games/quarry/Makefile        Tue Aug  9 12:08:36 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2022/04/18 19:11:10 adam Exp $
+# $NetBSD: Makefile,v 1.51 2022/08/09 12:08:36 jperkin Exp $
 
 DISTNAME=      quarry-0.2.0
 PKGREVISION=   40
@@ -13,8 +13,6 @@ GNU_CONFIGURE=                yes
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake pkg-config
 
-LDFLAGS.SunOS+=        -liconv
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/games/ufoai/Makefile
diff -u pkgsrc/games/ufoai/Makefile:1.43 pkgsrc/games/ufoai/Makefile:1.44
--- pkgsrc/games/ufoai/Makefile:1.43    Fri Jul 29 16:29:09 2022
+++ pkgsrc/games/ufoai/Makefile Tue Aug  9 12:08:36 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2022/07/29 16:29:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.44 2022/08/09 12:08:36 jperkin Exp $
 
 DISTNAME=              ufoai-2.2.1
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=ufoai/}
@@ -19,8 +19,6 @@ GNU_CONFIGURE=        yes
 USE_TOOLS+=    tar gmake bzip2 msgfmt
 MAKE_JOBS_SAFE=        no
 
-LIBS.SunOS+=   -lintl
-
 INSTALLATION_DIRS=     share/ufoai
 INSTALL_MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX}
 

Index: pkgsrc/games/wesnoth/Makefile
diff -u pkgsrc/games/wesnoth/Makefile:1.183 pkgsrc/games/wesnoth/Makefile:1.184
--- pkgsrc/games/wesnoth/Makefile:1.183 Wed Jul 27 08:40:58 2022
+++ pkgsrc/games/wesnoth/Makefile       Tue Aug  9 12:08:36 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.183 2022/07/27 08:40:58 adam Exp $
+# $NetBSD: Makefile,v 1.184 2022/08/09 12:08:36 jperkin Exp $
 
 DISTNAME=      wesnoth-1.16.5
 CATEGORIES=    games
@@ -58,7 +58,7 @@ PLIST_VARS+=          icons
 PLIST.icons=           yes
 .endif
 
-LDFLAGS.SunOS+=                -lintl -lsocket
+LDFLAGS.SunOS+=                -lsocket
 
 .include "../../audio/SDL2_mixer/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"

Index: pkgsrc/graphics/gnuplot/Makefile
diff -u pkgsrc/graphics/gnuplot/Makefile:1.159 pkgsrc/graphics/gnuplot/Makefile:1.160
--- pkgsrc/graphics/gnuplot/Makefile:1.159      Sat Jul  2 16:53:22 2022
+++ pkgsrc/graphics/gnuplot/Makefile    Tue Aug  9 12:08:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.159 2022/07/02 16:53:22 ryoon Exp $
+# $NetBSD: Makefile,v 1.160 2022/08/09 12:08:35 jperkin Exp $
 
 DISTNAME=      gnuplot-5.4.2
 CATEGORIES+=   graphics
@@ -23,7 +23,6 @@ INFO_FILES=           yes
 TEST_TARGET=           check
 
 PLIST_SUBST+=          API_VERSION=${API_VERSION}
-LDFLAGS.SunOS+=                -liconv
 
 .include "options.mk"
 

Index: pkgsrc/graphics/jpegpixi/Makefile
diff -u pkgsrc/graphics/jpegpixi/Makefile:1.17 pkgsrc/graphics/jpegpixi/Makefile:1.18
--- pkgsrc/graphics/jpegpixi/Makefile:1.17      Wed Aug 16 20:45:39 2017
+++ pkgsrc/graphics/jpegpixi/Makefile   Tue Aug  9 12:08:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2017/08/16 20:45:39 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2022/08/09 12:08:35 jperkin Exp $
 
 DISTNAME=              jpegpixi-1.1.1
 PKGREVISION=           3
@@ -13,8 +13,6 @@ COMMENT=              Low-loss JPEG interpolator to 
 GNU_CONFIGURE=         yes
 USE_PKGLOCALEDIR=      yes
 
-LIBS.SunOS+=           -lintl
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/tuxpaint/Makefile
diff -u pkgsrc/graphics/tuxpaint/Makefile:1.105 pkgsrc/graphics/tuxpaint/Makefile:1.106
--- pkgsrc/graphics/tuxpaint/Makefile:1.105     Fri Jul 29 16:29:09 2022
+++ pkgsrc/graphics/tuxpaint/Makefile   Tue Aug  9 12:08:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2022/07/29 16:29:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.106 2022/08/09 12:08:35 jperkin Exp $
 
 DISTNAME=      tuxpaint-0.9.23
 PKGREVISION=   11
@@ -46,7 +46,7 @@ CPPFLAGS.NetBSD+=     -DHAVE_STRCASESTR
 MAKE_FLAGS+=           LIBS=${LIBS:M*:Q}
 LIBS+=                 -liconv
 LIBS+=                 -lpng
-LIBS.SunOS+=           -lsocket -lnsl -lintl
+LIBS.SunOS+=           -lsocket -lnsl
 LDFLAGS.SunOS+=                -lsocket
 
 pre-build:

Index: pkgsrc/lang/squeak-vm/Makefile
diff -u pkgsrc/lang/squeak-vm/Makefile:1.57 pkgsrc/lang/squeak-vm/Makefile:1.58
--- pkgsrc/lang/squeak-vm/Makefile:1.57 Sat Jul  2 16:53:24 2022
+++ pkgsrc/lang/squeak-vm/Makefile      Tue Aug  9 12:08:32 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2022/07/02 16:53:24 ryoon Exp $
+# $NetBSD: Makefile,v 1.58 2022/08/09 12:08:32 jperkin Exp $
 #
 
 SQUEAK_VERSION=        4.10.2.2614
@@ -29,7 +29,7 @@ CMAKE_ARGS+=  -DPKGMANDIR=${PKGMANDIR}
 CMAKE_ARGS+=   -DVM_HOST=${MACHINE_GNU_PLATFORM:Q} -DVM_VERSION=${SQUEAK_VERSION}
 CMAKE_ARGS+=   -DDEVOSSAUDIO=${DEVOSSAUDIO}
 
-LDFLAGS.SunOS+=        -liconv -lsocket -lnsl -lm
+LDFLAGS.SunOS+=        -lsocket -lnsl -lm
 
 # UUID routines are in libc:
 BUILDLINK_TRANSFORM.NetBSD+=   rm:-luuid

Index: pkgsrc/mail/gmime3/Makefile
diff -u pkgsrc/mail/gmime3/Makefile:1.15 pkgsrc/mail/gmime3/Makefile:1.16
--- pkgsrc/mail/gmime3/Makefile:1.15    Wed Dec  8 16:02:19 2021
+++ pkgsrc/mail/gmime3/Makefile Tue Aug  9 12:08:30 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/12/08 16:02:19 adam Exp $
+# $NetBSD: Makefile,v 1.16 2022/08/09 12:08:30 jperkin Exp $
 
 DISTNAME=      gmime-3.2.7
 PKGNAME=       ${DISTNAME:S/gmime/gmime3/}
@@ -19,8 +19,6 @@ GNU_CONFIGURE=                yes
 CONFIGURE_ARGS+=       --enable-gtk-doc=no
 PKGCONFIG_OVERRIDE+=   gmime.pc.in
 
-LDFLAGS.SunOS+=                -liconv
-
 # one test failure as of 3.2.6
 # test-filters:
 # https://github.com/jstedfast/gmime/issues/81

Index: pkgsrc/mail/gnarwl/Makefile
diff -u pkgsrc/mail/gnarwl/Makefile:1.10 pkgsrc/mail/gnarwl/Makefile:1.11
--- pkgsrc/mail/gnarwl/Makefile:1.10    Sat Jan 18 21:49:49 2020
+++ pkgsrc/mail/gnarwl/Makefile Tue Aug  9 12:08:30 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/01/18 21:49:49 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2022/08/09 12:08:30 jperkin Exp $
 
 DISTNAME=      gnarwl-3.6
 PKGREVISION=   4
@@ -26,8 +26,6 @@ GNARWL_LIBS=          -L${BUILDLINK_PREFIX.openl
 CONFIGURE_ENV+=                LDFLAGS=${GNARWL_LIBS:Q}
 CONFIGURE_ARGS+=       --with-homedir=${GNARWL_HOME}
 
-LDFLAGS.SunOS+=        -liconv
-
 GNARWL_USER?=          gnarwl
 GNARWL_GROUP?=         gnarwl
 GNARWL_HOME?=          ${VARBASE}/gnarwl

Index: pkgsrc/mail/milter-manager/Makefile
diff -u pkgsrc/mail/milter-manager/Makefile:1.52 pkgsrc/mail/milter-manager/Makefile:1.53
--- pkgsrc/mail/milter-manager/Makefile:1.52    Fri Jul 29 16:29:08 2022
+++ pkgsrc/mail/milter-manager/Makefile Tue Aug  9 12:08:30 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2022/07/29 16:29:08 jperkin Exp $
+# $NetBSD: Makefile,v 1.53 2022/08/09 12:08:30 jperkin Exp $
 #
 
 DISTNAME=      milter-manager-${VERSION}
@@ -36,8 +36,6 @@ SUBST_MESSAGE.libev_inc=      Adjust include 
 SUBST_FILES.libev_inc=         configure
 SUBST_SED.libev_inc=           -e 's,/include/ev.h,/include/ev/ev.h,g'
 
-LIBS.SunOS+=   -lintl
-
 PKG_SYSCONFSUBDIR=     ${PKGBASE}
 
 EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}

Index: pkgsrc/multimedia/mediatomb/Makefile
diff -u pkgsrc/multimedia/mediatomb/Makefile:1.83 pkgsrc/multimedia/mediatomb/Makefile:1.84
--- pkgsrc/multimedia/mediatomb/Makefile:1.83   Mon Apr 18 19:11:46 2022
+++ pkgsrc/multimedia/mediatomb/Makefile        Tue Aug  9 12:08:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2022/04/18 19:11:46 adam Exp $
+# $NetBSD: Makefile,v 1.84 2022/08/09 12:08:34 jperkin Exp $
 
 DISTNAME=      mediatomb-0.12.1
 PKGREVISION=   61
@@ -43,8 +43,6 @@ SUBST_STAGE.config=   pre-configure
 
 INSTALLATION_DIRS+=    share/applications share/examples/mediatomb
 
-LDFLAGS.SunOS+=        -liconv
-
 post-extract:
        ${CP} ${FILESDIR}/config.xml.in ${WRKSRC}/config.xml
        ${CP} ${FILESDIR}/mediatomb.desktop.in ${WRKSRC}/mediatomb.desktop

Index: pkgsrc/multimedia/mkvtoolnix/Makefile
diff -u pkgsrc/multimedia/mkvtoolnix/Makefile:1.197 pkgsrc/multimedia/mkvtoolnix/Makefile:1.198
--- pkgsrc/multimedia/mkvtoolnix/Makefile:1.197 Mon Jul 11 08:46:49 2022
+++ pkgsrc/multimedia/mkvtoolnix/Makefile       Tue Aug  9 12:08:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.197 2022/07/11 08:46:49 adam Exp $
+# $NetBSD: Makefile,v 1.198 2022/08/09 12:08:34 jperkin Exp $
 
 DISTNAME=      mkvtoolnix-69.0.0
 CATEGORIES=    multimedia
@@ -35,7 +35,6 @@ CONFIGURE_ARGS+=      --with-qmake=${QTDIR}/b
 REPLACE_LOCALEDIR_PATTERNS=    build-config.in
 
 LDFLAGS.DragonFly=     -lboost_system
-LDFLAGS.SunOS+=                -lintl
 
 INSTALL_ENV+=  SHELL=${SH:Q}
 

Index: pkgsrc/multimedia/totem-pl-parser/Makefile
diff -u pkgsrc/multimedia/totem-pl-parser/Makefile:1.82 pkgsrc/multimedia/totem-pl-parser/Makefile:1.83
--- pkgsrc/multimedia/totem-pl-parser/Makefile:1.82     Fri Jul 29 16:29:09 2022
+++ pkgsrc/multimedia/totem-pl-parser/Makefile  Tue Aug  9 12:08:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2022/07/29 16:29:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.83 2022/08/09 12:08:34 jperkin Exp $
 
 DISTNAME=      totem-pl-parser-3.26.5
 PKGREVISION=   4
@@ -19,8 +19,6 @@ MESON_ARGS+=  -Denable-quvi=no
 # https://gitlab.gnome.org/GNOME/json-glib/issues/35
 MAKE_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/output/plparse
 
-LIBS.SunOS+=   -lintl
-
 PYTHON_FOR_BUILD_ONLY= tool
 
 PKGCONFIG_OVERRIDE+=   totem-plparser-mini.pc.in

Index: pkgsrc/net/gtk-gnutella/Makefile
diff -u pkgsrc/net/gtk-gnutella/Makefile:1.115 pkgsrc/net/gtk-gnutella/Makefile:1.116
--- pkgsrc/net/gtk-gnutella/Makefile:1.115      Mon Apr 18 19:11:50 2022
+++ pkgsrc/net/gtk-gnutella/Makefile    Tue Aug  9 12:08:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.115 2022/04/18 19:11:50 adam Exp $
+# $NetBSD: Makefile,v 1.116 2022/08/09 12:08:29 jperkin Exp $
 
 DISTNAME=      gtk-gnutella-1.1.11
 PKGREVISION=   18
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+=      --cc=${CC:Q}
 CONFIGURE_ARGS+=       --cflags=${CFLAGS:Unone:Q}
 CONFIGURE_ARGS+=       --yacc="yacc"
 
-LDFLAGS.SunOS+=        -lsocket -lnsl -liconv
+LDFLAGS.SunOS+=        -lsocket -lnsl
 
 .include "options.mk"
 

Index: pkgsrc/net/httping/Makefile
diff -u pkgsrc/net/httping/Makefile:1.26 pkgsrc/net/httping/Makefile:1.27
--- pkgsrc/net/httping/Makefile:1.26    Sat Jan 18 21:50:15 2020
+++ pkgsrc/net/httping/Makefile Tue Aug  9 12:08:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2020/01/18 21:50:15 jperkin Exp $
+# $NetBSD: Makefile,v 1.27 2022/08/09 12:08:29 jperkin Exp $
 
 DISTNAME=      httping-2.5
 PKGREVISION=   1
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+=      --with-openssl
 
 LDFLAGS.Darwin=                -lintl
 LDFLAGS.NetBSD=                -lintl
-LDFLAGS.SunOS=         -lnsl -lsocket -lresolv -lintl
+LDFLAGS.SunOS=         -lnsl -lsocket -lresolv
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/news/pan/Makefile
diff -u pkgsrc/news/pan/Makefile:1.123 pkgsrc/news/pan/Makefile:1.124
--- pkgsrc/news/pan/Makefile:1.123      Sun Jul  3 13:31:41 2022
+++ pkgsrc/news/pan/Makefile    Tue Aug  9 12:08:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.123 2022/07/03 13:31:41 rhialto Exp $
+# $NetBSD: Makefile,v 1.124 2022/08/09 12:08:34 jperkin Exp $
 
 PKGNAME=               pan-0.151
 CATEGORIES=            news
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=      --with-gtkspell
 LIBS+=                 -lcompat
 .endif
 
-LIBS.SunOS+=   -lsocket -liconv
+LIBS.SunOS+=   -lsocket
 
 pre-configure:
        cd ${WRKSRC} && ./autogen.sh

Index: pkgsrc/print/fig2dev/Makefile
diff -u pkgsrc/print/fig2dev/Makefile:1.8 pkgsrc/print/fig2dev/Makefile:1.9
--- pkgsrc/print/fig2dev/Makefile:1.8   Wed Jul 21 05:32:49 2021
+++ pkgsrc/print/fig2dev/Makefile       Tue Aug  9 12:08:31 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/07/21 05:32:49 fcambus Exp $
+# $NetBSD: Makefile,v 1.9 2022/08/09 12:08:31 jperkin Exp $
 
 DISTNAME=      fig2dev-3.2.8a
 CATEGORIES=    graphics print
@@ -11,8 +11,6 @@ COMMENT=      Convert .fig files to graphical
 
 GNU_CONFIGURE= yes
 
-LDFLAGS.SunOS+=        -liconv
-
 USE_TOOLS+=    gs:run
 
 .include "../../graphics/png/buildlink3.mk"

Index: pkgsrc/print/poppler-cpp/Makefile
diff -u pkgsrc/print/poppler-cpp/Makefile:1.30 pkgsrc/print/poppler-cpp/Makefile:1.31
--- pkgsrc/print/poppler-cpp/Makefile:1.30      Thu May 20 11:49:47 2021
+++ pkgsrc/print/poppler-cpp/Makefile   Tue Aug  9 12:08:32 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2021/05/20 11:49:47 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2022/08/09 12:08:32 jperkin Exp $
 
 .include "../../print/poppler/Makefile.common"
 
@@ -23,8 +23,6 @@ CMAKE_ARGS+=  -DENABLE_QT5=OFF
 # Don't build libcurl based HTTP support. ## might want to include
 CMAKE_ARGS+=   -DENABLE_LIBCURL=OFF
 
-LDFLAGS.SunOS+=                -liconv
-
 BUILDLINK_API_DEPENDS.poppler+=        poppler-${POPPLER_VERS}{,nb*}
 .include "../../print/poppler/buildlink3.mk"
 

Index: pkgsrc/security/gnupg2/Makefile
diff -u pkgsrc/security/gnupg2/Makefile:1.135 pkgsrc/security/gnupg2/Makefile:1.136
--- pkgsrc/security/gnupg2/Makefile:1.135       Tue Jul 12 05:46:00 2022
+++ pkgsrc/security/gnupg2/Makefile     Tue Aug  9 12:08:29 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.135 2022/07/12 05:46:00 adam Exp $
+# $NetBSD: Makefile,v 1.136 2022/08/09 12:08:29 jperkin Exp $
 
 DISTNAME=      gnupg-2.2.36
 PKGNAME=       ${DISTNAME:S/gnupg-/gnupg2-/}
@@ -36,7 +36,7 @@ TEST_TARGET=          check
 LDFLAGS.NetBSD+=       -lintl
 LDFLAGS.Darwin+=       -lintl -lresolv
 LDFLAGS.FreeBSD+=      -lintl
-LDFLAGS.SunOS+=                -lintl -lsocket -lrt
+LDFLAGS.SunOS+=                -lsocket -lrt
 LDFLAGS.Linux+=                -lrt
 
 .include "options.mk"

Index: pkgsrc/security/polkit/Makefile
diff -u pkgsrc/security/polkit/Makefile:1.45 pkgsrc/security/polkit/Makefile:1.46
--- pkgsrc/security/polkit/Makefile:1.45        Fri Jul 29 16:29:09 2022
+++ pkgsrc/security/polkit/Makefile     Tue Aug  9 12:08:30 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2022/07/29 16:29:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.46 2022/08/09 12:08:30 jperkin Exp $
 
 DISTNAME=      polkit-0.120
 PKGREVISION=   4
@@ -41,8 +41,6 @@ CONFIGURE_ARGS+=      --disable-libelogind
 CONFIGURE_ARGS+=       --with-duktape
 CONFIGURE_ARGS+=       --enable-introspection
 
-LIBS.SunOS+=   -lintl
-
 .include "../../mk/bsd.prefs.mk"
 
 POLKITD_USER?=                 polkitd

Index: pkgsrc/shells/fish/Makefile
diff -u pkgsrc/shells/fish/Makefile:1.35 pkgsrc/shells/fish/Makefile:1.36
--- pkgsrc/shells/fish/Makefile:1.35    Thu Jun 30 11:18:48 2022
+++ pkgsrc/shells/fish/Makefile Tue Aug  9 12:08:30 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2022/06/30 11:18:48 nia Exp $
+# $NetBSD: Makefile,v 1.36 2022/08/09 12:08:30 jperkin Exp $
 
 DISTNAME=              fish-3.4.1
 PKGREVISION=           1
@@ -22,8 +22,6 @@ CMAKE_ARGS+=          -DBUILD_DOCS=OFF
 
 PKG_SHELL=             bin/fish
 
-LDFLAGS.SunOS+=                -lintl
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h)

Index: pkgsrc/sysutils/bacula-qt5-console/Makefile
diff -u pkgsrc/sysutils/bacula-qt5-console/Makefile:1.15 pkgsrc/sysutils/bacula-qt5-console/Makefile:1.16
--- pkgsrc/sysutils/bacula-qt5-console/Makefile:1.15    Fri Jul 29 16:29:08 2022
+++ pkgsrc/sysutils/bacula-qt5-console/Makefile Tue Aug  9 12:08:33 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2022/07/29 16:29:08 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2022/08/09 12:08:33 jperkin Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-qt5-console-/}
 PKGREVISION=   3
@@ -16,8 +16,6 @@ BUILDLINK_TRANSFORM+= opt:-std=c++98:-st
 
 BUILD_DIRS=            src/qt-console
 
-LIBS.SunOS+=   -lintl
-
 INSTALLATION_DIRS=     bin share/examples/bacula
 
 CONF_FILES+=           ${EXAMPLESDIR}/bat.conf ${PKG_SYSCONFDIR}/bat.conf

Index: pkgsrc/sysutils/bacula-tray-monitor-qt5/Makefile
diff -u pkgsrc/sysutils/bacula-tray-monitor-qt5/Makefile:1.15 pkgsrc/sysutils/bacula-tray-monitor-qt5/Makefile:1.16
--- pkgsrc/sysutils/bacula-tray-monitor-qt5/Makefile:1.15       Fri Jul 29 16:29:09 2022
+++ pkgsrc/sysutils/bacula-tray-monitor-qt5/Makefile    Tue Aug  9 12:08:33 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2022/07/29 16:29:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2022/08/09 12:08:33 jperkin Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-tray-monitor-qt5-/}
 PKGREVISION=   3
@@ -16,8 +16,6 @@ BUILDLINK_TRANSFORM+= opt:-std=c++98:-st
 
 BUILD_DIRS=            src/qt-console/tray-monitor
 
-LIBS.SunOS+=   -lintl
-
 INSTALLATION_DIRS=     bin share/examples/bacula
 
 CONF_FILES+=           ${EXAMPLESDIR}/tray-monitor.conf ${PKG_SYSCONFDIR}/tray-monitor.conf

Index: pkgsrc/sysutils/cdrtools/Makefile
diff -u pkgsrc/sysutils/cdrtools/Makefile:1.125 pkgsrc/sysutils/cdrtools/Makefile:1.126
--- pkgsrc/sysutils/cdrtools/Makefile:1.125     Fri Feb 18 11:52:56 2022
+++ pkgsrc/sysutils/cdrtools/Makefile   Tue Aug  9 12:08:33 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.125 2022/02/18 11:52:56 micha Exp $
+# $NetBSD: Makefile,v 1.126 2022/08/09 12:08:33 jperkin Exp $
 
 DISTNAME=      schily-2021-09-18
 PKGNAME=       cdrtools-3.02a10
@@ -14,7 +14,6 @@ LICENSE=      cddl-1.0 AND gnu-gpl-v2 AND gnu
 MAKE_JOBS_SAFE=        no
 
 LDFLAGS.Darwin+=       -liconv
-LDFLAGS.SunOS+=                -liconv
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/sysutils/desktop-file-utils/Makefile
diff -u pkgsrc/sysutils/desktop-file-utils/Makefile:1.46 pkgsrc/sysutils/desktop-file-utils/Makefile:1.47
--- pkgsrc/sysutils/desktop-file-utils/Makefile:1.46    Wed Dec  8 16:06:28 2021
+++ pkgsrc/sysutils/desktop-file-utils/Makefile Tue Aug  9 12:08:33 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2021/12/08 16:06:28 adam Exp $
+# $NetBSD: Makefile,v 1.47 2022/08/09 12:08:33 jperkin Exp $
 
 DISTNAME=      desktop-file-utils-0.26
 PKGREVISION=   1
@@ -16,8 +16,6 @@ GCC_REQD+=    4.7
 
 USE_TOOLS+=            pkg-config
 
-LDFLAGS.SunOS+=                -lintl
-
 FILES_SUBST+=          APPLICATIONS_PATH="${PREFIX}/share/applications"
 FILES_SUBST+=          UPDATE_DESKTOPDB="${PREFIX}/bin/update-desktop-database"
 

Index: pkgsrc/sysutils/fsviewer/Makefile
diff -u pkgsrc/sysutils/fsviewer/Makefile:1.53 pkgsrc/sysutils/fsviewer/Makefile:1.54
--- pkgsrc/sysutils/fsviewer/Makefile:1.53      Mon Aug 17 20:20:04 2020
+++ pkgsrc/sysutils/fsviewer/Makefile   Tue Aug  9 12:08:33 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2020/08/17 20:20:04 leot Exp $
+# $NetBSD: Makefile,v 1.54 2022/08/09 12:08:33 jperkin Exp $
 
 DISTNAME=      FSViewer.app-0.2.5
 PKGNAME=       FSViewer-0.2.5
@@ -18,7 +18,7 @@ USE_TOOLS+=           gmake pkg-config
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 
-LDFLAGS.SunOS+=                -lWUtil -lX11 -lXpm -lintl -lm -lwraster
+LDFLAGS.SunOS+=                -lWUtil -lX11 -lXpm -lm -lwraster
 LDFLAGS.DragonFly=     -lintl -lfontconfig
 
 .include "../../mk/bsd.prefs.mk"

Index: pkgsrc/sysutils/mc/Makefile
diff -u pkgsrc/sysutils/mc/Makefile:1.128 pkgsrc/sysutils/mc/Makefile:1.129
--- pkgsrc/sysutils/mc/Makefile:1.128   Fri Jul 29 16:29:08 2022
+++ pkgsrc/sysutils/mc/Makefile Tue Aug  9 12:08:33 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.128 2022/07/29 16:29:08 jperkin Exp $
+# $NetBSD: Makefile,v 1.129 2022/08/09 12:08:33 jperkin Exp $
 
 DISTNAME=      mc-4.8.28
 PKGREVISION=   1
@@ -26,8 +26,6 @@ CHECK_WRKREF_SKIP+=   bin/mcdiff
 CHECK_WRKREF_SKIP+=    bin/mcedit
 CHECK_WRKREF_SKIP+=    bin/mcview
 
-LIBS.SunOS+=   -lintl
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Linux"

Index: pkgsrc/textproc/diction/Makefile
diff -u pkgsrc/textproc/diction/Makefile:1.17 pkgsrc/textproc/diction/Makefile:1.18
--- pkgsrc/textproc/diction/Makefile:1.17       Sat Jan 18 23:35:25 2020
+++ pkgsrc/textproc/diction/Makefile    Tue Aug  9 12:08:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/01/18 23:35:25 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2022/08/09 12:08:35 jperkin Exp $
 
 DISTNAME=      diction-1.13
 CATEGORIES=    textproc
@@ -16,8 +16,6 @@ USE_TOOLS+=           gmake msgfmt
 
 USE_FEATURES+=         getopt_long regcomp snprintf
 
-LIBS.SunOS+=           -lintl
-
 .include "options.mk"
 
 .include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/textproc/freexl/Makefile
diff -u pkgsrc/textproc/freexl/Makefile:1.4 pkgsrc/textproc/freexl/Makefile:1.5
--- pkgsrc/textproc/freexl/Makefile:1.4 Thu Aug  6 16:31:21 2020
+++ pkgsrc/textproc/freexl/Makefile     Tue Aug  9 12:08:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/08/06 16:31:21 adam Exp $
+# $NetBSD: Makefile,v 1.5 2022/08/09 12:08:34 jperkin Exp $
 
 DISTNAME=      freexl-1.0.6
 CATEGORIES=    textproc
@@ -15,7 +15,5 @@ GNU_CONFIGURE=                yes
 PKGCONFIG_OVERRIDE=    freexl.pc.in
 TEST_TARGET=           check
 
-LIBS.SunOS+=   -liconv
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/json-glib/Makefile
diff -u pkgsrc/textproc/json-glib/Makefile:1.39 pkgsrc/textproc/json-glib/Makefile:1.40
--- pkgsrc/textproc/json-glib/Makefile:1.39     Fri Jul 29 16:29:08 2022
+++ pkgsrc/textproc/json-glib/Makefile  Tue Aug  9 12:08:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2022/07/29 16:29:08 jperkin Exp $
+# $NetBSD: Makefile,v 1.40 2022/08/09 12:08:34 jperkin Exp $
 
 DISTNAME=      json-glib-1.6.2
 PKGREVISION=   2
@@ -20,8 +20,6 @@ MESON_ARGS+=  -Dman=true
 MESON_ARGS+=   -Dgtk_doc=disabled
 MESON_ARGS+=   -Dintrospection=enabled
 
-LIBS.SunOS+=   -lintl
-
 .include "../../mk/compiler.mk"
 
 .if !empty(PKGSRC_COMPILER:Mclang)

Index: pkgsrc/textproc/sphinxsearch/Makefile
diff -u pkgsrc/textproc/sphinxsearch/Makefile:1.17 pkgsrc/textproc/sphinxsearch/Makefile:1.18
--- pkgsrc/textproc/sphinxsearch/Makefile:1.17  Wed Jun 23 20:33:17 2021
+++ pkgsrc/textproc/sphinxsearch/Makefile       Tue Aug  9 12:08:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2021/06/23 20:33:17 nia Exp $
+# $NetBSD: Makefile,v 1.18 2022/08/09 12:08:34 jperkin Exp $
 #
 
 DISTNAME=      sphinx-2.2.11-release
@@ -63,7 +63,7 @@ CONFIGURE_ARGS+=      --with-iconv
 
 INSTALL_MAKE_FLAGS+=   sysconfdir=${EGDIR}
 
-LIBS.SunOS+=           -liconv -lsocket -lnsl
+LIBS.SunOS+=           -lsocket -lnsl
 
 post-install:
        ${MV} ${DESTDIR}${EGDIR}/sphinx.conf.dist ${DESTDIR}${EGDIR}/sphinx-full.conf

Index: pkgsrc/textproc/unac/Makefile
diff -u pkgsrc/textproc/unac/Makefile:1.4 pkgsrc/textproc/unac/Makefile:1.5
--- pkgsrc/textproc/unac/Makefile:1.4   Wed Sep  6 10:40:34 2017
+++ pkgsrc/textproc/unac/Makefile       Tue Aug  9 12:08:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/09/06 10:40:34 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/08/09 12:08:34 jperkin Exp $
 #
 
 DISTNAME=      unac-1.7.0
@@ -15,7 +15,5 @@ USE_LIBTOOL=  yes
 
 PKGCONFIG_OVERRIDE+=   unac.pc.in
 
-LIBS.SunOS+=   -liconv
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/wm/i3/Makefile
diff -u pkgsrc/wm/i3/Makefile:1.49 pkgsrc/wm/i3/Makefile:1.50
--- pkgsrc/wm/i3/Makefile:1.49  Tue Jun 28 11:37:00 2022
+++ pkgsrc/wm/i3/Makefile       Tue Aug  9 12:08:31 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2022/06/28 11:37:00 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2022/08/09 12:08:31 jperkin Exp $
 
 DISTNAME=      i3-4.20.1
 PKGREVISION=   2
@@ -15,7 +15,7 @@ GNU_CONFIGURE=        yes
 USE_TOOLS+=    bash pkg-config perl:run
 USE_LANGUAGES= c99
 
-LDFLAGS.SunOS+=        -lgen -liconv -lsocket
+LDFLAGS.SunOS+=        -lgen -lsocket
 
 EGDIR=         ${PREFIX}/share/examples/i3
 OWN_DIRS+=     ${PKG_SYSCONFDIR}/i3

Index: pkgsrc/wm/icewm/Makefile
diff -u pkgsrc/wm/icewm/Makefile:1.52 pkgsrc/wm/icewm/Makefile:1.53
--- pkgsrc/wm/icewm/Makefile:1.52       Fri Jul 29 16:29:09 2022
+++ pkgsrc/wm/icewm/Makefile    Tue Aug  9 12:08:31 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2022/07/29 16:29:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.53 2022/08/09 12:08:31 jperkin Exp $
 
 COMMENT=               Small, fast and light-weight window manager
 PKGREVISION=           3
@@ -8,8 +8,6 @@ CONFLICTS+=             icewm-gnome-[0-9]* icewm-im
 CONFIGURE_ARGS+=       --with-imlib=no
 CONFIGURE_ARGS+=       --with-xpm=${BUILDLINK_PREFIX.libXpm}
 
-LIBS.SunOS+=   -lintl
-
 .include "Makefile.common"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"

Index: pkgsrc/wm/icewm/Makefile.common
diff -u pkgsrc/wm/icewm/Makefile.common:1.73 pkgsrc/wm/icewm/Makefile.common:1.74
--- pkgsrc/wm/icewm/Makefile.common:1.73        Tue May 10 11:50:55 2022
+++ pkgsrc/wm/icewm/Makefile.common     Tue Aug  9 12:08:31 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.73 2022/05/10 11:50:55 nia Exp $
+# $NetBSD: Makefile.common,v 1.74 2022/08/09 12:08:31 jperkin Exp $
 #
 # used by wm/icewm/Makefile
 # used by wm/icewm-imlib/Makefile
@@ -49,7 +49,6 @@ SUBST_MESSAGE.apm=    Disable APM applet.
 .endif
 
 CONFIGURE_ARGS.NetBSD+=        --with-unicode-set=utf-32
-LIBS.SunOS+=           -lintl
 
 DOCDIR=                        ${PREFIX}/share/doc/icewm
 HTMLDIR=               ${PREFIX}/share/doc/icewm/html

Index: pkgsrc/wm/wmii/Makefile
diff -u pkgsrc/wm/wmii/Makefile:1.41 pkgsrc/wm/wmii/Makefile:1.42
--- pkgsrc/wm/wmii/Makefile:1.41        Wed Jul 21 14:40:31 2021
+++ pkgsrc/wm/wmii/Makefile     Tue Aug  9 12:08:31 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2021/07/21 14:40:31 taca Exp $
+# $NetBSD: Makefile,v 1.42 2022/08/09 12:08:31 jperkin Exp $
 
 DISTNAME=              wmii+ixp-3.9.2
 PKGNAME=               wmii-3.9.2
@@ -47,7 +47,7 @@ CONF_FILES+=          ${EGDIR}/${EGSUBDIR.${subd
 .endfor
 
 LDFLAGS.NetBSD+=       -lm # frexp
-LDFLAGS.SunOS+=                -lsocket -lnsl -liconv
+LDFLAGS.SunOS+=                -lsocket -lnsl
 
 SUBST_CLASSES+=                vars
 SUBST_STAGE.vars=      pre-configure

Index: pkgsrc/www/dillo/Makefile
diff -u pkgsrc/www/dillo/Makefile:1.85 pkgsrc/www/dillo/Makefile:1.86
--- pkgsrc/www/dillo/Makefile:1.85      Tue Jun 28 11:37:03 2022
+++ pkgsrc/www/dillo/Makefile   Tue Aug  9 12:08:32 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2022/06/28 11:37:03 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2022/08/09 12:08:32 jperkin Exp $
 
 DISTNAME=      dillo-3.0.5
 PKGREVISION=   11
@@ -29,8 +29,6 @@ INSTALLATION_DIRS=    share/doc/dillo ${EGD
 
 INSTALL_MAKE_FLAGS+=   sysconfdir=${EGDIR}
 
-LIBS.SunOS+=   -liconv
-
 .include "options.mk"
 
 post-install:

Index: pkgsrc/www/e2guardian/Makefile
diff -u pkgsrc/www/e2guardian/Makefile:1.13 pkgsrc/www/e2guardian/Makefile:1.14
--- pkgsrc/www/e2guardian/Makefile:1.13 Tue Jun 28 11:37:04 2022
+++ pkgsrc/www/e2guardian/Makefile      Tue Aug  9 12:08:32 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2022/06/28 11:37:04 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/08/09 12:08:32 jperkin Exp $
 
 DISTNAME=      e2guardian-5.1.1
 PKGREVISION=   6
@@ -49,8 +49,6 @@ CONFIGURE_ARGS+=      --with-piddir=${VARBASE
 CONFIGURE_ARGS+=       --with-logdir=${VARBASE}/log/${E2G_LOG}
 CONFIGURE_ARGS+=       --enable-ntlm
 
-LIBS.SunOS+=           -liconv
-
 WRKSRC=                ${WRKDIR}/${DISTNAME}
 
 .include "options.mk"

Index: pkgsrc/www/neon/Makefile
diff -u pkgsrc/www/neon/Makefile:1.86 pkgsrc/www/neon/Makefile:1.87
--- pkgsrc/www/neon/Makefile:1.86       Tue Jun 28 11:37:06 2022
+++ pkgsrc/www/neon/Makefile    Tue Aug  9 12:08:32 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2022/06/28 11:37:06 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2022/08/09 12:08:32 jperkin Exp $
 
 DISTNAME=      neon-0.32.2
 PKGREVISION=   1
@@ -23,8 +23,6 @@ TEST_TARGET=          check
 #selftest needs perl
 USE_TOOLS+=            perl
 
-LDFLAGS.SunOS+=                -lintl
-
 .include "options.mk"
 
 .include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/www/weex/Makefile
diff -u pkgsrc/www/weex/Makefile:1.16 pkgsrc/www/weex/Makefile:1.17
--- pkgsrc/www/weex/Makefile:1.16       Fri Mar 20 11:58:35 2020
+++ pkgsrc/www/weex/Makefile    Tue Aug  9 12:08:32 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2020/03/20 11:58:35 nia Exp $
+# $NetBSD: Makefile,v 1.17 2022/08/09 12:08:32 jperkin Exp $
 
 DISTNAME=      weex-2.6.1.5
 PKGREVISION=   1
@@ -13,8 +13,6 @@ GNU_CONFIGURE=                yes
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            msgfmt
 
-LIBS.SunOS+=           -lintl
-
 WEEX_DOCS=     AUTHORS BUGS BUGS.ja COPYING COPYING.ja \
                ChangeLog ChangeLog.ja FAQ FAQ.ja README README.ja \
                THANKS TODO TODO.ja

Index: pkgsrc/x11/gtk2/Makefile
diff -u pkgsrc/x11/gtk2/Makefile:1.326 pkgsrc/x11/gtk2/Makefile:1.327
--- pkgsrc/x11/gtk2/Makefile:1.326      Thu Jun 30 11:19:01 2022
+++ pkgsrc/x11/gtk2/Makefile    Tue Aug  9 12:08:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.326 2022/06/30 11:19:01 nia Exp $
+# $NetBSD: Makefile,v 1.327 2022/08/09 12:08:35 jperkin Exp $
 
 DISTNAME=      gtk+-2.24.33
 PKGNAME=       ${DISTNAME:S/gtk/gtk2/}
@@ -54,7 +54,6 @@ REQD_DIRS+=           ${PREFIX}/libdata/gtk-2.0
 
 BUILD_DIRS=            . demos/gtk-demo
 
-LDFLAGS.SunOS+=                -lintl
 # fix for 'only weak aliases are supported on darwin' error
 CONFIGURE_ARGS.Darwin+=        --disable-visibility
 

Index: pkgsrc/x11/kdelibs4/Makefile
diff -u pkgsrc/x11/kdelibs4/Makefile:1.131 pkgsrc/x11/kdelibs4/Makefile:1.132
--- pkgsrc/x11/kdelibs4/Makefile:1.131  Thu Jul 14 23:46:27 2022
+++ pkgsrc/x11/kdelibs4/Makefile        Tue Aug  9 12:08:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.131 2022/07/14 23:46:27 dholland Exp $
+# $NetBSD: Makefile,v 1.132 2022/08/09 12:08:35 jperkin Exp $
 
 DISTNAME=      kdelibs-4.14.38
 PKGNAME=       ${DISTNAME:S/-4/4-4/}
@@ -83,7 +83,6 @@ PLIST.kgrantpty=      yes
 
 CFLAGS.SunOS+=         -D__EXTENSIONS__
 LDFLAGS.Darwin+=       -lintl
-LDFLAGS.SunOS+=                -lintl
 
 # jasper uses SIZE_MAX and friends in its headers.
 CXXFLAGS+=     -D__STDC_LIMIT_MACROS

Index: pkgsrc/x11/wdm/Makefile
diff -u pkgsrc/x11/wdm/Makefile:1.67 pkgsrc/x11/wdm/Makefile:1.68
--- pkgsrc/x11/wdm/Makefile:1.67        Mon Aug 17 20:20:37 2020
+++ pkgsrc/x11/wdm/Makefile     Tue Aug  9 12:08:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2020/08/17 20:20:37 leot Exp $
+# $NetBSD: Makefile,v 1.68 2022/08/09 12:08:35 jperkin Exp $
 
 DISTNAME=              wdm-1.28
 PKGREVISION=           22
@@ -15,7 +15,7 @@ USE_PKGLOCALEDIR=     YES
 GNU_CONFIGURE=         YES
 
 LDFLAGS.DragonFly=     -lintl -lfontconfig
-LDFLAGS.SunOS+=                -lintl -lresolv
+LDFLAGS.SunOS+=                -lresolv
 
 CONFIGURE_ARGS+=       --with-wdmdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale

Index: pkgsrc/x11/xclip/Makefile
diff -u pkgsrc/x11/xclip/Makefile:1.21 pkgsrc/x11/xclip/Makefile:1.22
--- pkgsrc/x11/xclip/Makefile:1.21      Sun Nov  8 15:25:58 2020
+++ pkgsrc/x11/xclip/Makefile   Tue Aug  9 12:08:35 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2020/11/08 15:25:58 kim Exp $
+# $NetBSD: Makefile,v 1.22 2022/08/09 12:08:35 jperkin Exp $
 
 DISTNAME=      xclip-0.13
 PKGREVISION=   1
@@ -13,8 +13,6 @@ LICENSE=      gnu-gpl-v2
 GNU_CONFIGURE= yes
 USE_TOOLS+=    autoconf gmake
 
-LDFLAGS.SunOS+=        -liconv
-
 pre-configure:
        cd ${WRKSRC} && autoreconf
 



Home | Main Index | Thread Index | Old Index