diff options
| author | jlam <jlam> | 2005-08-10 20:56:10 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-08-10 20:56:10 +0000 |
| commit | b3f78ea1dc65ca87b470169b6f46da18d36bf91b (patch) | |
| tree | 4d8a0ec4125811389b8272e1e14bc12417f9448c /x11 | |
| parent | 6cc0e59139f460170ef1bc22cecf04a148381243 (diff) | |
| download | pkgsrc-b3f78ea1dc65ca87b470169b6f46da18d36bf91b.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')
48 files changed, 99 insertions, 122 deletions
diff --git a/x11/Xcomposite/Makefile b/x11/Xcomposite/Makefile index 55d3f6af21a..2ff10e6b553 100644 --- a/x11/Xcomposite/Makefile +++ b/x11/Xcomposite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:59 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:25 jlam Exp $ # DISTNAME= libXcomposite-1.0.1 @@ -12,6 +12,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://freedesktop.org/ COMMENT= Xcomposite extension (library) +USE_TOOLS+= pkg-config USE_LIBTOOL= yes GNU_CONFIGURE= yes @@ -20,5 +21,4 @@ PKGCONFIG_OVERRIDE+= xcomposite.pc.in .include "../../x11/Xfixes/buildlink3.mk" .include "../../x11/compositeext/buildlink3.mk" .include "../../x11/fixesext/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xfixes/Makefile b/x11/Xfixes/Makefile index 4a86d8899f5..bacefaa48f6 100644 --- a/x11/Xfixes/Makefile +++ b/x11/Xfixes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:59 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:25 jlam Exp $ # DISTNAME= libXfixes-2.0.1 @@ -14,12 +14,12 @@ COMMENT= X Fixes extension of X RandR PKG_INSTALLATION_TYPES= overwrite pkgviews +USE_TOOLS+= pkg-config USE_LIBTOOL= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= xfixes.pc.in -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/fixesext/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xrandr-mixedcase/Makefile b/x11/Xrandr-mixedcase/Makefile index fdf8d13bc2f..f3bff411ded 100644 --- a/x11/Xrandr-mixedcase/Makefile +++ b/x11/Xrandr-mixedcase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:59 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:26 jlam Exp $ # DISTNAME= libXrandr-1.0.2 @@ -14,6 +14,7 @@ COMMENT= X RandR extension (Library) PKG_INSTALLATION_TYPES= overwrite pkgviews +USE_TOOLS+= pkg-config USE_LIBTOOL= yes GNU_CONFIGURE= yes @@ -25,6 +26,5 @@ BUILDLINK_DEPENDS.randrext+= randrext>=1.0 .include "../../x11/Xrender/buildlink3.mk" .include "../../x11/randrext/buildlink3.mk" .include "../../x11/xextensions/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xrender/Makefile b/x11/Xrender/Makefile index 1989f814c09..b4919ee529a 100644 --- a/x11/Xrender/Makefile +++ b/x11/Xrender/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:59 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2005/08/10 20:56:26 jlam Exp $ DISTNAME= libXrender-0.8.4 PKGNAME= ${DISTNAME:S/lib//} @@ -13,13 +13,13 @@ COMMENT= Client library for the X Rendering Extension protocol PKG_INSTALLATION_TYPES= overwrite pkgviews +USE_TOOLS+= pkg-config USE_LIBTOOL= YES GNU_CONFIGURE= YES PKGCONFIG_OVERRIDE= xrender.pc.in BUILDLINK_DEPENDS.render+= render>=0.8 -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/render/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/compositeext/Makefile b/x11/compositeext/Makefile index 931b79ecfd9..57032328f02 100644 --- a/x11/compositeext/Makefile +++ b/x11/compositeext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/07/21 16:29:59 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2005/08/10 20:56:26 jlam Exp $ # DISTNAME= compositeext-2.0 @@ -12,11 +12,11 @@ COMMENT= Headers and specification for X Composite extension PKG_INSTALLATION_TYPES= overwrite pkgviews +USE_TOOLS+= pkg-config GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= compositeext.pc.in .include "../../x11/fixesext/buildlink3.mk" .include "../../x11/xextensions/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/devilspie/Makefile b/x11/devilspie/Makefile index 949acbc9265..fc7addebb70 100644 --- a/x11/devilspie/Makefile +++ b/x11/devilspie/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/07/21 16:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:26 jlam Exp $ DISTNAME= devilspie-0.10 CATEGORIES= x11 @@ -10,6 +10,7 @@ COMMENT= Window-matching utility to customize window behavior BUILD_DEPENDS+= libxslt>=1.0:../../textproc/libxslt +USE_TOOLS+= pkg-config GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES @@ -23,7 +24,6 @@ post-install: .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../devel/libwnck/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile index 65f2f1be0c0..fd3435d0696 100644 --- a/x11/fbdesk/Makefile +++ b/x11/fbdesk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/07/21 16:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:26 jlam Exp $ # DISTNAME= fbdesk-1.2.1 @@ -10,6 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://fluxbox.sourceforge.net/fbdesk/ COMMENT= Application that creates and manage icons on your desktop +USE_TOOLS+= pkg-config USE_LIBTOOL= YES GNU_CONFIGURE= YES @@ -20,5 +21,4 @@ post-install: .include "../../converters/libiconv/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/fixesext/Makefile b/x11/fixesext/Makefile index 773f5bf9d17..336348a843b 100644 --- a/x11/fixesext/Makefile +++ b/x11/fixesext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/07/21 16:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2005/08/10 20:56:26 jlam Exp $ # DISTNAME= fixesext-2.0.1 @@ -12,10 +12,10 @@ COMMENT= X Fixes extension headers and specification PKG_INSTALLATION_TYPES= overwrite pkgviews +USE_TOOLS+= pkg-config GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= fixesext.pc.in -.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index c8ddc9d73a2..4fe794c9b09 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2005/07/21 16:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.84 2005/08/10 20:56:26 jlam Exp $ # DISTNAME= gdm-2.8.0.0 @@ -25,7 +25,7 @@ USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config PKG_OPTIONS_VAR= PKG_OPTIONS.gdm PKG_SUPPORTED_OPTIONS= inet6 pam @@ -121,7 +121,6 @@ post-install: ${INSTALL_DATA} ${DISTDIR}/Daemon.png ${PREFIX}/share/pixmaps .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index 7b5858479a6..11371b4fd14 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/07/21 16:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2005/08/10 20:56:26 jlam Exp $ # DISTNAME= gnome-desktop-2.10.2 @@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes GNU_CONFIGURE= yes USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake perl:run +USE_TOOLS+= gmake perl:run pkg-config USE_LIBTOOL= yes BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 @@ -23,7 +23,6 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 .include "../../devel/glib2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../graphics/gnome2-pixmaps/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile index 03a5be54144..97059bcb540 100644 --- a/x11/gnome-mag/Makefile +++ b/x11/gnome-mag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/07/21 16:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2005/08/10 20:56:26 jlam Exp $ # DISTNAME= gnome-mag-0.12.0 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= GNOME screen magnifier USE_DIRS+= gnome2-1.5 -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes @@ -22,7 +22,6 @@ PKGCONFIG_OVERRIDE+= gnome-mag-1.0.pc.in .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/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/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 62a8df4c04c..5e588529260 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2005/07/21 16:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2005/08/10 20:56:26 jlam Exp $ # DISTNAME= gnome-panel-2.10.2 @@ -12,7 +12,7 @@ COMMENT= GNOME2 panel application GNU_CONFIGURE= YES USE_DIRS+= gnome2-1.5 -USE_TOOLS+= gmake perl:run +USE_TOOLS+= gmake perl:run pkg-config USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= libpanel-applet/libpanelapplet-2.0.pc.in @@ -44,7 +44,6 @@ BUILDLINK_DEPENDS.libglade2+= libglade2>=2.5.0 .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libwnck/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/gnome-icon-theme/buildlink3.mk" .include "../../mail/evolution-data-server/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 75ea6d71148..21d7aee8065 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2005/07/21 16:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.54 2005/08/10 20:56:26 jlam Exp $ # DISTNAME= gnome-session-2.10.0 @@ -18,7 +18,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} GNU_CONFIGURE= yes USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake perl +USE_TOOLS+= gmake perl pkg-config USE_LIBTOOL= yes MAKE_ENV+= REAL_GCONFTOOL="${GCONFTOOL2}" @@ -40,7 +40,6 @@ BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.8.3nb1 .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../security/gnome-keyring/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/scrollkeeper/buildlink3.mk" diff --git a/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile index 0d8c628c6ce..34b2983f83e 100644 --- a/x11/gnome-themes-extras/Makefile +++ b/x11/gnome-themes-extras/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/07/21 16:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:26 jlam Exp $ # DISTNAME= gnome-themes-extras-0.8.1 @@ -20,14 +20,13 @@ USE_DIRS+= xdg-1.1 USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/gtk2-engines/buildlink3.mk" diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile index 3c440989cd3..aee1295e3b7 100644 --- a/x11/gnome-themes/Makefile +++ b/x11/gnome-themes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/07/21 16:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2005/08/10 20:56:26 jlam Exp $ # DISTNAME= gnome-themes-2.10.1 @@ -13,14 +13,13 @@ COMMENT= Collection of themes and icons for GNOME 2 BUILD_USES_MSGFMT= yes USE_DIRS+= gnome2-1.5 theme-1.0 -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../wm/metacity/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile index 9eb2b5fdabd..240ac7eb8a4 100644 --- a/x11/gnome2-applets/Makefile +++ b/x11/gnome2-applets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2005/07/21 16:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2005/08/10 20:56:26 jlam Exp $ # DISTNAME= gnome-applets-2.10.1 @@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES GNU_CONFIGURE= yes USE_DIRS+= gnome2-1.5 -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes @@ -80,7 +80,6 @@ BUILDLINK_DEPENDS.libglade2+= libglade2>=2.4.0 .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/libwnck/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/gucharmap/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../multimedia/gstreamer/buildlink3.mk" diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile index b148f2c1ced..631c40b5b87 100644 --- a/x11/gnome2-control-center/Makefile +++ b/x11/gnome2-control-center/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2005/07/21 16:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2005/08/10 20:56:26 jlam Exp $ # DISTNAME= control-center-2.10.1 @@ -18,7 +18,7 @@ GNU_CONFIGURE= yes USE_DIRS+= gnome2-1.5 USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_LIBTOOL= yes CONFIGURE_ARGS+= --disable-alsa @@ -51,7 +51,6 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile index 8eb0a69e1b1..d3e3df571bd 100644 --- a/x11/gnome2-terminal/Makefile +++ b/x11/gnome2-terminal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/07/21 16:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.42 2005/08/10 20:56:26 jlam Exp $ # DISTNAME= gnome-terminal-2.10.0 @@ -18,7 +18,7 @@ CONFLICTS= gnome-core-[0-9]* GNU_CONFIGURE= YES USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= YES -USE_TOOLS+= gmake perl +USE_TOOLS+= gmake perl pkg-config USE_LIBTOOL= YES GCONF2_SCHEMAS= gnome-terminal.schemas @@ -29,7 +29,6 @@ BUILDLINK_DEPENDS.startup-notification+= startup-notification>=0.8 .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" .include "../../sysutils/gnome-vfs2/buildlink3.mk" .include "../../textproc/scrollkeeper/omf.mk" diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile index 8f6e4bc7093..5114462ce32 100644 --- a/x11/gnopernicus/Makefile +++ b/x11/gnopernicus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/07/21 16:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2005/08/10 20:56:26 jlam Exp $ # DISTNAME= gnopernicus-0.10.6 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= Collection of accessibility apps for GNOME 2 USE_DIRS+= gnome2-1.5 -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes @@ -59,7 +59,6 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.4.1 .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/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/x11/gnustep-back/Makefile b/x11/gnustep-back/Makefile index 2fef66b732a..54c7d85f957 100644 --- a/x11/gnustep-back/Makefile +++ b/x11/gnustep-back/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/07/29 12:59:50 adam Exp $ +# $NetBSD: Makefile,v 1.28 2005/08/10 20:56:26 jlam Exp $ DISTNAME= gnustep-back-0.10.0 CATEGORIES= x11 gnustep @@ -8,12 +8,12 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.gnustep.org/ COMMENT= X11 AppKit backend for GNUstep +USE_TOOLS+= pkg-config CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/libexec/GNUstep pre-install: ${INSTALL_DATA_DIR} ${GNUSTEP_SYSTEM_ROOT}/Library/Fonts -.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/glitz/buildlink3.mk" diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile index 50b21b75397..31c6f7716bd 100644 --- a/x11/gromit/Makefile +++ b/x11/gromit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/07/21 16:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2005/08/10 20:56:26 jlam Exp $ # DISTNAME= gromit-20041213 @@ -9,6 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.home.unix-ag.org/simon/gromit/ COMMENT= Text marker tool for the X11 screen +USE_TOOLS+= pkg-config INSTALLATION_DIRS= bin do-install: @@ -16,6 +17,5 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gromit ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gromit -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk-thinice-engine/Makefile b/x11/gtk-thinice-engine/Makefile index f267ce771a5..36e1c51c93e 100644 --- a/x11/gtk-thinice-engine/Makefile +++ b/x11/gtk-thinice-engine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/07/21 16:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2005/08/10 20:56:29 jlam Exp $ # DISTNAME= gtk-thinice-engine-2.0.2 @@ -14,7 +14,7 @@ COMMENT= Simple, clean theme engine 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 @@ -22,7 +22,6 @@ GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= gtk-thinice-engine-2.pc.in .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk2-chtheme/Makefile b/x11/gtk2-chtheme/Makefile index ef91ff70310..501531979da 100644 --- a/x11/gtk2-chtheme/Makefile +++ b/x11/gtk2-chtheme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/07/21 16:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:29 jlam Exp $ # DISTNAME= gtk-chtheme-0.3.1 @@ -11,9 +11,8 @@ MAINTAINER= kirtai@users.sourceforge.net HOMEPAGE= http://plasmasturm.org/programs/gtk-chtheme/ COMMENT= GTK+2 theme changer with preview -USE_TOOLS+= gmake perl +USE_TOOLS+= gmake perl pkg-config REPLACE_PERL= replace -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk2-engines-bluecurve/Makefile b/x11/gtk2-engines-bluecurve/Makefile index cd0bd576e6e..427a111422f 100644 --- a/x11/gtk2-engines-bluecurve/Makefile +++ b/x11/gtk2-engines-bluecurve/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/07/27 16:21:17 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:29 jlam Exp $ # DISTNAME= GTK2-Wonderland-Engine-1.0 @@ -14,12 +14,11 @@ COMMENT= Port of famous Bluecurve theme for GTK2+ GNU_CONFIGURE= yes USE_DIRS+= xdg-1.1 -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_LIBTOOL= yes WRKSRC= ${WRKDIR}/Bluecurve SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile index 84ae368d843..ac66b9bbce8 100644 --- a/x11/gtk2-engines/Makefile +++ b/x11/gtk2-engines/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/07/21 16:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2005/08/10 20:56:29 jlam Exp $ DISTNAME= gtk-engines-2.6.3 PKGNAME= ${DISTNAME:S/gtk/gtk2/} @@ -17,12 +17,12 @@ CONFLICTS+= gnome-themes-extras<0.8 BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.6.4 +USE_TOOLS+= pkg-config GNU_CONFIGURE= yes USE_DIRS+= theme-1.1 xdg-1.1 USE_LIBTOOL= yes PKGCONFIG_OVERRIDE= gtk-engines-2.pc.in -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk2-theme-switch/Makefile b/x11/gtk2-theme-switch/Makefile index dac91e877ec..d9fe1d66ac7 100644 --- a/x11/gtk2-theme-switch/Makefile +++ b/x11/gtk2-theme-switch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/07/27 16:21:17 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:29 jlam Exp $ # DISTNAME= gtk-theme-switch-2.0.0rc2 @@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.muhri.net/ COMMENT= Allows quick & easy switching of GTK+ 2.x themes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED INSTALLATION_DIRS= bin man/man1 @@ -22,6 +22,5 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/switch.1 \ ${PREFIX}/man/man1/gtk2-theme-switch.1 -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index 4a04a217caa..0e2eb1d8107 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.88 2005/08/03 19:42:20 xtraeme Exp $ +# $NetBSD: Makefile,v 1.89 2005/08/10 20:56:29 jlam Exp $ # DISTNAME= gtk+-2.6.9 @@ -24,7 +24,7 @@ BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1.2nb2 USE_DIRS+= xdg-1.1 USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_LIBTOOL= yes PTHREAD_AUTO_VARS= yes @@ -76,7 +76,6 @@ _BUILDING_GTK2= yes .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" diff --git a/x11/gtkglarea2/Makefile b/x11/gtkglarea2/Makefile index a6bc3a5a281..8ccf01d132e 100644 --- a/x11/gtkglarea2/Makefile +++ b/x11/gtkglarea2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/07/21 16:30:01 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2005/08/10 20:56:29 jlam Exp $ # DISTNAME= gtkglarea-1.99.0 @@ -12,14 +12,14 @@ MAINTAINER= recht@NetBSD.org HOMEPAGE= http://www.gnome.org/ COMMENT= OpenGL widget for the GTK+2 GUI toolkit -USE_LIBTOOL= YES +USE_TOOLS+= pkg-config +USE_LIBTOOL= yes PKGCONFIG_OVERRIDE+= gtkgl-2.0.pc.in -GNU_CONFIGURE= YES +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-lib-GL CONFIGURE_ARGS+= --with-GL-prefix=${BUILDLINK_PREFIX.MesaLib} -.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/Mesa/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile index 59035054663..a3b5563dc1f 100644 --- a/x11/gtkmm/Makefile +++ b/x11/gtkmm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/07/28 12:29:43 adam Exp $ +# $NetBSD: Makefile,v 1.29 2005/08/10 20:56:29 jlam Exp $ DISTNAME= gtkmm-2.6.4 CATEGORIES= x11 @@ -11,7 +11,7 @@ COMMENT= C++ interface to Gtk+ v2 USE_LANGUAGES= c c++ USE_LIBTOOL= yes -USE_TOOLS+= gmake perl:run +USE_TOOLS+= gmake perl:run pkg-config GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= atk/atkmm-1.6.pc.in @@ -20,6 +20,5 @@ PKGCONFIG_OVERRIDE+= gtk/gtkmm-2.4.pc.in PKGCONFIG_OVERRIDE+= pango/pangomm-1.4.pc.in .include "../../devel/glibmm/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gtksourceview/Makefile b/x11/gtksourceview/Makefile index c087961cc29..e44ab3e5ff1 100644 --- a/x11/gtksourceview/Makefile +++ b/x11/gtksourceview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/07/21 16:30:01 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2005/08/10 20:56:29 jlam Exp $ # DISTNAME= gtksourceview-1.2.0 @@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake perl +USE_TOOLS+= gmake perl pkg-config PKGCONFIG_OVERRIDE= gtksourceview-1.0.pc.in @@ -25,7 +25,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 "../../print/libgnomeprint/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile index c4aa56c55c5..1836e34dd5a 100644 --- a/x11/gtkterm2/Makefile +++ b/x11/gtkterm2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/07/21 16:30:01 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:29 jlam Exp $ DISTNAME= gtkterm2-0.2.3 CATEGORIES= x11 @@ -8,11 +8,11 @@ MAINTAINER= yui@yui.pe.kr HOMEPAGE= http://gtkterm.feige.net/ COMMENT= Simple GTK-2 terminal with tabs +USE_TOOLS+= pkg-config USE_LIBTOOL= YES GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../x11/vte/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index cdea14d6871..0eaefc32793 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.85 2005/07/30 11:10:08 markd Exp $ +# $NetBSD: Makefile,v 1.86 2005/08/10 20:56:29 jlam Exp $ DISTNAME= kdebase-${_KDE_VERSION} CATEGORIES= x11 @@ -14,6 +14,7 @@ SITES_NetBSD-flag.png= http://www.NetBSD.org/images/ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +USE_TOOLS+= pkg-config USE_DIRS+= xdg-1.2 USE_PKGINSTALL= YES @@ -155,7 +156,6 @@ CONFIGURE_ENV+= kde_cv_path_fontconfig_config='NONE' .if ${OPSYS} != "SunOS" .include "../../devel/libusb/buildlink3.mk" .endif -.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" diff --git a/x11/lablgtk2/Makefile b/x11/lablgtk2/Makefile index ba75f68e2ba..cbbd8f50396 100644 --- a/x11/lablgtk2/Makefile +++ b/x11/lablgtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/07/21 16:30:01 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:29 jlam Exp $ # DISTNAME= lablgtk-2.4.0 @@ -11,13 +11,12 @@ HOMEPAGE= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/ COMMENT= GTK+ 2.x bindings for Objective Caml GNU_CONFIGURE= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config BUILDLINK_DEPMETHOD.ocaml= full .include "../../devel/libglade2/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../graphics/librsvg2/buildlink3.mk" .include "../../lang/ocaml/buildlink3.mk" diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index ccee65127b2..af165e61853 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/07/21 16:30:01 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:29 jlam Exp $ # DISTNAME= libxklavier-2.0 @@ -11,6 +11,7 @@ COMMENT= High-level API for the X Keyboard Extension (XKB) PKG_INSTALLATION_TYPES= overwrite pkgviews +USE_TOOLS+= pkg-config GNU_CONFIGURE= YES USE_LIBTOOL= YES @@ -21,7 +22,6 @@ CONFIGURE_ARGS+= --enable-xmm-support BUILDLINK_TRANSFORM+= rm:-Werror -.include "../../devel/pkg-config/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/libzvt/Makefile b/x11/libzvt/Makefile index 2e623c18a8a..7fe5407eed4 100644 --- a/x11/libzvt/Makefile +++ b/x11/libzvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/07/21 16:30:01 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2005/08/10 20:56:29 jlam Exp $ # DISTNAME= libzvt-2.0.1 @@ -12,12 +12,11 @@ HOMEPAGE= http://www.gnome.org/ COMMENT= Virtual Terminal Widget Library for GNOME2 GNU_CONFIGURE= YES -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= libzvt/libzvt-2.0.pc.in .include "../../graphics/libart2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index 044ad89af8c..ce7a466f94b 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/07/21 16:30:01 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2005/08/10 20:56:29 jlam Exp $ DISTNAME= mlterm-2.9.2 PKGREVISION= 1 @@ -12,6 +12,7 @@ COMMENT= Multilingual terminal emulator # CODESET is only supported on NetBSD in 1.5T and later - see <langinfo.h> NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-* NetBSD-1.5[A-S]-* +USE_TOOLS+= pkg-config USE_PKGINSTALL= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes @@ -46,7 +47,6 @@ SUBST_SED.link= -e 's|(LIBTOOL_LINK).*(LIBS)|& -R${X11BASE}/lib|g' \ -e 's|/usr/local/|${PREFIX}/|g' \ -e 's|/usr/X11R6/|${X11BASE}/|g' -.include "../../devel/pkg-config/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/py-gnome2-extras/Makefile b/x11/py-gnome2-extras/Makefile index 0a89952f74e..debbd871b3c 100644 --- a/x11/py-gnome2-extras/Makefile +++ b/x11/py-gnome2-extras/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/07/21 16:30:01 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2005/08/10 20:56:29 jlam Exp $ # DISTNAME= gnome-python-extras-2.10.1 @@ -16,13 +16,13 @@ USE_LIBTOOL= YES PKGCONFIG_OVERRIDE+= gnome-python-extras-2.0.pc.in GNU_CONFIGURE= YES CONFIGURE_ENV+= PYTHON=${PYTHONBIN} +USE_TOOLS+= pkg-config PYTHON_VERSIONS_ACCEPTED= 24 23 .include "../../lang/python/extension.mk" .include "../../lang/python/application.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/gnome-panel/buildlink3.mk" .include "../../www/libgtkhtml/buildlink3.mk" .include "../../print/libgnomeprint/buildlink3.mk" diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile index bf8dc561491..2f08ff58937 100644 --- a/x11/py-gnome2/Makefile +++ b/x11/py-gnome2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/07/21 16:30:01 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:29 jlam Exp $ # DISTNAME= gnome-python-2.10.0 @@ -16,6 +16,7 @@ USE_LIBTOOL= YES PKGCONFIG_OVERRIDE+= gnome-python-2.0.pc.in GNU_CONFIGURE= YES CONFIGURE_ENV+= PYTHON=${PYTHONBIN} +USE_TOOLS+= pkg-config PYTHON_VERSIONS_ACCEPTED= 24 23 @@ -28,7 +29,6 @@ BUILDLINK_DEPENDS.GConf2+= GConf2>=2.9.0 .include "../../devel/libbonoboui/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" BUILDLINK_DEPENDS.pyorbit+= ${PYPKGPREFIX}-ORBit>=2.0.1 .include "../../net/py-ORBit/buildlink3.mk" diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile index 7487d3139b5..892802afca4 100644 --- a/x11/py-gtk2/Makefile +++ b/x11/py-gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/07/21 16:30:01 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2005/08/10 20:56:29 jlam Exp $ # DISTNAME= pygtk-2.6.2 @@ -18,12 +18,11 @@ USE_LIBTOOL= YES PKGCONFIG_OVERRIDE+= pygtk-2.0.pc.in pygobject-2.0.pc.in GNU_CONFIGURE= YES CONFIGURE_ENV+= PYTHON=${PYTHONBIN} -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config PYTHON_VERSIONS_ACCEPTED= 24 23 .include "../../devel/libglade2/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../lang/python/extension.mk" .include "../../lang/python/application.mk" .include "../../math/py-Numeric/buildlink3.mk" diff --git a/x11/py-wxWidgets/Makefile b/x11/py-wxWidgets/Makefile index 08e60eea896..e9b01dd2a67 100644 --- a/x11/py-wxWidgets/Makefile +++ b/x11/py-wxWidgets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/08/07 11:31:32 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:29 jlam Exp $ # DISTNAME= wxPythonSrc-2.4.2.4 @@ -12,7 +12,7 @@ HOMEPAGE= http://wxpython.org/ COMMENT= wxPython: Python bindings for wxWidgets WRKSRC= ${WRKDIR}/wxPythonSrc-2.4.2.4/wxPython -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config # previous name of the package CONFLICTS+= ${PYPKGPREFIX}-wxWindows-[0-9]* @@ -30,7 +30,6 @@ PYSETUPBUILDARGS= NO_SCRIPTS=1 ${WXARG} PYSETUPINSTALLARGS= NO_SCRIPTS=1 ${WXARG} PYBINMODULE= yes -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/wxGTK24/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../lang/python/extension.mk" diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile index 9a92b16a026..91bb1edabb4 100644 --- a/x11/startup-notification/Makefile +++ b/x11/startup-notification/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/07/21 16:30:01 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:30 jlam Exp $ DISTNAME= startup-notification-0.8 CATEGORIES= x11 gnome @@ -11,6 +11,7 @@ COMMENT= X11 application startup notification library PKG_INSTALLATION_TYPES= overwrite pkgviews +USE_TOOLS+= pkg-config GNU_CONFIGURE= yes USE_LIBTOOL= yes @@ -22,6 +23,5 @@ post-install: doc/startup-notification.txt \ ${PREFIX}/share/doc/startup-notification/ -.include "../../devel/pkg-config/buildlink3.mk" .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/vte/Makefile b/x11/vte/Makefile index 47356b8f5e4..c2022514ba9 100644 --- a/x11/vte/Makefile +++ b/x11/vte/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/07/21 16:30:01 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2005/08/10 20:56:30 jlam Exp $ # DISTNAME= vte-0.11.13 @@ -17,7 +17,7 @@ USE_DIRS+= gnome2-1.2 USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config CONFIGURE_ARGS+= --disable-gtk-doc CONFIGURE_ARGS+= --disable-python @@ -31,7 +31,6 @@ BUILDLINK_DEPENDS.fontconfig+= fontconfig>=2.1.93 .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -.include "../../devel/pkg-config/buildlink3.mk" .include "../../fonts/Xft2/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" diff --git a/x11/wxGTK/Makefile.common b/x11/wxGTK/Makefile.common index 2fbc848c69c..53c5f5b673b 100644 --- a/x11/wxGTK/Makefile.common +++ b/x11/wxGTK/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2005/08/07 11:26:17 wiz Exp $ +# $NetBSD: Makefile.common,v 1.3 2005/08/10 20:56:30 jlam Exp $ # DISTNAME= wxGTK-2.6.1 @@ -12,6 +12,7 @@ HOMEPAGE= http://www.wxwidgets.org/ PATCHDIR= ${.CURDIR}/../../x11/wxGTK/patches DISTINFO_FILE= ${.CURDIR}/../../x11/wxGTK/distinfo +USE_TOOLS+= pkg-config USE_PKGLOCALEDIR= YES USE_LANGUAGES= c c++ GNU_CONFIGURE= YES @@ -28,7 +29,6 @@ CPPFLAGS+= -Dunix=1 # src/common/unzip.c needs this DOCDIR= ${PREFIX}/share/doc/wxGTK -.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" diff --git a/x11/wxGTK24/Makefile.common b/x11/wxGTK24/Makefile.common index ce8210c72ed..497e18f82ad 100644 --- a/x11/wxGTK24/Makefile.common +++ b/x11/wxGTK24/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1.1.1 2005/08/07 11:27:28 wiz Exp $ +# $NetBSD: Makefile.common,v 1.2 2005/08/10 20:56:30 jlam Exp $ # DISTNAME= wxGTK-2.4.2 @@ -13,6 +13,7 @@ HOMEPAGE= http://www.wxwidgets.org/ PATCHDIR= ${.CURDIR}/../../x11/wxGTK24/patches DISTINFO_FILE= ${.CURDIR}/../../x11/wxGTK24/distinfo +USE_TOOLS+= pkg-config USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES USE_LANGUAGES= c c++ @@ -37,7 +38,6 @@ CONFIGURE_ARGS+= --with-gtk CONFIGURE_ARGS+= --enable-gtk2 PLIST_SUBST+= GTKVER=2 -.include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" diff --git a/x11/xcompmgr/Makefile b/x11/xcompmgr/Makefile index 1185907e7c1..6755171f9b0 100644 --- a/x11/xcompmgr/Makefile +++ b/x11/xcompmgr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/07/21 16:30:01 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2005/08/10 20:56:30 jlam Exp $ # DISTNAME= xcompmgr-1.1.1 @@ -9,6 +9,7 @@ MAINTAINER= xtraeme@NetBSD.org HOMEPAGE= http://www.freedesktop.org/ COMMENT= Sample compositing manager for X.org >= 6.8.0 +USE_TOOLS+= pkg-config GNU_CONFIGURE= yes .include "../../mk/bsd.prefs.mk" @@ -18,7 +19,6 @@ GNU_CONFIGURE= yes PKG_SKIP_REASON+= "This package is exclusively for X.org." .endif -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/Xcomposite/buildlink3.mk" .include "../../x11/Xrender/buildlink3.mk" .include "../../x11/compositeext/buildlink3.mk" diff --git a/x11/xcursor/Makefile b/x11/xcursor/Makefile index acf8e952b2d..c8cbfde18a0 100644 --- a/x11/xcursor/Makefile +++ b/x11/xcursor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/07/21 16:30:01 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:30 jlam Exp $ # DISTNAME= libXcursor-1.1.2 @@ -13,6 +13,7 @@ COMMENT= Client-side cursor loading library for X PKG_INSTALLATION_TYPES= overwrite pkgviews +USE_TOOLS+= pkg-config USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes @@ -21,7 +22,6 @@ PKGCONFIG_OVERRIDE+= xcursor.pc.in BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 -.include "../../devel/pkg-config/buildlink3.mk" .include "../../x11/Xfixes/buildlink3.mk" .include "../../x11/Xrender/buildlink3.mk" .include "../../mk/bsd.pkg.mk" 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" diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index 42b7e239726..4c807e867dc 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/07/21 16:30:01 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2005/08/10 20:56:30 jlam Exp $ # DISTNAME= zenity-2.10.0 @@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes USE_DIRS+= gnome2-1.5 USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake pkg-config BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 @@ -24,7 +24,6 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0 .include "../../devel/glib2/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 "../../textproc/intltool/buildlink3.mk" |