diff options
| author | jlam <jlam> | 2005-08-10 20:56:10 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-08-10 20:56:10 +0000 |
| commit | 4deddec7cb25319298bf73b1fafbb654175a865c (patch) | |
| tree | 4d8a0ec4125811389b8272e1e14bc12417f9448c /lang | |
| parent | 9210d617d0c1b31f1f4fab84de4f8025b609fc18 (diff) | |
| download | pkgsrc-4deddec7cb25319298bf73b1fafbb654175a865c.tar.gz | |
Remove the abuse of buildlink that was pkg-config/buildlink3.mk. That
file's sole purpose was to provide a dependency on pkg-config and set
some environment variables. Instead, turn pkg-config into a "tool"
in the tools framework, where the pkg-config wrapper automatically
adds PKG_CONFIG_LIBDIR to the environment before invoking the real
pkg-config.
For all package Makefiles that included pkg-config/buildlink3.mk, remove
that inclusion and replace it with USE_TOOLS+=pkg-config.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/classpath-gui/Makefile | 5 | ||||
| -rw-r--r-- | lang/mono/Makefile | 5 | ||||
| -rw-r--r-- | lang/sablevm-classpath-gui/Makefile | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/lang/classpath-gui/Makefile b/lang/classpath-gui/Makefile index 37134304c8e..c911970acdd 100644 --- a/lang/classpath-gui/Makefile +++ b/lang/classpath-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:52 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:18 jlam Exp $ .include "../../lang/classpath/Makefile.common" @@ -7,6 +7,8 @@ COMMENT+= (GUI libraries) DEPENDS+= classpath>=0.12:../../lang/classpath +USE_TOOLS+= pkg-config + BUILD_DIRS= ${WRKSRC}/native/jni/classpath BUILD_DIRS+= ${WRKSRC}/native/jni/gtk-peer INSTALL_DIRS= ${WRKSRC}/native/jni/gtk-peer @@ -15,7 +17,6 @@ BUILDLINK_FILES.libart2+= bin/libart2-config BUILDLINK_TRANSFORM.libart2+= -e 's|/libart2-config|/libart-config|g' .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 4bf27d92813..055e49e946e 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/08/06 06:19:21 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2005/08/10 20:56:18 jlam Exp $ DISTNAME= mono-1.1.8.3 PKGREVISION= 1 @@ -21,7 +21,7 @@ NOT_FOR_PLATFORM+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[AB]-* # LP64 problems NOT_FOR_PLATFORM+= *-*-alpha *-*-sparc64 -USE_TOOLS+= bison gmake gtar perl:run +USE_TOOLS+= bison gmake gtar perl:run pkg-config USE_PKGINSTALL= yes USE_LIBTOOL= yes EXTRACT_USING= gtar @@ -60,7 +60,6 @@ TEST_TARGET= check .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/icu/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" diff --git a/lang/sablevm-classpath-gui/Makefile b/lang/sablevm-classpath-gui/Makefile index 6815ead4c2a..2d4d87fef03 100644 --- a/lang/sablevm-classpath-gui/Makefile +++ b/lang/sablevm-classpath-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:52 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:18 jlam Exp $ # .include "../../lang/sablevm-classpath/Makefile.common" @@ -9,6 +9,8 @@ COMMENT+= (GUI libraries) DEPENDS+= sablevm-classpath>=1.1.3nb1:../../lang/sablevm-classpath +USE_TOOLS+= pkg-config + BUILD_DIRS= ${WRKSRC}/native/jni/classpath BUILD_DIRS+= ${WRKSRC}/native/jni/gtk-peer INSTALL_DIRS= ${WRKSRC}/native/jni/gtk-peer @@ -18,7 +20,6 @@ PRINT_PLIST_AWK+= \ { print "@comment in sablevm-classpath: "$$0; next; } .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/java-env.mk" |