move installation of gettextize files to devel/gettext.

repair gettext build on fresh install.  re-introduce gettextize file
installation.  reported by: mycroft

6 files changed, 41 insertions, 40 deletions

diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile
index e815631732f..612d90d9859 100644
--- a/devel/gettext-lib/Makefile
+++ b/devel/gettext-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/11/16 02:40:13 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2000/11/29 05:05:29 itojun Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
 #
 
@@ -17,6 +17,7 @@ CONFIGURE_ARGS+=	--with-included-gettext
 
 PATCHDIR=		${.CURDIR}/../../devel/gettext/patches
 PATCH_SUM_FILE=		${.CURDIR}/../../devel/gettext/files/patch-sum
+INSTALL_TARGET=		install-exec
 
 makepatchsum::
 
diff --git a/devel/gettext-lib/pkg/PLIST b/devel/gettext-lib/pkg/PLIST
index a9e34d7a39f..4b132871321 100644
--- a/devel/gettext-lib/pkg/PLIST
+++ b/devel/gettext-lib/pkg/PLIST
@@ -1,30 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2000/10/31 17:06:20 itojun Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/11/29 05:05:30 itojun Exp $
 include/libintl.h
 lib/libintl.a
 lib/libintl.la
 lib/libintl.so.1.0
-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
-@dirrm share/gettext/intl
-@dirrm share/gettext
diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index cba62df802a..6a7749da2df 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2000/11/29 04:34:48 mycroft Exp $
+# $NetBSD: Makefile,v 1.24 2000/11/29 05:05:28 itojun Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
 #
 
@@ -27,4 +27,7 @@ post-patch:
 post-configure:
 	${RM} -f ${WRKSRC}/intl/libintl.h
 
+post-install:
+	cd ${WRKSRC}/intl; ${MAKE_PROGRAM} install-data
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gettext/files/patch-sum b/devel/gettext/files/patch-sum
index c7669b99657..2e87651ef47 100644
--- a/devel/gettext/files/patch-sum
+++ b/devel/gettext/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.3 2000/10/31 17:06:18 itojun Exp $
+$NetBSD: patch-sum,v 1.4 2000/11/29 05:05:29 itojun Exp $
 
 MD5 (patch-aa) = 0592cc9a5a42e25bfbe17840082ca9df
 MD5 (patch-ab) = 85ec64fb316f252bc687b1cfe94a3c25
-MD5 (patch-ac) = 18c7239ccb1fbe6a5d431a6788d6bdab
+MD5 (patch-ac) = 96c82660a763af6ae0cd63b15c451ad4
 MD5 (patch-ad) = 34286240637175a6774fda926fb93407
 MD5 (patch-ae) = ef09df0e830bc5ec50cff3d47cbbebe0
 MD5 (patch-af) = 7dbf6692ba7a390a16f566953ef6bd64
diff --git a/devel/gettext/patches/patch-ac b/devel/gettext/patches/patch-ac
index 05103fce2d2..a98280b519a 100644
--- a/devel/gettext/patches/patch-ac
+++ b/devel/gettext/patches/patch-ac
@@ -1,15 +1,14 @@
-$NetBSD: patch-ac,v 1.1 2000/06/30 17:07:36 danw Exp $
+$NetBSD: patch-ac,v 1.2 2000/11/29 05:05:29 itojun Exp $
 
-Fix for shared libintl
-
---- intl/Makefile.in.orig	Fri Jun 23 03:38:59 2000
-+++ intl/Makefile.in	Fri Jun 23 03:54:52 2000
-@@ -119,7 +119,7 @@
- 	    $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
- 	  fi; \
+--- intl/Makefile.in.orig	Mon Apr 27 14:53:18 1998
++++ intl/Makefile.in	Tue Nov 28 21:02:03 2000
+@@ -121,3 +121,3 @@
  	  $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
 -	  $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
 +	  $(LIBTOOL) install -c libintl.la $(libdir); \
  	else \
- 	  : ; \
+@@ -125,3 +125,3 @@
  	fi
+-install-data: all
++install-data:
+ 	if test "$(PACKAGE)" = "gettext"; then \
diff --git a/devel/gettext/pkg/PLIST b/devel/gettext/pkg/PLIST
index deedcd88471..30bfa110097 100644
--- a/devel/gettext/pkg/PLIST
+++ b/devel/gettext/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2000/11/29 04:41:02 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.12 2000/11/29 05:05:29 itojun Exp $
 bin/gettext
 bin/gettextize
 bin/msgcmp
@@ -19,6 +19,29 @@ 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/da/LC_MESSAGES/gettext.mo
 share/locale/de/LC_MESSAGES/gettext.mo