From b3f78ea1dc65ca87b470169b6f46da18d36bf91b Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 10 Aug 2005 20:56:10 +0000 Subject: 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. --- editors/abiword/Makefile.common | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'editors/abiword') diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common index 01ae524a643..e3eb0fe307f 100644 --- a/editors/abiword/Makefile.common +++ b/editors/abiword/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.23 2005/07/28 15:22:07 adam Exp $ +# $NetBSD: Makefile.common,v 1.24 2005/08/10 20:56:16 jlam Exp $ # Be sure to update PLIST and distinfo for editors/abiword-plugins when updating ABIWORD_VERSION= 2.2.9 @@ -17,13 +17,12 @@ BUILD_USES_MSGFMT= yes MAKEFILE= GNUmakefile USE_DIRS+= xdg-1.1 USE_LIBTOOL= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-libpng=${BUILDLINK_PREFIX.png} .include "../../converters/fribidi/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" -- cgit v1.2.3