more locale directory hardcoding. suggested by lamj

4 files changed, 69 insertions, 1 deletions

diff --git a/mail/mutt/files/patch-sum b/mail/mutt/files/patch-sum
index 62985a2f02c..039ba0c1b25 100644
--- a/mail/mutt/files/patch-sum
+++ b/mail/mutt/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.10 2000/11/02 06:57:32 itojun Exp $
+$NetBSD: patch-sum,v 1.11 2000/11/02 07:15:09 itojun Exp $
 
 MD5 (patch-aa) = 7d2e9e14bd302e841ed1f2b47f0dfa58
 MD5 (patch-ab) = e7f615cb63a40130edefe8a51aca3593
@@ -9,3 +9,6 @@ MD5 (patch-af) = b530bbcd85e85ae7233be82d698a374f
 MD5 (patch-ag) = 53602ef8fd94e9ce0ce7f03b61c85495
 MD5 (patch-ah) = 9626fd08270eba43d1b2cca49b94ddc6
 MD5 (patch-ai) = 5f95158e1b743d37a9e3d4f37bf0a117
+MD5 (patch-aj) = 09d8cbce56ce994baf6bf6253578e6ee
+MD5 (patch-ak) = be91a3bc9f33ea4019bb84d347e9a693
+MD5 (patch-al) = fb4ec79afca1a120be2b4ad940385c39
diff --git a/mail/mutt/patches/patch-aj b/mail/mutt/patches/patch-aj
new file mode 100644
index 00000000000..1b36e3580e4
--- /dev/null
+++ b/mail/mutt/patches/patch-aj
@@ -0,0 +1,21 @@
+$NetBSD: patch-aj,v 1.1 2000/11/02 07:15:09 itojun Exp $
+--- aclocal.m4-	Thu Nov  2 16:11:43 2000
++++ aclocal.m4	Thu Nov  2 16:11:51 2000
+@@ -388,7 +388,7 @@
+ 		  [CATOBJEXT=.gmo
+ 		   DATADIRNAME=share],
+ 		  [CATOBJEXT=.mo
+-		   DATADIRNAME=lib])
++		   DATADIRNAME=share])
+ 		INSTOBJEXT=.mo
+ 	      fi
+ 	    fi
+@@ -419,7 +419,7 @@
+ 		 USE_INCLUDED_LIBINTL=yes
+ 		 CATOBJEXT=.cat
+ 		 INSTOBJEXT=.cat
+-		 DATADIRNAME=lib
++		 DATADIRNAME=share
+ 		 INTLDEPS='$(top_builddir)/intl/libintl.a'
+ 		 INTLLIBS=$INTLDEPS
+ 		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
diff --git a/mail/mutt/patches/patch-ak b/mail/mutt/patches/patch-ak
new file mode 100644
index 00000000000..d86f81ac600
--- /dev/null
+++ b/mail/mutt/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2000/11/02 07:15:09 itojun Exp $
+
+--- configure.in-	Thu Nov  2 16:05:24 2000
++++ configure.in	Thu Nov  2 16:05:31 2000
+@@ -606,7 +606,7 @@
+ MUTT_AM_GNU_GETTEXT
+ CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/intl"
+ 
+-MUTTLOCALEDIR=$mutt_cv_prefix/$DATADIRNAME/locale
++MUTTLOCALEDIR=$mutt_cv_prefix/share/locale
+ AC_SUBST(MUTTLOCALEDIR)
+ AC_DEFINE_UNQUOTED(MUTTLOCALEDIR, "$MUTTLOCALEDIR")
+ 
diff --git a/mail/mutt/patches/patch-al b/mail/mutt/patches/patch-al
new file mode 100644
index 00000000000..793d35e45ad
--- /dev/null
+++ b/mail/mutt/patches/patch-al
@@ -0,0 +1,31 @@
+$NetBSD: patch-al,v 1.1 2000/11/02 07:15:10 itojun Exp $
+
+--- configure.orig	Sat Jul 29 03:50:27 2000
++++ configure	Thu Nov  2 16:05:11 2000
+@@ -6045,7 +6045,7 @@
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+   CATOBJEXT=.mo
+-		   DATADIRNAME=lib
++		   DATADIRNAME=share
+ fi
+ rm -f conftest*
+ 		INSTOBJEXT=.mo
+@@ -6307,7 +6307,7 @@
+ 		 USE_INCLUDED_LIBINTL=yes
+ 		 CATOBJEXT=.cat
+ 		 INSTOBJEXT=.cat
+-		 DATADIRNAME=lib
++		 DATADIRNAME=share
+ 		 INTLDEPS='$(top_builddir)/intl/libintl.a'
+ 		 INTLLIBS=$INTLDEPS
+ 		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+@@ -6602,7 +6602,7 @@
+   
+ CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/intl"
+ 
+-MUTTLOCALEDIR=$mutt_cv_prefix/$DATADIRNAME/locale
++MUTTLOCALEDIR=$mutt_cv_prefix/share/locale
+ 
+ cat >> confdefs.h <<EOF
+ #define MUTTLOCALEDIR "$MUTTLOCALEDIR"