Change to use catgets. hier(7)-lint: install locale stuff in

share/locale instead of lib/locale.

4 files changed, 60 insertions, 14 deletions

diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 2384a6340d5..18ded025625 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/06/18 16:06:37 agc Exp $
+# $NetBSD: Makefile,v 1.8 1998/08/15 00:12:10 tv Exp $
 #
 
 DISTNAME=       tar-1.12
@@ -11,7 +11,10 @@ MAINTAINER=	packages@netbsd.org
 USE_GTEXINFO=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --program-prefix=g
+CONFIGURE_ARGS= --program-prefix=g --with-catgets
+
+post-patch:
+	@${ECHO} '' >>${WRKSRC}/po/fr.po
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/gtar.1 ${PREFIX}/man/man1/
diff --git a/archivers/gtar/patches/patch-ac b/archivers/gtar/patches/patch-ac
new file mode 100644
index 00000000000..43a23ee7101
--- /dev/null
+++ b/archivers/gtar/patches/patch-ac
@@ -0,0 +1,30 @@
+$NetBSD: patch-ac,v 1.1 1998/08/15 00:12:10 tv Exp $
+
+--- intl/xopen-msg.sed.orig	Mon Apr  7 00:28:52 1997
++++ intl/xopen-msg.sed	Fri Aug 14 19:18:49 1998
+@@ -81,6 +81,8 @@
+   G
+   s/^[^\n]*$/& /
+   s/\(.*\)\n\([0-9]*\)/\2 \1/
++# Change escaped quotes into regular quotes.
++  s/\\*"/"/g
+ # Clear flag from last substitution.
+   tb
+ # Append the next line.
+@@ -90,12 +92,16 @@
+   s/\(.*\n\)"\(.*\)"/\1\2/
+ # Yes, then branch.
+   ta
++# Comment out if no message exists.
++  s/^\([0-9]* *\n\)/$ \1/
+   P
+   D
+ # Note that `D' includes a jump to the start!!
+ # We found a continuation line.  But before printing insert '\'.
+   :a
+   s/\(.*\)\(\n.*\)/\1\\\2/
++# Change escaped quotes into regular quotes.
++  s/\\*"/"/g
+   P
+ # We cannot use the sed command `D' here
+   s/.*\n\(.*\)/\1/
diff --git a/archivers/gtar/patches/patch-ad b/archivers/gtar/patches/patch-ad
new file mode 100644
index 00000000000..cca5abde475
--- /dev/null
+++ b/archivers/gtar/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 1998/08/15 00:12:10 tv Exp $
+
+--- configure.orig	Fri Aug 14 19:35:25 1998
++++ configure	Fri Aug 14 19:35:33 1998
+@@ -4509,7 +4509,7 @@
+ 		 USE_INCLUDED_LIBINTL=yes
+ 		 CATOBJEXT=.cat
+ 		 INSTOBJEXT=.cat
+-		 DATADIRNAME=lib
++		 DATADIRNAME=share
+ 		 INTLDEPS="../intl/libintl.a"
+ 		 INTLLIBS=$INTLDEPS
+ 		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
diff --git a/archivers/gtar/pkg/PLIST b/archivers/gtar/pkg/PLIST
index 4d49f470429..cdf720abf0a 100644
--- a/archivers/gtar/pkg/PLIST
+++ b/archivers/gtar/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1998/03/04 14:57:13 tv Exp $
+@comment $NetBSD: PLIST,v 1.2 1998/08/15 00:12:10 tv Exp $
 bin/gtar
 @unexec %D/bin/install-info --delete --info-dir=%D/info %D/info/tar.info
 info/tar.info
@@ -11,14 +11,14 @@ info/tar.info-6
 info/tar.info-7
 info/tar.info-8
 @exec %D/bin/install-info --info-dir=%D/info %D/info/tar.info
-man/man1/gtar.1.gz
-share/locale/de/LC_MESSAGES/tar.mo
-share/locale/fr/LC_MESSAGES/tar.mo
-share/locale/it/LC_MESSAGES/tar.mo
-share/locale/ko/LC_MESSAGES/tar.mo
-share/locale/nl/LC_MESSAGES/tar.mo
-share/locale/no/LC_MESSAGES/tar.mo
-share/locale/pl/LC_MESSAGES/tar.mo
-share/locale/pt/LC_MESSAGES/tar.mo
-share/locale/sl/LC_MESSAGES/tar.mo
-share/locale/sv/LC_MESSAGES/tar.mo
+man/man1/gtar.1
+share/locale/de/LC_MESSAGES/tar.cat
+share/locale/fr/LC_MESSAGES/tar.cat
+share/locale/it/LC_MESSAGES/tar.cat
+share/locale/ko/LC_MESSAGES/tar.cat
+share/locale/nl/LC_MESSAGES/tar.cat
+share/locale/no/LC_MESSAGES/tar.cat
+share/locale/pl/LC_MESSAGES/tar.cat
+share/locale/pt/LC_MESSAGES/tar.cat
+share/locale/sl/LC_MESSAGES/tar.cat
+share/locale/sv/LC_MESSAGES/tar.cat