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 /x11/xscreensaver-demo | |
| 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 'x11/xscreensaver-demo')
| -rw-r--r-- | x11/xscreensaver-demo/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/x11/xscreensaver-demo/Makefile b/x11/xscreensaver-demo/Makefile index 89f6b12fb22..10399a5f3a1 100644 --- a/x11/xscreensaver-demo/Makefile +++ b/x11/xscreensaver-demo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/07/21 16:30:01 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:30 jlam Exp $ # PKGNAME= ${DISTNAME:S/-/-demo-/} @@ -10,6 +10,8 @@ USE_DIRS+= xdg-1.1 .include "../../x11/xscreensaver/Makefile.common" +USE_TOOLS+= pkg-config + CONFIGURE_ARGS+= --with-gtk=${BUILDLINK_PREFIX.gtk2} CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2} CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config @@ -24,7 +26,6 @@ post-install: ${PREFIX}/man/man1/xscreensaver-demo.1 .include "../../devel/libglade2/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/xscreensaver/buildlink3.mk" |