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 /inputmethod | |
| 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 'inputmethod')
| -rw-r--r-- | inputmethod/imhangul/Makefile | 4 | ||||
| -rw-r--r-- | inputmethod/imhangul_status_applet/Makefile | 5 | ||||
| -rw-r--r-- | inputmethod/nabi/Makefile | 4 | ||||
| -rw-r--r-- | inputmethod/uim/Makefile | 5 |
4 files changed, 8 insertions, 10 deletions
diff --git a/inputmethod/imhangul/Makefile b/inputmethod/imhangul/Makefile index 57dd4922ae0..a15b02102d0 100644 --- a/inputmethod/imhangul/Makefile +++ b/inputmethod/imhangul/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/07/21 16:29:52 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2005/08/10 20:56:18 jlam Exp $ DISTNAME= imhangul-0.9.11 PKGREVISION= 1 @@ -10,12 +10,12 @@ MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://imhangul.kldp.net/ COMMENT= GTK+-2.0 Hangul Input Module +USE_TOOLS+= pkg-config GNU_CONFIGURE= YES USE_LIBTOOL= YES SHLIBTOOL_OVERRIDE= libtool USE_PKGLOCALEDIR= YES GTK2_IMMODULES= YES -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/imhangul_status_applet/Makefile b/inputmethod/imhangul_status_applet/Makefile index 7ce37f97d9d..db70785b2db 100644 --- a/inputmethod/imhangul_status_applet/Makefile +++ b/inputmethod/imhangul_status_applet/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= imhangul_status_applet-0.2 @@ -15,13 +15,12 @@ DEPENDS= imhangul>=0.9.6:../../inputmethod/imhangul GNU_CONFIGURE= yes USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_LIBTOOL= yes GCONF2_SCHEMAS= imhangul_status.schemas .include "../../devel/GConf2/schemas.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../x11/gnome-panel/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/nabi/Makefile b/inputmethod/nabi/Makefile index 8d557fba283..c6ebba4f480 100644 --- a/inputmethod/nabi/Makefile +++ b/inputmethod/nabi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:52 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:18 jlam Exp $ # DISTNAME= nabi-0.15 @@ -9,11 +9,11 @@ MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://nabi.kldp.net/ COMMENT= X Input Method for Korean +USE_TOOLS+= pkg-config GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile index de93d8e8463..8a24b714b9f 100644 --- a/inputmethod/uim/Makefile +++ b/inputmethod/uim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/07/21 16:29:52 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2005/08/10 20:56:18 jlam Exp $ # DISTNAME= uim-0.4.6 @@ -12,7 +12,7 @@ COMMENT= Multilingual input method library USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES USE_NCURSES= # clear_screen, clr_eos -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config PKGCONFIG_OVERRIDE+= ${WRKSRC}/uim.pc.in GNU_CONFIGURE= YES GTK2_IMMODULES= YES @@ -36,7 +36,6 @@ post-install: .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" |