[pkgsrc/trunk]: pkgsrc libXpm: Add USE_EXPLICIT_LIBDEPS, set to no.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cea3e0f51aaf
branches:  trunk
changeset: 383072:cea3e0f51aaf
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Aug 11 13:37:24 2022 +0000

description:
libXpm: Add USE_EXPLICIT_LIBDEPS, set to no.

This variable controls whether we add the explicit library dependencies from
libiconv and gettext-lib, required by this package as it's a bit special in how
it handles libintl.

diffstat:

 converters/libiconv/buildlink3.mk |  7 +++++--
 devel/gettext-lib/buildlink3.mk   |  7 +++++--
 x11/libXpm/Makefile               |  3 ++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diffs (59 lines):

diff -r fefd3cdb2bb0 -r cea3e0f51aaf converters/libiconv/buildlink3.mk
--- a/converters/libiconv/buildlink3.mk Thu Aug 11 13:31:49 2022 +0000
+++ b/converters/libiconv/buildlink3.mk Thu Aug 11 13:37:24 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2022/08/09 11:31:14 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2022/08/11 13:37:24 jperkin Exp $
 
 BUILDLINK_TREE+=       iconv
 
@@ -23,7 +23,10 @@
 # Ideally this would be done via CWRAPPERS_LDADD to avoid leaking into LDFLAGS
 # but there is no concensus on that yet.
 #
-.if ${OPSYS_EXPLICIT_LIBDEPS:Uno:tl} == "yes"
+# USE_EXPLICIT_LIBDEPS is a package-settable variable for rare cases where the
+# libraries need to be pulled in but we do not want to expose them by default.
+#
+.if ${OPSYS_EXPLICIT_LIBDEPS:Uno:tl} == "yes" && ${USE_EXPLICIT_LIBDEPS:Uyes:tl} != "no"
 BUILDLINK_LDFLAGS.iconv+=      ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib
 BUILDLINK_LDFLAGS.iconv+=      ${BUILDLINK_LDADD.iconv}
 .endif
diff -r fefd3cdb2bb0 -r cea3e0f51aaf devel/gettext-lib/buildlink3.mk
--- a/devel/gettext-lib/buildlink3.mk   Thu Aug 11 13:31:49 2022 +0000
+++ b/devel/gettext-lib/buildlink3.mk   Thu Aug 11 13:37:24 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.41 2022/08/09 11:31:14 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.42 2022/08/11 13:37:24 jperkin Exp $
 
 BUILDLINK_TREE+=       gettext
 
@@ -37,7 +37,10 @@
 # Ideally this would be done via CWRAPPERS_LDADD to avoid leaking into LDFLAGS
 # but there is no concensus on that yet.
 #
-.if ${OPSYS_EXPLICIT_LIBDEPS:Uno:tl} == "yes"
+# USE_EXPLICIT_LIBDEPS is a package-settable variable for rare cases where the
+# libraries need to be pulled in but we do not want to expose them by default.
+#
+.if ${OPSYS_EXPLICIT_LIBDEPS:Uno:tl} == "yes" && ${USE_EXPLICIT_LIBDEPS:Uyes:tl} != "no"
 BUILDLINK_LDFLAGS.gettext+=    ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.gettext}/lib
 BUILDLINK_LDFLAGS.gettext+=    ${BUILDLINK_LDADD.gettext}
 .endif
diff -r fefd3cdb2bb0 -r cea3e0f51aaf x11/libXpm/Makefile
--- a/x11/libXpm/Makefile       Thu Aug 11 13:31:49 2022 +0000
+++ b/x11/libXpm/Makefile       Thu Aug 11 13:37:24 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2022/04/10 08:53:16 nia Exp $
+# $NetBSD: Makefile,v 1.24 2022/08/11 13:37:24 jperkin Exp $
 
 DISTNAME=              libXpm-3.5.13
 CATEGORIES=            graphics x11
@@ -22,6 +22,7 @@
 # pass down INTLLIBS in the build environment for use by the [cs]xpm
 # Makefiles.
 #
+USE_EXPLICIT_LIBDEPS=  no
 CONFIGURE_ENV+=                ac_cv_search_gettext=no
 MAKE_ENV+=             INTLLIBS=${BUILDLINK_LDADD.gettext:Q}