[pkgsrc/trunk]: pkgsrc/devel gettext: check for glibc in the right package + ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bf61607fa5fa
branches:  trunk
changeset: 409951:bf61607fa5fa
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Jan 23 11:42:16 2020 +0000

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

diffstat:

 devel/gettext-tools/Makefile |  4 ++--
 devel/gettext/Makefile       |  9 +--------
 devel/gettext/PLIST          |  3 +--
 3 files changed, 4 insertions(+), 12 deletions(-)

diffs (51 lines):

diff -r 349f431cbc47 -r bf61607fa5fa devel/gettext-tools/Makefile
--- a/devel/gettext-tools/Makefile      Thu Jan 23 10:20:44 2020 +0000
+++ b/devel/gettext-tools/Makefile      Thu Jan 23 11:42:16 2020 +0000
@@ -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 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Linux"
+.if !empty(GLIBC_VERSION)
 PLIST.glibc=   yes
 .endif
 
diff -r 349f431cbc47 -r bf61607fa5fa devel/gettext/Makefile
--- a/devel/gettext/Makefile    Thu Jan 23 10:20:44 2020 +0000
+++ b/devel/gettext/Makefile    Thu Jan 23 11:42:16 2020 +0000
@@ -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 @@
 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}
diff -r 349f431cbc47 -r bf61607fa5fa devel/gettext/PLIST
--- a/devel/gettext/PLIST       Thu Jan 23 10:20:44 2020 +0000
+++ b/devel/gettext/PLIST       Thu Jan 23 11:42:16 2020 +0000
@@ -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