Make sure that locale files get installed into the right directory under

Solaris.

4 files changed, 33 insertions, 3 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 3da5c4af73a..6e6468b5150 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/07/22 13:37:12 tron Exp $
+# $NetBSD: Makefile,v 1.9 2001/07/22 15:24:10 tron Exp $
 
 DISTNAME=		mutt-1.3.19i
 CATEGORIES=		mail
@@ -44,9 +44,9 @@ CONFIGURE_ARGS+=	--without-ssl
 .endif
 
 BUILD_DEFS+=		MUTT_USE_SSL
-
 DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 INSTALL_FILE=		${WRKDIR}/INSTALL
+MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 FILES_SUBST=		CAT=${CAT:Q}
 FILES_SUBST+=		CHMOD=${CHMOD:Q}
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 4c131a5c577..9478c83544b 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/07/22 13:37:13 tron Exp $
+$NetBSD: distinfo,v 1.4 2001/07/22 15:24:10 tron Exp $
 
 SHA1 (mutt-1.3.19i.tar.gz) = 55c188cdade8bc040e23f1340f41d74514e239b7
 Size (mutt-1.3.19i.tar.gz) = 2439217 bytes
+SHA1 (patch-aa) = 8325c09e6ab9b43786571548359fa0be4f94d14c
 SHA1 (patch-ab) = 24984804280b5db991a2a471eba39506369add70
+SHA1 (patch-ac) = 19225ed3e60de9772de5e7092f2cc67b804f0f86
diff --git a/mail/mutt-devel/patches/patch-aa b/mail/mutt-devel/patches/patch-aa
new file mode 100644
index 00000000000..8de5aee9a98
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2001/07/22 15:24:10 tron Exp $
+
+--- intl/Makefile.in.orig	Thu Jun  7 22:00:05 2001
++++ intl/Makefile.in	Sun Jul 22 16:58:54 2001
+@@ -31,7 +31,7 @@
+ libdir = @libdir@
+ includedir = @includedir@
+ datadir = @datadir@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/$(PKGLOCALEDIR)/locale
+ gettextsrcdir = $(datadir)/gettext/intl
+ aliaspath = $(localedir)
+ subdir = intl
diff --git a/mail/mutt-devel/patches/patch-ac b/mail/mutt-devel/patches/patch-ac
new file mode 100644
index 00000000000..d056033b399
--- /dev/null
+++ b/mail/mutt-devel/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2001/07/22 15:24:10 tron Exp $
+
+--- po/Makefile.in.in.orig	Mon Aug  7 10:31:36 2000
++++ po/Makefile.in.in	Sun Jul 22 17:17:57 2001
+@@ -21,8 +21,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/po
+ subdir = po
+