- Install locale files into correct directory under SunOS.

- Fix problem with unwanted change of "charset.aliases" more cleanly.

4 files changed, 31 insertions, 10 deletions

diff --git a/sysutils/fileutils/Makefile b/sysutils/fileutils/Makefile
index 371dc177c2c..01c95965337 100644
--- a/sysutils/fileutils/Makefile
+++ b/sysutils/fileutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/03/11 19:17:44 tron Exp $
+# $NetBSD: Makefile,v 1.18 2002/03/11 19:35:05 tron Exp $
 
 DISTNAME=		fileutils-4.1.7
 CATEGORIES=		sysutils
@@ -12,14 +12,7 @@ COMMENT=		GNU file management utilities
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--program-prefix=g \
 			--with-libiconv-prefix=${BUILDLINK_DIR}
-
-CHARSET_FILE=		${PREFIX}/lib/charset.alias
-
-pre-install:
-	@${CP} -p ${CHARSET_FILE} ${CHARSET_FILE}.preserve
-
-post-install:
-	@${MV} ${CHARSET_FILE}.preserve ${CHARSET_FILE}
+MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 .include "../../converters/libiconv/buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
diff --git a/sysutils/fileutils/distinfo b/sysutils/fileutils/distinfo
index 67cd46c71b2..42f7b69b95b 100644
--- a/sysutils/fileutils/distinfo
+++ b/sysutils/fileutils/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.3 2002/03/11 19:17:44 tron Exp $
+$NetBSD: distinfo,v 1.4 2002/03/11 19:35:05 tron Exp $
 
 SHA1 (fileutils-4.1.7.tar.bz2) = 94c7979d3ce64f62bde4e677282b338a1bfada72
 Size (fileutils-4.1.7.tar.bz2) = 1663871 bytes
+SHA1 (patch-aa) = a0586d09dff967fb3f9c10ae7b3d32aa842af3dc
+SHA1 (patch-ab) = a1327a674d05bc6fd7adb234b72da5b3ee5ddd28
diff --git a/sysutils/fileutils/patches/patch-aa b/sysutils/fileutils/patches/patch-aa
new file mode 100644
index 00000000000..f206363bfca
--- /dev/null
+++ b/sysutils/fileutils/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2002/03/11 19:35:06 tron Exp $
+
+--- po/Makefile.in.in.orig	Sun Mar 10 11:22:46 2002
++++ po/Makefile.in.in	Mon Mar 11 20:25:59 2002
+@@ -21,7 +21,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = @prefix@/$(PKGLOCALEDIR)/locale
+ gettextsrcdir = $(datadir)/gettext/po
+ 
+ INSTALL = @INSTALL@
diff --git a/sysutils/fileutils/patches/patch-ab b/sysutils/fileutils/patches/patch-ab
new file mode 100644
index 00000000000..bd33aadebe3
--- /dev/null
+++ b/sysutils/fileutils/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2002/03/11 19:35:06 tron Exp $
+
+--- lib/Makefile.in.orig	Sun Mar 10 19:40:15 2002
++++ lib/Makefile.in	Mon Mar 11 20:25:16 2002
+@@ -975,7 +975,7 @@
+ 
+ install-data-am:
+ 
+-install-exec-am: install-exec-local
++install-exec-am:
+ 
+ install-info: install-info-am
+