Update "gettext" package to version 0.10.35.

5 files changed, 77 insertions, 74 deletions

diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index a608bd74e54..d020ac294ff 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,14 +1,18 @@
-# $NetBSD: Makefile,v 1.2 1998/09/04 12:38:53 agc Exp $
+# $NetBSD: Makefile,v 1.3 1998/12/23 00:14:16 tron Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
 #
 
-DISTNAME=	gettext-0.10
+DISTNAME=	gettext-0.10.35
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU}
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	tron@netbsd.org
 
-GNU_CONFIGURE=	yes
+CONFLICTS=	gettext-*
+
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+CONFIGURE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 INFO_FILES=	gettext.info
 
diff --git a/devel/gettext/files/md5 b/devel/gettext/files/md5
index b6a2b445404..3e60f55f104 100644
--- a/devel/gettext/files/md5
+++ b/devel/gettext/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/09/04 12:38:54 agc Exp $
+$NetBSD: md5,v 1.3 1998/12/23 00:14:16 tron Exp $
 
-MD5 (gettext-0.10.tar.gz) = e9d58ee3880feed61b2b8145b5ec519a
+MD5 (gettext-0.10.35.tar.gz) = f29d32b82217b9d89fcda66328752acc
diff --git a/devel/gettext/patches/patch-aa b/devel/gettext/patches/patch-aa
index d6748dfedab..273cfe9c7ce 100644
--- a/devel/gettext/patches/patch-aa
+++ b/devel/gettext/patches/patch-aa
@@ -1,20 +1,14 @@
-$NetBSD: patch-aa,v 1.2 1998/09/04 12:38:55 agc Exp $
+$NetBSD: patch-aa,v 1.3 1998/12/23 00:14:16 tron Exp $
 
---- config.h.in.orig	Thu Apr  2 16:41:28 1998
-+++ config.h.in	Thu Apr  2 16:41:36 1998
-@@ -6,15 +6,6 @@
- /* Default value for alignment of strings in .mo file.  */
- #define DEFAULT_ALIGNMENT 1
+--- configure.orig	Fri May  1 07:48:25 1998
++++ configure	Tue Dec 22 23:56:52 1998
+@@ -1319,9 +1319,6 @@
+   echo "$ac_t""no" 1>&6
+ fi
  
--#ifndef __P
--# if __STDC__
--#  define __P(args) args
--# else
--#  define __P(args) ()
--# endif
--#endif
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 -
--
- /* Define if using alloca.c.  */
- #undef C_ALLOCA
- 
+ # Check for any special flags to pass to ltconfig.
+ libtool_flags=
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
diff --git a/devel/gettext/patches/patch-ab b/devel/gettext/patches/patch-ab
index aa443436d34..fc56124d0e5 100644
--- a/devel/gettext/patches/patch-ab
+++ b/devel/gettext/patches/patch-ab
@@ -1,12 +1,13 @@
-$NetBSD: patch-ab,v 1.2 1998/09/04 12:38:55 agc Exp $
+$NetBSD: patch-ab,v 1.3 1998/12/23 00:14:16 tron Exp $
 
---- misc/Makefile.in.orig	Thu Apr  2 17:02:04 1998
-+++ misc/Makefile.in	Thu Apr  2 17:02:52 1998
-@@ -65,6 +65,7 @@
- 	    $(INSTALL_DATA) $$file $(lispdir)/$$file; \
- 	  done; \
- 	fi
-+	mkdir -p $(localedir)
- 	$(INSTALL_DATA) $(srcdir)/locale.alias $(localedir)/locale.alias
+--- misc/Makefile.in.orig	Fri May  1 08:47:40 1998
++++ misc/Makefile.in	Tue Dec 22 23:49:22 1998
+@@ -232,7 +232,7 @@
+ install-exec: install-binSCRIPTS
+ 	@$(NORMAL_INSTALL)
  
- uninstall:
+-install-data: install-lispLISP install-localeDATA
++install-data: install-localeDATA
+ 	@$(NORMAL_INSTALL)
+ 
+ install: install-exec install-data all
diff --git a/devel/gettext/pkg/PLIST b/devel/gettext/pkg/PLIST
index 6a13a915d79..484b2b51634 100644
--- a/devel/gettext/pkg/PLIST
+++ b/devel/gettext/pkg/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 1998/11/13 01:32:03 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.5 1998/12/23 00:14:16 tron Exp $
 bin/gettext
 bin/gettextize
 bin/msgcmp
+bin/msgcomm
 bin/msgfmt
 bin/msgmerge
 bin/msgunfmt
-bin/tupdate
 bin/xgettext
 include/libintl.h
 @unexec %D/bin/install-info --delete %D/info/gettext.info %D/info/dir
@@ -14,46 +14,50 @@ info/gettext.info-1
 info/gettext.info-2
 info/gettext.info-3
 info/gettext.info-4
+info/gettext.info-5
 @exec %D/bin/install-info %D/info/gettext.info %D/info/dir
 lib/libintl.a
-lib/locale/de/LC_MESSAGES/gettext.cat
-lib/locale/fr/LC_MESSAGES/gettext.cat
-lib/locale/no/LC_MESSAGES/gettext.cat
-lib/locale/no@nynorsk/LC_MESSAGES/gettext.cat
-lib/locale/sv/LC_MESSAGES/gettext.cat
-share/gettext/aclocal.m4
-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-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-libgettext.h
-share/gettext/intl-linux-msg.sed
-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/gettext/root-ABOUT-NLS
+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
+share/locale/sv/LC_MESSAGES/gettext.mo
+share/locale/no/LC_MESSAGES/gettext.mo
+share/locale/da/LC_MESSAGES/gettext.mo
+share/locale/es/LC_MESSAGES/gettext.mo
+share/locale/pt/LC_MESSAGES/gettext.mo
+share/locale/nl/LC_MESSAGES/gettext.mo
+share/locale/sl/LC_MESSAGES/gettext.mo
+share/locale/pl/LC_MESSAGES/gettext.mo
+share/locale/ko/LC_MESSAGES/gettext.mo
+share/locale/no@nynorsk/LC_MESSAGES/gettext.mo
 share/locale/locale.alias
-@dirrm lib/locale/de/LC_MESSAGES
-@dirrm lib/locale/de
-@dirrm lib/locale/fr/LC_MESSAGES
-@dirrm lib/locale/fr
-@dirrm lib/locale/no/LC_MESSAGES
-@dirrm lib/locale/no
-@dirrm lib/locale/no@nynorsk/LC_MESSAGES
-@dirrm lib/locale/no@nynorsk
-@dirrm lib/locale/sv/LC_MESSAGES
-@dirrm lib/locale/sv
-@dirrm lib/locale
+@dirrm share/gettext/po
+@dirrm share/gettext/intl
 @dirrm share/gettext