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

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

72 files changed, 89 insertions, 182 deletions

diff --git a/audio/aumix/Makefile.common b/audio/aumix/Makefile.common
index 0929e8daf16..936b07c04cb 100644
--- a/audio/aumix/Makefile.common
+++ b/audio/aumix/Makefile.common
@@ -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"
diff --git a/audio/libifp/Makefile b/audio/libifp/Makefile
index 1bc800c7883..eb7a3dfd5e5 100644
--- a/audio/libifp/Makefile
+++ b/audio/libifp/Makefile
@@ -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"
diff --git a/audio/libmusicbrainz5/Makefile b/audio/libmusicbrainz5/Makefile
index ae5ebe897bb..29ccbde2cf0 100644
--- a/audio/libmusicbrainz5/Makefile
+++ b/audio/libmusicbrainz5/Makefile
@@ -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"
diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile
index 43fd0f34183..98abe0df5ed 100644
--- a/audio/ncmpc/Makefile
+++ b/audio/ncmpc/Makefile
@@ -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
diff --git a/audio/speech-dispatcher/Makefile b/audio/speech-dispatcher/Makefile
index dc8e8ecb410..04d4d500076 100644
--- a/audio/speech-dispatcher/Makefile
+++ b/audio/speech-dispatcher/Makefile
@@ -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
diff --git a/comms/gammu/Makefile b/comms/gammu/Makefile
index 0c4648bcbee..43ec8921142 100644
--- a/comms/gammu/Makefile
+++ b/comms/gammu/Makefile
@@ -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 CMakeLists.txt
 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 --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile
index 5b1767869d1..30850aa92c3 100644
--- a/comms/scmxx/Makefile
+++ b/comms/scmxx/Makefile
@@ -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 Siemens mobile phones
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake msgfmt
-LDFLAGS.SunOS+=		-lintl
 
 INSTALLATION_DIRS+=	share/doc/scmxx share/examples/scmxx
 
diff --git a/converters/odt2txt/Makefile b/converters/odt2txt/Makefile
index 7ebcf3a34b0..77f09cd9c99 100644
--- a/converters/odt2txt/Makefile
+++ b/converters/odt2txt/Makefile
@@ -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"
diff --git a/databases/postgresql10/options.mk b/databases/postgresql10/options.mk
index abb0e5bd85b..d30141b98fd 100644
--- a/databases/postgresql10/options.mk
+++ b/databases/postgresql10/options.mk
@@ -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
diff --git a/databases/postgresql11/options.mk b/databases/postgresql11/options.mk
index 215d1be9a7a..36c81abcd9d 100644
--- a/databases/postgresql11/options.mk
+++ b/databases/postgresql11/options.mk
@@ -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
diff --git a/databases/postgresql12/options.mk b/databases/postgresql12/options.mk
index a45eaeb24a3..12464d87b65 100644
--- a/databases/postgresql12/options.mk
+++ b/databases/postgresql12/options.mk
@@ -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
diff --git a/databases/postgresql13/options.mk b/databases/postgresql13/options.mk
index d41860f3eb6..1ad9b88cfb5 100644
--- a/databases/postgresql13/options.mk
+++ b/databases/postgresql13/options.mk
@@ -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
diff --git a/databases/postgresql14/options.mk b/databases/postgresql14/options.mk
index 155f61a9f48..d28d4309384 100644
--- a/databases/postgresql14/options.mk
+++ b/databases/postgresql14/options.mk
@@ -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
diff --git a/devel/at-spi2-core/Makefile b/devel/at-spi2-core/Makefile
index caf4e59417a..ccddd3e383f 100644
--- a/devel/at-spi2-core/Makefile
+++ b/devel/at-spi2-core/Makefile
@@ -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-private/atspi-2.pc
 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 --git a/devel/cook/Makefile b/devel/cook/Makefile
