From 05e219ade4f2521edad5179c111daef6b97958fc Mon Sep 17 00:00:00 2001 From: sturm Date: Fri, 2 Apr 2004 19:07:04 +0000 Subject: [PATCH] explicitly depend on pkgconfig, needed to find gtk+2 and friends --- audio/xhippo/Makefile | 3 ++- graphics/dia/Makefile | 3 ++- net/ethereal/Makefile | 5 +++-- net/xchat2/Makefile | 3 ++- news/pan/Makefile | 3 ++- www/bluefish/Makefile | 3 ++- x11/ogle_gui/Makefile | 3 ++- x11/rox-filer/Makefile | 3 ++- x11/xscreensaver/Makefile | 3 ++- 9 files changed, 19 insertions(+), 10 deletions(-) diff --git a/audio/xhippo/Makefile b/audio/xhippo/Makefile index 556b8d2d908..3bac8e82fc7 100644 --- a/audio/xhippo/Makefile +++ b/audio/xhippo/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2003/12/10 21:28:58 naddy Exp $ +# $OpenBSD: Makefile,v 1.11 2004/04/02 19:07:04 sturm Exp $ COMMENT= "generic playlist manager for UNIX" @@ -16,6 +16,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_GNU:=xhippo/} +BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig LIB_DEPENDS= gdk_pixbuf_xlib-2.0.0.0::x11/gtk+2 \ id3tag.2::audio/libid3tag diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index 181fc04f30a..7345be4c300 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2003/12/08 01:09:15 margarida Exp $ +# $OpenBSD: Makefile,v 1.24 2004/04/02 19:07:04 sturm Exp $ COMMENT= "technical diagrams drawing tool" @@ -17,6 +17,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes +BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig LIB_DEPENDS= gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2 \ art_lgpl_2.5::graphics/libart \ popt::devel/popt \ diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index 7c460f1beef..65b10716445 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.86 2004/03/31 09:49:38 jakob Exp $ +# $OpenBSD: Makefile,v 1.87 2004/04/02 19:07:05 sturm Exp $ COMMENT= "network protocol analyzer" COMMENT-x11= "network protocol analyzer (X11 GUI)" @@ -52,7 +52,8 @@ BUILD_DEPENDS+= glib.1.2,gmodule.1.2::devel/glib .else CONFIGURE_ARGS+= --enable-gtk2 LIB_DEPENDS+= glib-2.0.0.0,gthread-2.0.0.0::devel/glib2 -BUILD_DEPENDS+= gdk_pixbuf-2.0.0.0,gdk-x11-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2 +BUILD_DEPENDS+= gdk_pixbuf-2.0.0.0,gdk-x11-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2 \ + :pkgconfig-*:devel/pkgconfig .endif .if ${SUBPACKAGE} == "-x11" diff --git a/net/xchat2/Makefile b/net/xchat2/Makefile index 4c582bea40d..626534c3f4f 100644 --- a/net/xchat2/Makefile +++ b/net/xchat2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2004/01/10 22:21:23 couderc Exp $ +# $OpenBSD: Makefile,v 1.8 2004/04/02 19:07:05 sturm Exp $ COMMENT= "GTK+2 IRC client" @@ -22,6 +22,7 @@ MASTER_SITES0= ${MASTER_SITE_SOURCEFORGE:=xchat/} EXTRACT_SUFX= .tar.bz2 +BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig LIB_DEPENDS= gtk-x11-2.0.0.0,gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0::x11/gtk+2 MODULES= gettext diff --git a/news/pan/Makefile b/news/pan/Makefile index 7bca5f2fc4b..8e00d0ec0be 100644 --- a/news/pan/Makefile +++ b/news/pan/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2003/09/23 04:22:02 jolan Exp $ +# $OpenBSD: Makefile,v 1.13 2004/04/02 19:07:05 sturm Exp $ COMMENT= "powerful Gtk+2 newsreader" @@ -7,6 +7,7 @@ DISTNAME= pan-${VER} CATEGORIES= news x11 MASTER_SITES= http://pan.rebelbase.com/download/releases/${VER}/SOURCE/ +BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig LIB_DEPENDS= gdk_pixbuf-2.0.0.0,gdk-x11-2.0.0.5::x11/gtk+2 \ gtk-x11-2.0.0.5::x11/gtk+2 \ gthread-2.0.0.0::devel/glib2 \ diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile index 2161bddbd40..20d1be29ad0 100644 --- a/www/bluefish/Makefile +++ b/www/bluefish/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2004/03/23 19:29:12 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.31 2004/04/02 19:07:05 sturm Exp $ COMMENT= "HTML editor for experienced web designers" @@ -21,6 +21,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes +BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig LIB_DEPENDS= gtk-x11-2.0.0.14,gdk-x11-2.0.0.14,gdk_pixbuf-2.0.0.14::x11/gtk+2 \ pcre::devel/pcre \ aspell::textproc/aspell/core diff --git a/x11/ogle_gui/Makefile b/x11/ogle_gui/Makefile index 86c0faf993e..48ee5fd7344 100644 --- a/x11/ogle_gui/Makefile +++ b/x11/ogle_gui/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2003/11/13 18:48:38 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2004/04/02 19:07:05 sturm Exp $ CATEGORIES= x11 @@ -28,6 +28,7 @@ FLAVOR?= LIB_DEPENDS+= glade.5.0::devel/libglade \ gtk.1.2::x11/gtk+ .else +BUILD_DEPENDS+= :pkgconfig-*:devel/pkgconfig LIB_DEPENDS+= glade-2.0.0.0::devel/libglade2 \ gtk-x11-2.0.0.0::x11/gtk+2 CONFIGURE_ARGS+=--enable-gtk2 diff --git a/x11/rox-filer/Makefile b/x11/rox-filer/Makefile index 51431f11a1b..e0667795362 100644 --- a/x11/rox-filer/Makefile +++ b/x11/rox-filer/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2004/02/07 17:47:50 couderc Exp $ +# $OpenBSD: Makefile,v 1.20 2004/04/02 19:07:05 sturm Exp $ COMMENT= "gtk file manager with desktop features" @@ -21,6 +21,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/} DISTFILES= ${DISTNAME}.tgz +BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig LIB_DEPENDS= gtk-x11-2.0.0.9,gdk_pixbuf-2.0.0.9,gdk-x11-2.0.0.9::x11/gtk+2 \ xml2::textproc/libxml RUN_DEPENDS= ::misc/shared-mime-info diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index 7ad76b84c42..982d0c80bd2 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2004/03/12 18:03:17 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.23 2004/04/02 19:07:05 sturm Exp $ COMMENT= "screen saver and locker for the X Window System" @@ -52,6 +52,7 @@ CONFIGURE_ARGS+= --without-gle .endif .if ${FLAVOR:L:Mgtk2} +BUILD_DEPENDS+= :pkgconfig-*:devel/pkgconfig LIB_DEPENDS+= gdk_pixbuf_xlib-2.0.0.0::x11/gtk+2 \ glade-2.0.0.0::devel/libglade2 CONFIGURE_ARGS+= --with-gtk2