From 841fea3ae3862c79c30e17abe88d263735c4aa6b Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Mon, 21 Mar 2005 22:33:05 +0000
Subject: 1.27: Do not add LIBTOOL_OVERRIDE to Makefiles by default -- the
 pkgsrc default is usable for nearly all cases.

---
 pkgtools/url2pkg/Makefile      | 4 ++--
 pkgtools/url2pkg/files/url2pkg | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'pkgtools/url2pkg')

diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile
index a7bd8c6d3c7..9733ec9c546 100644
--- a/pkgtools/url2pkg/Makefile
+++ b/pkgtools/url2pkg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2004/11/05 17:38:51 tv Exp $
+# $NetBSD: Makefile,v 1.33 2005/03/21 22:33:05 wiz Exp $
 #
 
-DISTNAME=	url2pkg-1.26
+DISTNAME=	url2pkg-1.27
 CATEGORIES=	pkgtools sysutils
 MASTER_SITES=	# Nothing
 DISTFILES=	# Nothing
diff --git a/pkgtools/url2pkg/files/url2pkg b/pkgtools/url2pkg/files/url2pkg
index 097931cc6f7..9d95f777709 100755
--- a/pkgtools/url2pkg/files/url2pkg
+++ b/pkgtools/url2pkg/files/url2pkg
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: url2pkg,v 1.27 2004/11/05 17:38:51 tv Exp $
+# $NetBSD: url2pkg,v 1.28 2005/03/21 22:33:05 wiz Exp $
 #
 # url2pkg
 # (c) 1999-2002 Hubert Feyrer <hubert@feyrer.de>
@@ -138,7 +138,6 @@ libtool=\${WRKSRC}/libtool
 echo checking libtool: $ltconfig
 if [ -f $ltconfig -o -f $ltmain ]; then
 	USE_LIBTOOL=yes
-	LIBTOOL_OVERRIDE=${libtool}
 fi
 
 PKGCONFIGS=`cd $wsrcdir && find * -name \*.pc.in -a ! -name \*-uninstalled.pc.in -type f`
@@ -160,9 +159,6 @@ echo "Fixing up Makefile."
 	if [ "${USE_LIBTOOL}" != "" ]; then
 		echo "USE_LIBTOOL=		$USE_LIBTOOL"
 	fi
-	if [ "${LIBTOOL_OVERRIDE}" != "" ]; then
-		echo "LIBTOOL_OVERRIDE=	$LIBTOOL_OVERRIDE"
-	fi
 
 	for i in $PKGCONFIGS ; do
 		echo "PKGCONFIG_OVERRIDE+=	\${WRKSRC}/$i"
-- 
cgit v1.2.3