split devel/gettext into devel/gettext and devel/gettext-lib.

TODO: gettext-lib can be omitted if we have /usr/lib/libintl.a.

7 files changed, 115 insertions, 32 deletions

diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 9bbadfa3fff..4e68dd0ef6f 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/10/31 11:56:54 itojun Exp $
+# $NetBSD: Makefile,v 1.17 2000/10/31 17:06:18 itojun Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
 #
 
@@ -9,11 +9,17 @@ MASTER_SITES=		${MASTER_SITE_GNU:=gettext/}
 
 MAINTAINER=		packages@netbsd.org
 
+DEPENDS+=		gettext-lib-0.10.35nb1:../../devel/gettext-lib
+
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-CONFIGURE_ARGS+=	--with-included-gettext
 
 INFO_FILES=		gettext.info
 
+post-patch:
+	${RM} -f ${WRKSRC}/intl/libgettext.h
+	${RM} -f ${WRKSRC}/intl/libintl.h
+	${CP} ${FILESDIR}/libgettext.h ${WRKSRC}/intl
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gettext/files/libgettext.h b/devel/gettext/files/libgettext.h
new file mode 100644
index 00000000000..98fb7327d23
--- /dev/null
+++ b/devel/gettext/files/libgettext.h
@@ -0,0 +1,7 @@
+#include <libintl.h>
+
+#define gettext__	gettext
+#define dgettext__	dgettext
+#define dcgettext__	dcgettext
+#define textdomain__	textdomain
+#define bindtextdomain__	bindtextdomain
diff --git a/devel/gettext/files/patch-sum b/devel/gettext/files/patch-sum
index 3adca8466f1..c7669b99657 100644
--- a/devel/gettext/files/patch-sum
+++ b/devel/gettext/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 2000/06/30 17:07:35 danw Exp $
+$NetBSD: patch-sum,v 1.3 2000/10/31 17:06:18 itojun Exp $
 
 MD5 (patch-aa) = 0592cc9a5a42e25bfbe17840082ca9df
 MD5 (patch-ab) = 85ec64fb316f252bc687b1cfe94a3c25
@@ -8,3 +8,6 @@ MD5 (patch-ae) = ef09df0e830bc5ec50cff3d47cbbebe0
 MD5 (patch-af) = 7dbf6692ba7a390a16f566953ef6bd64
 MD5 (patch-ag) = b4f2ed4e07367dd7d16a94947380fbb9
 MD5 (patch-ah) = 7a05abc62bbe4b1af6121f998e4b1572
