From 90956287687cb95fafa04d350078b5d8bedc47dc Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Mon, 14 Aug 2000 14:19:30 +0000
Subject: No more USE_PKGLIBTOOL. LTCONFIG_OVERRIDE -> minus one patch.

---
 comms/p5-pilot-link/Makefile         | 31 ++++++++++++++++---------------
 comms/p5-pilot-link/files/patch-sum  |  3 +--
 comms/p5-pilot-link/patches/patch-aa | 21 ---------------------
 3 files changed, 17 insertions(+), 38 deletions(-)
 delete mode 100644 comms/p5-pilot-link/patches/patch-aa

diff --git a/comms/p5-pilot-link/Makefile b/comms/p5-pilot-link/Makefile
index 5081e16248d..5c8a08dd9db 100644
--- a/comms/p5-pilot-link/Makefile
+++ b/comms/p5-pilot-link/Makefile
@@ -1,23 +1,24 @@
-# $NetBSD: Makefile,v 1.5 2000/06/01 11:23:16 rh Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/14 14:19:30 wiz Exp $
 
-DISTNAME=	pilot-link.0.9.3
-PKGNAME=	p5-pilot-link-0.9.3
-CATEGORIES=	comms
-MASTER_SITES=	ftp://ryeham.ee.ryerson.ca/pub/PalmOS/
+DISTNAME=		pilot-link.0.9.3
+PKGNAME=		p5-pilot-link-0.9.3
+CATEGORIES=		comms
+MASTER_SITES=		ftp://ryeham.ee.ryerson.ca/pub/PalmOS/
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=		packages@netbsd.org
 
-DEPENDS+=	pilot-link-0.9.3:../pilot-link
+DEPENDS+=		pilot-link-0.9.3:../../comms/pilot-link
 
-USE_PERL5=	yes
-USE_PKGLIBTOOL=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-perl5=${PERL5_BIN} --without-tcl \
-		--without-python --without-java
+USE_PERL5=		yes
+USE_LIBTOOL=		yes
+LTCONFIG_OVERRIDE=	${WRKDIR}/${DISTNAME}/scripts/ltconfig
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--with-perl5=${PERL5_BIN} --without-tcl \
+			--without-python --without-java
 
-MAKE_ENV+=	OTHERLDFLAGS="${LDFLAGS}"
-PERL5_BIN=	${LOCALBASE}/bin/perl
-WRKSRC=		${WRKDIR}/${DISTNAME}/Perl5
+MAKE_ENV+=		OTHERLDFLAGS="${LDFLAGS}"
+PERL5_BIN=		${LOCALBASE}/bin/perl
+WRKSRC=			${WRKDIR}/${DISTNAME}/Perl5
 
 pre-configure:
 	@cd ${WRKSRC} && \
diff --git a/comms/p5-pilot-link/files/patch-sum b/comms/p5-pilot-link/files/patch-sum
index b200318055e..a14bf068a07 100644
--- a/comms/p5-pilot-link/files/patch-sum
+++ b/comms/p5-pilot-link/files/patch-sum
@@ -1,4 +1,3 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:26 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/14 14:19:33 wiz Exp $
 
-MD5 (patch-aa) = 1d33bc2644aa1f3fdf63f3961c6a751e
 MD5 (patch-ab) = dee95e7f265b0713467bb2024f51f027
diff --git a/comms/p5-pilot-link/patches/patch-aa b/comms/p5-pilot-link/patches/patch-aa
deleted file mode 100644
index fb4499ec24c..00000000000
--- a/comms/p5-pilot-link/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/05/20 21:16:17 tron Exp $
-
---- ../configure.orig	Fri Jul 17 16:01:39 1998
-+++ ../configure	Fri Jul 17 16:03:49 1998
-@@ -1000,7 +1000,7 @@
- 
- 
- 
--
-+if false; then
- # Always use our own libtool.
- LIBTOOL='$(top_builddir)/libtool'
- 
-@@ -1063,6 +1063,7 @@
- ${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
- 
- # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
-- 
cgit v1.2.3