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 /mail/evolution14 | |
| 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 'mail/evolution14')
| -rw-r--r-- | mail/evolution14/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mail/evolution14/Makefile b/mail/evolution14/Makefile index 582b493f2a5..8c93115f579 100644 --- a/mail/evolution14/Makefile +++ b/mail/evolution14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:52 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:19 jlam Exp $ DISTNAME= evolution-1.4.6 PKGNAME= ${DISTNAME:S/evolution/evolution14/} @@ -28,7 +28,7 @@ BUILDLINK_DEPENDS.db3= db3-3.11.2{,nb*} GNU_CONFIGURE= YES USE_DIRS+= gnome2-1.5 -USE_TOOLS+= bison gmake +USE_TOOLS+= bison gmake pkg-config USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES @@ -50,7 +50,6 @@ CONFIGURE_ARGS+= --enable-openssl=yes CONFIGURE_ARGS+= --with-krb5=/usr --with-krb4=/usr CONFIGURE_ARGS+= --with-db3-includes=${LOCALBASE}/include/db3 CONFIGURE_ARGS+= --with-db3-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig" PKGCONFIG_OVERRIDE= camel.pc.in PKGCONFIG_OVERRIDE+= evolution-shell.pc.in @@ -78,7 +77,6 @@ LDFLAGS+= -lsemaphore .include "../../devel/libbonoboui/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../print/libgnomeprint/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" |