+MD5 (patch-ai) = 527848020efded5b14d606dae792e4dc
+MD5 (patch-aj) = 285e0147ca68d1f796f2078c820d7619
+MD5 (patch-ak) = cbcf98066a450b227cbea9d62c211595
diff --git a/devel/gettext/patches/patch-ai b/devel/gettext/patches/patch-ai
new file mode 100644
index 00000000000..473b39a007e
--- /dev/null
+++ b/devel/gettext/patches/patch-ai
@@ -0,0 +1,63 @@
+$NetBSD: patch-ai,v 1.1 2000/10/31 17:06:18 itojun Exp $
+
+use already-installed libintl, not in-tree libintl
+
+--- src/Makefile.in.orig	Fri May  1 15:47:25 1998
++++ src/Makefile.in	Wed Nov  1 01:25:11 2000
+@@ -108,7 +108,7 @@
+ 
+ INCLUDES = -I$(srcdir) -I.. -I$(top_srcdir)/lib -I../intl -I$(top_srcdir)/intl
+ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+-LDADD = ../lib/libnlsut.a ../intl/libintl.$la
++LDADD = ../lib/libnlsut.a 
+ 
+ SED = sed
+ YACC = @YACC@
+@@ -136,39 +136,39 @@
+ 
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lintl
+ gettext_OBJECTS =  gettextp.o
+ gettext_LDADD = $(LDADD)
+-gettext_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.$la
++gettext_DEPENDENCIES =  ../lib/libnlsut.a 
+ gettext_LDFLAGS = 
+ msgcmp_OBJECTS =  message.o msgcmp.o open-po.o po-gram.gen.o \
+ po-hash.gen.o po-lex.o po.o str-list.o dir-list.o
+ msgcmp_LDADD = $(LDADD)
+-msgcmp_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.$la
++msgcmp_DEPENDENCIES =  ../lib/libnlsut.a 
+ msgcmp_LDFLAGS = 
+ msgfmt_OBJECTS =  msgfmt.o open-po.o po-gram.gen.o po-hash.gen.o \
+ po-lex.o po.o str-list.o message.o dir-list.o
+ msgfmt_LDADD = $(LDADD)
+-msgfmt_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.$la
++msgfmt_DEPENDENCIES =  ../lib/libnlsut.a 
+ msgfmt_LDFLAGS = 
+ msgmerge_OBJECTS =  message.o msgmerge.o open-po.o po-gram.gen.o \
+ po-hash.gen.o po-lex.o po.o str-list.o dir-list.o
+ msgmerge_LDADD = $(LDADD)
+-msgmerge_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.$la
++msgmerge_DEPENDENCIES =  ../lib/libnlsut.a 
+ msgmerge_LDFLAGS = 
+ msgunfmt_OBJECTS =  message.o msgunfmt.o str-list.o
+ msgunfmt_LDADD = $(LDADD)
+-msgunfmt_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.$la
++msgunfmt_DEPENDENCIES =  ../lib/libnlsut.a 
+ msgunfmt_LDFLAGS = 
+ xgettext_OBJECTS =  message.o open-po.o po-gram.gen.o po-hash.gen.o \
+ po-lex.o po.o str-list.o xget-lex.o xgettext.o dir-list.o
+ xgettext_LDADD = $(LDADD)
+-xgettext_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.$la
++xgettext_DEPENDENCIES =  ../lib/libnlsut.a 
+ xgettext_LDFLAGS = 
+ msgcomm_OBJECTS =  msgcomm.o message.o po-gram.gen.o po-hash.gen.o \
+ po-lex.o open-po.o po.o str-list.o dir-list.o
+ msgcomm_LDADD = $(LDADD)
+-msgcomm_DEPENDENCIES =  ../lib/libnlsut.a ../intl/libintl.$la
++msgcomm_DEPENDENCIES =  ../lib/libnlsut.a 
+ msgcomm_LDFLAGS = 
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
diff --git a/devel/gettext/patches/patch-aj b/devel/gettext/patches/patch-aj
new file mode 100644
index 00000000000..32caf0b6923
--- /dev/null
+++ b/devel/gettext/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2000/10/31 17:06:18 itojun Exp $
+
+--- Makefile.in-	Wed Nov  1 01:32:40 2000
++++ Makefile.in	Wed Nov  1 01:32:49 2000
+@@ -103,7 +103,7 @@
+ gettextsrc_DATA = ABOUT-NLS
+ 
+ EXTRA_DIST = BUGS DISCLAIM README.gemtext
+-SUBDIRS = doc lib intl src po m4 misc tests
++SUBDIRS = doc lib src po m4 misc tests
+ 
+ DISTCLEANFILES = intl/libintl.h
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/devel/gettext/patches/patch-ak b/devel/gettext/patches/patch-ak
new file mode 100644
index 00000000000..a148709a9f4
--- /dev/null
+++ b/devel/gettext/patches/patch-ak
@@ -0,0 +1,19 @@
+$NetBSD: patch-ak,v 1.1 2000/10/31 17:06:19 itojun Exp $
+
+use locally-built msgfmt.
+
+--- po/Makefile.in.in-	Wed Nov  1 01:46:43 2000
++++ po/Makefile.in.in	Wed Nov  1 01:47:00 2000
+@@ -30,9 +30,9 @@
+ 
+ CC = @CC@
+ GENCAT = @GENCAT@
+-GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
+-MSGFMT = @MSGFMT@
+-XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
++GMSGFMT = PATH=../src:$$PATH msgfmt
++MSGFMT = PATH=../src:$$PATH msgfmt
++XGETTEXT = PATH=../src:$$PATH xgettext
+ MSGMERGE = PATH=../src:$$PATH msgmerge
+ 
+ DEFS = @DEFS@
diff --git a/devel/gettext/pkg/PLIST b/devel/gettext/pkg/PLIST
index 93019325b0e..9c9d06b38da 100644
--- a/devel/gettext/pkg/PLIST
+++ b/devel/gettext/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2000/06/30 17:07:36 danw Exp $
+@comment $NetBSD: PLIST,v 1.9 2000/10/31 17:06:19 itojun Exp $
 bin/gettext
 bin/gettextize
 bin/msgcmp
@@ -7,7 +7,6 @@ bin/msgfmt
 bin/msgmerge
 bin/msgunfmt
 bin/xgettext
-include/libintl.h
 @unexec install-info --delete %D/info/gettext.info %D/info/dir
 info/gettext.info
 info/gettext.info-1
@@ -16,36 +15,10 @@ info/gettext.info-3
 info/gettext.info-4
 info/gettext.info-5
 @exec install-info %D/info/gettext.info %D/info/dir
-lib/libintl.a
-lib/libintl.la
-lib/libintl.so.1.0
 share/aclocal/gettext.m4
 share/aclocal/lcmessage.m4
 share/aclocal/progtest.m4
 share/gettext/ABOUT-NLS
-share/gettext/intl/ChangeLog
-share/gettext/intl/Makefile.in
-share/gettext/intl/VERSION
-share/gettext/intl/bindtextdom.c
-share/gettext/intl/cat-compat.c
-share/gettext/intl/dcgettext.c
-share/gettext/intl/dgettext.c
-share/gettext/intl/explodename.c
-share/gettext/intl/finddomain.c
-share/gettext/intl/gettext.c
-share/gettext/intl/gettext.h
-share/gettext/intl/gettextP.h
-share/gettext/intl/hash-string.h
-share/gettext/intl/intl-compat.c
-share/gettext/intl/l10nflist.c
-share/gettext/intl/libgettext.h
-share/gettext/intl/linux-msg.sed
-share/gettext/intl/loadinfo.h
-share/gettext/intl/loadmsgcat.c
-share/gettext/intl/localealias.c
-share/gettext/intl/po2tbl.sed.in
-share/gettext/intl/textdomain.c
-share/gettext/intl/xopen-msg.sed
 share/gettext/po/Makefile.in.in
 share/locale/de/LC_MESSAGES/gettext.mo
 share/locale/fr/LC_MESSAGES/gettext.mo
@@ -61,5 +34,4 @@ share/locale/ko/LC_MESSAGES/gettext.mo
 share/locale/no@nynorsk/LC_MESSAGES/gettext.mo
 share/locale/locale.alias
 @dirrm share/gettext/po
-@dirrm share/gettext/intl
 @dirrm share/gettext