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 /www/mozilla | |
| 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 'www/mozilla')
| -rw-r--r-- | www/mozilla/Makefile.common | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 65e0e3d9113..68b88ba4d1b 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.61 2005/07/25 15:47:20 adam Exp $ +# $NetBSD: Makefile.common,v 1.62 2005/08/10 20:56:25 jlam Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-${MOZ_DIST_VER}-source @@ -15,7 +15,7 @@ BUILD_DEPENDS+= zip>=2.3:../../archivers/zip WRKSRC= ${WRKDIR}/mozilla USE_LANGUAGES= c c++ -USE_TOOLS+= autoconf213 gmake perl +USE_TOOLS+= autoconf213 gmake perl pkg-config GNU_CONFIGURE= yes CONFIG_GUESS_OVERRIDE= build/autoconf/config.guess @@ -54,7 +54,6 @@ UNLIMIT_RESOURCES= datasize memorysize stacksize .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .ifdef _MOZILLA_USE_GTK2 -.include "../../devel/pkg-config/buildlink3.mk" .include "../../net/libIDL/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 --disable-gnomevfs @@ -186,7 +185,6 @@ CONFIGURE_ARGS+= --with-pthreads .if ${MOZILLA_USE_XFT} == "YES" && exists(${X11BASE}/include/X11/Xdefs.h) CONFIGURE_ARGS+= --enable-xft # pkgconfig defaults to a "build" dependency, which is what we want. -.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" .endif |