index 86887b5c288..8d7b34107c5 100644
--- a/devel/cook/Makefile
+++ b/devel/cook/Makefile
@@ -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 \
diff --git a/devel/doc++/Makefile b/devel/doc++/Makefile
index e85c8e98df0..8d1889bdb04 100644
--- a/devel/doc++/Makefile
+++ b/devel/doc++/Makefile
@@ -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:
diff --git a/devel/git-base/Makefile b/devel/git-base/Makefile
index 7d2c8da0804..cc6c471cef9 100644
--- a/devel/git-base/Makefile
+++ b/devel/git-base/Makefile
@@ -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 TEST_SHELL_PATH
 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 --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 81ead330e2d..e201f277f13 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -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}/output/gio:${WRKSRC}/output/glib:${WRKSRC}/
 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"
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 90b7faf965a..fbf4470ed75 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -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"
diff --git a/devel/libmtp/Makefile b/devel/libmtp/Makefile
index be3239047d7..ab262970585 100644
--- a/devel/libmtp/Makefile
+++ b/devel/libmtp/Makefile
@@ -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"
 
diff --git a/devel/log4cplus/Makefile b/devel/log4cplus/Makefile
index e01cfb6a859..3158170a457 100644
--- a/devel/log4cplus/Makefile
+++ b/devel/log4cplus/Makefile
@@ -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
diff --git a/devel/ucommon/Makefile b/devel/ucommon/Makefile
index cca37fbb740..e9f7e8781f7 100644
--- a/devel/ucommon/Makefile
+++ b/devel/ucommon/Makefile
@@ -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"
diff --git a/editors/lyx/Makefile b/editors/lyx/Makefile
index e6518cb7492..0b62fd1e594 100644
--- a/editors/lyx/Makefile
+++ b/editors/lyx/Makefile
@@ -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
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index 837cfd655cc..695ca7c72c8 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -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
diff --git a/editors/xnedit/Makefile b/editors/xnedit/Makefile
index 3263938ba25..2c46f0e783d 100644
--- a/editors/xnedit/Makefile
+++ b/editors/xnedit/Makefile
@@ -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
diff --git a/emulators/xcpc/Makefile b/emulators/xcpc/Makefile
index 5229206b4ae..9eac0edc5dc 100644
--- a/emulators/xcpc/Makefile
+++ b/emulators/xcpc/Makefile
@@ -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
diff --git a/games/chromium-bsu/Makefile b/games/chromium-bsu/Makefile
index e66e117e1ba..2fd31d7a360 100644
--- a/games/chromium-bsu/Makefile
+++ b/games/chromium-bsu/Makefile
@@ -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
diff --git a/games/hex-a-hop/Makefile b/games/hex-a-hop/Makefile
index 38232acc7e1..5830d2640cc 100644
--- a/games/hex-a-hop/Makefile
+++ b/games/hex-a-hop/Makefile
@@ -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"
diff --git a/games/quarry/Makefile b/games/quarry/Makefile
index f934b424700..379b61727c9 100644
--- a/games/quarry/Makefile
+++ b/games/quarry/Makefile
@@ -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"
diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile
index 8c2eea8004b..f18d3768dcc 100644
--- a/games/ufoai/Makefile
+++ b/games/ufoai/Makefile
@@ -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}
 
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 0f62f55201d..1ed27798eb7 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -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"
diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index a3e0ed15926..2c8bb6c02b4 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -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"
 
diff --git a/graphics/jpegpixi/Makefile b/graphics/jpegpixi/Makefile
index 5f03531fe3b..0ec168a0519 100644
--- a/graphics/jpegpixi/Makefile
+++ b/graphics/jpegpixi/Makefile
@@ -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 remove bad pixels
 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"
diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index db04599e868..c1b02ba0097 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -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:
diff --git a/lang/squeak-vm/Makefile b/lang/squeak-vm/Makefile
index 8bf23f01be4..5d430f71166 100644
--- a/lang/squeak-vm/Makefile
+++ b/lang/squeak-vm/Makefile
@@ -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
diff --git a/mail/gmime3/Makefile b/mail/gmime3/Makefile
index 9bd831b399b..c358f50f2e4 100644
--- a/mail/gmime3/Makefile
+++ b/mail/gmime3/Makefile
@@ -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
diff --git a/mail/gnarwl/Makefile b/mail/gnarwl/Makefile
index a533c92a9b2..a95954a12e5 100644
--- a/mail/gnarwl/Makefile
+++ b/mail/gnarwl/Makefile
@@ -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.openldap}/lib	\
 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
diff --git a/mail/milter-manager/Makefile b/mail/milter-manager/Makefile
index 605eee75442..b217d198cfb 100644
--- a/mail/milter-manager/Makefile
+++ b/mail/milter-manager/Makefile
@@ -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 path for libevent from pkgsrc.
 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}
