do not hardcode locale subdir to /usr/pkg/share/locale, or it will choke

on Solrais.
add "MAKE_ENV+=LIBS=-lintl", as automake and reconfiguration will remove
-lintl from Makefile.

6 files changed, 6 insertions, 84 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 93b1c224d56..b4d6ee43c71 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2000/11/02 06:57:32 itojun Exp $
+# $NetBSD: Makefile,v 1.59 2000/11/09 14:53:00 itojun Exp $
 
 DISTNAME=	mutt-1.2.5i
 CATEGORIES=	mail
@@ -15,11 +15,14 @@ BUILD_DEPENDS+=	${LOCALBASE}/bin/automake:../../devel/automake
 BUILD_DEPENDS+=	msgfmt:../../devel/gettext
 
 USE_LIBINTL=	yes
+MAKE_ENV+=	LIBS=-lintl
+CONFIGURE_ENV+=	LIBS=-lintl
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS+= --with-exec-shell=/bin/ksh \
 		 --with-docdir=${PREFIX}/share/doc/mutt \
-		 --enable-pop --enable-imap
+		 --enable-pop --enable-imap \
+		 --without-included-gettext
 USE_CURSES=	yes
 REPLACE_NCURSES=	configure configure.in
 
diff --git a/mail/mutt/files/patch-sum b/mail/mutt/files/patch-sum
index 039ba0c1b25..2764d2e9ad7 100644
--- a/mail/mutt/files/patch-sum
+++ b/mail/mutt/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.11 2000/11/02 07:15:09 itojun Exp $
+$NetBSD: patch-sum,v 1.12 2000/11/09 14:53:00 itojun Exp $
 
 MD5 (patch-aa) = 7d2e9e14bd302e841ed1f2b47f0dfa58
 MD5 (patch-ab) = e7f615cb63a40130edefe8a51aca3593
@@ -8,7 +8,3 @@ MD5 (patch-ae) = 9f7427c1b9477c19e11a748c889174a6
 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-ai b/mail/mutt/patches/patch-ai
deleted file mode 100644
index 1cb215b12a2..00000000000
--- a/mail/mutt/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2000/11/02 06:57:32 itojun Exp $
-
---- po/Makefile.in.in-	Thu Nov  2 15:53:03 2000
-+++ po/Makefile.in.in	Thu Nov  2 15:53:20 2000
-@@ -126,6 +126,3 @@
- 	  cat=`basename $$cat`; \
--	  case "$$cat" in \
--	    *.gmo) destdir=$(gnulocaledir);; \
--	    *)     destdir=$(localedir);; \
--	  esac; \
-+	  destdir=$(gnulocaledir); \
- 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
diff --git a/mail/mutt/patches/patch-aj b/mail/mutt/patches/patch-aj
deleted file mode 100644
index 1b36e3580e4..00000000000
--- a/mail/mutt/patches/patch-aj
+++ /dev/null
@@ -1,21 +0,0 @@
-$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
deleted file mode 100644
index d86f81ac600..00000000000
--- a/mail/mutt/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index 793d35e45ad..00000000000
--- a/mail/mutt/patches/patch-al
+++ /dev/null
@@ -1,31 +0,0 @@
-$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"