From c73eab32dc9e37a75b8f7fea5f0907a46c6e695e Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Tue, 6 Apr 1999 14:41:22 +0000
Subject: Make this package use NetBSD's own pkglibtool. Remove two redundant
 definitions in the package Makefile.

---
 x11/eterm/Makefile         |  6 ++----
 x11/eterm/patches/patch-ab | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 x11/eterm/patches/patch-ab

(limited to 'x11/eterm')

diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 4d31db2149b..173c5f42e24 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/03/30 04:48:43 garbled Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/06 14:41:22 agc Exp $
 
 DISTNAME=		Eterm-0.8.8
 PKGNAME=		eterm-0.8.8
@@ -13,12 +13,10 @@ HOMEPAGE=		http://www.eterm.org/
 
 DEPENDS+=		imlib-1.9.4:../../graphics/imlib
 
-WRKSRC=			${WRKDIR}/${DISTNAME}
-
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
-USE_X11=		yes
 USE_X11BASE=		yes
+USE_LIBTOOL=		yes
 
 post-extract:
 	${MV} ${WRKDIR}/Eterm/bg/scale/* ${WRKSRC}/bg/scale
diff --git a/x11/eterm/patches/patch-ab b/x11/eterm/patches/patch-ab
new file mode 100644
index 00000000000..1286157bbd6
--- /dev/null
+++ b/x11/eterm/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.1 1999/04/06 14:41:22 agc Exp $
+
+Use NetBSD's own pkglibtool
+
+--- configure	1999/04/06 14:17:16	1.1
++++ configure	1999/04/06 14:17:39
+@@ -1518,6 +1518,7 @@
+ fi
+ 
+ # Always use our own libtool.
++if false; then
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+ # Check for any special flags to pass to ltconfig.
+@@ -1562,6 +1563,8 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
++
++fi
+ 
+ 
+ echo $ac_n "checking for distribution root""... $ac_c" 1>&6
-- 
cgit v1.2.3