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 | 7820875fff0afd6ebe69c1b4bdbb85e3952a0f1f (patch) | |
| tree | 4d8a0ec4125811389b8272e1e14bc12417f9448c /ham | |
| parent | 50dfb1eae01aa73de001b1546218ed750ef35575 (diff) | |
| download | pkgsrc-7820875fff0afd6ebe69c1b4bdbb85e3952a0f1f.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 'ham')
| -rw-r--r-- | ham/gmfsk/Makefile | 5 | ||||
| -rw-r--r-- | ham/xdx/Makefile | 5 | ||||
| -rw-r--r-- | ham/xlog/Makefile | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/ham/gmfsk/Makefile b/ham/gmfsk/Makefile index 3efe2cb7ce1..49bc80b9059 100644 --- a/ham/gmfsk/Makefile +++ b/ham/gmfsk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:52 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:18 jlam Exp $ # DISTNAME= gmfsk-0.6 @@ -9,14 +9,13 @@ MAINTAINER= wulf@NetBSD.org HOMEPAGE= http://gmfsk.connect.fi/ COMMENT= Multimode HF terminal program -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config GNU_CONFIGURE= yes GCONF2_SCHEMAS+=gmfsk.schemas CONFIGURE_ARGS+=--enable-hamlib .include "../../devel/GConf2/schemas.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../math/fftw2/buildlink3.mk" .include "../../ham/hamlib/buildlink3.mk" diff --git a/ham/xdx/Makefile b/ham/xdx/Makefile index 69a0d03969c..8bf48071ac7 100644 --- a/ham/xdx/Makefile +++ b/ham/xdx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:52 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:18 jlam Exp $ # DISTNAME= xdx-1.2 @@ -9,12 +9,11 @@ MAINTAINER= wulf@NetBSD.org HOMEPAGE= http://www.qsl.net/pg4i/linux/xdx.html COMMENT= Amateur Radio tcp/ip DX-cluster client -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config GNU_CONFIGURE= yes USE_PKGLOCALEDIR=yes BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/ham/xlog/Makefile b/ham/xlog/Makefile index 221f8939a86..067e506c91f 100644 --- a/ham/xlog/Makefile +++ b/ham/xlog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/07/21 16:29:52 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2005/08/10 20:56:18 jlam Exp $ # DISTNAME= xlog-1.0 @@ -11,11 +11,10 @@ COMMENT= Amateur Radio logging program GNU_CONFIGURE= yes USE_PKGLOCALEDIR=yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config CONFIGURE_ARGS= --enable-hamlib -.include "../../devel/pkg-config/buildlink3.mk" .include "../../ham/hamlib/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../print/libgnomeprint/buildlink3.mk" |