USE_PKGLOCALEDIR, remove unnecessary patches.

5 files changed, 11 insertions, 54 deletions

diff --git a/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile
index aedec8e0e67..3bef7754668 100644
--- a/archivers/gsharutils/Makefile
+++ b/archivers/gsharutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/11/18 08:03:13 salo Exp $
+# $NetBSD: Makefile,v 1.12 2002/11/30 11:16:17 salo Exp $
 
 DISTNAME=	sharutils-4.2.1
 PKGNAME=	g${DISTNAME}
@@ -11,12 +11,15 @@ COMMENT=	Allow packing and unpacking of shell archives
 
 BUILD_USES_MSGFMT=	yes
 
-USE_BUILDLINK2=	yes
-GNU_CONFIGURE=  yes
-CONFIGURE_ARGS= --program-prefix=g --disable-uucode
-MAKE_ENV+=	PKGLOCALEDIR=${PKGLOCALEDIR}
-INSTALL_TARGET= install install-man
-INFO_FILES=	remsync.info sharutils.info
+USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
+GNU_CONFIGURE=		yes
+
+CONFIGURE_ARGS+=	--program-prefix=g
+CONFIGURE_ARGS+=	--disable-uucode
+
+INSTALL_TARGET=		install install-man
+INFO_FILES=		remsync.info sharutils.info
 TEXINFO_OVERRIDE=	YES
 
 post-patch:
diff --git a/archivers/gsharutils/distinfo b/archivers/gsharutils/distinfo
index d747b959404..88a4aea68af 100644
--- a/archivers/gsharutils/distinfo
+++ b/archivers/gsharutils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/11/18 08:03:13 salo Exp $
+$NetBSD: distinfo,v 1.6 2002/11/30 11:16:17 salo Exp $
 
 SHA1 (sharutils-4.2.1.tar.gz) = 3f0c0af31bd429cee1e088eb74867f20f8d399ef
 Size (sharutils-4.2.1.tar.gz) = 306022 bytes
@@ -8,6 +8,3 @@ SHA1 (patch-ac) = 76bf1dedc34a462dd05a55511d9caf578cae78d0
 SHA1 (patch-ad) = fe6ba534c9830294c97dd37586aaa2c63d385a4c
 SHA1 (patch-ae) = 8b88d98af2d1f24ba2623e8d56b36061806f5e12
 SHA1 (patch-af) = 50aee8dc24a33892a0f17f7aeb5cfbae1adcb0c9
-SHA1 (patch-ag) = 330021cbe475a24da8f73f9313b9915f5fe7c581
-SHA1 (patch-ah) = b774a30113e964279720ff7ee1aed934618f8117
-SHA1 (patch-aj) = 039866e5018a807a1a65afb290ebbb90c32aab74
diff --git a/archivers/gsharutils/patches/patch-ag b/archivers/gsharutils/patches/patch-ag
deleted file mode 100644
index eef50085f23..00000000000
--- a/archivers/gsharutils/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2002/11/18 08:03:14 salo Exp $
-
---- src/Makefile.in.orig	Sat Nov 25 22:37:27 1995
-+++ src/Makefile.in	Mon Nov 18 04:05:51 2002
-@@ -31,7 +31,7 @@
- transform = @program_transform_name@
- bindir = $(exec_prefix)/bin
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
- subdir = src
- 
- AR = ar
diff --git a/archivers/gsharutils/patches/patch-ah b/archivers/gsharutils/patches/patch-ah
deleted file mode 100644
index 30340d18d31..00000000000
--- a/archivers/gsharutils/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2002/11/18 08:03:15 salo Exp $
-
---- intl/Makefile.in.orig	Mon Dec  4 17:19:40 1995
-+++ intl/Makefile.in	Mon Nov 18 03:55:12 2002
-@@ -30,8 +30,8 @@
- libdir = $(prefix)/lib
- includedir = $(prefix)/include
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
--gnulocaledir = $(prefix)/share/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
-+gnulocaledir = $(localedir)
- gettextsrcdir = $(prefix)/share/gettext
- aliaspath = $(localedir):.
- subdir = intl
diff --git a/archivers/gsharutils/patches/patch-aj b/archivers/gsharutils/patches/patch-aj
deleted file mode 100644
index 6cc20e9b042..00000000000
--- a/archivers/gsharutils/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2002/11/18 08:03:15 salo Exp $
-
---- po/Makefile.in.in.orig	Mon Dec  4 17:19:48 1995
-+++ po/Makefile.in.in	Mon Nov 18 04:06:43 2002
-@@ -28,8 +28,8 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
--gnulocaledir = $(prefix)/share/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
-+gnulocaledir = $(localedir)
- gettextsrcdir = $(prefix)/share/gettext
- subdir = po
-