From 937b3bf13ba04761e827057af8b9188f24755d9a Mon Sep 17 00:00:00 2001
From: salo <salo@pkgsrc.org>
Date: Sat, 30 Nov 2002 23:21:32 +0000
Subject: USE_PKGLOCALEDIR, remove unnecessary patches, delint.

---
 devel/gettext/Makefile         |  5 ++---
 devel/gettext/distinfo         |  4 ++--
 devel/gettext/patches/patch-aa | 11 +----------
 3 files changed, 5 insertions(+), 15 deletions(-)

(limited to 'devel/gettext')

diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index d6fdba84aa5..7ae8d623502 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2002/11/27 17:41:05 drochner Exp $
+# $NetBSD: Makefile,v 1.39 2002/11/30 23:21:34 salo Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
 #
 
@@ -13,13 +13,12 @@ COMMENT=		tools for providing messages in different languages
 DEPENDS+=		gettext-m4-0.11.5:../../devel/gettext-m4
 
 USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
 CONFIG_SUB_OVERRIDE=	${WRKSRC}/config.sub
-CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
-MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 USE_GNU_GETTEXT=	yes
 CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ARGS+=	--with-libintl-prefix=${BUILDLINK_PREFIX.gettext}
diff --git a/devel/gettext/distinfo b/devel/gettext/distinfo
index 52a57175e5f..2b24d28fb99 100644
--- a/devel/gettext/distinfo
+++ b/devel/gettext/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2002/11/27 17:41:05 drochner Exp $
+$NetBSD: distinfo,v 1.7 2002/11/30 23:21:34 salo Exp $
 
 SHA1 (gettext-0.11.5.tar.gz) = 4d17534afac106bc0f2310a9fd77a291d433234b
 Size (gettext-0.11.5.tar.gz) = 3724099 bytes
-SHA1 (patch-aa) = 0b0b2fe55a10db61431f7217b804e4540581263d
+SHA1 (patch-aa) = faa6d71599703d20ac7652637c83a0c713467a32
 SHA1 (patch-ab) = 6e9eec0ff3bbab05df5a6b513ee9f8d3b39ad385
 SHA1 (patch-ac) = 1703e08d31fb31b99f6496ef56f4c405f1baefab
 SHA1 (patch-ai) = 97b824ed5e8b776a6b9e5a75287c6349e8e345d4
diff --git a/devel/gettext/patches/patch-aa b/devel/gettext/patches/patch-aa
index 3a7c90b55ff..264150d4721 100644
--- a/devel/gettext/patches/patch-aa
+++ b/devel/gettext/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.9 2002/11/27 17:41:06 drochner Exp $
+$NetBSD: patch-aa,v 1.10 2002/11/30 23:21:35 salo Exp $
 
 --- configure.orig	Tue Aug  6 15:57:16 2002
 +++ configure	Sun Sep  1 16:06:20 2002
@@ -13,12 +13,3 @@ $NetBSD: patch-aa,v 1.9 2002/11/27 17:41:06 drochner Exp $
        fi
  
        if test "$gt_use_preinstalled_gnugettext" = "yes" \
-@@ -14369,7 +14365,7 @@
-         nls_cv_header_intl=
-     nls_cv_header_libgt=
- 
--        DATADIRNAME=share
-+        DATADIRNAME=${PKGLOCALEDIR}
- 
-         INSTOBJEXT=.mo
- 
-- 
cgit v1.2.3