Make $(localdir) and $(gnulocaledir) equal so that the locale files

don't get installed to both ${PREFIX}/lib/locale and ${PREFIX}/share/locale.
This fixes the i386 bulk build leftovers.

4 files changed, 56 insertions, 7 deletions

diff --git a/archivers/gsharutils/distinfo b/archivers/gsharutils/distinfo
index 08a31957bf5..e478c41115c 100644
--- a/archivers/gsharutils/distinfo
+++ b/archivers/gsharutils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 11:21:04 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/04/28 02:05:57 jtb Exp $
 
 SHA1 (sharutils-4.2.1.tar.gz) = 3f0c0af31bd429cee1e088eb74867f20f8d399ef
 Size (sharutils-4.2.1.tar.gz) = 306022 bytes
@@ -8,4 +8,6 @@ SHA1 (patch-ac) = 76bf1dedc34a462dd05a55511d9caf578cae78d0
 SHA1 (patch-ad) = fe6ba534c9830294c97dd37586aaa2c63d385a4c
 SHA1 (patch-ae) = 8b88d98af2d1f24ba2623e8d56b36061806f5e12
 SHA1 (patch-af) = 50aee8dc24a33892a0f17f7aeb5cfbae1adcb0c9
-SHA1 (patch-ag) = 3c996cc7fa9c40ca3fbe80980a31257238f4844f
+SHA1 (patch-ag) = 0bf292dcd529d84719b06a7ac9b85d43b1c30cc1
+SHA1 (patch-ah) = 3b03c7d96dd062636600634e91ca20b56539e7f0
+SHA1 (patch-ai) = 3be9a75c8623b5d1f1d18cfd70026af48c6ef7b1
diff --git a/archivers/gsharutils/patches/patch-ag b/archivers/gsharutils/patches/patch-ag
index 46ccc134d15..5c7308e6be2 100644
--- a/archivers/gsharutils/patches/patch-ag
+++ b/archivers/gsharutils/patches/patch-ag
@@ -1,14 +1,33 @@
-$NetBSD: patch-ag,v 1.1 2000/12/19 04:36:56 itojun Exp $
+$NetBSD: patch-ag,v 1.2 2001/04/28 02:05:57 jtb Exp $
 
---- po/Makefile.in.in-	Tue Dec 19 13:30:14 2000
-+++ po/Makefile.in.in	Tue Dec 19 13:31:03 2000
-@@ -126,3 +126,3 @@
+--- po/Makefile.in.in.orig	Mon Dec  4 16:19:48 1995
++++ po/Makefile.in.in
+@@ -28,8 +28,8 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
+-gnulocaledir = $(prefix)/share/locale
++localedir = $(prefix)/share/locale
++gnulocaledir = $(localedir)
+ gettextsrcdir = $(prefix)/share/gettext
+ subdir = po
+ 
+@@ -124,7 +124,7 @@
+ 	  else \
+ 	    destdir=$(localedir); \
  	  fi; \
 -	  lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
 +	  lang=`echo $$cat | sed 's/\.[a-z]*$$//'`; \
  	  dir=$$destdir/$$lang/LC_MESSAGES; \
-@@ -146,3 +146,3 @@
+ 	  $(top_srcdir)/mkinstalldirs $$dir; \
+ 	  if test -r $$cat; then \
+@@ -144,7 +144,7 @@
+ uninstall:
+ 	catalogs='$(CATALOGS)'; \
  	for cat in $$catalogs; do \
 -	  lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
 +	  lang=`echo $$cat | sed 's/\.[a-z]*$$//'`; \
  	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ 	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+ 	done
diff --git a/archivers/gsharutils/patches/patch-ah b/archivers/gsharutils/patches/patch-ah
new file mode 100644
index 00000000000..b12ccf5dd29
--- /dev/null
+++ b/archivers/gsharutils/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1 2001/04/28 02:05:57 jtb Exp $
+
+--- intl/Makefile.in.orig	Mon Dec  4 16:19:40 1995
++++ intl/Makefile.in
+@@ -30,8 +30,8 @@
+ libdir = $(prefix)/lib
+ includedir = $(prefix)/include
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
+-gnulocaledir = $(prefix)/share/locale
++localedir = $(prefix)/share/locale
++gnulocaledir = $(localedir)
+ gettextsrcdir = $(prefix)/share/gettext
+ aliaspath = $(localedir):.
+ subdir = intl
diff --git a/archivers/gsharutils/patches/patch-ai b/archivers/gsharutils/patches/patch-ai
new file mode 100644
index 00000000000..8fb10788679
--- /dev/null
+++ b/archivers/gsharutils/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2001/04/28 02:05:57 jtb Exp $
+
+--- src/Makefile.in.orig	Sat Nov 25 21:37:27 1995
++++ src/Makefile.in
+@@ -31,7 +31,7 @@
+ transform = @program_transform_name@
+ bindir = $(exec_prefix)/bin
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ subdir = src
+ 
+ AR = ar