Update url2pkg to 1.21. Notable changes include:

	- now sets USE_PKGLOCALEDIR if .mo or .gmo files are found
	- now recognizes GCONF schemas
	- no PKGCONFIG_OVERRIDE statements for -uninstalled .pc.in files
	- some minor code cleanup

2 files changed, 50 insertions, 23 deletions

diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile
index fc1dc40f36c..fca281c5cad 100644
--- a/pkgtools/url2pkg/Makefile
+++ b/pkgtools/url2pkg/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2003/03/29 12:42:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2003/04/21 23:31:14 rh Exp $
 #
 
-DISTNAME=	url2pkg-1.20
+DISTNAME=	url2pkg-1.21
 WRKSRC=		${WRKDIR}
 CATEGORIES=	pkgtools sysutils
 MASTER_SITES=	# Nothing
diff --git a/pkgtools/url2pkg/files/url2pkg b/pkgtools/url2pkg/files/url2pkg
index d03db418aff..288a11e4415 100755
--- a/pkgtools/url2pkg/files/url2pkg
+++ b/pkgtools/url2pkg/files/url2pkg
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: url2pkg,v 1.21 2002/10/30 03:33:57 rh Exp $
+# $NetBSD: url2pkg,v 1.22 2003/04/21 23:31:15 rh Exp $
 #
 # url2pkg
 # (c) 1999-2002 Hubert Feyrer <hubert@feyrer.de>
@@ -68,16 +68,16 @@ if [ ! -f w*/.extract_done ]; then
 	echo '# $'NetBSD'$'
 	echo '#'
 	echo ""
-	echo "DISTNAME=	$DISTNAME"
-	echo "CATEGORIES=	FILLTHISINPLEASE"
-	echo "MASTER_SITES=	$MASTER_SITES/"
+	echo "DISTNAME=		$DISTNAME"
+	echo "CATEGORIES=		FILLTHISINPLEASE"
+	echo "MASTER_SITES=		$MASTER_SITES/"
 	if [ "$EXTRACT_SUFX" != ".tar.gz" ]; then
-		echo "EXTRACT_SUFX=	${EXTRACT_SUFX}"
+		echo "EXTRACT_SUFX=		${EXTRACT_SUFX}"
 	fi
 	echo ""
-	echo "MAINTAINER=	$email_maintainer"
-	echo "HOMEPAGE=	"
-	echo "COMMENT=	SHORT_DESCRIPTION_OF_THE_PACKAGE"
+	echo "MAINTAINER=		$email_maintainer"
+	echo "HOMEPAGE=		"
+	echo "COMMENT=		SHORT_DESCRIPTION_OF_THE_PACKAGE"
 	echo ""
 	echo '.include "../../mk/bsd.pkg.mk"'
 	) >Makefile
@@ -102,28 +102,36 @@ if [ "$wrksrc" != "$DISTNAME" ]; then
 	WRKSRC="\${WRKDIR}/$wrksrc"
 fi
 
-configure=`echo w*`/$wrksrc/configure
+wsrcdir=`echo w*`/$wrksrc
+configure=$wsrcdir/configure
 echo checking $configure XXX
 if [ -x $configure ]; then
 	if $configure --version | egrep					\
 	    'configure generated by autoconf version|Free Software Foundation' \
 	    >/dev/null 2>&1 ; then
-		GNU_CONFIGURE=YES
+		GNU_CONFIGURE=yes
 	else
-		HAS_CONFIGURE=YES
+		HAS_CONFIGURE=yes
 	fi
+
+	if find $wsrcdir -name \*.mo -o -name \*.gmo >/dev/null ; then
+		USE_PKGLOCALEDIR=yes
+	fi
+
+	GCONF2_SCHEMAS=`find $wsrcdir -name \*.schemas -o -name \*.schemas.in* \
+		| sed -e 's|^.*/||' -e 's/.in.in$//' -e 's/.in$//'`
 fi
 
-ltconfig=`echo w*`/$wrksrc/ltconfig
-ltmain=`echo w*`/$wrksrc/ltmain.sh
+ltconfig=$wsrcdir/ltconfig
+ltmain=$wsrcdir/ltmain.sh
 libtool=\${WRKSRC}/libtool
 echo checking libtool: $ltconfig
 if [ -f $ltconfig -o -f $ltmain ]; then
-	USE_LIBTOOL=YES
+	USE_LIBTOOL=yes
 	LIBTOOL_OVERRIDE=${libtool}
 fi
 
-PKGCONFIGS=`cd w*/$wrksrc && find * -name \*.pc.in -type f`
+PKGCONFIGS=`cd $wsrcdir && find * -name \*.pc.in -a ! -name \*-uninstalled.pc.in -type f`
 
 echo "Fixing up Makefile."
 (
@@ -133,10 +141,14 @@ echo "Fixing up Makefile."
 		echo "WRKSRC=		$WRKSRC"
 	fi
 
-	echo "USE_BUILDLINK2=	YES"
+	echo "USE_BUILDLINK2=		yes"
+
+	if [ "${USE_PKGLOCALEDIR}" != "" ]; then
+		echo "USE_PKGLOCALEDIR=	$USE_PKGLOCALEDIR"
+	fi
 
 	if [ "${USE_LIBTOOL}" != "" ]; then
-		echo "USE_LIBTOOL=	$USE_LIBTOOL"
+		echo "USE_LIBTOOL=		$USE_LIBTOOL"
 	fi
 	if [ "${LIBTOOL_OVERRIDE}" != "" ]; then
 		echo "LIBTOOL_OVERRIDE=	$LIBTOOL_OVERRIDE"
@@ -147,20 +159,35 @@ echo "Fixing up Makefile."
 	done
 
 	if [ "${HAS_CONFIGURE}" != "" ]; then
-		echo "HAS_CONFIGURE=	$HAS_CONFIGURE"
+		echo "HAS_CONFIGURE=		$HAS_CONFIGURE"
 	fi
 	if [ "${GNU_CONFIGURE}" != "" ]; then
-		echo "GNU_CONFIGURE=	$GNU_CONFIGURE"
+		echo "GNU_CONFIGURE=		$GNU_CONFIGURE"
 	fi
 
 	echo ""
+
+	if [ -n "$GCONF2_SCHEMAS" ]; then
+		echo 'CONFIGURE_ENV+=		GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"'
+		echo 'MAKE_ENV+=		GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"'
+
+		echo ""
+
+		for i in $GCONF2_SCHEMAS ; do
+			echo "GCONF2_SCHEMAS+=	$i"
+		done
+
+		echo ""
+		echo '.include "../../devel/GConf2/schemas.mk"'
+	fi
+
 	echo '.include "../../mk/bsd.pkg.mk"'
 ) >Makefile.$$
 mv Makefile.$$ Makefile
 
 echo ""
-echo "Contents of "`echo w*`"/${wrksrc}:"
-ls -la w*/$wrksrc
+echo "Contents of $wsrcdir:"
+ls -la $wsrcdir
 
 if [ ! -f DESCR ]; then
 	touch DESCR