Fix pkg/PLIST, and merge all info file.

4 files changed, 67 insertions, 79 deletions

diff --git a/devel/gettext/files/patch-ad b/devel/gettext/files/patch-ad
index eea8e9c9deab..3a0c6f4c39f6 100644
--- a/devel/gettext/files/patch-ad
+++ b/devel/gettext/files/patch-ad
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Fri May  1 15:47:40 1998
-+++ misc/Makefile.in	Fri Aug  7 23:13:23 1998
+--- misc/Makefile.in.orig	Fri May  1 14:47:40 1998
++++ misc/Makefile.in	Thu Dec  3 20:11:52 1998
 @@ -164,10 +164,8 @@
  	@list='$(lisp_LISP)'; for p in $$list; do \
  	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
@@ -11,3 +11,14 @@
  	  else : ; fi; \
  	done
  
+--- doc/Makefile.in.orig	Thu Dec  3 20:12:35 1998
++++ doc/Makefile.in	Thu Dec  3 20:12:51 1998
+@@ -79,7 +79,7 @@
+ LIBOBJS = @LIBOBJS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = @MAKEINFO@ --no-split
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MSGFMT = @MSGFMT@
+ NM = @NM@
diff --git a/devel/gettext/files/patch-ae b/devel/gettext/files/patch-ae
index f52804bfa80c..29dad1ad6f74 100644
--- a/devel/gettext/files/patch-ae
+++ b/devel/gettext/files/patch-ae
@@ -1,6 +1,5 @@
-diff -uNr ../gg/configure ./configure
---- ../gg/configure	Fri May  1 14:48:25 1998
-+++ ./configure	Mon Jul 20 12:49:23 1998
+--- configure.orig	Fri May  1 13:48:25 1998
++++ configure	Thu Dec  3 20:11:52 1998
 @@ -4004,7 +4004,7 @@
    ;;
  esac
diff --git a/devel/gettext/files/patch-af b/devel/gettext/files/patch-af
index 10096b53055b..7da1ef001b32 100644
--- a/devel/gettext/files/patch-af
+++ b/devel/gettext/files/patch-af
@@ -1,6 +1,5 @@
-diff -uNr ../gg/misc/locale.alias ./misc/locale.alias
---- ../gg/misc/locale.alias	Sun Oct 20 00:40:54 1996
-+++ ./misc/locale.alias	Mon Jul 20 12:49:42 1998
+--- misc/locale.alias.orig	Sat Oct 19 23:40:54 1996
++++ misc/locale.alias	Thu Dec  3 20:11:52 1998
 @@ -40,6 +40,7 @@
  icelandic       is_IS.ISO-8859-1
  italian         it_CH.ISO-8859-1
@@ -9,4 +8,3 @@ diff -uNr ../gg/misc/locale.alias ./misc/locale.alias
  norwegian       no_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
  portuguese      pt_PT.ISO-8859-1
-
diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist
index 6506cdbf75a0..4899dd242253 100644
--- a/devel/gettext/pkg-plist
+++ b/devel/gettext/pkg-plist
@@ -1,104 +1,84 @@
 bin/gettext
+bin/gettextize
 bin/msgcmp
+bin/msgcomm
 bin/msgfmt
 bin/msgmerge
 bin/msgunfmt
 bin/xgettext
-bin/msgcomm
-bin/gettextize
 @unexec install-info --delete %D/info/gettext.info %D/info/dir
 info/gettext.info
-info/gettext.info-1
-info/gettext.info-2
-info/gettext.info-3
-info/gettext.info-4
-info/gettext.info-5
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/gettext.info %D/info/dir
 include/libintl.h
 lib/libintl.a
-share/locale/no/LC_MESSAGES/gettext.mo
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
+share/aclocal/gettext.m4
+share/aclocal/lcmessage.m4
+share/aclocal/progtest.m4
+share/gettext/ABOUT-NLS
+share/gettext/po-mode.el
+share/gettext/po/Makefile.in.in
+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/xopen-msg.sed
+share/gettext/intl/textdomain.c
 share/locale/da/LC_MESSAGES/gettext.mo