diff --git a/multimedia/mediatomb/Makefile b/multimedia/mediatomb/Makefile
index 03d501a3292..2967aeddd88 100644
--- a/multimedia/mediatomb/Makefile
+++ b/multimedia/mediatomb/Makefile
@@ -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
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index ad5eb76a1e2..4a8cb99ec69 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -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}/bin/qmake
 REPLACE_LOCALEDIR_PATTERNS=	build-config.in
 
 LDFLAGS.DragonFly=	-lboost_system
-LDFLAGS.SunOS+=		-lintl
 
 INSTALL_ENV+=	SHELL=${SH:Q}
 
diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile
index 58d50b4b631..833e5619788 100644
--- a/multimedia/totem-pl-parser/Makefile
+++ b/multimedia/totem-pl-parser/Makefile
@@ -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
diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile
index 04eb4d9d1d8..d376388dfe4 100644
--- a/net/gtk-gnutella/Makefile
+++ b/net/gtk-gnutella/Makefile
@@ -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"
 
diff --git a/net/httping/Makefile b/net/httping/Makefile
index a2a3bb91e50..e7fd8010522 100644
--- a/net/httping/Makefile
+++ b/net/httping/Makefile
@@ -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"
diff --git a/news/pan/Makefile b/news/pan/Makefile
index bae96f8db68..96e9717860c 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -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
diff --git a/print/fig2dev/Makefile b/print/fig2dev/Makefile
index d888c3e3fdb..468097e9156 100644
--- a/print/fig2dev/Makefile
+++ b/print/fig2dev/Makefile
@@ -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 or printable formats
 
 GNU_CONFIGURE=	yes
 
-LDFLAGS.SunOS+=	-liconv
-
 USE_TOOLS+=	gs:run
 
 .include "../../graphics/png/buildlink3.mk"
diff --git a/print/poppler-cpp/Makefile b/print/poppler-cpp/Makefile
index 82b7773f54f..f973fdde045 100644
--- a/print/poppler-cpp/Makefile
+++ b/print/poppler-cpp/Makefile
@@ -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"
 
diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile
index 78af1957a1c..10a1a7b4826 100644
--- a/security/gnupg2/Makefile
+++ b/security/gnupg2/Makefile
@@ -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"
diff --git a/security/polkit/Makefile b/security/polkit/Makefile
index 33d8f685e2a..d651e84040e 100644
--- a/security/polkit/Makefile
+++ b/security/polkit/Makefile
@@ -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
diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index b686bf310bb..3fb50549d16 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -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)
diff --git a/sysutils/bacula-qt5-console/Makefile b/sysutils/bacula-qt5-console/Makefile
index e514b245c14..8afcfb38620 100644
--- a/sysutils/bacula-qt5-console/Makefile
+++ b/sysutils/bacula-qt5-console/Makefile
@@ -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:-std=gnu++98 # typeof
 
 BUILD_DIRS=		src/qt-console
 
-LIBS.SunOS+=	-lintl
-
 INSTALLATION_DIRS=	bin share/examples/bacula
 
 CONF_FILES+=		${EXAMPLESDIR}/bat.conf ${PKG_SYSCONFDIR}/bat.conf
diff --git a/sysutils/bacula-tray-monitor-qt5/Makefile b/sysutils/bacula-tray-monitor-qt5/Makefile
index 973a5cc0b53..94c6f7a8130 100644
--- a/sysutils/bacula-tray-monitor-qt5/Makefile
+++ b/sysutils/bacula-tray-monitor-qt5/Makefile
@@ -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:-std=gnu++98 # typeof
 
 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
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index cd8733873bf..8f4066d3625 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -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-lgpl-v2.1 AND 2-clause-bsd
 MAKE_JOBS_SAFE=	no
 
 LDFLAGS.Darwin+=	-liconv
-LDFLAGS.SunOS+=		-liconv
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/sysutils/desktop-file-utils/Makefile b/sysutils/desktop-file-utils/Makefile
index 862e6568a3f..436ac46c1f5 100644
--- a/sysutils/desktop-file-utils/Makefile
+++ b/sysutils/desktop-file-utils/Makefile
@@ -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"
 
