CVS commit: pkgsrc/devel

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jan 23 11:42:16 UTC 2020

Modified Files:
        pkgsrc/devel/gettext: Makefile PLIST
        pkgsrc/devel/gettext-tools: Makefile

Log Message:
gettext: check for glibc in the right package + check for glibc, not Linux


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 pkgsrc/devel/gettext/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/gettext/PLIST
cvs rdiff -u -r1.39 -r1.40 pkgsrc/devel/gettext-tools/Makefile

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

Modified files:

Index: pkgsrc/devel/gettext/Makefile
diff -u pkgsrc/devel/gettext/Makefile:1.86 pkgsrc/devel/gettext/Makefile:1.87
--- pkgsrc/devel/gettext/Makefile:1.86  Sun Nov  3 10:39:11 2019
+++ pkgsrc/devel/gettext/Makefile       Thu Jan 23 11:42:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2019/11/03 10:39:11 rillig Exp $
+# $NetBSD: Makefile,v 1.87 2020/01/23 11:42:16 nia Exp $
 
 .include "../../devel/gettext/Makefile.common"
 
@@ -26,13 +26,6 @@ TEST_TARGET=         check
 BROKEN_GETTEXT_DETECTION=      yes
 USE_BUILTIN.gettext=           no # force use of pkgsrc gettext-lib
 
-.include "../../mk/bsd.prefs.mk"
-
-PLIST_VARS+=   glibc
-.if ${OPSYS} == "Linux"
-PLIST.glibc=   yes
-.endif
-
 do-install:
        cd ${WRKSRC}/gettext-tools && ${MAKE} install-gettextsrcSCRIPTS DESTDIR=${DESTDIR}
        cd ${WRKSRC}/gettext-tools/projects && ${MAKE} install DESTDIR=${DESTDIR}

Index: pkgsrc/devel/gettext/PLIST
diff -u pkgsrc/devel/gettext/PLIST:1.20 pkgsrc/devel/gettext/PLIST:1.21
--- pkgsrc/devel/gettext/PLIST:1.20     Mon May 27 13:21:41 2019
+++ pkgsrc/devel/gettext/PLIST  Thu Jan 23 11:42:16 2020
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2019/05/27 13:21:41 ryoon Exp $
-${PLIST.glibc}lib/preloadable_libintl.so
+@comment $NetBSD: PLIST,v 1.21 2020/01/23 11:42:16 nia Exp $
 share/gettext/ABOUT-NLS
 share/gettext/config.rpath
 share/gettext/projects/GNOME/team-address

Index: pkgsrc/devel/gettext-tools/Makefile
diff -u pkgsrc/devel/gettext-tools/Makefile:1.39 pkgsrc/devel/gettext-tools/Makefile:1.40
--- pkgsrc/devel/gettext-tools/Makefile:1.39    Sun Nov  3 10:39:12 2019
+++ pkgsrc/devel/gettext-tools/Makefile Thu Jan 23 11:42:16 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2019/11/03 10:39:12 rillig Exp $
+# $NetBSD: Makefile,v 1.40 2020/01/23 11:42:16 nia Exp $
 
 .include "../../devel/gettext/Makefile.common"
 
@@ -41,7 +41,7 @@ PLIST_VARS+=  glibc
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Linux"
+.if !empty(GLIBC_VERSION)
 PLIST.glibc=   yes
 .endif