+share/locale/de/LC_MESSAGES/gettext.mo
+share/locale/es/LC_MESSAGES/gettext.mo
+share/locale/fr/LC_MESSAGES/gettext.mo
+share/locale/ko/LC_MESSAGES/gettext.mo
+share/locale/nl/LC_MESSAGES/gettext.mo
+share/locale/no/LC_MESSAGES/gettext.mo
+share/locale/no@nynorsk/LC_MESSAGES/gettext.mo
+share/locale/pl/LC_MESSAGES/gettext.mo
+share/locale/pt/LC_MESSAGES/gettext.mo
+share/locale/sl/LC_MESSAGES/gettext.mo
+share/locale/sv/LC_MESSAGES/gettext.mo
+share/locale/locale.alias
+@dirrm share/gettext/intl
+@dirrm share/gettext/po
+@dirrm share/gettext
 @dirrm share/locale/da/LC_MESSAGES
 @dirrm share/locale/da
-share/locale/de/LC_MESSAGES/gettext.mo
 @dirrm share/locale/de/LC_MESSAGES
 @dirrm share/locale/de
-share/locale/es/LC_MESSAGES/gettext.mo
 @dirrm share/locale/es/LC_MESSAGES
 @dirrm share/locale/es
-share/locale/fr/LC_MESSAGES/gettext.mo
 @dirrm share/locale/fr/LC_MESSAGES
 @dirrm share/locale/fr
-share/locale/ko/LC_MESSAGES/gettext.mo
 @dirrm share/locale/ko/LC_MESSAGES
 @dirrm share/locale/ko
-share/locale/nl/LC_MESSAGES/gettext.mo
 @dirrm share/locale/nl/LC_MESSAGES
 @dirrm share/locale/nl
-share/locale/pl/LC_MESSAGES/gettext.mo
+@dirrm share/locale/no/LC_MESSAGES
+@dirrm share/locale/no
+@dirrm share/locale/no@nynorsk/LC_MESSAGES
+@dirrm share/locale/no@nynorsk
 @dirrm share/locale/pl/LC_MESSAGES
 @dirrm share/locale/pl
-share/locale/pt/LC_MESSAGES/gettext.mo
 @dirrm share/locale/pt/LC_MESSAGES
 @dirrm share/locale/pt
-share/locale/sl/LC_MESSAGES/gettext.mo
 @dirrm share/locale/sl/LC_MESSAGES
 @dirrm share/locale/sl
-share/locale/sv/LC_MESSAGES/gettext.mo
 @dirrm share/locale/sv/LC_MESSAGES
 @dirrm share/locale/sv
-share/locale/no@nynorsk/LC_MESSAGES/gettext.mo
-@dirrm share/locale/no@nynorsk/LC_MESSAGES
-@dirrm share/locale/no@nynorsk
-@exec mkdir -p %D/share/locale/ca/LC_MESSAGES
-@dirrm share/locale/ca/LC_MESSAGES
-@dirrm share/locale/ca
-@exec mkdir -p %D/share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
-@exec mkdir -p %D/share/locale/it/LC_MESSAGES
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
-@exec mkdir -p %D/share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
-@exec mkdir -p %D/share/locale/tr/LC_MESSAGES
-@dirrm share/locale/tr/LC_MESSAGES
-@dirrm share/locale/tr
-share/locale/locale.alias
 @dirrm share/locale
-share/gettext/intl/VERSION
-share/gettext/intl/ChangeLog
-share/gettext/intl/Makefile.in
-share/gettext/intl/linux-msg.sed
-share/gettext/intl/po2tbl.sed.in
-share/gettext/intl/xopen-msg.sed
-share/gettext/intl/gettext.h
-share/gettext/intl/gettextP.h
-share/gettext/intl/hash-string.h
-share/gettext/intl/libgettext.h
-share/gettext/intl/loadinfo.h
-share/gettext/intl/bindtextdom.c
-share/gettext/intl/dcgettext.c
-share/gettext/intl/dgettext.c
-share/gettext/intl/gettext.c
-share/gettext/intl/finddomain.c
-share/gettext/intl/loadmsgcat.c
-share/gettext/intl/localealias.c
-share/gettext/intl/textdomain.c
-share/gettext/intl/l10nflist.c
-share/gettext/intl/explodename.c
-share/gettext/intl/intl-compat.c
-share/gettext/intl/cat-compat.c
-share/gettext/po/Makefile.in.in
-share/gettext/ABOUT-NLS
-share/gettext/po-mode.el
-@dirrm share/gettext/intl
-@dirrm share/gettext/po
-@dirrm share/gettext
-share/aclocal/gettext.m4
-share/aclocal/lcmessage.m4
-share/aclocal/progtest.m4