diff --git a/sysutils/fsviewer/Makefile b/sysutils/fsviewer/Makefile
index 3ab85b8d1ac..824fa7e2be3 100644
--- a/sysutils/fsviewer/Makefile
+++ b/sysutils/fsviewer/Makefile
@@ -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"
diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index 84ae334f86d..7b5d094e8b2 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -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"
diff --git a/textproc/diction/Makefile b/textproc/diction/Makefile
index 634f8fc2ff7..29146523150 100644
--- a/textproc/diction/Makefile
+++ b/textproc/diction/Makefile
@@ -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"
diff --git a/textproc/freexl/Makefile b/textproc/freexl/Makefile
index a0a6e86a3b3..09da763c9b3 100644
--- a/textproc/freexl/Makefile
+++ b/textproc/freexl/Makefile
@@ -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"
diff --git a/textproc/json-glib/Makefile b/textproc/json-glib/Makefile
index 5c6063b0f7e..a283a572149 100644
--- a/textproc/json-glib/Makefile
+++ b/textproc/json-glib/Makefile
@@ -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)
diff --git a/textproc/sphinxsearch/Makefile b/textproc/sphinxsearch/Makefile
index 973ed84f993..71dee4c6ce5 100644
--- a/textproc/sphinxsearch/Makefile
+++ b/textproc/sphinxsearch/Makefile
@@ -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
diff --git a/textproc/unac/Makefile b/textproc/unac/Makefile
index 2371944f0d3..6337ae518c9 100644
--- a/textproc/unac/Makefile
+++ b/textproc/unac/Makefile
@@ -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"
diff --git a/wm/i3/Makefile b/wm/i3/Makefile
index e70a5e52e7d..c136ffecb5f 100644
--- a/wm/i3/Makefile
+++ b/wm/i3/Makefile
@@ -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
diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile
index bf1c8cb821a..e6f918890e4 100644
--- a/wm/icewm/Makefile
+++ b/wm/icewm/Makefile
@@ -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-imlib-[0-9]*
 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"
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index 065bd5a8beb..b921b201aa3 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -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
diff --git a/wm/wmii/Makefile b/wm/wmii/Makefile
index 9b6d7a51a06..01ef44cf6ae 100644
--- a/wm/wmii/Makefile
+++ b/wm/wmii/Makefile
@@ -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.${subdir}}/${file} \
 .endfor
 
 LDFLAGS.NetBSD+=	-lm # frexp
-LDFLAGS.SunOS+=		-lsocket -lnsl -liconv
+LDFLAGS.SunOS+=		-lsocket -lnsl
 
 SUBST_CLASSES+=		vars
 SUBST_STAGE.vars=	pre-configure
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index b9aa1eafb1f..5874f13dd33 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -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 ${EGDIR}
 
 INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
 
-LIBS.SunOS+=	-liconv
-
 .include "options.mk"
 
 post-install:
diff --git a/www/e2guardian/Makefile b/www/e2guardian/Makefile
index 201d6fb2a94..1c8783105f0 100644
--- a/www/e2guardian/Makefile
+++ b/www/e2guardian/Makefile
@@ -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}/run
 CONFIGURE_ARGS+=	--with-logdir=${VARBASE}/log/${E2G_LOG}
 CONFIGURE_ARGS+=	--enable-ntlm
 
-LIBS.SunOS+=		-liconv
-
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 .include "options.mk"
diff --git a/www/neon/Makefile b/www/neon/Makefile
index 108a43f12d3..90ed633f67f 100644
--- a/www/neon/Makefile
+++ b/www/neon/Makefile
@@ -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"
diff --git a/www/weex/Makefile b/www/weex/Makefile
index 14c7f0dc9eb..86ba1c2ec41 100644
--- a/www/weex/Makefile
+++ b/www/weex/Makefile
@@ -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
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 31715a1a36b..c74f3de1e66 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -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
 
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 6e3f8d7f608..b56ab47e0ff 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -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
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 4a4f7d38727..d9632c14d57 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -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
diff --git a/x11/xclip/Makefile b/x11/xclip/Makefile
index 0d40a2e7e45..b00e88865fc 100644
--- a/x11/xclip/Makefile
+++ b/x11/xclip/Makefile
@@ -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