diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2006-01-05 17:26:54 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2006-01-05 17:26:54 +0000 |
| commit | 6c95a6da67de0770c846024017589f8d9d555077 (patch) | |
| tree | 31a5b4b90d6abc12fe6d3e4c3564818792886774 /pkgtools | |
| parent | 7d0b3d06dc8d3e702c072428e1646d89df7722d8 (diff) | |
| download | pkgsrc-6c95a6da67de0770c846024017589f8d9d555077.tar.gz | |
Update to 1.32:
* Don't use ${WRKSRC} for PKGCONFIG_OVERRIDE (it's assigned automatically)
* If there are pkg-config files, now it will add "USE_TOOLS+= pkg-config".
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/url2pkg/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/url2pkg/files/url2pkg | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile index 9b58ff78730..134de70381b 100644 --- a/pkgtools/url2pkg/Makefile +++ b/pkgtools/url2pkg/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.38 2005/10/18 21:10:28 rh Exp $ +# $NetBSD: Makefile,v 1.39 2006/01/05 17:26:54 xtraeme Exp $ # -DISTNAME= url2pkg-1.31 +DISTNAME= url2pkg-1.32 CATEGORIES= pkgtools sysutils MASTER_SITES= # Nothing DISTFILES= # Nothing diff --git a/pkgtools/url2pkg/files/url2pkg b/pkgtools/url2pkg/files/url2pkg index c4218e7e850..f6151e1eff0 100755 --- a/pkgtools/url2pkg/files/url2pkg +++ b/pkgtools/url2pkg/files/url2pkg @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: url2pkg,v 1.33 2005/10/18 21:10:28 rh Exp $ +# $NetBSD: url2pkg,v 1.34 2006/01/05 17:26:54 xtraeme Exp $ # # url2pkg # (c) 1999-2002 Hubert Feyrer <hubert@feyrer.de> @@ -186,8 +186,12 @@ echo "Fixing up Makefile." echo "USE_LIBTOOL= $USE_LIBTOOL" fi + if [ -n $PKGCONFIGS ]; then + echo "USE_TOOLS+= pkg-config" + fi + for i in $PKGCONFIGS ; do - echo "PKGCONFIG_OVERRIDE+= \${WRKSRC}/$i" + echo "PKGCONFIG_OVERRIDE+= $i" done if [ "${HAS_CONFIGURE}" != "" ]; then |