diff options
| author | jlam <jlam@pkgsrc.org> | 2005-08-10 20:56:10 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-08-10 20:56:10 +0000 |
| commit | b1f207194f3f2d4cb73651c67948873344bf1d1f (patch) | |
| tree | 4d8a0ec4125811389b8272e1e14bc12417f9448c /archivers | |
| parent | 05aabdaad3c4d3e4d043bc1a2aaafaf17d881208 (diff) | |
| download | pkgsrc-b1f207194f3f2d4cb73651c67948873344bf1d1f.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 'archivers')
| -rw-r--r-- | archivers/file-roller/Makefile | 5 | ||||
| -rw-r--r-- | archivers/libcomprex/Makefile | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index dd327f2f49b..c2916b2925c 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/07/21 16:29:42 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2005/08/10 20:56:10 jlam Exp $ # DISTNAME= file-roller-2.10.2 @@ -18,7 +18,7 @@ DEPENDS+= zip>=2.3nb2:../../archivers/zip GNU_CONFIGURE= yes USE_DIRS+= gnome2-1.5 -USE_TOOLS+= gmake perl +USE_TOOLS+= gmake perl pkg-config USE_PKGLOCALEDIR= yes GCONF2_SCHEMAS= file-roller.schemas @@ -46,7 +46,6 @@ BUILDLINK_DEPENDS.libglade2+= libglade2>=2.4.0 .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../sysutils/nautilus/buildlink3.mk" diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile index 816d2316e73..938e4e698ae 100644 --- a/archivers/libcomprex/Makefile +++ b/archivers/libcomprex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/08/08 09:00:00 adam Exp $ +# $NetBSD: Makefile,v 1.16 2005/08/10 20:56:10 jlam Exp $ DISTNAME= libcomprex-0.3.3 CATEGORIES= archivers @@ -11,6 +11,7 @@ COMMENT= Library to handle (de)compression of files PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LIBTOOL= yes +USE_TOOLS+= pkg-config USE_PKGLOCALEDIR= yes PKGCONFIG_OVERRIDE= libcomprex.pc.in GNU_CONFIGURE= yes @@ -18,6 +19,5 @@ CONFIGURE_ENV+= ac_cv_lib_curl_curl_formparse=yes .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" |