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 /converters | |
| 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 'converters')
| -rw-r--r-- | converters/fribidi/Makefile | 4 | ||||
| -rw-r--r-- | converters/wv/Makefile | 5 | ||||
| -rw-r--r-- | converters/wv2/Makefile | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/converters/fribidi/Makefile b/converters/fribidi/Makefile index f2563a372f7..0c7815cbae1 100644 --- a/converters/fribidi/Makefile +++ b/converters/fribidi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:45 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:13 jlam Exp $ # DISTNAME= fribidi-0.10.4 @@ -13,10 +13,10 @@ COMMENT= Free Implementation of the Unicode Bidirectional Algorithm USE_LIBTOOL= yes GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config PKGCONFIG_OVERRIDE= fribidi.pc.in TEST_TARGET= check -.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/converters/wv/Makefile b/converters/wv/Makefile index 81f6024f494..7224c5d40ac 100644 --- a/converters/wv/Makefile +++ b/converters/wv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2005/07/21 16:29:45 wiz Exp $ +# $NetBSD: Makefile,v 1.48 2005/08/10 20:56:13 jlam Exp $ DISTNAME= wv-1.0.3 PKGREVISION= 2 @@ -9,7 +9,7 @@ MAINTAINER= adam@NetBSD.org HOMEPAGE= http://wvware.sourceforge.net/ COMMENT= Library and executables to access Microsoft Word files -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes @@ -27,7 +27,6 @@ CONFIGURE_ARGS+= --with-png=${BUILDLINK_PREFIX.png} .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/libwmf/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/converters/wv2/Makefile b/converters/wv2/Makefile index b97008ef816..4afb613b331 100644 --- a/converters/wv2/Makefile +++ b/converters/wv2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:45 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:13 jlam Exp $ # DISTNAME= wv2-0.2.2 @@ -15,6 +15,7 @@ USE_GNU_ICONV= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config CONFIGURE_ARGS+= --disable-debug CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv} @@ -23,5 +24,4 @@ CONFIGURE_ARGS.gnu-iconv= --with-libiconv=${BUILDLINK_PREFIX.iconv} .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/libgsf/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |