Mon Jun 26 21:22:49 2017 UTC ()
Introduce a PLIST variable for preloadable_libintl.so. While that file
is installed only for glibc systems, approximate it as Linux for now.

Reported by Jason Bacon.


(joerg)
diff -r1.83 -r1.84 pkgsrc/devel/gettext/Makefile
diff -r1.18 -r1.19 pkgsrc/devel/gettext/PLIST
cvs diff -r1.83 -r1.84 pkgsrc/devel/gettext/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/gettext/Makefile 2014/09/01 17:59:12 1.83
+++ pkgsrc/devel/gettext/Makefile 2017/06/26 21:22:49 1.84
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.83 2014/09/01 17:59:12 tron Exp $ 1# $NetBSD: Makefile,v 1.84 2017/06/26 21:22:49 joerg Exp $
2 2
3.include "../../devel/gettext/Makefile.common" 3.include "../../devel/gettext/Makefile.common"
4 4
5COMMENT= Tools for providing messages in different languages 5COMMENT= Tools for providing messages in different languages
6 6
7DEPENDS+= gettext-m4-${PKGVERSION_NOREV}{,nb[0-9]*}:../../devel/gettext-m4 7DEPENDS+= gettext-m4-${PKGVERSION_NOREV}{,nb[0-9]*}:../../devel/gettext-m4
8DEPENDS+= gettext-tools-${PKGVERSION_NOREV}{,nb[0-9]*}:../../devel/gettext-tools 8DEPENDS+= gettext-tools-${PKGVERSION_NOREV}{,nb[0-9]*}:../../devel/gettext-tools
9BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.18 9BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.18
10 10
11USE_LANGUAGES= c c++ 11USE_LANGUAGES= c c++
12USE_PKGLOCALEDIR= yes 12USE_PKGLOCALEDIR= yes
13SHLIBTOOL_OVERRIDE= # empty 13SHLIBTOOL_OVERRIDE= # empty
14CONFIGURE_ARGS+= --disable-csharp 14CONFIGURE_ARGS+= --disable-csharp
@@ -16,23 +16,30 @@ CONFIGURE_ARGS+= --without-git @@ -16,23 +16,30 @@ CONFIGURE_ARGS+= --without-git
16CONFIGURE_ARGS+= --without-included-gettext 16CONFIGURE_ARGS+= --without-included-gettext
17CONFIGURE_ENV+= GCJ= ac_cv_prog_GCJ= 17CONFIGURE_ENV+= GCJ= ac_cv_prog_GCJ=
18CONFIGURE_ENV+= HAVE_GCJ_IN_PATH= 18CONFIGURE_ENV+= HAVE_GCJ_IN_PATH=
19CONFIGURE_ENV+= HAVE_JAVAC_IN_PATH= 19CONFIGURE_ENV+= HAVE_JAVAC_IN_PATH=
20CONFIGURE_ENV+= HAVE_JIKES_IN_PATH= 20CONFIGURE_ENV+= HAVE_JIKES_IN_PATH=
21CONFIGURE_ENV+= ac_cv_libexpat=no 21CONFIGURE_ENV+= ac_cv_libexpat=no
22 22
23INSTALLATION_DIRS+= lib/gettext ${PKGMANDIR}/man1 23INSTALLATION_DIRS+= lib/gettext ${PKGMANDIR}/man1
24TEST_TARGET= check 24TEST_TARGET= check
25 25
26BROKEN_GETTEXT_DETECTION= yes 26BROKEN_GETTEXT_DETECTION= yes
27USE_BUILTIN.gettext= no # force use of pkgsrc gettext-lib 27USE_BUILTIN.gettext= no # force use of pkgsrc gettext-lib
28 28
 29.include "../../mk/bsd.prefs.mk"
 30
 31PLIST_VARS+= glibc
 32.if ${OPSYS} == "Linux"
 33PLIST.glibc= yes
 34.endif
 35
29do-install: 36do-install:
30 cd ${WRKSRC}/gettext-tools && ${MAKE} install-gettextsrcSCRIPTS DESTDIR=${DESTDIR} 37 cd ${WRKSRC}/gettext-tools && ${MAKE} install-gettextsrcSCRIPTS DESTDIR=${DESTDIR}
31 cd ${WRKSRC}/gettext-tools/projects && ${MAKE} install DESTDIR=${DESTDIR} 38 cd ${WRKSRC}/gettext-tools/projects && ${MAKE} install DESTDIR=${DESTDIR}
32 cd ${WRKSRC}/gettext-runtime && ${MAKE} install-gettextsrcDATA DESTDIR=${DESTDIR} 39 cd ${WRKSRC}/gettext-runtime && ${MAKE} install-gettextsrcDATA DESTDIR=${DESTDIR}
33 cd ${WRKSRC}/gettext-tools/intl && ${MAKE} install-exec install-data DESTDIR=${DESTDIR} 40 cd ${WRKSRC}/gettext-tools/intl && ${MAKE} install-exec install-data DESTDIR=${DESTDIR}
34 cd ${WRKSRC}/gettext-tools/po && ${MAKE} installdirs-data DESTDIR=${DESTDIR} 41 cd ${WRKSRC}/gettext-tools/po && ${MAKE} installdirs-data DESTDIR=${DESTDIR}
35 42
36.include "../../devel/gettext-lib/buildlink3.mk" 43.include "../../devel/gettext-lib/buildlink3.mk"
37.include "../../devel/gettext-asprintf/buildlink3.mk" 44.include "../../devel/gettext-asprintf/buildlink3.mk"
38.include "../../mk/bsd.pkg.mk" 45.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/devel/gettext/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/gettext/PLIST 2014/08/31 10:24:02 1.18
+++ pkgsrc/devel/gettext/PLIST 2017/06/26 21:22:49 1.19
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1@comment $NetBSD: PLIST,v 1.18 2014/08/31 10:24:02 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.19 2017/06/26 21:22:49 joerg Exp $
 2${PLIST.glibc}lib/preloadable_libintl.so
2share/gettext/ABOUT-NLS 3share/gettext/ABOUT-NLS
3share/gettext/config.rpath 4share/gettext/config.rpath
4share/gettext/intl/COPYING.LIB 5share/gettext/intl/COPYING.LIB
5share/gettext/intl/Makefile.in 6share/gettext/intl/Makefile.in
6share/gettext/intl/VERSION 7share/gettext/intl/VERSION
7share/gettext/intl/bindtextdom.c 8share/gettext/intl/bindtextdom.c
8share/gettext/intl/config.charset 9share/gettext/intl/config.charset
9share/gettext/intl/dcgettext.c 10share/gettext/intl/dcgettext.c
10share/gettext/intl/dcigettext.c 11share/gettext/intl/dcigettext.c
11share/gettext/intl/dcngettext.c 12share/gettext/intl/dcngettext.c
12share/gettext/intl/dgettext.c 13share/gettext/intl/dgettext.c
13share/gettext/intl/dngettext.c 14share/gettext/intl/dngettext.c
14share/gettext/intl/eval-plural.h 15share/gettext/intl/eval-plural.h