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 /comms | |
| 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 'comms')
| -rw-r--r-- | comms/jpilot-syncmal/Makefile | 5 | ||||
| -rw-r--r-- | comms/jpilot/Makefile | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile index 1c80219c0d4..8e11c14e600 100644 --- a/comms/jpilot-syncmal/Makefile +++ b/comms/jpilot-syncmal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/07/21 16:29:45 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2005/08/10 20:56:13 jlam Exp $ DISTNAME= jpilot-syncmal_0.71.2 PKGNAME= jpilot-syncmal-0.71.2 @@ -12,7 +12,7 @@ COMMENT= MAL synchronization plugin for J-Pilot BUILDLINK_DEPMETHOD.jpilot= full -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_LIBTOOL= # defined SHLIBTOOL_OVERRIDE= libtool @@ -29,6 +29,5 @@ PLIST_SUBST+= PLUGINSDIR=${PLUGINSDIR:S/${PREFIX}\///} .include "../../comms/jpilot/buildlink3.mk" .include "../../comms/pilot-link-libs/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile index f250e6a7017..fa96927ae71 100644 --- a/comms/jpilot/Makefile +++ b/comms/jpilot/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= jpilot-0.99.5 @@ -16,6 +16,7 @@ CONFLICTS+= jpilot-libplugin-[0-9]* USE_DIRS+= gnome1-1.0 USE_LIBTOOL= YES +USE_TOOLS+= pkg-config USE_PKGLOCALEDIR= YES USE_OLD_DES_API= YES @@ -33,7 +34,6 @@ PLUGINSDIR= ${PREFIX}/lib/jpilot/plugins .include "../../comms/pilot-link-libs/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" |