From 8a0b15f754b5f8933d0db5ddac50e7ffe662b1cc Mon Sep 17 00:00:00 2001
From: rh <rh@pkgsrc.org>
Date: Wed, 30 Oct 2002 03:33:56 +0000
Subject: Update url2pkg to 1.20.  Changes are: 	- recognise newer GNU
 configure scripts 	- USE_BUILDLINK2 	- add support for
 PKGCONFIG_OVERRIDE

---
 pkgtools/url2pkg/Makefile      |  6 +++---
 pkgtools/url2pkg/files/url2pkg | 19 ++++++++++++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile
index 9ebd33d5628..9e4482c466b 100644
--- a/pkgtools/url2pkg/Makefile
+++ b/pkgtools/url2pkg/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.19 2002/05/14 00:05:02 rh Exp $
+# $NetBSD: Makefile,v 1.20 2002/10/30 03:33:56 rh Exp $
 #
 
-DISTNAME=	url2pkg-1.19
+DISTNAME=	url2pkg-1.20
 CATEGORIES=	pkgtools sysutils
 MASTER_SITES=	# Nothing
 DISTFILES=	# Nothing
 
 MAINTAINER=	hubertf@netbsd.org
-COMMENT=	Shellscript to help with the first steps to build a package
+COMMENT=	Shell script to help with the first steps to build a package
 
 EXTRACT_ONLY=	# empty
 WRKSRC=		${WRKDIR}
diff --git a/pkgtools/url2pkg/files/url2pkg b/pkgtools/url2pkg/files/url2pkg
index ec79f69ca0a..d03db418aff 100755
--- a/pkgtools/url2pkg/files/url2pkg
+++ b/pkgtools/url2pkg/files/url2pkg
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: url2pkg,v 1.20 2002/05/14 00:05:02 rh Exp $
+# $NetBSD: url2pkg,v 1.21 2002/10/30 03:33:57 rh Exp $
 #
 # url2pkg
 # (c) 1999-2002 Hubert Feyrer <hubert@feyrer.de>
@@ -104,9 +104,10 @@ fi
 
 configure=`echo w*`/$wrksrc/configure
 echo checking $configure XXX
-if [ -f $configure ]; then
-	if expr 2>&1 >/dev/null  "`$configure --version`" \
-	   : 'configure generated by autoconf version.*' ; then
+if [ -x $configure ]; then
+	if $configure --version | egrep					\
+	    'configure generated by autoconf version|Free Software Foundation' \
+	    >/dev/null 2>&1 ; then
 		GNU_CONFIGURE=YES
 	else
 		HAS_CONFIGURE=YES
@@ -122,6 +123,8 @@ if [ -f $ltconfig -o -f $ltmain ]; then
 	LIBTOOL_OVERRIDE=${libtool}
 fi
 
+PKGCONFIGS=`cd w*/$wrksrc && find * -name \*.pc.in -type f`
+
 echo "Fixing up Makefile."
 (
 	sed '/^.include/d' <Makefile
@@ -130,6 +133,8 @@ echo "Fixing up Makefile."
 		echo "WRKSRC=		$WRKSRC"
 	fi
 
+	echo "USE_BUILDLINK2=	YES"
+
 	if [ "${USE_LIBTOOL}" != "" ]; then
 		echo "USE_LIBTOOL=	$USE_LIBTOOL"
 	fi
@@ -137,6 +142,10 @@ echo "Fixing up Makefile."
 		echo "LIBTOOL_OVERRIDE=	$LIBTOOL_OVERRIDE"
 	fi
 
+	for i in $PKGCONFIGS ; do
+		echo "PKGCONFIG_OVERRIDE+=	\${WRKSRC}/$i"
+	done
+
 	if [ "${HAS_CONFIGURE}" != "" ]; then
 		echo "HAS_CONFIGURE=	$HAS_CONFIGURE"
 	fi
@@ -157,6 +166,6 @@ if [ ! -f DESCR ]; then
 	touch DESCR
 fi
 echo ""
-echo "Don't forget to fill in the COMMENT variable and DESCR when you're done."
+echo "Remember to fill in CATEGORIES, HOMEPAGE, COMMENT, and DESCR when you're done!"
 echo ""
 echo "Good luck! (See pkgsrc/Packages.txt for some more help :-)"
-- 
cgit v1.2.3