From 451429c2fa5908769eefba81de992e2a057878d9 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Mon, 18 Jun 2001 22:09:16 +0000
Subject: Use zlib buildlink.mk for zlib dependency (from pkg/13217 by Stoned
 Elipot) and install locale files under PKGLOCALEDIR.

---
 devel/gtexinfo/Makefile         | 12 +++++-------
 devel/gtexinfo/distinfo         |  4 ++--
 devel/gtexinfo/patches/patch-ag | 18 ++----------------
 3 files changed, 9 insertions(+), 25 deletions(-)

(limited to 'devel/gtexinfo')

diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile
index 47403e4d0cc..adeda914bef 100644
--- a/devel/gtexinfo/Makefile
+++ b/devel/gtexinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/02/16 14:38:29 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2001/06/18 22:09:16 jlam Exp $
 #
 
 DISTNAME=		texinfo-3.12
@@ -10,16 +10,14 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/texinfo/texinfo.html
 COMMENT=		GNU info file manipulation utilities
 
-.include "../../mk/bsd.prefs.mk"
-.if (${OPSYS} == "SunOS")
-DEPENDS+=		zlib-1.*:../zlib
-CFLAGS+=		-I${PREFIX}/include             # zlib.h
-.endif
-
+USE_BUILDLINK_ONLY=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-catgets
+CONFIGURE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 PLIST_SRC=      	${WRKDIR}/.PLIST_SRC
 
+.include "../../devel/zlib/buildlink.mk"
+
 .if exists(/usr/bin/install-info)
 IGNORE=			"${PKGNAME} is included with your NetBSD distribution"
 .endif
diff --git a/devel/gtexinfo/distinfo b/devel/gtexinfo/distinfo
index cbf3a259b2e..9fad0d8f1b7 100644
--- a/devel/gtexinfo/distinfo
+++ b/devel/gtexinfo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:21 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/06/18 22:09:16 jlam Exp $
 
 SHA1 (texinfo-3.12.tar.gz) = 297a3baeb7c20635aa3a74697b71fdc13b2e82a5
 Size (texinfo-3.12.tar.gz) = 756883 bytes
@@ -8,4 +8,4 @@ SHA1 (patch-ac) = 8956b859a443c17893ea113a6a365b1f202685ee
 SHA1 (patch-ad) = b39433e8cfef85fcb71011bae1bc64c0f825cd67
 SHA1 (patch-ae) = 3b24bf945215ab0f67cf7a55130a14677f18e331
 SHA1 (patch-af) = aaf33281da19658906eee6a922397968a200f186
-SHA1 (patch-ag) = 5168b3ec749474bf250707bb0340943021ba9bcd
+SHA1 (patch-ag) = ae8aaf53f6ebea49a19a3d6f0c30505b72d47e44
diff --git a/devel/gtexinfo/patches/patch-ag b/devel/gtexinfo/patches/patch-ag
index 956f32335fc..19aa0d52c48 100644
--- a/devel/gtexinfo/patches/patch-ag
+++ b/devel/gtexinfo/patches/patch-ag
@@ -1,27 +1,13 @@
-$NetBSD: patch-ag,v 1.4 2000/05/02 18:48:39 danw Exp $
-
-Don't check ncurses lib - just use standard curses.
-Install files into share hierarchy
-Don't assume that we're using the install.sh script - comment out
-	the attempt to prefix it with ../
+$NetBSD: patch-ag,v 1.5 2001/06/18 22:09:17 jlam Exp $
 
 --- configure.orig	Tue Mar  3 13:30:18 1998
 +++ configure	Sun Oct  4 15:53:12 1998
-@@ -1401,7 +1401,7 @@
- # Some GNU/Linux systems (e.g., SuSE 4.3, 1996) don't have curses, but
- # rather ncurses.  So we check for it.
- TERMLIBS=
--for termlib in ncurses curses termcap terminfo termlib ; do
-+for termlib in curses termcap terminfo termlib ; do
-    echo $ac_n "checking for tputs in -l${termlib}""... $ac_c" 1>&6
- echo "configure:1407: checking for tputs in -l${termlib}" >&5
- ac_lib_var=`echo ${termlib}'_'tputs | sed 'y%./+-%__p_%'`
 @@ -3443,7 +3443,7 @@
  		 USE_INCLUDED_LIBINTL=yes
  		 CATOBJEXT=.cat
  		 INSTOBJEXT=.cat
 -		 DATADIRNAME=lib
-+		 DATADIRNAME=share
++		 DATADIRNAME=${PKGLOCALEDIR}
  		 INTLDEPS='$(top_builddir)/intl/libintl.a'
  		 INTLLIBS=$INTLDEPS
  		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-- 
cgit v1.2.3