diff options
Diffstat (limited to 'devel')
42 files changed, 82 insertions, 137 deletions
diff --git a/devel/ArX/Makefile b/devel/ArX/Makefile index 86debc557c6..e7b251a345b 100644 --- a/devel/ArX/Makefile +++ b/devel/ArX/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:46 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:14 jlam Exp $ # DISTNAME= ArX-1.0.20 @@ -15,6 +15,7 @@ DEPENDS+= diffutils-[0-9]*:../../devel/diffutils DEPENDS+= gtar-base-[0-9]*:../../archivers/gtar-base BUILD_DEPENDS+= scons-[0-9]*:../../devel/scons +USE_TOOLS+= pkg-config USE_PKGLOCALEDIR= yes USE_LANGUAGES= c c++ GNU_CONFIGURE= yes @@ -40,7 +41,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCDIR} .endfor -.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ArX2/Makefile b/devel/ArX2/Makefile index a35bc4d0f28..b3f8166596d 100644 --- a/devel/ArX2/Makefile +++ b/devel/ArX2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/07/24 08:47:42 recht Exp $ +# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:14 jlam Exp $ # DISTNAME= ArX-2.2.3 @@ -14,6 +14,7 @@ DEPENDS+= diffutils-[0-9]*:../../devel/diffutils DEPENDS+= gtar-base-[0-9]*:../../archivers/gtar-base BUILD_DEPENDS+= scons-[0-9]*:../../devel/scons +USE_TOOLS+= pkg-config USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes @@ -41,6 +42,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCDIR} .endfor -.include "../../devel/pkg-config/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common index 17e3435ea99..eecf356bb77 100644 --- a/devel/GConf2/Makefile.common +++ b/devel/GConf2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.31 2005/07/27 17:11:08 drochner Exp $ +# $NetBSD: Makefile.common,v 1.32 2005/08/10 20:56:14 jlam Exp $ # DISTNAME= GConf-2.10.1 @@ -22,7 +22,7 @@ PATCHDIR= ${.CURDIR}/../GConf2/patches USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_TOOLS+= gmake perl +USE_TOOLS+= gmake perl pkg-config PKGCONFIG_OVERRIDE= gconf-2.0.pc.in @@ -33,5 +33,3 @@ CONFIGURE_ARGS+= --with-sysconfsubdir= CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc CONFIGURE_ARGS+= --disable-gtk-doc CONFIGURE_ARGS+= --enable-gconf-source=xml::${PKG_SYSCONFDIR}/gconf.xml.defaults - -.include "../../devel/pkg-config/buildlink3.mk" diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile index d08d8fd31ef..d3e2b17e152 100644 --- a/devel/anjuta/Makefile +++ b/devel/anjuta/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/08/01 17:17:14 drochner Exp $ +# $NetBSD: Makefile,v 1.33 2005/08/10 20:56:14 jlam Exp $ DISTNAME= anjuta-1.2.3 PKGREVISION= 1 @@ -16,12 +16,11 @@ DEPENDS+= glade2>=2.6.0:../../devel/glade2 DEPENDS+= gnome2-terminal>=2.4.2:../../x11/gnome2-terminal DEPENDS+= libtool>=1.5.2:../../devel/libtool DEPENDS+= yelp>=2.4.2:../../misc/yelp -BUILDLINK_DEPMETHOD.pkg-config= full USE_DIRS+= gnome2-1.5 USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake:run +USE_TOOLS+= gmake:run pkg-config:run GNU_CONFIGURE= yes SUBST_CLASSES+= make @@ -43,7 +42,6 @@ SUBST_SED.unused= -e 's/__unused__/_exctags_unused_/g' .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/vte/buildlink3.mk" diff --git a/devel/at-spi/Makefile b/devel/at-spi/Makefile index 9e75d49d447..000f1b4c5c2 100644 --- a/devel/at-spi/Makefile +++ b/devel/at-spi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:46 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2005/08/10 20:56:14 jlam Exp $ # DISTNAME= at-spi-1.6.3 @@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Assistive Technology Service Provider Interface -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes @@ -24,7 +24,6 @@ PKGCONFIG_OVERRIDE+= libspi-1.0.pc.in .include "../../devel/atk/buildlink3.mk" .include "../../devel/gail/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" diff --git a/devel/atk/Makefile b/devel/atk/Makefile index dcb8f03943d..1633e815348 100644 --- a/devel/atk/Makefile +++ b/devel/atk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/07/21 16:29:46 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2005/08/10 20:56:14 jlam Exp $ # DISTNAME= atk-1.10.1 @@ -12,7 +12,7 @@ COMMENT= Set of interfaces for accessibility PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes @@ -31,6 +31,5 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.3 .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/blib/Makefile b/devel/blib/Makefile index c4a12a7e9d2..4a6f090cca0 100644 --- a/devel/blib/Makefile +++ b/devel/blib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:46 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:14 jlam Exp $ # DISTNAME= blib-1.0.2 @@ -10,6 +10,7 @@ MAINTAINER= salo@NetBSD.org HOMEPAGE= http://www.blinkenlights.de/ COMMENT= Blinkenlights library +USE_TOOLS+= pkg-config USE_LIBTOOL= YES GNU_CONFIGURE= YES @@ -27,7 +28,5 @@ CONFIGURE_ARGS+= --disable-directfb post-extract: ${TOUCH} ${WRKSRC}/modules/libtool -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/devel/coconut/Makefile b/devel/coconut/Makefile index 7938fb2c08a..28bd448d523 100644 --- a/devel/coconut/Makefile +++ b/devel/coconut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:46 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:14 jlam Exp $ # DISTNAME= coconut-0.3.0 @@ -13,6 +13,7 @@ COMMENT= Objective-C library for Unix-like systems BUILD_DEPENDS+= papaya>=0.1.7:../../devel/papaya +USE_TOOLS+= pkg-config USE_LIBTOOL= YES GNU_CONFIGURE= YES CPPFLAGS+= -I${PREFIX}/include/libxml2/libxml -DGL_GLEXT_LEGACY @@ -23,7 +24,6 @@ MAKE_ENV+= AM_MAKEFLAGS="am__depfiles_maybe=" .include "../../textproc/libxslt/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../net/gnet1/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index 428c8825b1c..3862c7fce55 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:46 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:14 jlam Exp $ DISTNAME= devhelp-0.7 PKGREVISION= 11 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.imendio.com/projects/devhelp/ COMMENT= Documentation viewer based on GNOME2 USE_DIRS+= gnome2-1.5 -USE_TOOLS+= gmake perl +USE_TOOLS+= gmake perl pkg-config USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes @@ -25,7 +25,6 @@ BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../www/libgtkhtml/buildlink3.mk" diff --git a/devel/eel2/Makefile b/devel/eel2/Makefile index 65dfc0108db..8271c6e06dd 100644 --- a/devel/eel2/Makefile +++ b/devel/eel2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/07/21 16:29:46 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2005/08/10 20:56:14 jlam Exp $ DISTNAME= eel-2.10.1 PKGNAME= ${DISTNAME:S/-/2-/} @@ -13,7 +13,7 @@ COMMENT= Eazel Extensions Library for GNOME2 BUILD_USES_MSGFMT= YES USE_DIRS+= gnome2-1.5 -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES @@ -27,7 +27,6 @@ PKGCONFIG_OVERRIDE= eel-2.0.pc.in .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../sysutils/gnome-menus/buildlink3.mk" diff --git a/devel/eet/Makefile b/devel/eet/Makefile index c2fa4f4752f..823d0428303 100644 --- a/devel/eet/Makefile +++ b/devel/eet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:46 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:14 jlam Exp $ # DISTNAME= eet-0.9.9 @@ -11,12 +11,12 @@ COMMENT= Library for speedy storage, retrieval, and compression PKG_INSTALLATION_TYPES= overwrite pkgviews +USE_TOOLS+= pkg-config GNU_CONFIGURE= YES USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= eet.pc.in -.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile index b243239e0b1..4778fafe34c 100644 --- a/devel/g-wrap/Makefile +++ b/devel/g-wrap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/08/10 19:01:23 gdt Exp $ +# $NetBSD: Makefile,v 1.40 2005/08/10 20:56:14 jlam Exp $ DISTNAME= g-wrap-1.9.6 CATEGORIES= devel @@ -12,7 +12,7 @@ DEPENDS+= guile-lib>=0.1.2:../../devel/guile-lib GNU_CONFIGURE= YES -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_LIBTOOL= YES TEST_TARGET= check @@ -23,6 +23,5 @@ pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/guile/site/g-wrap/guile/ws .include "../../devel/glib/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../lang/guile/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gail/Makefile b/devel/gail/Makefile index ce60610e845..22109bc7695 100644 --- a/devel/gail/Makefile +++ b/devel/gail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:46 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2005/08/10 20:56:14 jlam Exp $ # DISTNAME= gail-1.8.4 @@ -11,7 +11,7 @@ HOMEPAGE= http://developer.gnome.org/projects/gap/ COMMENT= GNOME Accessibility Implementation Library GNU_CONFIGURE= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes @@ -22,7 +22,6 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc .include "../../devel/atk/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/devel/gal2/Makefile b/devel/gal2/Makefile index 1b85accd407..c595a2b366f 100644 --- a/devel/gal2/Makefile +++ b/devel/gal2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/07/27 17:46:52 drochner Exp $ +# $NetBSD: Makefile,v 1.40 2005/08/10 20:56:14 jlam Exp $ # # Check the API before updating this package! gal-2.5 and above should # get their own gal26 package! @@ -14,7 +14,7 @@ MAINTAINER= recht@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Library functions that came from Gnumeric and Evolution (gal-2.4 API) -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes @@ -29,7 +29,6 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc .include "../../devel/glib2/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 "../../print/libgnomeprintui/buildlink3.mk" diff --git a/devel/gal20/Makefile b/devel/gal20/Makefile index 340523a4f73..57e2fec227d 100644 --- a/devel/gal20/Makefile +++ b/devel/gal20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:46 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:14 jlam Exp $ # DISTNAME= gal-1.99.11 @@ -12,7 +12,7 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= Library functions that came from Gnumeric and Evolution -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_PKGLOCALEDIR= yes BUILD_USES_MSGFMT= yes USE_LIBTOOL= yes @@ -22,7 +22,6 @@ CONFIGURE_ARGS= --enable-gtk-doc=no CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile index efb69a38e58..c01a2734b6b 100644 --- a/devel/gconfmm/Makefile +++ b/devel/gconfmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/07/22 21:25:59 adam Exp $ +# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:14 jlam Exp $ DISTNAME= gconfmm-2.10.0 CATEGORIES= devel @@ -12,11 +12,10 @@ COMMENT= C++ bindings for gconf USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config PKGCONFIG_OVERRIDE+= ${WRKSRC}/gconf/gconfmm-2.6.pc.in GNU_CONFIGURE= yes .include "../../devel/GConf2/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtkmm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/glade2/Makefile.common b/devel/glade2/Makefile.common index ad61851d79d..44bcab84b62 100644 --- a/devel/glade2/Makefile.common +++ b/devel/glade2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2005/07/21 16:29:46 wiz Exp $ +# $NetBSD: Makefile.common,v 1.7 2005/08/10 20:56:15 jlam Exp $ DISTNAME= glade-2.10.0 PKGNAME= ${DISTNAME:S/-/2-/} @@ -16,12 +16,11 @@ PLIST_SRC= ${.CURDIR}/../../devel/glade2/PLIST GNU_CONFIGURE= YES USE_DIRS+= gnome2-1.5 -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 70a87cead01..093b7973660 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2005/08/09 22:20:02 jmmv Exp $ +# $NetBSD: Makefile,v 1.79 2005/08/10 20:56:15 jlam Exp $ DISTNAME= glib-2.6.6 PKGNAME= ${DISTNAME:S/glib/glib2/} @@ -18,7 +18,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews BUILD_USES_MSGFMT= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake perl:run +USE_TOOLS+= gmake perl:run pkg-config USE_LIBTOOL= yes TEST_TARGET= check @@ -74,7 +74,6 @@ PRINT_PLIST_AWK+= /^@dirrm include\/glib$$/ \ .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile index e8739a0f51f..bf69057d9c5 100644 --- a/devel/glibmm/Makefile +++ b/devel/glibmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/07/22 21:12:21 adam Exp $ +# $NetBSD: Makefile,v 1.2 2005/08/10 20:56:15 jlam Exp $ DISTNAME= glibmm-2.6.1 CATEGORIES= devel @@ -12,11 +12,10 @@ COMMENT= C++ bindings for glib USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config PKGCONFIG_OVERRIDE+= ${WRKSRC}/glib/glibmm-2.4.pc.in GNU_CONFIGURE= yes .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libsigc++2/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gnome2-libole2/Makefile b/devel/gnome2-libole2/Makefile index 379d221e8b8..77b69f42fc1 100644 --- a/devel/gnome2-libole2/Makefile +++ b/devel/gnome2-libole2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:47 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:15 jlam Exp $ # DISTNAME= libole2-2.2.8 @@ -16,9 +16,9 @@ BUILD_USES_MSGFMT= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES +USE_TOOLS+= pkg-config .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile index 5bbf7aa69ba..62db8e8806f 100644 --- a/devel/gob2/Makefile +++ b/devel/gob2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/07/21 16:29:47 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2005/08/10 20:56:15 jlam Exp $ # DISTNAME= gob2-2.0.11 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.5z.com/jirka/gob.html COMMENT= GNOME object builder for glib2 GNU_CONFIGURE= YES +USE_TOOLS+= pkg-config .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index 63d3136c624..9d91e89dfc9 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/08/05 21:52:36 jlam Exp $ +# $NetBSD: Makefile,v 1.40 2005/08/10 20:56:15 jlam Exp $ DISTNAME= libbonobo-2.10.0 CATEGORIES= devel gnome @@ -15,7 +15,7 @@ GNU_CONFIGURE= YES USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES -USE_TOOLS+= bison gmake perl:run +USE_TOOLS+= bison gmake perl:run pkg-config PKGCONFIG_OVERRIDE= bonobo/libbonobo-2.0.pc.in PKGCONFIG_OVERRIDE+= bonobo-activation/bonobo-activation-2.0.pc.in @@ -36,7 +36,6 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/(bonobo|bonobo\/monikers)$$/ \ .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile index d5ff93a7b11..219e917951e 100644 --- a/devel/libbonoboui/Makefile +++ b/devel/libbonoboui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/07/27 17:23:51 drochner Exp $ +# $NetBSD: Makefile,v 1.43 2005/08/10 20:56:15 jlam Exp $ # DISTNAME= libbonoboui-2.10.0 @@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes GNU_CONFIGURE= yes USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_LIBTOOL= yes PKGCONFIG_OVERRIDE= bonobo/libbonoboui-2.0.pc.in @@ -31,7 +31,6 @@ BUILDLINK_DEPENDS.libbonobo+= libbonobo>=2.8.1 .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" diff --git a/devel/libgail-gnome/Makefile b/devel/libgail-gnome/Makefile index 39a09201fe6..716ec584c1d 100644 --- a/devel/libgail-gnome/Makefile +++ b/devel/libgail-gnome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:47 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:15 jlam Exp $ # DISTNAME= libgail-gnome-1.1.1 @@ -12,6 +12,7 @@ COMMENT= GNOME Accessibility Implementation Library GNU_CONFIGURE= YES USE_LIBTOOL= YES +USE_TOOLS+= pkg-config PKGCONFIG_OVERRIDE= libgail-gnome.pc.in @@ -20,7 +21,6 @@ PKGCONFIG_OVERRIDE= libgail-gnome.pc.in .include "../../devel/libbonobo/buildlink3.mk" .include "../../devel/libbonoboui/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gnome-panel/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile index 68452471560..cec1a3bf2dd 100644 --- a/devel/libglade2/Makefile +++ b/devel/libglade2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/07/21 16:29:48 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2005/08/10 20:56:15 jlam Exp $ # DISTNAME= libglade-2.5.1 @@ -13,7 +13,7 @@ COMMENT= Runtime interpreter for GLADE GUI files (v2) BUILD_USES_MSGFMT= YES -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config GNU_CONFIGURE= YES USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= libglade-2.0.pc.in @@ -33,7 +33,6 @@ post-install: .include "../../devel/atk/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../textproc/xmlcatmgr/catalogs.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile index 137b6310117..5f563468847 100644 --- a/devel/libglademm/Makefile +++ b/devel/libglademm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/07/22 21:31:33 adam Exp $ +# $NetBSD: Makefile,v 1.2 2005/08/10 20:56:15 jlam Exp $ DISTNAME= libglademm-2.6.0 CATEGORIES= devel @@ -12,11 +12,10 @@ COMMENT= C++ bindings for libglade USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config PKGCONFIG_OVERRIDE+= ${WRKSRC}/libglade/libglademm-2.4.pc.in GNU_CONFIGURE= yes .include "../../devel/libglade2/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtkmm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile index c836406b16e..4444816eb06 100644 --- a/devel/libgnome/Makefile +++ b/devel/libgnome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/07/27 17:20:49 drochner Exp $ +# $NetBSD: Makefile,v 1.41 2005/08/10 20:56:15 jlam Exp $ # DISTNAME= libgnome-2.10.1 @@ -16,7 +16,7 @@ BUILD_USES_MSGFMT= YES BUILDLINK_DEPENDS.esound+= esound>=0.2.26 GNU_CONFIGURE= YES -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES USE_PKGINSTALL= YES @@ -58,7 +58,6 @@ GCONF2_SCHEMAS+= desktop_gnome_typing_break.schemas .include "../../devel/glib2/buildlink3.mk" .include "../../devel/GConf2/schemas.mk" .include "../../devel/libbonobo/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" diff --git a/devel/libgnomemm/Makefile b/devel/libgnomemm/Makefile index 3223f501779..6298aabc096 100644 --- a/devel/libgnomemm/Makefile +++ b/devel/libgnomemm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/07/22 22:00:24 adam Exp $ +# $NetBSD: Makefile,v 1.2 2005/08/10 20:56:15 jlam Exp $ DISTNAME= libgnomemm-2.10.0 CATEGORIES= devel @@ -12,11 +12,10 @@ COMMENT= C++ bindings for libgnome USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgnome/libgnomemm-2.6.pc.in GNU_CONFIGURE= yes .include "../../devel/libgnome/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtkmm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile index da910dec4f5..d8287fabbed 100644 --- a/devel/libgnomeui/Makefile +++ b/devel/libgnomeui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2005/07/27 17:25:02 drochner Exp $ +# $NetBSD: Makefile,v 1.47 2005/08/10 20:56:15 jlam Exp $ # DISTNAME= libgnomeui-2.10.1 @@ -17,7 +17,7 @@ CONFLICTS+= gnome-libs<=1.4.2nb1 GNU_CONFIGURE= yes USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake perl +USE_TOOLS+= gmake perl pkg-config USE_LIBTOOL= yes CONFIGURE_ARGS+= --disable-gtk-doc @@ -45,7 +45,6 @@ post-configure: .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../security/gnome-keyring/buildlink3.mk" diff --git a/devel/libgnomeuimm/Makefile b/devel/libgnomeuimm/Makefile index a9c96fbd14f..fdc7ea3b6f5 100644 --- a/devel/libgnomeuimm/Makefile +++ b/devel/libgnomeuimm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/07/22 22:05:31 adam Exp $ +# $NetBSD: Makefile,v 1.2 2005/08/10 20:56:15 jlam Exp $ DISTNAME= libgnomeuimm-2.10.0 CATEGORIES= devel @@ -12,7 +12,7 @@ COMMENT= C++ bindings for libgnomeui USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgnomeui/libgnomeuimm-2.6.pc.in GNU_CONFIGURE= yes @@ -20,7 +20,6 @@ GNU_CONFIGURE= yes .include "../../devel/libglademm/buildlink3.mk" .include "../../devel/libgnomemm/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libgnomecanvasmm/buildlink3.mk" .include "../../sysutils/gnome-vfsmm/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile index 8e9789d3a2e..6e4c088d432 100644 --- a/devel/libgphoto2/Makefile +++ b/devel/libgphoto2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:48 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2005/08/10 20:56:15 jlam Exp $ # DISTNAME= libgphoto2-2.1.6 @@ -11,6 +11,7 @@ COMMENT= Digital camera access library CONFLICTS+= gphoto<2.1.1 +USE_TOOLS+= pkg-config USE_LIBTOOL= YES PKGCONFIG_OVERRIDE+= libgphoto2/libgphoto2.pc.in USE_PKGLOCALEDIR= YES @@ -26,6 +27,5 @@ PLIST_SUBST+= HAVE_LIBUSB="@comment" .include "../../devel/libusb/buildlink3.mk" PLIST_SUBST+= HAVE_LIBUSB="" .endif -.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index 4b2f138fb78..32352aec964 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/07/21 16:29:48 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2005/08/10 20:56:15 jlam Exp $ # DISTNAME= libgsf-1.12.1 @@ -10,6 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME2 structured file library +USE_TOOLS+= pkg-config GNU_CONFIGURE= YES USE_LIBTOOL= YES @@ -22,7 +23,6 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/libgsf .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile index 97af51899be..5a06220f818 100644 --- a/devel/libidn/Makefile +++ b/devel/libidn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/07/22 23:41:42 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:15 jlam Exp $ # DISTNAME= libidn-0.5.18 @@ -15,6 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= yes TEST_TARGET= check USE_LIBTOOL= yes +USE_TOOLS+= pkg-config PKGCONFIG_OVERRIDE+= libidn.pc.in @@ -22,6 +23,5 @@ INFO_FILES= libidn.info .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/libgetopt/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libmatchbox/Makefile b/devel/libmatchbox/Makefile index 602ffad56e0..55463ab89cd 100644 --- a/devel/libmatchbox/Makefile +++ b/devel/libmatchbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:48 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:15 jlam Exp $ # DISTNAME= libmatchbox-1.6 @@ -12,8 +12,8 @@ COMMENT= Library for matchbox window manager for computers with small displays USE_LIBTOOL= yes GNU_CONFIGURE= yes +USE_TOOLS+= pkg-config -.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/xpm/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/devel/libntlm/Makefile b/devel/libntlm/Makefile index e7123551358..842fbe39b1c 100644 --- a/devel/libntlm/Makefile +++ b/devel/libntlm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/07/22 23:45:22 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2005/08/10 20:56:15 jlam Exp $ # DISTNAME= libntlm-0.3.7 @@ -9,11 +9,11 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://josefsson.org/libntlm/ COMMENT= Library that implement Microsoft's NTLM authentication +USE_TOOLS+= pkg-config GNU_CONFIGURE= yes USE_LIBTOOL= yes TEST_TARGET= check PKGCONFIG_OVERRIDE+= libntlm.pc.in -.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libstatgrab/Makefile b/devel/libstatgrab/Makefile index 562d9756a83..ade07dda34e 100644 --- a/devel/libstatgrab/Makefile +++ b/devel/libstatgrab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:48 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:15 jlam Exp $ DISTNAME= libstatgrab-0.11 CATEGORIES= devel @@ -16,6 +16,7 @@ COMMENT= Provides a useful interface to system statistics GNU_CONFIGURE= yes USE_LIBTOOL= yes +USE_TOOLS+= pkg-config PKGCONFIG_OVERRIDE= libstatgrab.pc.in CONFIGURE_ARGS+= --disable-examples @@ -40,5 +41,4 @@ PLIST_SUBST+= SAIDAR="" .include "../../devel/ncurses/buildlink3.mk" .endif -.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/libwnck/Makefile b/devel/libwnck/Makefile index 1caab4f6696..49a25b2a2eb 100644 --- a/devel/libwnck/Makefile +++ b/devel/libwnck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/07/27 17:13:16 drochner Exp $ +# $NetBSD: Makefile,v 1.29 2005/08/10 20:56:15 jlam Exp $ # DISTNAME= libwnck-2.10.2 @@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= yes GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_LIBTOOL= yes PKGCONFIG_OVERRIDE= libwnck-1.0.pc.in @@ -24,7 +24,6 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ogre/Makefile b/devel/ogre/Makefile index f37e206343f..50053006e62 100644 --- a/devel/ogre/Makefile +++ b/devel/ogre/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/07/21 16:29:49 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2005/08/10 20:56:15 jlam Exp $ # DISTNAME= ogre-v0-12-1 @@ -14,7 +14,7 @@ COMMENT= Object-Oriented Graphics Rendering Engine WRKSRC= ${WRKDIR}/ogrenew GNU_CONFIGURE= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_LIBTOOL= yes CONFIGURE_ARGS+= --with-platform=SDL @@ -23,7 +23,6 @@ PKGCONFIG_OVERRIDE+= OGRE.pc.in .include "../../devel/devIL/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/p5-ExtUtils-PkgConfig/Makefile b/devel/p5-ExtUtils-PkgConfig/Makefile index d311921de76..5f7591c08f3 100644 --- a/devel/p5-ExtUtils-PkgConfig/Makefile +++ b/devel/p5-ExtUtils-PkgConfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/08/06 06:19:10 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/08/10 20:56:15 jlam Exp $ # DISTNAME= ExtUtils-PkgConfig-1.06 @@ -14,7 +14,7 @@ COMMENT= Simplistic perl interface to pkg-config PKG_INSTALLATION_TYPES= overwrite pkgviews PERL5_PACKLIST= auto/ExtUtils/PkgConfig/.packlist +USE_TOOLS= pkg-config -.include "../../devel/pkg-config/buildlink3.mk" .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/p5-glib2/Makefile b/devel/p5-glib2/Makefile index c3dddb119ea..a82006652cc 100644 --- a/devel/p5-glib2/Makefile +++ b/devel/p5-glib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/08/06 06:19:18 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:16 jlam Exp $ # DISTNAME= Glib-${DIST_VERSION} @@ -16,7 +16,7 @@ DEPENDS+= p5-ExtUtils-PkgConfig>=1.03:../../devel/p5-ExtUtils-PkgConfig PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config MAKE_PARAMS+= disable-threadsafe DIST_VERSION= 1.040 @@ -24,6 +24,5 @@ DIST_VERSION= 1.040 PERL5_PACKLIST= auto/Glib/.packlist .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/pango/Makefile b/devel/pango/Makefile index 8f344fc8a2e..d5133f3520e 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2005/07/28 11:04:13 wiz Exp $ +# $NetBSD: Makefile,v 1.59 2005/08/10 20:56:16 jlam Exp $ # DISTNAME= pango-1.8.2 @@ -15,7 +15,7 @@ COMMENT= Library for layout and rendering of text PKG_INSTALLATION_TYPES= overwrite pkgviews USE_PKGINSTALL= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config GNU_CONFIGURE= yes TEST_TARGET= check USE_LIBTOOL= yes @@ -38,7 +38,6 @@ BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" diff --git a/devel/pkg-config/buildlink3.mk b/devel/pkg-config/buildlink3.mk deleted file mode 100644 index 27454a79c42..00000000000 --- a/devel/pkg-config/buildlink3.mk +++ /dev/null @@ -1,26 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.2 2005/07/22 01:57:02 grant Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -PKG_CONFIG_BUILDLINK3_MK:= ${PKG_CONFIG_BUILDLINK3_MK}+ - -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= pkg-config -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npkg-config} -BUILDLINK_PACKAGES+= pkg-config - -.if !empty(PKG_CONFIG_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.pkg-config+= pkg{,-}config>=0.15.0 -BUILDLINK_PKGSRCDIR.pkg-config?= ../../devel/pkg-config -BUILDLINK_DEPMETHOD.pkg-config?= build - -PKG_CONFIG_LIBDIR?= ${BUILDLINK_DIR}/lib/pkgconfig -CONFIGURE_ENV+= PKG_CONFIG=${BUILDLINK_PREFIX.pkg-config}/bin/pkg-config -CONFIGURE_ENV+= PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q} -MAKE_ENV+= PKG_CONFIG=${BUILDLINK_PREFIX.pkg-config}/bin/pkg-config -MAKE_ENV+= PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q} - -.endif # PKG_CONFIG_BUILDLINK3_MK - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |