Install locale files under ${PKGLOCALEDIR}, and mark as USE_BUILDLINK_ONLY.

7 files changed, 26 insertions, 74 deletions

diff --git a/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile
index f642f068a6c..a47352a104b 100644
--- a/archivers/gsharutils/Makefile
+++ b/archivers/gsharutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/03/27 03:19:44 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2001/07/15 11:44:50 jlam Exp $
 
 DISTNAME=	sharutils-4.2.1
 PKGNAME=	g${DISTNAME}
@@ -10,14 +10,16 @@ HOMEPAGE=	http://www.gnu.org/software/sharutils/sharutils.html
 COMMENT=	Allow packing and unpacking of shell archives
 
 BUILD_USES_MSGFMT=	yes
+USE_BUILDLINK_ONLY=	yes
 
-USE_LIBINTL=	yes
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS= --program-prefix=g --disable-uucode
+CONFIGURE_ENV+=	PKGLOCALEDIR=${PKGLOCALEDIR}
 INSTALL_TARGET= install install-man
 INFO_FILES=	remsync.info sharutils.info
 
 post-patch:
 	@${TOUCH} ${TOUCH_FLAGS} ${WRKSRC}/po/sharutils.pot
 
+.include "../../devel/gettext-lib/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/gsharutils/distinfo b/archivers/gsharutils/distinfo
index e478c41115c..c5710976944 100644
--- a/archivers/gsharutils/distinfo
+++ b/archivers/gsharutils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/04/28 02:05:57 jtb Exp $
+$NetBSD: distinfo,v 1.4 2001/07/15 11:44:50 jlam Exp $
 
 SHA1 (sharutils-4.2.1.tar.gz) = 3f0c0af31bd429cee1e088eb74867f20f8d399ef
 Size (sharutils-4.2.1.tar.gz) = 306022 bytes
@@ -8,6 +8,4 @@ SHA1 (patch-ac) = 76bf1dedc34a462dd05a55511d9caf578cae78d0
 SHA1 (patch-ad) = fe6ba534c9830294c97dd37586aaa2c63d385a4c
 SHA1 (patch-ae) = 8b88d98af2d1f24ba2623e8d56b36061806f5e12
 SHA1 (patch-af) = 50aee8dc24a33892a0f17f7aeb5cfbae1adcb0c9
-SHA1 (patch-ag) = 0bf292dcd529d84719b06a7ac9b85d43b1c30cc1
-SHA1 (patch-ah) = 3b03c7d96dd062636600634e91ca20b56539e7f0
-SHA1 (patch-ai) = 3be9a75c8623b5d1f1d18cfd70026af48c6ef7b1
+SHA1 (patch-aj) = b7a7f8fba49317f1815e71855d7bf21a0d356af2
diff --git a/archivers/gsharutils/patches/patch-ag b/archivers/gsharutils/patches/patch-ag
deleted file mode 100644
index 5c7308e6be2..00000000000
--- a/archivers/gsharutils/patches/patch-ag
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2001/04/28 02:05:57 jtb Exp $
-
---- 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; \
- 	  $(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
deleted file mode 100644
index b12ccf5dd29..00000000000
--- a/archivers/gsharutils/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 8fb10788679..00000000000
--- a/archivers/gsharutils/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
diff --git a/archivers/gsharutils/patches/patch-aj b/archivers/gsharutils/patches/patch-aj
new file mode 100644
index 00000000000..31cfe306e49
--- /dev/null
+++ b/archivers/gsharutils/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2001/07/15 11:44:51 jlam Exp $
+
+--- configure.orig	Sun Dec  3 19:44:54 1995
++++ configure
+@@ -3581,6 +3581,8 @@
+   CATALOGS="$new_CATALOGS"
+ fi
+ 
++DATADIRNAME=${PKGLOCALEDIR}
++
+ 
+ 
+ trap '' 1 2 15
diff --git a/archivers/gsharutils/pkg/PLIST b/archivers/gsharutils/pkg/PLIST
index f3978d11e44..3a2dc315a2f 100644
--- a/archivers/gsharutils/pkg/PLIST
+++ b/archivers/gsharutils/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1999/05/23 20:33:46 tv Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/07/15 11:44:51 jlam Exp $
 bin/gmail-files
 bin/gmailshar
 bin/gremsync
@@ -12,9 +12,9 @@ info/remsync.info
 @exec install-info %D/info/remsync.info %D/info/dir
 man/man1/gshar.1
 man/man1/gunshar.1
-share/locale/de/LC_MESSAGES/sharutils.mo
-share/locale/fr/LC_MESSAGES/sharutils.mo
-share/locale/ja_JP.EUC/LC_MESSAGES/sharutils.mo
-share/locale/nl/LC_MESSAGES/sharutils.mo
-share/locale/pt/LC_MESSAGES/sharutils.mo
-share/locale/sv/LC_MESSAGES/sharutils.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/sharutils.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/sharutils.mo
+${PKGLOCALEDIR}/locale/ja_JP.EUC/LC_MESSAGES/sharutils.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/sharutils.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/sharutils.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/sharutils.mo