Thu Oct 20 10:22:52 2011 UTC ()
Fix conflict with other gettext packages


(adam)
diff -r1.79 -r1.80 pkgsrc/devel/gettext/Makefile
diff -r1.13 -r1.14 pkgsrc/devel/gettext/PLIST
cvs diff -r1.79 -r1.80 pkgsrc/devel/gettext/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/gettext/Makefile 2011/04/12 17:41:28 1.79
+++ pkgsrc/devel/gettext/Makefile 2011/10/20 10:22:51 1.80
@@ -1,17 +1,19 @@ @@ -1,17 +1,19 @@
1# $NetBSD: Makefile,v 1.79 2011/04/12 17:41:28 adam Exp $ 1# $NetBSD: Makefile,v 1.80 2011/10/20 10:22:51 adam Exp $
2 2
3.include "../../devel/gettext/Makefile.common" 3.include "../../devel/gettext/Makefile.common"
4 4
 5PKGREVISION= 1
 6
5COMMENT= Tools for providing messages in different languages 7COMMENT= Tools for providing messages in different languages
6LICENSE= gnu-gpl-v2 8LICENSE= gnu-gpl-v2
7 9
8DEPENDS+= gettext-m4-${PKGVERSION_NOREV}{,nb[0-9]*}:../../devel/gettext-m4 10DEPENDS+= gettext-m4-${PKGVERSION_NOREV}{,nb[0-9]*}:../../devel/gettext-m4
9DEPENDS+= gettext-tools-${PKGVERSION_NOREV}{,nb[0-9]*}:../../devel/gettext-tools 11DEPENDS+= gettext-tools-${PKGVERSION_NOREV}{,nb[0-9]*}:../../devel/gettext-tools
10BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.18 12BUILDLINK_API_DEPENDS.gettext+= gettext-lib>=0.18
11 13
12USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
13USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
14SHLIBTOOL_OVERRIDE= # empty 16SHLIBTOOL_OVERRIDE= # empty
15CONFIGURE_ARGS+= --disable-csharp 17CONFIGURE_ARGS+= --disable-csharp
16CONFIGURE_ARGS+= --without-git 18CONFIGURE_ARGS+= --without-git
17CONFIGURE_ARGS+= --without-included-gettext 19CONFIGURE_ARGS+= --without-included-gettext
@@ -20,24 +22,21 @@ CONFIGURE_ENV+= HAVE_GCJ_IN_PATH= @@ -20,24 +22,21 @@ CONFIGURE_ENV+= HAVE_GCJ_IN_PATH=
20CONFIGURE_ENV+= HAVE_JAVAC_IN_PATH= 22CONFIGURE_ENV+= HAVE_JAVAC_IN_PATH=
21CONFIGURE_ENV+= HAVE_JIKES_IN_PATH= 23CONFIGURE_ENV+= HAVE_JIKES_IN_PATH=
22CONFIGURE_ENV+= ac_cv_libexpat=no 24CONFIGURE_ENV+= ac_cv_libexpat=no
23 25
24INSTALLATION_DIRS+= lib/gettext ${PKGMANDIR}/man1 26INSTALLATION_DIRS+= lib/gettext ${PKGMANDIR}/man1
25TEST_TARGET= check 27TEST_TARGET= check
26 28
27BROKEN_GETTEXT_DETECTION= yes 29BROKEN_GETTEXT_DETECTION= yes
28USE_BUILTIN.gettext= no # force use of pkgsrc gettext-lib 30USE_BUILTIN.gettext= no # force use of pkgsrc gettext-lib
29 31
30do-install: 32do-install:
31 cd ${WRKSRC}/gettext-tools && ${MAKE} install-gettextsrcSCRIPTS DESTDIR=${DESTDIR} 33 cd ${WRKSRC}/gettext-tools && ${MAKE} install-gettextsrcSCRIPTS DESTDIR=${DESTDIR}
32 cd ${WRKSRC}/gettext-tools/projects && ${MAKE} install DESTDIR=${DESTDIR} 34 cd ${WRKSRC}/gettext-tools/projects && ${MAKE} install DESTDIR=${DESTDIR}
33 cd ${WRKSRC}/gettext-tools/misc && ${MAKE} install DESTDIR=${DESTDIR} 
34 cd ${WRKSRC}/gettext-tools/src && ${MAKE} install-tcl install-exec-local DESTDIR=${DESTDIR} 35 cd ${WRKSRC}/gettext-tools/src && ${MAKE} install-tcl install-exec-local DESTDIR=${DESTDIR}
35 cd ${WRKSRC}/gettext-runtime && ${MAKE} install-gettextsrcDATA DESTDIR=${DESTDIR} 36 cd ${WRKSRC}/gettext-runtime && ${MAKE} install-gettextsrcDATA DESTDIR=${DESTDIR}
36 cd ${WRKSRC}/gettext-tools/intl && ${MAKE} install-exec install-data DESTDIR=${DESTDIR} 37 cd ${WRKSRC}/gettext-tools/intl && ${MAKE} install-exec install-data DESTDIR=${DESTDIR}
37 cd ${WRKSRC}/gettext-tools/po && ${MAKE} installdirs-data install-data DESTDIR=${DESTDIR} 38 cd ${WRKSRC}/gettext-tools/po && ${MAKE} installdirs-data DESTDIR=${DESTDIR}
38 ${INSTALL_MAN} ${WRKSRC}/gettext-tools/man/autopoint.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 
39 ${INSTALL_MAN} ${WRKSRC}/gettext-tools/man/gettextize.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 
40 39
41.include "../../devel/gettext-lib/buildlink3.mk" 40.include "../../devel/gettext-lib/buildlink3.mk"
42.include "../../devel/gettext-asprintf/buildlink3.mk" 41.include "../../devel/gettext-asprintf/buildlink3.mk"
43.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/devel/gettext/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/gettext/PLIST 2011/04/12 17:41:28 1.13
+++ pkgsrc/devel/gettext/PLIST 2011/10/20 10:22:51 1.14
@@ -1,24 +1,19 @@ @@ -1,24 +1,19 @@
1@comment $NetBSD: PLIST,v 1.13 2011/04/12 17:41:28 adam Exp $ 1@comment $NetBSD: PLIST,v 1.14 2011/10/20 10:22:51 adam Exp $
2bin/autopoint 
3bin/gettextize 
4lib/gettext/hostname 2lib/gettext/hostname
5lib/gettext/project-id 3lib/gettext/project-id
6lib/gettext/urlget 4lib/gettext/urlget
7lib/gettext/user-email 5lib/gettext/user-email
8man/man1/autopoint.1 
9man/man1/gettextize.1 
10share/gettext/ABOUT-NLS 6share/gettext/ABOUT-NLS
11share/gettext/archive.dir.tar.gz 
12share/gettext/config.rpath 7share/gettext/config.rpath
13share/gettext/intl/COPYING.LIB-2.0 8share/gettext/intl/COPYING.LIB-2.0
14share/gettext/intl/COPYING.LIB-2.1 9share/gettext/intl/COPYING.LIB-2.1
15share/gettext/intl/ChangeLog 10share/gettext/intl/ChangeLog
16share/gettext/intl/Makefile.in 11share/gettext/intl/Makefile.in
17share/gettext/intl/VERSION 12share/gettext/intl/VERSION
18share/gettext/intl/bindtextdom.c 13share/gettext/intl/bindtextdom.c
19share/gettext/intl/config.charset 14share/gettext/intl/config.charset
20share/gettext/intl/dcgettext.c 15share/gettext/intl/dcgettext.c
21share/gettext/intl/dcigettext.c 16share/gettext/intl/dcigettext.c
22share/gettext/intl/dcngettext.c 17share/gettext/intl/dcngettext.c
23share/gettext/intl/dgettext.c 18share/gettext/intl/dgettext.c
24share/gettext/intl/dngettext.c 19share/gettext/intl/dngettext.c
@@ -66,35 +61,26 @@ share/gettext/intl/relocatable.c @@ -66,35 +61,26 @@ share/gettext/intl/relocatable.c
66share/gettext/intl/relocatable.h 61share/gettext/intl/relocatable.h
67share/gettext/intl/setlocale.c 62share/gettext/intl/setlocale.c
68share/gettext/intl/textdomain.c 63share/gettext/intl/textdomain.c
69share/gettext/intl/threadlib.c 64share/gettext/intl/threadlib.c
70share/gettext/intl/tsearch.c 65share/gettext/intl/tsearch.c
71share/gettext/intl/tsearch.h 66share/gettext/intl/tsearch.h
72share/gettext/intl/vasnprintf.c 67share/gettext/intl/vasnprintf.c
73share/gettext/intl/vasnprintf.h 68share/gettext/intl/vasnprintf.h
74share/gettext/intl/vasnwprintf.h 69share/gettext/intl/vasnwprintf.h
75share/gettext/intl/version.c 70share/gettext/intl/version.c
76share/gettext/intl/wprintf-parse.h 71share/gettext/intl/wprintf-parse.h
77share/gettext/intl/xsize.h 72share/gettext/intl/xsize.h
78share/gettext/msgunfmt.tcl 73share/gettext/msgunfmt.tcl
79share/gettext/po/Makefile.in.in 
80share/gettext/po/Makevars.template 
81share/gettext/po/Rules-quot 
82share/gettext/po/boldquot.sed 
83share/gettext/po/en@boldquot.header 
84share/gettext/po/en@quot.header 
85share/gettext/po/insert-header.sin 
86share/gettext/po/quot.sed 
87share/gettext/po/remove-potcdate.sin 
88share/gettext/projects/GNOME/team-address 74share/gettext/projects/GNOME/team-address
89share/gettext/projects/GNOME/teams.html 75share/gettext/projects/GNOME/teams.html
90share/gettext/projects/GNOME/teams.url 76share/gettext/projects/GNOME/teams.url
91share/gettext/projects/GNOME/trigger 77share/gettext/projects/GNOME/trigger
92share/gettext/projects/KDE/team-address 78share/gettext/projects/KDE/team-address
93share/gettext/projects/KDE/teams.html 79share/gettext/projects/KDE/teams.html
94share/gettext/projects/KDE/teams.url 80share/gettext/projects/KDE/teams.url
95share/gettext/projects/KDE/trigger 81share/gettext/projects/KDE/trigger
96share/gettext/projects/TP/team-address 82share/gettext/projects/TP/team-address
97share/gettext/projects/TP/teams.html 83share/gettext/projects/TP/teams.html
98share/gettext/projects/TP/teams.url 84share/gettext/projects/TP/teams.url
99share/gettext/projects/TP/trigger 85share/gettext/projects/TP/trigger
100share/gettext/projects/index 86share/gettext/projects/index