From 13bd1e3ebd3fc22eb058d7277d5acab1d79db893 Mon Sep 17 00:00:00 2001
From: grant <grant@pkgsrc.org>
Date: Sat, 30 Nov 2002 14:59:39 +0000
Subject: [PATCH] USE_PKGLOCALEDIR.

---
 mail/mutt/Makefile         | 14 +++++++-------
 mail/mutt/distinfo         |  4 +---
 mail/mutt/patches/patch-aa | 13 -------------
 mail/mutt/patches/patch-ac | 13 -------------
 4 files changed, 8 insertions(+), 36 deletions(-)
 delete mode 100644 mail/mutt/patches/patch-aa
 delete mode 100644 mail/mutt/patches/patch-ac

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 3d14971a7d2f..820e90217cbd 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2002/11/27 19:05:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.88 2002/11/30 14:59:39 grant Exp $
 
 DISTNAME=		mutt-1.4i
 PKGNAME=		${DISTNAME:C/i$//}
@@ -13,12 +13,13 @@ MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.mutt.org/
 COMMENT=		text-based MIME mail client with PGP support
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK2=		# defined
 
-BUILD_USES_MSGFMT=	YES
+BUILD_USES_MSGFMT=	# defined
 
-USE_GMAKE=		YES
-GNU_CONFIGURE=		YES
+USE_GMAKE=		# defined
+GNU_CONFIGURE=		# defined
+USE_PKGLOCALEDIR=	# defined
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR} \
 			--with-docdir=${PREFIX}/share/doc/mutt \
 			--without-included-gettext \
@@ -34,7 +35,7 @@ WRKSRC=			${WRKDIR}/${DISTNAME:C/i$$//}
 CONFIGURE_ARGS+=	--with-slang=${BUILDLINK_PREFIX.libslang}
 .else
 . if ${MUTT_USE_NCURSES} == YES
-USE_NCURSES=		YES
+USE_NCURSES=		# defined
 . endif
 . include "../../devel/ncurses/buildlink2.mk"
 CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_PREFIX.ncurses}
@@ -58,7 +59,6 @@ CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
 .endif
 
 BUILD_DEFS+=		MUTT_USE_NCURSES MUTT_USE_SLANG MUTT_USE_SSL USE_SASL
-MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 EGDIR=			${PREFIX}/share/examples/mutt
 CONF_FILES=		${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index d1f6037fa340..0f10dbc4efeb 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.9 2002/11/27 19:05:40 jmmv Exp $
+$NetBSD: distinfo,v 1.10 2002/11/30 14:59:39 grant Exp $
 
 SHA1 (mutt-1.4i.tar.gz) = 6b7fb8440de18f12ceb24a486a1bbe77fce93955
 Size (mutt-1.4i.tar.gz) = 2554158 bytes
-SHA1 (patch-aa) = 8325c09e6ab9b43786571548359fa0be4f94d14c
 SHA1 (patch-ab) = ceb983dd36cd5d8960c41b8f232cc5210b99f50b
-SHA1 (patch-ac) = 4aa38ccf5454e4d3e79b8ddc8aad610b1c1bd6c2
 SHA1 (patch-ad) = 63abea4130832d7612a904f7954ab9c97b3b80ac
 SHA1 (patch-ae) = 7a7bc491c9f58b6ba26d5619182fb812d0f5e94e
diff --git a/mail/mutt/patches/patch-aa b/mail/mutt/patches/patch-aa
deleted file mode 100644
index cd065ea6ac7d..000000000000
--- a/mail/mutt/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2002/05/29 12:13:53 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/patches/patch-ac b/mail/mutt/patches/patch-ac
deleted file mode 100644
index 7146d4258abe..000000000000
--- a/mail/mutt/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2002/05/29 12:13:53 tron Exp $
-
---- po/Makefile.in.in.orig	Tue Jan  1 21:17:15 2002
-+++ po/Makefile.in.in	Wed Jan  2 09:54:40 2002
-@@ -23,7 +23,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@