diff options
author | nia <nia@pkgsrc.org> | 2020-01-23 11:42:16 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2020-01-23 11:42:16 +0000 |
commit | b69823fda3d72afa9ad586d56a45c4c5a2c4ebcc (patch) | |
tree | a6440ba5ed259c1198e9240c5bf5f46b2ccbb7cb /devel | |
parent | a81207937b496ab3ea1b872a97b1012384019e14 (diff) | |
download | pkgsrc-b69823fda3d72afa9ad586d56a45c4c5a2c4ebcc.tar.gz |
gettext: check for glibc in the right package + check for glibc, not Linux
Diffstat (limited to 'devel')
-rw-r--r-- | devel/gettext-tools/Makefile | 4 | ||||
-rw-r--r-- | devel/gettext/Makefile | 9 | ||||
-rw-r--r-- | devel/gettext/PLIST | 3 |
3 files changed, 4 insertions, 12 deletions
diff --git a/devel/gettext-tools/Makefile b/devel/gettext-tools/Makefile index c72372a9d1a..2bd21131315 100644 --- a/devel/gettext-tools/Makefile +++ b/devel/gettext-tools/Makefile @@ -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 diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index a11ca90ea05..7255f742d4a 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -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} diff --git a/devel/gettext/PLIST b/devel/gettext/PLIST index 342c7f46d65..d6dd9f259d0 100644 --- a/devel/gettext/PLIST +++ b/devel/gettext/PLIST @@ -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 |