CVS commit: pkgsrc

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Aug 11 13:37:24 UTC 2022

Modified Files:
        pkgsrc/converters/libiconv: buildlink3.mk
        pkgsrc/devel/gettext-lib: buildlink3.mk
        pkgsrc/x11/libXpm: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/converters/libiconv/buildlink3.mk
cvs rdiff -u -r1.41 -r1.42 pkgsrc/devel/gettext-lib/buildlink3.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/libXpm/Makefile

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

Modified files:

Index: pkgsrc/converters/libiconv/buildlink3.mk
diff -u pkgsrc/converters/libiconv/buildlink3.mk:1.27 pkgsrc/converters/libiconv/buildlink3.mk:1.28
--- pkgsrc/converters/libiconv/buildlink3.mk:1.27       Tue Aug  9 11:31:14 2022
+++ pkgsrc/converters/libiconv/buildlink3.mk    Thu Aug 11 13:37:24 2022
@@ -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 @@ BUILDLINK_LDADD.iconv=               ${BUILDLINK_LIBN
 # 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

Index: pkgsrc/devel/gettext-lib/buildlink3.mk
diff -u pkgsrc/devel/gettext-lib/buildlink3.mk:1.41 pkgsrc/devel/gettext-lib/buildlink3.mk:1.42
--- pkgsrc/devel/gettext-lib/buildlink3.mk:1.41 Tue Aug  9 11:31:14 2022
+++ pkgsrc/devel/gettext-lib/buildlink3.mk      Thu Aug 11 13:37:24 2022
@@ -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 @@ CONFIGURE_ENV+=                      INTLLIBS="${BUILDLINK_
 # 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

Index: pkgsrc/x11/libXpm/Makefile
diff -u pkgsrc/x11/libXpm/Makefile:1.23 pkgsrc/x11/libXpm/Makefile:1.24
--- pkgsrc/x11/libXpm/Makefile:1.23     Sun Apr 10 08:53:16 2022
+++ pkgsrc/x11/libXpm/Makefile  Thu Aug 11 13:37:24 2022
@@ -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 @@ CONFIGURE_ENV+=               APP_MAN_SUFFIX=1
 # 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}