diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile index 357fa34a306..25c9e813fcf 100644 --- a/audio/libgpod/Makefile +++ b/audio/libgpod/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2010/09/05 22:00:13 sthen Exp $ +# $OpenBSD: Makefile,v 1.23 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT-main= library to access the contents of an iPod COMMENT-python= python bindings for libgpod @@ -6,7 +6,7 @@ COMMENT-python= python bindings for libgpod VERSION= 0.7.2 DISTNAME= libgpod-${VERSION} PKGNAME-main= ${DISTNAME} -REVISION-main = 2 +REVISION-main = 3 PKGNAME-python= py-gpod-${VERSION} REVISION-python = 3 SHARED_LIBS= gpod 720.0 @@ -39,7 +39,7 @@ LIB_DEPENDS-python= ${LIB_DEPENDS} \ ::devel/libffi \ ::${BUILD_PKGPATH},-main LIB_DEPENDS= ::devel/glib2 \ - ::x11/gtk+2 \ + ::graphics/gdk-pixbuf2 \ ::textproc/libxml WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 m z pcre diff --git a/cad/geda-gaf/Makefile b/cad/geda-gaf/Makefile index 7d97990df2c..355239ec0da 100644 --- a/cad/geda-gaf/Makefile +++ b/cad/geda-gaf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2010/04/29 16:46:06 jasper Exp $ +# $OpenBSD: Makefile,v 1.3 2010/09/30 07:21:18 ajacoutot Exp $ COMMENT = suite of tools for electronic design automation DISTNAME = geda-gaf-1.6.0 @@ -6,6 +6,8 @@ CATEGORIES = cad HOMEPAGE = http://geda.seul.org MAINTAINER = Edd Barrett +REVISION = 0 + SHARED_LIBS = geda 0.0 # 38.0 USE_LIBTOOL = Yes @@ -20,12 +22,12 @@ WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \ expat fontconfig freetype glitz iconv intl ltdl m \ pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \ png pthread pthread-stubs xcb xcb-render \ - xcb-render-util z + xcb-render-util z gdk_pixbuf-2.0 MASTER_SITES = http://geda.seul.org/release/v1.6/1.6.0/ LIB_DEPENDS = gio-2.0,glib-2.0,gobject-2.0,gmodule-2.0::devel/glib2 \ - gtk-x11-2.0,gdk_pixbuf-2.0,gdk-x11-2.0::x11/gtk+2 \ + gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 \ guile::lang/guile \ gmp::devel/gmp diff --git a/cad/xnecview/Makefile b/cad/xnecview/Makefile index d7cfd8a504b..c469b75fb7a 100644 --- a/cad/xnecview/Makefile +++ b/cad/xnecview/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2010/09/12 19:54:48 jasper Exp $ +# $OpenBSD: Makefile,v 1.12 2010/09/30 07:21:18 ajacoutot Exp $ COMMENT= NEC2 antenna simulator visualizer @@ -7,7 +7,7 @@ BROKEN-arm= makedepend infinite loop VERSION= 1.35 DISTNAME= xnecview-${VERSION} -PKGNAME= ${DISTNAME}p5 +REVISION= 6 EXTRACT_SUFX= .tgz MASTER_SITES= http://wwwhome.cs.utwente.nl/~ptdeboer/ham/xnecview/ @@ -26,11 +26,11 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png -WANTLIB += pthread-stubs xcb z +WANTLIB += pthread-stubs xcb z gdk_pixbuf-2.0 MODULES= devel/gettext -LIB_DEPENDS= gtk-x11-2.0.>=400.13,gdk-x11-2.0.>=400.13,gdk_pixbuf-2.0.>=400.13::x11/gtk+2 +LIB_DEPENDS= gtk-x11-2.0.>=400.13,gdk-x11-2.0.>=400.13::x11/gtk+2 CONFIGURE_STYLE= imake diff --git a/devel/asp2php/Makefile b/devel/asp2php/Makefile index 302e07e9ad8..4404927de81 100644 --- a/devel/asp2php/Makefile +++ b/devel/asp2php/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.24 2010/03/23 20:48:21 jasper Exp $ +# $OpenBSD: Makefile,v 1.25 2010/09/30 07:21:18 ajacoutot Exp $ COMMENT= convert ASP code to PHP code DISTNAME= asp2php-0.77.3 -PKGNAME= ${DISTNAME}p2 +REVISION= 3 CATEGORIES= devel www HOMEPAGE= http://asp2php.naken.cc/ @@ -22,14 +22,14 @@ FLAVOR?= .if ${FLAVOR} != "no_x11" USE_X11= Yes -LIB_DEPENDS+= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 +LIB_DEPENDS+= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 ALL_TARGET= all gui WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pixman-1 png pthread-stubs xcb z +WANTLIB += pixman-1 png pthread-stubs xcb z gdk_pixbuf-2.0 .endif WRKDIST= ${WRKDIR}/asp2php diff --git a/devel/eclipse/sdk/Makefile b/devel/eclipse/sdk/Makefile index 45fd9a63961..03ab6aaeeea 100644 --- a/devel/eclipse/sdk/Makefile +++ b/devel/eclipse/sdk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.53 2009/12/22 15:31:26 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.54 2010/09/30 07:21:18 ajacoutot Exp $ SHARED_ONLY= Yes ONLY_FOR_ARCHS= amd64 i386 @@ -11,7 +11,7 @@ COMMENT-browser= HTML Browser Widget library for swt/eclipse ECLIPSE_VER= 3.2.2 DISTNAME= eclipse-sourceBuild-srcIncluded-${ECLIPSE_VER} PKGNAME= eclipse-sdk-${ECLIPSE_VER} -PKGNAME-main= eclipse-sdk-${ECLIPSE_VER}p12 +PKGNAME-main= eclipse-sdk-${ECLIPSE_VER}p13 PKGNAME-swt= swt-${ECLIPSE_VER}p1 PKGNAME-gnome= swt-gnome-${ECLIPSE_VER}p2 PKGNAME-browser= swt-browser-${ECLIPSE_VER}p3 @@ -70,10 +70,10 @@ RUN_DEPENDS-main= ::java/javaPathHelper \ ${MODJAVA_RUN_DEPENDS} \ :swt-browser-${ECLIPSE_VER}:devel/eclipse/sdk,-browser \ ::devel/desktop-file-utils -LIB_DEPENDS-main= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 +LIB_DEPENDS-main= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 WANTLIB-main= X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama \ - Xcomposite Xdamage \ + Xcomposite Xdamage gdk_pixbuf-2.0 \ Xrandr Xrender c expat m z fontconfig \ freetype atk-1.0 glib-2.0 gmodule-2.0 \ gobject-2.0 glitz png iconv intl \ diff --git a/devel/ethos/Makefile b/devel/ethos/Makefile index a90fc40c526..20a35b694e7 100644 --- a/devel/ethos/Makefile +++ b/devel/ethos/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.9 2010/09/28 20:13:38 jasper Exp $ +# $OpenBSD: Makefile,v 1.10 2010/09/30 07:21:18 ajacoutot Exp $ COMMENT = plugin framework library VERSION = 0.2.2 DISTNAME = ethos-${VERSION} -REVISION = 2 +REVISION = 3 SHARED_LIBS= ethos-1.0 1.0 \ ethos-ui-1.0 0.0 @@ -40,12 +40,12 @@ BUILD_DEPENDS += ${RUN_DEPENDS} RUN_DEPENDS += ::x11/py-gtk2 LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \ - gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 + gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 -WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 +WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 gdk_pixbuf-2.0 WANTLIB += pcre pixman-1 png pthread-stubs xcb z ffi .include diff --git a/devel/geany/Makefile b/devel/geany/Makefile index c2b103b36a7..49cd30aa96b 100644 --- a/devel/geany/Makefile +++ b/devel/geany/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.23 2009/12/22 15:31:27 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.24 2010/09/30 07:21:18 ajacoutot Exp $ SHARED_ONLY= Yes COMMENT= small and lightweight IDE DISTNAME= geany-0.18 -PKGNAME= ${DISTNAME}p0 +REVISION= 1 CATEGORIES= devel @@ -30,14 +30,14 @@ USE_GMAKE= Yes USE_LIBTOOL= Yes WANTLIB= X11 Xext Xrender Xau Xcursor Xdmcp Xfixes Xi \ - Xcomposite Xdamage pcre \ + Xcomposite Xdamage pcre gdk_pixbuf-2.0 \ Xinerama Xrandr expat stdc++ c m z glitz png \ glib-2.0 gmodule-2.0 gobject-2.0 gio-2.0 \ fontconfig freetype atk-1.0 cairo \ pango-1.0 pangoft2-1.0 pangocairo-1.0 pixman-1 \ pthread-stubs xcb -LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils CONFIGURE_STYLE=gnu diff --git a/devel/gtkparasite/Makefile b/devel/gtkparasite/Makefile index 7b67f6f5f91..492824441e3 100644 --- a/devel/gtkparasite/Makefile +++ b/devel/gtkparasite/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 2010/08/30 22:03:58 jasper Exp $ +# $OpenBSD: Makefile,v 1.4 2010/09/30 07:21:18 ajacoutot Exp $ COMMENT = Gtk debugging tool DISTNAME = gtkparasite-0.0.1 -REVISION= 1 +REVISION= 2 CATEGORIES = devel HOMEPAGE = http://chipx86.github.com/gtkparasite/ @@ -23,7 +23,7 @@ MODULES = lang/python USE_LIBTOOL = Yes LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \ - gdk_pixbuf-2.0,gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 + gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 RUN_DEPENDS = ::x11/py-gtk2 BUILD_DEPENDS+= ${RUN_DEPENDS} @@ -32,7 +32,7 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat ffi fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pcre pixman-1 png pthread-stubs util xcb z +WANTLIB += pcre pixman-1 png pthread-stubs util xcb z gdk_pixbuf-2.0 CONFIGURE_STYLE = gnu diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile index ec5233c6d14..6649bc26c8d 100755 --- a/devel/libglademm/Makefile +++ b/devel/libglademm/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.16 2009/08/10 06:31:08 kili Exp $ +# $OpenBSD: Makefile,v 1.17 2010/09/30 07:21:18 ajacoutot Exp $ COMMENT-main= C++ bindings for libglade COMMENT-docs= C++ bindings for libglade documentation GNOME_PROJECT= libglademm GNOME_VERSION= 2.6.7 -PKGNAME-main= ${DISTNAME}p0 +PKGNAME-main= ${DISTNAME}p1 PKGNAME-docs= libglademm-docs-${GNOME_VERSION} SHARED_LIBS += glademm-2.4 1.7 # .1.5 CATEGORIES= devel @@ -29,7 +29,7 @@ WANTLIB-main= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ expat fontconfig freetype gio-2.0 giomm-2.4 glib-2.0 \ glibmm-2.4 glitz gmodule-2.0 gobject-2.0 m pango-1.0 \ pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png \ - pthread-stubs sigc-2.0 xcb xml2 z + pthread-stubs sigc-2.0 xcb xml2 z gdk_pixbuf-2.0 MODULES= devel/gettext \ x11/gnome @@ -37,7 +37,7 @@ MODULES= devel/gettext \ LIB_DEPENDS= gtkmm-2.4.>=3,gdkmm-2.4.>=3,atkmm-1.6.>=3::x11/gtk2mm \ pangomm-1.4::devel/pangomm \ glade-2.0.>=0.9::devel/libglade2 \ - gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0:gtk+2->=2.8:x11/gtk+2 + gdk-x11-2.0,gtk-x11-2.0:gtk+2->=2.8:x11/gtk+2 USE_X11= Yes CONFIGURE_STYLE=gnu diff --git a/devel/libunique/Makefile b/devel/libunique/Makefile index 3f4cc19c500..b7436085f53 100644 --- a/devel/libunique/Makefile +++ b/devel/libunique/Makefile @@ -1,10 +1,12 @@ -# $OpenBSD: Makefile,v 1.5 2009/10/12 10:25:07 jasper Exp $ +# $OpenBSD: Makefile,v 1.6 2010/09/30 07:21:18 ajacoutot Exp $ COMMENT = library for writing single instance application GNOME_PROJECT = libunique GNOME_VERSION = 1.1.2 +REVISION = 0 + SHARED_LIBS += unique-1.0 1.0 # .100.2 CATEGORIES = devel @@ -29,13 +31,13 @@ CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ MODULES = devel/gettext \ x11/gnome -LIB_DEPENDS = gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ +LIB_DEPENDS = gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ dbus-glib-1::x11/dbus-glib WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ Xi Xinerama Xrandr Xrender atk-1.0 cairo dbus-1 expat \ fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 \ gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre \ - pixman-1 png pthread-stubs xcb z + pixman-1 png pthread-stubs xcb z gdk_pixbuf-2.0 .include diff --git a/devel/vte/Makefile b/devel/vte/Makefile index 96c40685969..9d84deb7607 100644 --- a/devel/vte/Makefile +++ b/devel/vte/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.60 2010/09/29 10:54:24 jasper Exp $ +# $OpenBSD: Makefile,v 1.61 2010/09/30 07:21:18 ajacoutot Exp $ COMMENT-main= terminal emulation library COMMENT-python= python bindings for vte @@ -7,8 +7,8 @@ GNOME_PROJECT= vte GNOME_VERSION= 0.24.3 PKGNAME-main= ${DISTNAME} PKGNAME-python= py-${DISTNAME} -REVISION-main = 1 -REVISION-python = 1 +REVISION-main = 2 +REVISION-python = 2 CATEGORIES= devel @@ -37,11 +37,11 @@ WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += m ncurses pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre WANTLIB += pixman-1 png pthread-stubs xcb xcb-render xcb-render-util -WANTLIB += z gthread-2.0 +WANTLIB += z gthread-2.0 gdk_pixbuf-2.0 WANTLIB-main= ${WANTLIB} util c pthread LIB_DEPENDS-main= ${LIB_DEPENDS} \ - gdk-x11-2.0.>=1000,gdk_pixbuf-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 + gdk-x11-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 WANTLIB-python= ${WANTLIB} diff --git a/editors/beaver/Makefile b/editors/beaver/Makefile index bce2cab7f8f..1b26fbce185 100644 --- a/editors/beaver/Makefile +++ b/editors/beaver/Makefile @@ -1,11 +1,13 @@ -# $OpenBSD: Makefile,v 1.18 2009/12/22 15:08:35 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.19 2010/09/30 07:21:18 ajacoutot Exp $ COMMENT= lightweight Gtk text editor with syntax highlighting DISTNAME= beaver0_3_0_1 -PKGNAME= beaver-0.3.0.1p2 +PKGNAME= beaver-0.3.0.1 CATEGORIES= editors +REVISION= 3 + HOMEPAGE= http://www.nongnu.org/beaver/ # XXX should use ${MASTER_SITE_SAVANNAH:=beaver/} but % in the # XXX directory name causes a problem @@ -22,9 +24,9 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \ freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 iconv \ intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png \ - pthread-stubs xcb z + pthread-stubs xcb z gdk_pixbuf-2.0 -LIB_DEPENDS= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 RUN_DEPENDS= ::devel/desktop-file-utils diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile index 0434bd28c60..2c0bd300539 100755 --- a/editors/leafpad/Makefile +++ b/editors/leafpad/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.27 2009/12/22 16:51:00 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.28 2010/09/30 07:21:18 ajacoutot Exp $ COMMENT= simple GTK+ text editor DISTNAME= leafpad-0.8.17 -PKGNAME= ${DISTNAME}p2 +REVISION= 3 CATEGORIES= editors x11 HOMEPAGE= http://tarot.freeshell.org/leafpad/ @@ -20,12 +20,12 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat \ fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 \ gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ - pixman-1 png pthread-stubs xcb z + pixman-1 png pthread-stubs xcb z gdk_pixbuf-2.0 MODULES= devel/gettext \ textproc/intltool -LIB_DEPENDS= gtk-x11-2.0.>=1000,gdk-x11-2.0.>=1000,gdk_pixbuf-2.0.>=1000::x11/gtk+2 +LIB_DEPENDS= gtk-x11-2.0.>=1000,gdk-x11-2.0.>=1000::x11/gtk+2 RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils USE_X11= Yes diff --git a/editors/openoffice3/Makefile b/editors/openoffice3/Makefile index cc96515837c..4928ddc5eb9 100644 --- a/editors/openoffice3/Makefile +++ b/editors/openoffice3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.49 2010/09/29 15:46:29 landry Exp $ +# $OpenBSD: Makefile,v 1.50 2010/09/30 07:21:18 ajacoutot Exp $ ONLY_FOR_ARCHS= amd64 i386 @@ -13,7 +13,7 @@ PKGNAME= openoffice-${VERSION} PKGNAME-main= openoffice-${VERSION} PKGNAME-kde= openoffice-kde-${VERSION} PKGNAME-java= openoffice-java-${VERSION} -REVISION-main= 2 +REVISION-main= 3 REVISION-kde= 1 REVISION-java= 2 CATEGORIES= editors productivity @@ -94,7 +94,7 @@ BUILD_DEPENDS+= :zip-*:archivers/zip \ MODULES+= lang/python \ devel/gconf2 MODGCONF2_LIBDEP=No -LIB_DEPENDS-main=gdk-x11-2.0.>=400.14,gdk_pixbuf-2.0.>=400.14,gtk-x11-2.0.>=400.14::x11/gtk+2 \ +LIB_DEPENDS-main=gdk-x11-2.0.>=400.14,gtk-x11-2.0.>=400.14::x11/gtk+2 \ ${MODPY_LIB_DEPENDS} \ db.>=4:db->=4,<5:databases/db/v4 \ xslt.>=3::textproc/libxslt \ @@ -111,7 +111,7 @@ WANTLIB-main= ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \ crypto dbus-1 expat fontconfig freetype gio-2.0 glib-2.0 \ glitz gmodule-2.0 gobject-2.0 gthread-2.0 iconv intl \ jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 \ - png pthread pthread-stubs ssl util xcb xml2 z + png pthread pthread-stubs ssl util xcb xml2 z gdk_pixbuf-2.0 RUN_DEPENDS-main= :desktop-file-utils-*:devel/desktop-file-utils .include diff --git a/editors/scite/Makefile b/editors/scite/Makefile index e470ededf71..b985418f4ed 100644 --- a/editors/scite/Makefile +++ b/editors/scite/Makefile @@ -1,12 +1,14 @@ -# $OpenBSD: Makefile,v 1.13 2009/08/10 06:31:08 kili Exp $ +# $OpenBSD: Makefile,v 1.14 2010/09/30 07:21:18 ajacoutot Exp $ COMMENT= flexible and small GTK+ editor VERSION= 1.76 DISTNAME= scite${VERSION:S/.//} -PKGNAME= scite-${VERSION}p2 +PKGNAME= scite-${VERSION} CATEGORIES= editors x11 +REVISION= 3 + HOMEPAGE= http://www.scintilla.org/SciTE.html MAINTAINER= Jeremy Evans @@ -21,14 +23,14 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pixman-1 png pthread pthread-stubs stdc++ xcb z +WANTLIB += pixman-1 png pthread pthread-stubs stdc++ xcb z gdk_pixbuf-2.0 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scintilla/} EXTRACT_SUFX= .tgz MODULES= devel/gettext -LIB_DEPENDS= gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 \ +LIB_DEPENDS= gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 \ scintilla.>=6,scintilla_lexers.>=6::editors/scintilla USE_GMAKE= Yes diff --git a/editors/tea/Makefile b/editors/tea/Makefile index 3c14d4cd1bf..cd5af6ec90e 100644 --- a/editors/tea/Makefile +++ b/editors/tea/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.8 2009/08/10 06:31:08 kili Exp $ +# $OpenBSD: Makefile,v 1.9 2010/09/30 07:21:18 ajacoutot Exp $ COMMENT= powerful and simple GTK editor DISTNAME= teagtk-17.6.6 -PKGNAME= ${DISTNAME}p0 +REVISION= 1 CATEGORIES= editors x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tea-editor/} EXTRACT_SUFX= .tar.bz2 @@ -18,7 +18,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -LIB_DEPENDS= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ gtksourceview-2.0:gtksourceview->=2,<3:x11/gtksourceview \ aspell.>=16:aspell-*:textproc/aspell/core \ zzip.>=13::archivers/zziplib @@ -28,7 +28,7 @@ WANTLIB= X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \ Xcomposite Xdamage Xrender expat fontconfig freetype z \ atk-1.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 glitz \ pango-1.0 pangoft2-1.0 pangocairo-1.0 png cairo xml2 \ - c m stdc++ pixman-1 pthread-stubs xcb + c m stdc++ pixman-1 pthread-stubs xcb gdk_pixbuf-2.0 MODULES= devel/gettext diff --git a/editors/vim/Makefile b/editors/vim/Makefile index 15a9bd0682e..e35471570d9 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.110 2010/09/09 22:29:28 ckuethe Exp $ +# $OpenBSD: Makefile,v 1.111 2010/09/30 07:21:18 ajacoutot Exp $ COMMENT-main= vi clone, many additional features COMMENT-lang= vi clone, NLS subpackage @@ -8,8 +8,8 @@ REV= 3 VERSION= 7.3.${REV} # keep PKGNAME for full version number PKGNAME= vim-${VERSION} -PKGNAME-main= vim-${VERSION} -PKGNAME-lang= vim-lang-${VERSION} +PKGNAME-main= vim-${VERSION}p0 +PKGNAME-lang= vim-lang-${VERSION}p0 P= ${DISTNAME:C/[-\.]//g} CATEGORIES= editors MASTER_SITES= ftp://ftp.vim.org/pub/vim/unix/ \ @@ -100,7 +100,7 @@ WANTLIB+= ICE SM X11 Xaw Xext Xmu Xpm Xt pthread-stubs xcb !${FLAVOR:L:Mmotif} && !${FLAVOR:L:Mno_x11} && !${FLAVOR:L:Mathena} MAKE_FLAGS+= 'LDFLAGS=-pthread' MAKE_FLAGS+= 'CFLAGS=-pthread' -LIB_DEPENDS+= gdk-x11-2.0.>=0.11,gdk_pixbuf-2.0.>=0.11,gtk-x11-2.0.>=0.11::x11/gtk+2 +LIB_DEPENDS+= gdk-x11-2.0.>=0.11,gtk-x11-2.0.>=0.11::x11/gtk+2 CONFIGURE_ARGS+=--enable-gui="gtk2" --with-x --enable-fontset --enable-xim --disable-gtk-check --enable-gtk2-check USE_X11= Yes WANTLIB+= ICE SM X11 Xext Xrender Xt fontconfig freetype m z\ @@ -108,7 +108,7 @@ WANTLIB+= ICE SM X11 Xext Xrender Xt fontconfig freetype m z\ pango-1.0 pangoft2-1.0 pangocairo-1.0 cairo pthread\ glitz Xau Xcomposite Xcursor Xdamage Xfixes Xi Xinerama \ Xrandr pixman-1 pthread-stubs xcb gthread-2.0 xcb-render \ - xcb-render-util + xcb-render-util gdk_pixbuf-2.0 .else ERRORS= "Fatal: You must select one GUI interface: no_x11, gtk2, athena or motif" .endif diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile index fa20d5eb2ce..ad2890c5a22 100644 --- a/emulators/BasiliskII/Makefile +++ b/emulators/BasiliskII/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2010/09/12 16:49:09 jasper Exp $ +# $OpenBSD: Makefile,v 1.19 2010/09/30 07:21:18 ajacoutot Exp $ # $RuOBSD: Makefile,v 1.4 2002/04/29 11:07:18 grange Exp $ # $NetBSD: Makefile,v 1.1.1.1 2001/12/29 00:22:02 abs Exp $ @@ -8,6 +8,8 @@ DISTNAME= BasiliskII_src_01052006 PKGNAME= BasiliskII-1.0 CATEGORIES= emulators +REVISION= 0 + HOMEPAGE= http://basilisk.cebix.net/ # GPLv2 @@ -26,10 +28,10 @@ WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xxf86dga Xxf86vm WANTLIB += atk-1.0 audiofile c cairo expat fontconfig freetype WANTLIB += gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 m pango-1.0 WANTLIB += pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread pthread-stubs -WANTLIB += sndio stdc++ xcb z +WANTLIB += sndio stdc++ xcb z gdk_pixbuf-2.0 LIB_DEPENDS= esd.>=2::audio/esound \ - gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 + gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 USE_X11= Yes USE_GMAKE= Yes diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile index 5693a233328..ac534ec2849 100644 --- a/emulators/fuse/Makefile +++ b/emulators/fuse/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.18 2010/05/09 18:19:25 jakemsr Exp $ +# $OpenBSD: Makefile,v 1.19 2010/09/30 07:21:18 ajacoutot Exp $ COMMENT= Free Unix Spectrum Emulator DISTNAME= fuse-0.10.0.2 -PKGNAME= ${DISTNAME}p2 +REVISION= 3 CATEGORIES= emulators HOMEPAGE= http://fuse-emulator.sourceforge.net/ @@ -37,12 +37,13 @@ FLAVORS=gtk FLAVOR?= .if ${FLAVOR:L:Mgtk} -LIB_DEPENDS+= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ +LIB_DEPENDS+= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ gio-2.0,gmodule-2.0,gobject-2.0::devel/glib2 CONFIGURE_ARGS+= --with-gtk2 WANTLIB+= Xcomposite Xcursor Xdamage Xfixes Xi Xinerama Xrandr \ Xrender atk-1.0 cairo expat fontconfig freetype glitz \ - pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 + pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 \ + gdk_pixbuf-2.0 .else CONFIGURE_ARGS+= --without-gtk WANTLIB+= ICE SM diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile index 15c280f763a..7a61fbfcb86 100644 --- a/emulators/snes9x/Makefile +++ b/emulators/snes9x/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2010/05/13 23:31:56 jakemsr Exp $ +# $OpenBSD: Makefile,v 1.12 2010/09/30 07:21:18 ajacoutot Exp $ COMMENT = emulates the Super Nintendo Entertainment System @@ -6,6 +6,8 @@ DISTNAME = snes9x-1.52-src PKGNAME = ${DISTNAME:S/-src//} CATEGORIES = emulators games +REVISION = 0 + HOMEPAGE = http://www.snes9x.com/ # non-commercial @@ -19,7 +21,7 @@ WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 \ gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 \ pangoft2-1.0 pixman-1 pthread pthread-stubs stdc++ \ - xcb xcb-render xcb-render-util z + xcb xcb-render xcb-render-util z gdk_pixbuf-2.0 MASTER_SITES = http://sites.google.com/site/bearoso/snes9x/ EXTRACT_SUFX = .tar.bz2 @@ -30,7 +32,7 @@ LIB_DEPENDS = glade-2.0::devel/libglade2 \ SDL::devel/sdl \ png::graphics/png \ xml2::textproc/libxml \ - gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 + gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 .if ${MACHINE_ARCH} == "i386" BUILD_DEPENDS = ::devel/nasm diff --git a/games/belooted/Makefile b/games/belooted/Makefile index 6d3327d5cdf..5202bad4515 100644 --- a/games/belooted/Makefile +++ b/games/belooted/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.9 2009/12/22 16:28:00 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.10 2010/09/30 07:21:18 ajacoutot Exp $ COMMENT= 32-card trick-taking game DISTNAME= belooted-0.1.4.1 -PKGNAME= ${DISTNAME}p0 +REVISION= 1 CATEGORIES= games @@ -23,12 +23,12 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png -WANTLIB += pthread-stubs xcb z +WANTLIB += pthread-stubs xcb z gdk_pixbuf-2.0 MODULES= devel/gettext \ textproc/intltool -LIB_DEPENDS= gdk-x11-2.0.>=1000,gdk_pixbuf-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 +LIB_DEPENDS= gdk-x11-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils \ ::x11/gnome/librsvg diff --git a/games/circuit/Makefile b/games/circuit/Makefile index f42f5866a49..eea2e306e00 100644 --- a/games/circuit/Makefile +++ b/games/circuit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2010/03/21 11:04:34 jasper Exp $ +# $OpenBSD: Makefile,v 1.14 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= finish-the-cycle logic puzzle CATEGORIES= games @@ -6,7 +6,7 @@ CATEGORIES= games MAINTAINER= Marc Espie DISTNAME= circuit-0.1.4 -PKGNAME= ${DISTNAME}p3 +REVISION= 4 MASTER_SITES= ftp://quatramaran.ens.fr/pub/cigaes/circuit/ # BSD @@ -19,9 +19,9 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png -WANTLIB += pthread-stubs xcb z +WANTLIB += pthread-stubs xcb z gdk_pixbuf-2.0 -LIB_DEPENDS= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 MODULES= devel/gettext diff --git a/games/corewars/Makefile b/games/corewars/Makefile index 83ddda49107..c9a2bc73533 100644 --- a/games/corewars/Makefile +++ b/games/corewars/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.13 2010/03/24 22:32:16 jasper Exp $ +# $OpenBSD: Makefile,v 1.14 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= computer simulation game DISTNAME= corewars-0.9.13 -PKGNAME= ${DISTNAME}p1 +REVISION= 2 CATEGORIES= games x11 @@ -21,9 +21,9 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png -WANTLIB += pthread-stubs xcb z +WANTLIB += pthread-stubs xcb z gdk_pixbuf-2.0 -LIB_DEPENDS= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=corewars/} diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile index 1037b196366..f497e36933f 100644 --- a/games/crossfire-client/Makefile +++ b/games/crossfire-client/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.23 2010/04/26 01:43:02 jakemsr Exp $ +# $OpenBSD: Makefile,v 1.24 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= graphical networked AD&D style game VERSION= 1.11.0 DISTNAME= crossfire-client-${VERSION} -PKGNAME= ${DISTNAME}p4 +REVISION= 5 CATEGORIES= games x11 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -23,13 +23,13 @@ WANTLIB= GL GLU SDL X11 Xau Xcomposite Xcursor Xdamage Xdmcp \ cairo crypto expat fontconfig freetype gio-2.0 glib-2.0 \ glitz gmodule-2.0 gobject-2.0 idn m pango-1.0 \ pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread \ - pthread-stubs sndio ssl xcb z + pthread-stubs sndio ssl xcb z gdk_pixbuf-2.0 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=crossfire/} MODULES= devel/gettext -LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ SDL_image.>=2::devel/sdl-image \ glut.>=4::graphics/freeglut \ curl.>=8::net/curl diff --git a/games/csmash/Makefile b/games/csmash/Makefile index edce7142f22..88122766c70 100644 --- a/games/csmash/Makefile +++ b/games/csmash/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 2009/08/10 06:31:41 kili Exp $ +# $OpenBSD: Makefile,v 1.4 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= Cannon Smash 3D table tennis DISTNAME= csmash-0.6.6 -PKGNAME= ${DISTNAME}p1 +REVISION= 2 CATEGORIES= games HOMEPAGE= http://cannonsmash.sourceforge.net/ @@ -24,13 +24,14 @@ MODULES= devel/gettext LIB_DEPENDS= SDL_image::devel/sdl-image \ SDL_mixer::devel/sdl-mixer \ - gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 + gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 WANTLIB+= GL GLU ICE Xau Xcomposite Xcursor Xdamage Xdmcp Xfixes \ Xi Xinerama Xmu Xrandr Xrender Xt atk-1.0 c cairo expat \ fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 \ gobject-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 \ - png pthread pthread-stubs stdc++ xcb z X11 Xext m SDL + png pthread pthread-stubs stdc++ xcb z X11 Xext m SDL \ + gdk_pixbuf-2.0 CONFIGURE_STYLE= gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL" \ diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile index 5cb27614a5f..8b1b38949c3 100644 --- a/games/dopewars/Makefile +++ b/games/dopewars/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.44 2009/08/10 06:31:41 kili Exp $ +# $OpenBSD: Makefile,v 1.45 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= game where you deal drugs on the streets of NY DISTNAME= dopewars-1.5.12 -PKGNAME= ${DISTNAME}p3 +REVISION= 4 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dopewars/} @@ -39,12 +39,12 @@ FLAVOR?= CONFIGURE_ARGS+= --disable-gui-client .else USE_X11= Yes -LIB_DEPENDS+= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 +LIB_DEPENDS+= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 WANTLIB+= X11 Xext Xrender Xrandr expat fontconfig freetype m z cairo \ Xau Xcomposite Xcursor Xdamage Xdmcp Xfixes Xi Xinerama \ glitz gmodule-2.0 gobject-2.0 atk-1.0 pango-1.0 \ pangoft2-1.0 pangocairo-1.0 pixman-1 png pthread-stubs \ - xcb + xcb gdk_pixbuf-2.0 .endif post-install: diff --git a/games/eboard/Makefile b/games/eboard/Makefile index 11d6ba2ca8c..f64b7f3ddeb 100644 --- a/games/eboard/Makefile +++ b/games/eboard/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.37 2010/01/07 09:49:21 jakemsr Exp $ +# $OpenBSD: Makefile,v 1.38 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= gtk+2 chess board interface DISTNAME= eboard-1.0.4 -PKGNAME= ${DISTNAME}p5 +REVISION= 6 CATEGORIES= games x11 HOMEPAGE= http://www.bergo.eng.br/eboard/ @@ -18,13 +18,13 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \ freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 \ m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 \ - png pthread pthread-stubs sndio stdc++ xcb z + png pthread pthread-stubs sndio stdc++ xcb z gdk_pixbuf-2.0 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=eboard/} EXTRACT_SUFX= .tar.bz2 -LIB_DEPENDS= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 MODULES= devel/gettext diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile index 8d7e442f502..e62d91aea3b 100644 --- a/games/freeciv/Makefile +++ b/games/freeciv/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.78 2009/12/22 16:28:00 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.79 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT-main= Civilization clone for X11; multiplayer; game server COMMENT-client= Freeciv client @@ -7,7 +7,7 @@ COMMENT-share= shared data files for Freeciv VERSION= 2.1.4 DISTNAME= freeciv-${VERSION} PKGNAME-main= freeciv-server-${VERSION}p1 -PKGNAME-client= freeciv-client-${VERSION}p5 +PKGNAME-client= freeciv-client-${VERSION}p6 PKGNAME-share= freeciv-share-${VERSION}p1 CATEGORIES= games HOMEPAGE= http://www.freeciv.org/ @@ -53,9 +53,9 @@ WANTLIB-client= ${WANTLIB} \ Xrandr X11 Xext Xrender atk-1.0 cairo expat fontconfig \ freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 \ pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png \ - pthread-stubs xcb + pthread-stubs xcb gdk_pixbuf-2.0 LIB_DEPENDS-client=${LIB_DEPENDS} \ - gtk-x11-2.0.>=0.5,gdk-x11-2.0.>=0.5,gdk_pixbuf-2.0.>=0.5::x11/gtk+2 + gtk-x11-2.0.>=0.5,gdk-x11-2.0.>=0.5::x11/gtk+2 RUN_DEPENDS-client= :desktop-file-utils-*:devel/desktop-file-utils \ :freeciv-share-${VERSION}:${BUILD_PKGPATH},-share diff --git a/games/gargoyle/Makefile b/games/gargoyle/Makefile index 4d675bf9be8..cd343b0c7db 100644 --- a/games/gargoyle/Makefile +++ b/games/gargoyle/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2009/08/28 01:02:20 sthen Exp $ +# $OpenBSD: Makefile,v 1.6 2010/09/30 07:21:19 ajacoutot Exp $ SHARED_ONLY = Yes @@ -6,6 +6,7 @@ COMMENT = cross-platform interactive fiction player DISTNAME = gargoyle-2009-08-25-sources PKGNAME = gargoyle-20090825 +REVISION = 0 CATEGORIES = games x11 @@ -24,7 +25,7 @@ PERMIT_DISTFILES_FTP = Yes WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ Xi Xinerama Xrandr Xrender c cairo expat fontconfig \ freetype iconv m pixman-1 pthread pthread-stubs xcb stdc++ \ - vorbisfile z + vorbisfile z gdk_pixbuf-2.0 MASTER_SITES = http://garglk.googlecode.com/files/ EXTRACT_SUFX = .zip @@ -37,7 +38,7 @@ LIB_DEPENDS = SDL.>=2.0::devel/sdl \ atk-1.0::devel/atk \ gio-2.0,glib-2.0,gmodule-2.0,gobject-2.0::devel/glib2 \ glitz::graphics/glitz \ - gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 \ + gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 \ jpeg.>=62::graphics/jpeg \ pango-1.0.>=1600.0,pangocairo-1.0.>=1600.0,pangoft2-1.0.>=1600.0::devel/pango \ png.>=3::graphics/png \ diff --git a/games/gnome-mastermind/Makefile b/games/gnome-mastermind/Makefile index ee9c89f1f3e..86bb2d1b4a1 100644 --- a/games/gnome-mastermind/Makefile +++ b/games/gnome-mastermind/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.3 2009/12/22 16:28:00 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.4 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT = Mastermind clone reflexion game GNOME_PROJECT = gnome-mastermind GNOME_VERSION = 0.3.1 -PKGNAME = ${DISTNAME}p1 +REVISION= 2 CATEGORIES = games @@ -22,7 +22,7 @@ MODULES = devel/gettext \ x11/gnome DESKTOP_FILES = Yes -LIB_DEPENDS = gdk-x11-2.0.>=1000,gdk_pixbuf-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 \ +LIB_DEPENDS = gdk-x11-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 \ gconf-2.>=6::devel/gconf2 RUN_DEPENDS += ::x11/gnome/librsvg @@ -37,6 +37,6 @@ WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1 WANTLIB += dbus-glib-1 expat fontconfig freetype gio-2.0 glib-2.0 WANTLIB += glitz gmodule-2.0 gobject-2.0 gthread-2.0 m pango-1.0 WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread -WANTLIB += pthread-stubs xcb z +WANTLIB += pthread-stubs xcb z gdk_pixbuf-2.0 .include diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile index f87a95eb9bb..8d72faacae6 100644 --- a/games/gtkballs/Makefile +++ b/games/gtkballs/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.28 2009/11/17 19:30:01 naddy Exp $ +# $OpenBSD: Makefile,v 1.29 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= gtk+ clone of the lines ball logic game DISTNAME= gtkballs-3.1.5 -PKGNAME= ${DISTNAME}p8 +REVISION= 9 CATEGORIES= games x11 MASTER_SITES= ${HOMEPAGE}dist/ \ ${MASTER_SITE_SUNSITE:=games/strategy/} @@ -21,11 +21,11 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png -WANTLIB += pthread-stubs xcb z +WANTLIB += pthread-stubs xcb z gdk_pixbuf-2.0 MODULES= devel/gettext -LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 NO_REGRESS= Yes USE_GMAKE= Yes diff --git a/games/xcowsay/Makefile b/games/xcowsay/Makefile index 5d8f13f0b53..48b0ade2f0d 100644 --- a/games/xcowsay/Makefile +++ b/games/xcowsay/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.2 2009/11/03 19:55:57 landry Exp $ +# $OpenBSD: Makefile,v 1.3 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT = displays a cute cow and message on your desktop DISTNAME = xcowsay-1.1 -PKGNAME = ${DISTNAME}p0 +REVISION= 1 CATEGORIES = games HOMEPAGE = http://www.doof.me.uk/xcowsay/ @@ -17,12 +17,12 @@ MASTER_SITES = http://www.nickg.me.uk/files/ CONFIGURE_STYLE = gnu MODULES = devel/gettext -LIB_DEPENDS = gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 +LIB_DEPENDS = gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pixman-1 png pthread-stubs xcb z +WANTLIB += pixman-1 png pthread-stubs xcb z gdk_pixbuf-2.0 .include diff --git a/games/xscorch/Makefile b/games/xscorch/Makefile index 34d41a00ed9..7edb330747d 100644 --- a/games/xscorch/Makefile +++ b/games/xscorch/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.5 2010/04/27 20:50:21 jasper Exp $ +# $OpenBSD: Makefile,v 1.6 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= Scorched Earth-clone DISTNAME= xscorch-0.2.1-pre2 -PKGNAME= ${DISTNAME}p0 +REVISION= 1 CATEGORIES= games HOMEPAGE= http://www.xscorch.org/ @@ -20,12 +20,12 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 -WANTLIB += png pthread-stubs readline sndio termcap xcb z +WANTLIB += png pthread-stubs readline sndio termcap xcb z gdk_pixbuf-2.0 MODULES= devel/gettext LIB_DEPENDS= mikmod::audio/libmikmod \ - gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 + gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 USE_X11= Yes USE_LIBTOOL= Yes diff --git a/geo/osm-gps-map/Makefile b/geo/osm-gps-map/Makefile index ccf4fcdceca..96419306f2f 100644 --- a/geo/osm-gps-map/Makefile +++ b/geo/osm-gps-map/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.7 2010/03/21 10:44:25 jasper Exp $ +# $OpenBSD: Makefile,v 1.8 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= Gtk+ Widget for Displaying OpenStreetMap tiles DISTNAME= osm-gps-map-0.5.0 +REVISON= 0 SHARED_LIBS += osmgpsmap 0.0 # .0.0 CATEGORIES= geo x11 @@ -23,12 +24,12 @@ WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gnutls WANTLIB += gobject-2.0 gpg-error gthread-2.0 m pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs tasn1 -WANTLIB += xcb xml2 z gcrypt +WANTLIB += xcb xml2 z gcrypt gdk_pixbuf-2.0 USE_LIBTOOL= Yes LIB_DEPENDS= soup-2.4::devel/libsoup \ - gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 + gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 CONFIGURE_STYLE= gnu AUTOMAKE_VERSION= 1.8 diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile index 57799a6d8c8..e6e100f3824 100644 --- a/graphics/dia/Makefile +++ b/graphics/dia/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.64 2010/08/30 21:24:15 jasper Exp $ +# $OpenBSD: Makefile,v 1.65 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= technical diagrams drawing tool GNOME_PROJECT= dia GNOME_VERSION= 0.97.1 -REVISION= 1 +REVISION= 2 CATEGORIES= graphics @@ -23,10 +23,10 @@ WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += pcre pixman-1 png pthread pthread-stubs xcb xml2 z -WANTLIB += xcb-render xcb-render-util +WANTLIB += xcb-render xcb-render-util gdk_pixbuf-2.0 BUILD_DEPENDS= ::textproc/docbook-xsl -LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ art_lgpl_2.>=5::graphics/libart \ xslt.>=3::textproc/libxslt diff --git a/graphics/goocanvas/Makefile b/graphics/goocanvas/Makefile index 0bdbe540082..19ccb69141d 100644 --- a/graphics/goocanvas/Makefile +++ b/graphics/goocanvas/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.3 2009/08/10 06:31:44 kili Exp $ +# $OpenBSD: Makefile,v 1.4 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= canvas widget for GTK+ based on Cairo GNOME_PROJECT= goocanvas GNOME_VERSION= 0.14 -PKGNAME= ${DISTNAME}p0 +REVISION= 1 SHARED_LIBS += goocanvas 1.0 # .6.0 CATEGORIES= graphics @@ -20,13 +20,13 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 -WANTLIB += png pthread-stubs xcb z +WANTLIB += png pthread-stubs xcb z gdk_pixbuf-2.0 MODULES= devel/gettext \ x11/gnome BUILD_DEPENDS= ::x11/gnome/doc-utils -LIB_DEPENDS= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 USE_X11= Yes diff --git a/graphics/gpicview/Makefile b/graphics/gpicview/Makefile index da22d3cd5e9..63e525191a4 100644 --- a/graphics/gpicview/Makefile +++ b/graphics/gpicview/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.7 2009/12/22 16:06:40 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.8 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT = simple and fast image viewer for X DISTNAME = gpicview-0.2.1 -PKGNAME = ${DISTNAME}p1 +REVISION = 2 CATEGORIES = graphics x11 @@ -15,7 +15,7 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 jpeg WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png -WANTLIB += gio-2.0 pthread pthread-stubs xcb z +WANTLIB += gio-2.0 pthread pthread-stubs xcb z gdk_pixbuf-2.0 # GPLv2 PERMIT_PACKAGE_CDROM = Yes @@ -27,7 +27,7 @@ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=lxde/} MODULES = devel/gettext -LIB_DEPENDS = gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 +LIB_DEPENDS = gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 RUN_DEPENDS = :desktop-file-utils-*:devel/desktop-file-utils MODULES += textproc/intltool diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile index aace08e196c..a4c3bd4f299 100644 --- a/graphics/gqview/Makefile +++ b/graphics/gqview/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.56 2009/12/22 16:06:41 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.57 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= Gtk-based graphic file viewer DISTNAME= gqview-2.1.5 -PKGNAME= ${DISTNAME}p1 +REVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gqview/} @@ -21,13 +21,13 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi \ Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \ freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 m \ pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png \ - pthread-stubs xcb z + pthread-stubs xcb z gdk_pixbuf-2.0 MODULES= devel/gettext RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils \ ::devel/xdg-utils -LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ lcms::graphics/lcms USE_X11= Yes diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile index 447869c73e9..0503da5640e 100644 --- a/graphics/gtkam/Makefile +++ b/graphics/gtkam/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.22 2010/04/24 08:41:24 jasper Exp $ +# $OpenBSD: Makefile,v 1.23 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= digital camera frontend DISTNAME= gtkam-0.1.16.1 -PKGNAME= ${DISTNAME}p2 +REVISION= 3 CATEGORIES= graphics @@ -22,12 +22,12 @@ WANTLIB= gmodule-2.0 X11 Xext Xrender gobject-2.0 glitz png \ pango-1.0 pangocairo-1.0 pangoft2-1.0 Xau Xcursor \ Xdmcp Xfixes Xi Xinerama Xrandr exif expat ltdl usb \ Xcomposite Xdamage pixman-1 pthread gio-2.0 \ - pthread-stubs xcb + pthread-stubs xcb gdk_pixbuf-2.0 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gphoto/} LIB_DEPENDS= gphoto2,gphoto2_port::graphics/libgphoto2 \ - gdk_pixbuf-2.0.>=0.11,gdk-x11-2.0.>=0.11,gtk-x11-2.0.>=0.11::x11/gtk+2 \ + gdk-x11-2.0.>=0.11,gtk-x11-2.0.>=0.11::x11/gtk+2 \ exif-gtk::graphics/libexif-gtk RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils diff --git a/graphics/gtkimageview/Makefile b/graphics/gtkimageview/Makefile index 7c05fc79e61..f609f139427 100644 --- a/graphics/gtkimageview/Makefile +++ b/graphics/gtkimageview/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 2010/05/10 08:38:44 robert Exp $ +# $OpenBSD: Makefile,v 1.4 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= image viewer widget for gtk DISTNAME= gtkimageview-1.6.4 -PKGNAME= ${DISTNAME}p1 +REVISION= 2 SHARED_LIBS= gtkimageview 0.0 @@ -21,12 +21,12 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig freetype WANTLIB += gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 m pango-1.0 WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread-stubs -WANTLIB += xcb z +WANTLIB += xcb z gdk_pixbuf-2.0 MASTER_SITES= ${HOMEPAGE}chrome/common/releases/ MODULES= devel/gettext -LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2,-main +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2,-main USE_GMAKE= Yes USE_LIBTOOL= Yes diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile index d52a7ec1a77..f7b892fed4d 100644 --- a/graphics/libexif-gtk/Makefile +++ b/graphics/libexif-gtk/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.8 2009/08/10 06:31:45 kili Exp $ +# $OpenBSD: Makefile,v 1.9 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= GTK2 interface to libexif DISTNAME= libexif-gtk-0.3.5 -PKGNAME= ${DISTNAME}p6 +REVISION= 7 SHARED_LIBS += exif-gtk 0.0 # .5.0 CATEGORIES= graphics @@ -21,10 +21,10 @@ WANTLIB= X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \ Xrender atk-1.0 cairo expat fontconfig freetype pcre \ gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 m pango-1.0 \ pangocairo-1.0 pangoft2-1.0 pixman-1 z png Xcomposite \ - Xdamage pthread-stubs xcb + Xdamage pthread-stubs xcb gdk_pixbuf-2.0 MODULES= devel/gettext -LIB_DEPENDS= gdk-x11-2.0.>=1000,gdk_pixbuf-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 \ +LIB_DEPENDS= gdk-x11-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 \ exif.>=12::graphics/libexif USE_LIBTOOL= Yes diff --git a/graphics/pigment/Makefile b/graphics/pigment/Makefile index c206c72c903..7d14c08efa2 100644 --- a/graphics/pigment/Makefile +++ b/graphics/pigment/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2009/10/13 19:36:31 landry Exp $ +# $OpenBSD: Makefile,v 1.2 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT = 3D scene graph library for rich UI @@ -7,6 +7,8 @@ CATEGORIES = graphics DISTNAME = pigment-0.3.17 MASTER_SITES = http://elisa.fluendo.com/static/download/pigment/ +REVISION = 0 + SHARED_LIBS += pigment-0.3 0.0 \ pigment-gtk-0.3 0.0 \ pigment-imaging-0.3 0.0 @@ -33,7 +35,7 @@ USE_GMAKE = Yes # needs a check-enabled gstreamer NO_REGRESS = Yes -LIB_DEPENDS = gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0,gdk_pixbuf_xlib-2.0::x11/gtk+2 \ +LIB_DEPENDS = gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 \ gstvideo-0.10::multimedia/gstreamer-0.10/plugins-base WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes @@ -41,5 +43,6 @@ WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre xml2 WANTLIB += pixman-1 png pthread-stubs xcb z gstbase-0.10 gstreamer-0.10 +WANTLIB += gdk_pixbuf-2.0 gdk_pixbuf_xlib-2.0 .include diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile index 017a5824fb0..eb4e420e957 100644 --- a/graphics/qiv/Makefile +++ b/graphics/qiv/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.15 2009/08/21 18:39:59 kili Exp $ +# $OpenBSD: Makefile,v 1.16 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= very small and pretty fast gdk/Imlib image viewer DISTNAME= qiv-2.2.2 -PKGNAME= ${DISTNAME}p0 +REVISION= 1 CATEGORIES= graphics EXTRACT_SUFX= .tgz @@ -15,7 +15,7 @@ MASTER_SITES= ${HOMEPAGE}download/ LIB_DEPENDS= magic::devel/libmagic \ Imlib2::graphics/imlib2 \ exif::graphics/libexif \ - gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 + gdk-x11-2.0::x11/gtk+2 # GPLv2 PERMIT_PACKAGE_CDROM= Yes @@ -26,7 +26,7 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ Xi Xinerama Xrandr Xrender c cairo expat fontconfig \ freetype gio-2.0 glib-2.0 glitz gmodule-2.0 \ gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ - pixman-1 png pthread-stubs xcb z + pixman-1 png pthread-stubs xcb z gdk_pixbuf-2.0 MODULES= devel/gettext diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile index a66738a3678..1f7d90a57f9 100755 --- a/graphics/sane-frontends/Makefile +++ b/graphics/sane-frontends/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.20 2009/08/10 06:31:45 kili Exp $ +# $OpenBSD: Makefile,v 1.21 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= API for accessing scanners, frontends DISTNAME= sane-frontends-1.0.14 -PKGNAME= ${DISTNAME}p13 +REVISION= 14 + CATEGORIES= graphics HOMEPAGE= http://www.sane-project.org/ @@ -26,10 +27,10 @@ WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo exif expat WANTLIB += fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 WANTLIB += gobject-2.0 gphoto2 gphoto2_port jpeg m pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pixman-1 png pthread pthread-stubs tiff usb xcb z -WANTLIB += avahi-client avahi-common +WANTLIB += avahi-client avahi-common gdk_pixbuf-2.0 MODULES= devel/gettext -LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ sane.>=1::graphics/sane-backends USE_X11= Yes diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile index 52958bc5907..c0580ad9896 100644 --- a/graphics/xsane/Makefile +++ b/graphics/xsane/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.20 2010/04/26 09:57:59 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.21 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= scanner frontend for SANE DISTNAME= xsane-0.997 -PKGNAME= ${DISTNAME}p1 +REVISION= 2 CATEGORIES= graphics @@ -19,7 +19,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes +WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes gdk_pixbuf-2.0 WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo exif expat WANTLIB += fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 WANTLIB += gobject-2.0 gphoto2 gphoto2_port jpeg m pango-1.0 pangocairo-1.0 @@ -27,7 +27,7 @@ WANTLIB += pangoft2-1.0 pixman-1 png pthread pthread-stubs tiff usb xcb z WANTLIB += avahi-client avahi-common gthread-2.0 xcb-render xcb-render-util MODULES= devel/gettext -LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ lcms.>=1::graphics/lcms \ sane.>=1::graphics/sane-backends RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils \ diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile index ea2353f6adf..d4040bf9831 100644 --- a/graphics/xzgv/Makefile +++ b/graphics/xzgv/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.7 2009/08/10 06:31:45 kili Exp $ +# $OpenBSD: Makefile,v 1.8 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= picture viewer for X, with thumbnail-based file selector DISTNAME= xzgv-0.9 -PKGNAME= ${DISTNAME}p0 +REVISION= 1 CATEGORIES= graphics HOMEPAGE= http://xzgv.sourceforge.net/ @@ -19,9 +19,9 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xzgv/} MODULES= devel/gettext -LIB_DEPENDS+= gdk-x11-2.0.>=0.11,gdk_pixbuf-2.0.>=0.11,gtk-x11-2.0.>=0.11::x11/gtk+2 +LIB_DEPENDS+= gdk-x11-2.0.>=0.11,gtk-x11-2.0.>=0.11::x11/gtk+2 -WANTLIB+= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes +WANTLIB+= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes gdk_pixbuf-2.0 WANTLIB+= Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB+= freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 m pango-1.0 WANTLIB+= pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread-stubs xcb z diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile index 25cafbee6da..db29f7eb29e 100644 --- a/graphics/zbar/Makefile +++ b/graphics/zbar/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.3 2010/08/30 21:24:15 jasper Exp $ +# $OpenBSD: Makefile,v 1.4 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= ZBar barcode reader DISTNAME= zbar-0.10 -REVISION= 1 +REVISION= 2 SHARED_LIBS= zbar 0.0 \ zbargtk 0.0 @@ -30,11 +30,11 @@ WANTLIB += cairo expat fontconfig freetype gio-2.0 glib-2.0 glitz WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 jasper jbig jpeg WANTLIB += lcms m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre WANTLIB += pixman-1 png pthread pthread-stubs tiff wmflite -WANTLIB += xcb xml2 z +WANTLIB += xcb xml2 z gdk_pixbuf-2.0 LIB_DEPENDS= MagickCore.>=1,MagickWand.>=1::graphics/ImageMagick \ ffi::devel/libffi \ - gdk-x11-2.0.>=0.11,gdk_pixbuf-2.0.>=0.11,gtk-x11-2.0.>=0.11::x11/gtk+2 + gdk-x11-2.0.>=0.11,gtk-x11-2.0.>=0.11::x11/gtk+2 BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= ::x11/py-gtk2 diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile index cf5645e4c7c..383a754c8e7 100644 --- a/lang/kaffe/Makefile +++ b/lang/kaffe/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.42 2010/09/25 18:25:35 steven Exp $ +# $OpenBSD: Makefile,v 1.43 2010/09/30 07:21:19 ajacoutot Exp $ ONLY_FOR_ARCHS= amd64 i386 powerpc COMMENT-main= kaffe.org's Java JDK1.4 compiler, runtime and libs DISTNAME= kaffe-1.1.7 -PKGNAME-main= ${DISTNAME}p8 +PKGNAME-main= ${DISTNAME}p9 CATEGORIES= lang @@ -31,7 +31,7 @@ USE_X11= Yes BUILD_DEPENDS= ::archivers/zip \ :jikes->=1.22p0:lang/jikes -LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ gmp.>=4.::devel/gmp \ audiofile::devel/libaudiofile \ esd.>=2::audio/esound \ @@ -42,7 +42,7 @@ RUN_DEPENDS= ::archivers/zip \ WANTLIB += ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xtst atk-1.0 c cairo WANTLIB += expat fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 -WANTLIB += gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 +WANTLIB += gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 gdk_pixbuf-2.0 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs sndio xcb z SEPARATE_BUILD= concurrent diff --git a/mail/claws-mail-attremover/Makefile b/mail/claws-mail-attremover/Makefile index 45c7265a894..a5de02219b1 100644 --- a/mail/claws-mail-attremover/Makefile +++ b/mail/claws-mail-attremover/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2010/06/11 17:10:40 landry Exp $ +# $OpenBSD: Makefile,v 1.4 2010/09/30 07:21:19 ajacoutot Exp $ SHARED_ONLY = Yes @@ -7,6 +7,7 @@ COMMENT = remove attachments from emails VERSION = 1.0.12 DISTNAME = att_remover-${VERSION} PKGNAME = claws-mail-attremover-${VERSION} +REVISION = 0 MASTER_SITES = http://www.claws-mail.org/downloads/plugins/ CATEGORIES = mail DIST_SUBDIR = claws @@ -26,7 +27,7 @@ LIBTOOL_FLAGS = --tag=disable-static MODULES = devel/gettext -LIB_DEPENDS = gdk-x11-2.0.>=1403,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 +LIB_DEPENDS = gdk-x11-2.0.>=1403,gtk-x11-2.0::x11/gtk+2 RUN_DEPENDS = :claws-mail->=3.7.6:mail/claws-mail BUILD_DEPENDS = ${RUN_DEPENDS} @@ -36,7 +37,7 @@ WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 \ gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ pcre pixman-1 png pthread-stubs xcb xcb-render \ - xcb-render-util z + xcb-render-util z gdk_pixbuf-2.0 CONFIGURE_STYLE = gnu CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/mail/claws-mail-htmlviewer/Makefile b/mail/claws-mail-htmlviewer/Makefile index 48d5c88c669..4f07fbc7ccf 100644 --- a/mail/claws-mail-htmlviewer/Makefile +++ b/mail/claws-mail-htmlviewer/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2010/06/11 17:10:40 landry Exp $ +# $OpenBSD: Makefile,v 1.18 2010/09/30 07:21:19 ajacoutot Exp $ SHARED_ONLY= Yes @@ -7,6 +7,7 @@ COMMENT= HTML renderer plugin for Claws Mail VERSION= 0.27 DISTNAME= gtkhtml2_viewer-${VERSION} PKGNAME= claws-mail-htmlviewer-${VERSION} +REVISION= 0 MASTER_SITES= http://www.claws-mail.org/downloads/plugins/ CATEGORIES= mail DIST_SUBDIR= claws @@ -30,14 +31,14 @@ RUN_DEPENDS= ::mail/claws-mail BUILD_DEPENDS= ${RUN_DEPENDS} LIB_DEPENDS= xml2::textproc/libxml \ curl.>=7::net/curl \ - gdk-x11-2.0.>=1403,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 + gdk-x11-2.0.>=1403,gtk-x11-2.0::x11/gtk+2 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo crypto expat WANTLIB += fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 WANTLIB += gobject-2.0 gthread-2.0 idn m pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread-stubs ssl xcb -WANTLIB += xcb-render xcb-render-util z +WANTLIB += xcb-render xcb-render-util z gdk_pixbuf-2.0 CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile index 26fe0d8f1fc..554fc149c65 100644 --- a/mail/claws-mail-rssyl/Makefile +++ b/mail/claws-mail-rssyl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2010/06/11 17:10:40 landry Exp $ +# $OpenBSD: Makefile,v 1.18 2010/09/30 07:21:19 ajacoutot Exp $ SHARED_ONLY= Yes @@ -6,7 +6,7 @@ COMMENT= RSS aggregator plugin for Claws-mail VERSION= 0.27 DISTNAME= rssyl-${VERSION} -PKGNAME= claws-mail-rssyl-${VERSION}p0 +PKGNAME= claws-mail-rssyl-${VERSION}p1 MASTER_SITES= http://www.claws-mail.org/downloads/plugins/ CATEGORIES= mail DIST_SUBDIR= claws @@ -29,7 +29,7 @@ MODULES= devel/gettext RUN_DEPENDS= ::mail/claws-mail BUILD_DEPENDS= ${RUN_DEPENDS} LIB_DEPENDS= xml2.>=9::textproc/libxml \ - gdk-x11-2.0.>=1403,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ + gdk-x11-2.0.>=1403,gtk-x11-2.0::x11/gtk+2 \ curl.>=15::net/curl WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes @@ -37,7 +37,7 @@ WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo crypto expat WANTLIB += fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 WANTLIB += gobject-2.0 gthread-2.0 idn m pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread-stubs ssl xcb -WANTLIB += xcb-render xcb-render-util z +WANTLIB += xcb-render xcb-render-util z gdk_pixbuf-2.0 CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile index c6f1f700797..70dd6cc0774 100644 --- a/mail/claws-mail-vcalendar/Makefile +++ b/mail/claws-mail-vcalendar/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2010/06/11 17:10:40 landry Exp $ +# $OpenBSD: Makefile,v 1.19 2010/09/30 07:21:19 ajacoutot Exp $ SHARED_ONLY= Yes @@ -7,6 +7,7 @@ COMMENT= groupware plugin for Claws-mail VERSION= 2.0.8 DISTNAME= vcalendar-${VERSION} PKGNAME= claws-mail-vcalendar-${VERSION} +REVISION= 0 MASTER_SITES= http://www.claws-mail.org/downloads/plugins/ CATEGORIES= mail DIST_SUBDIR= claws @@ -26,7 +27,7 @@ LIBTOOL_FLAGS= --tag=disable-static MODULES= devel/gettext -LIB_DEPENDS= gdk-x11-2.0.>=1403,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ +LIB_DEPENDS= gdk-x11-2.0.>=1403,gtk-x11-2.0::x11/gtk+2 \ curl.>=15::net/curl RUN_DEPENDS= ::mail/claws-mail @@ -37,7 +38,7 @@ WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo crypto expat WANTLIB += fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 WANTLIB += gobject-2.0 gthread-2.0 idn m pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread-stubs ssl xcb -WANTLIB += xcb-render xcb-render-util z +WANTLIB += xcb-render xcb-render-util z gdk_pixbuf-2.0 CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index cd7f567bd7c..804a80286a3 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.34 2010/06/11 17:08:32 landry Exp $ +# $OpenBSD: Makefile,v 1.35 2010/09/30 07:21:19 ajacoutot Exp $ SHARED_ONLY= Yes @@ -10,11 +10,11 @@ COMMENT-spamassassin= spamassassin plugin V= 3.7.6 DISTNAME= claws-mail-${V} -PKGNAME-main= ${DISTNAME} +PKGNAME-main= ${DISTNAME}p0 FULLPKGNAME-docs= claws-mail-docs-${V} FULLPKGPATH-docs= mail/claws-mail,-docs -PKGNAME-bogofilter= claws-mail-bogofilter-${V} -PKGNAME-spamassassin= claws-mail-spamassassin-${V} +PKGNAME-bogofilter= claws-mail-bogofilter-${V}p0 +PKGNAME-spamassassin= claws-mail-spamassassin-${V}p0 CATEGORIES= mail news HOMEPAGE= http://www.claws-mail.org/ @@ -49,14 +49,14 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ expat fontconfig freetype gio-2.0 glib-2.0 glitz \ gmodule-2.0 gobject-2.0 idn m pango-1.0 pangocairo-1.0 \ pangoft2-1.0 pcre pixman-1 png pthread-stubs ssl \ - gcrypt gpg-error xcb z + gcrypt gpg-error xcb z gdk_pixbuf-2.0 WANTLIB-main= ${WANTLIB} ICE SM c dbus-1 gthread-2.0 \ pthread stdc++ tasn1 xcb-atom xcb-aux xcb-event WANTLIB-docs= -LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ execinfo::devel/libexecinfo \ etpan.>=13::mail/libetpan \ sasl2::security/cyrus-sasl2 diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile index e38f91cc3dc..2fb53bebabf 100644 --- a/mail/sylpheed/Makefile +++ b/mail/sylpheed/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.86 2010/01/10 10:21:05 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.87 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= mail/news client in gtk+ @@ -6,6 +6,8 @@ MAJOR= 2.7 VERSION= ${MAJOR}.1 DISTNAME= sylpheed-${VERSION} +REVISION= 0 + SHARED_LIBS += sylph-0 0.0 # .0.1 SHARED_LIBS += sylpheed-plugin-0 0.0 # .0.1 @@ -19,13 +21,13 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes MODULES= devel/gettext -LIB_DEPENDS= gtk-x11-2.0.>=0.9,gdk_pixbuf-2.0.>=0.9,gdk-x11-2.0.>=0.9::x11/gtk+2 \ +LIB_DEPENDS= gtk-x11-2.0.>=0.9,gdk-x11-2.0.>=0.9::x11/gtk+2 \ gtkspell.>=1::textproc/gtkspell WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo crypto enchant WANTLIB += expat fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 -WANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 +WANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 gdk_pixbuf-2.0 WANTLIB += pcre pixman-1 png pthread pthread-stubs ssl stdc++ xcb z RUN_DEPENDS= ::devel/desktop-file-utils diff --git a/math/calcoo/Makefile b/math/calcoo/Makefile index 94846d89638..82b0eafc5ea 100644 --- a/math/calcoo/Makefile +++ b/math/calcoo/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.34 2010/07/18 10:30:41 steven Exp $ +# $OpenBSD: Makefile,v 1.35 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT= RPN and algebraic scientific calculator DISTNAME= calcoo-1.3.18 -REVISION= 3 +REVISION= 4 CATEGORIES= math HOMEPAGE= http://calcoo.sourceforge.net/ @@ -18,13 +18,13 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calcoo/} MODULES= devel/gettext -LIB_DEPENDS= gdk_pixbuf-2.0.>=1000,gdk-x11-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 +LIB_DEPENDS= gdk-x11-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png -WANTLIB += pthread-stubs xcb z +WANTLIB += pthread-stubs xcb z gdk_pixbuf-2.0 USE_X11= Yes SEPARATE_BUILD= simple diff --git a/math/graphviz/Makefile b/math/graphviz/Makefile index c6906af3464..ac342ab00f7 100644 --- a/math/graphviz/Makefile +++ b/math/graphviz/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.35 2010/08/09 08:55:43 espie Exp $ +# $OpenBSD: Makefile,v 1.36 2010/09/30 07:21:19 ajacoutot Exp $ COMMENT-main= graph drawing software DISTNAME= graphviz-2.12 PKGNAME-main= ${DISTNAME} -REVISION-main= 9 +REVISION-main= 10 CATEGORIES= math devel graphics MULTI_PACKAGES= -main @@ -72,10 +72,10 @@ LIB_DEPENDS= jpeg.>=62::graphics/jpeg \ gd.>=20.34:gd->=2.0.34:graphics/gd # cairo stuff -LIB_DEPENDS+= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 +LIB_DEPENDS+= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 WANTLIB+= cairo.>=5 glitz pango-1.0 pangocairo-1.0 pangoft2-1.0 \ - gmodule-2.0 glib-2.0 gobject-2.0 pixman-1 + gmodule-2.0 glib-2.0 gobject-2.0 pixman-1 gdk_pixbuf-2.0 # gnome stuff LIB_DEPENDS+= gnomeui-2::x11/gnome/libgnomeui diff --git a/math/grpn/Makefile b/math/grpn/Makefile index 2f7b9448839..b5d2a150164 100644 --- a/math/grpn/Makefile +++ b/math/grpn/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.18 2010/07/18 10:30:41 steven Exp $ +# $OpenBSD: Makefile,v 1.19 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT= graphical reverse polish notation calculator DISTNAME= grpn-1.1.2 -REVISION= 2 +REVISION= 3 CATEGORIES= math x11 HOMEPAGE= http://lashwhip.com/grpn.html @@ -23,9 +23,9 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png -WANTLIB += pthread-stubs xcb z +WANTLIB += pthread-stubs xcb z gdk_pixbuf-2.0 -LIB_DEPENDS= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 MAKE_FLAGS= CC="${CC}" ALL_TARGET= diff --git a/misc/logjam/Makefile b/misc/logjam/Makefile index fc3ed33ac12..2888249e479 100644 --- a/misc/logjam/Makefile +++ b/misc/logjam/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.23 2009/12/21 22:15:32 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.24 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT = gtk livejournal client DISTNAME = logjam-4.5.3 -PKGNAME = ${DISTNAME}p3 +REVISION = 4 CATEGORIES = misc x11 HOMEPAGE = http://logjam.danga.com/ @@ -19,6 +19,7 @@ WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo crypto expat WANTLIB += fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 WANTLIB += gobject-2.0 gthread-2.0 idn m pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs ssl xcb z +WANTLIB += gdk_pixbuf-2.0 MASTER_SITES = http://logjam.danga.com/download/ EXTRACT_SUFX = .tar.bz2 @@ -26,7 +27,7 @@ EXTRACT_SUFX = .tar.bz2 MODULES = devel/gettext \ textproc/intltool -LIB_DEPENDS = gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 \ +LIB_DEPENDS = gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 \ sqlite3::databases/sqlite3 \ curl.>=2::net/curl \ xml2::textproc/libxml diff --git a/misc/wmtimer/Makefile b/misc/wmtimer/Makefile index c0a16f8b87f..8df86a812a4 100644 --- a/misc/wmtimer/Makefile +++ b/misc/wmtimer/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.23 2010/03/25 06:22:41 jasper Exp $ +# $OpenBSD: Makefile,v 1.24 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT= wm-dockapp; alarm clock DISTNAME= wmtimer-2.92 +REVISION= 0 CATEGORIES= misc x11 x11/windowmaker HOMEPAGE= http://www.darkops.net/wmtimer/ @@ -23,9 +24,9 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xpm Xrandr Xrender atk-1.0 c cairo expat WANTLIB += fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 WANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pixman-1 png pthread pthread-stubs xcb z +WANTLIB += pixman-1 png pthread pthread-stubs xcb z gdk_pixbuf-2.0 -LIB_DEPENDS= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 USE_X11= Yes NO_REGRESS= Yes diff --git a/misc/xcdroast/Makefile b/misc/xcdroast/Makefile index 12c2af2c0e6..5e7e6c36bd1 100644 --- a/misc/xcdroast/Makefile +++ b/misc/xcdroast/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.25 2010/04/15 14:58:24 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.26 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT= gtk-based frontend to cdrtools DISTNAME= xcdroast-0.98alpha16 -PKGNAME= ${DISTNAME:L:S/alpha/a/}p0 +PKGNAME= ${DISTNAME:L:S/alpha/a/}p1 CATEGORIES= misc x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xcdroast/} @@ -18,14 +18,14 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png -WANTLIB += pthread-stubs xcb z +WANTLIB += pthread-stubs xcb z gdk_pixbuf-2.0 USE_X11= Yes MODULES= devel/gettext RUN_DEPENDS= :cdrtools->=2.0:sysutils/cdrtools -LIB_DEPENDS= gdk_pixbuf-2.0.>=0.14,gdk-x11-2.0.>=0.14,gtk-x11-2.0.>=0.14::x11/gtk+2 +LIB_DEPENDS= gdk-x11-2.0.>=0.14,gtk-x11-2.0.>=0.14::x11/gtk+2 CONFIGURE_STYLE=gnu CONFIGURE_ARGS+=--enable-gtk2 diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile index b1dd0495821..1a4716128a2 100644 --- a/multimedia/avidemux/Makefile +++ b/multimedia/avidemux/Makefile @@ -1,10 +1,12 @@ -# $OpenBSD: Makefile,v 1.25 2010/07/09 23:12:07 landry Exp $ +# $OpenBSD: Makefile,v 1.26 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT= free video editor V= 2.4.4 DISTNAME= avidemux_${V} -PKGNAME= avidemux-${V}p4 +PKGNAME= avidemux-${V} + +REVISION= 5 CATEGORIES= multimedia @@ -23,14 +25,14 @@ WANTLIB += Xi Xinerama Xrandr Xrender Xv atk-1.0 c cairo WANTLIB += expat fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 WANTLIB += gobject-2.0 gthread-2.0 m ogg pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs sndio -WANTLIB += stdc++ xcb xcb-render xcb-render-util z +WANTLIB += stdc++ xcb xcb-render xcb-render-util z gdk_pixbuf-2.0 MODULES= devel/gettext RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \ ${MODGNU_AUTOMAKE_DEPENDS} -LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ faac.>=1::audio/faac \ faad.>=2::audio/faad \ mp3lame.>=1::audio/lame \ diff --git a/multimedia/gstreamer-0.10/plugins-good/Makefile b/multimedia/gstreamer-0.10/plugins-good/Makefile index 91a32216643..4cdb72a1346 100644 --- a/multimedia/gstreamer-0.10/plugins-good/Makefile +++ b/multimedia/gstreamer-0.10/plugins-good/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.61 2010/09/12 22:33:57 jakemsr Exp $ +# $OpenBSD: Makefile,v 1.62 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT-main = good elements for GStreamer COMMENT-aalib = aalib element for GStreamer (plugins-good) @@ -17,6 +17,7 @@ PKGNAME-caca = gstreamer-libcaca-${V} REVISION-main = 0 EPOCH-main = 0 +REVISION-gdk = 0 MULTI_PACKAGES = -main -aalib \ -dv -gdk -caca @@ -80,7 +81,7 @@ LIB_DEPENDS-dv = ${LIB_DEPENDS} \ WANTLIB-gdk = ${WANTLIB} \ gio-2.0 gdk_pixbuf-2.0 gstvideo-0.10 LIB_DEPENDS-gdk = ${LIB_DEPENDS} \ - ::x11/gtk+2 \ + ::graphics/gdk-pixbuf2 \ ::$P/plugins-base WANTLIB-caca = ${WANTLIB} \ diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile index d06c15c0d68..1c69378232d 100644 --- a/multimedia/libquicktime/Makefile +++ b/multimedia/libquicktime/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.24 2010/08/25 23:27:21 sthen Exp $ +# $OpenBSD: Makefile,v 1.25 2010/09/30 07:21:20 ajacoutot Exp $ # $FreeBSD: ports/multimedia/libquicktime/Makefile,v 1.19 2004/03/16 04:23:53 edwin Exp $ SHARED_ONLY= Yes COMMENT= library for reading and writing quicktime files DISTNAME= libquicktime-1.1.5 -REVISION= 0 +REVISION= 1 CATEGORIES= multimedia SHARED_LIBS= quicktime 4.0 @@ -26,7 +26,7 @@ WANTLIB= GL ICE SM X11 Xau Xaw Xcomposite Xcursor \ pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \ pthread pthread-stubs schroedinger-1.0 \ sndio speex theora xcb xcb-render \ - xcb-render-util z + xcb-render-util z gdk_pixbuf-2.0 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libquicktime/} @@ -35,7 +35,7 @@ MODULES= devel/gettext BUILD_DEPENDS= :doxygen-*:devel/doxygen LIB_DEPENDS= avcodec.>=14,avutil.>=7,swscale.>=2:ffmpeg->=20100512:graphics/ffmpeg \ dv.>=4::multimedia/libdv \ - gtk-x11-2.0.>=800.8,gdk-x11-2.0.>=800.8,gdk_pixbuf-2.0.>=800.8::x11/gtk+2 \ + gtk-x11-2.0.>=800.8,gdk-x11-2.0.>=800.8::x11/gtk+2 \ jpeg.>=9::graphics/jpeg \ mp3lame::audio/lame \ png.>=4::graphics/png \ diff --git a/multimedia/pspvc/Makefile b/multimedia/pspvc/Makefile index 6176cefa098..9642ec8e089 100644 --- a/multimedia/pspvc/Makefile +++ b/multimedia/pspvc/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2009/08/10 06:33:02 kili Exp $ +# $OpenBSD: Makefile,v 1.6 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT= Video converter for the Playstation Portable V= 0.3 DISTNAME= pspvc-${V} -PKGNAME= ${DISTNAME}p3 +REVISION= 4 DISTFILES= pspvc-install-${V}.tar.gz CATEGORIES= multimedia @@ -21,12 +21,12 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pcre pixman-1 png pthread-stubs xcb z +WANTLIB += pcre pixman-1 png pthread-stubs xcb z gdk_pixbuf-2.0 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pspvc/} RUN_DEPENDS= ::graphics/ffmpeg -LIB_DEPENDS+= gdk-x11-2.0.>=0.11,gdk_pixbuf-2.0.>=0.11,gtk-x11-2.0.>=0.11::x11/gtk+2 +LIB_DEPENDS+= gdk-x11-2.0.>=0.11,gtk-x11-2.0.>=0.11::x11/gtk+2 CONFIGURE_STYLE=gnu diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile index 0755ad89196..e3be7cb0712 100644 --- a/net/ettercap/Makefile +++ b/net/ettercap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.44 2010/07/12 22:07:38 sthen Exp $ +# $OpenBSD: Makefile,v 1.45 2010/09/30 07:21:20 ajacoutot Exp $ SHARED_ONLY= Yes @@ -7,7 +7,7 @@ COMMENT= multi-purpose sniffer/interceptor/logger VER= 0.7.3 DISTNAME= ettercap-NG-${VER} PKGNAME= ettercap-${VER} -REVISION= 4 +REVISION= 5 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ettercap/} @@ -42,12 +42,12 @@ CONFIGURE_ARGS+= --enable-gtk=no .else USE_X11= Yes MODULES= devel/gettext -LIB_DEPENDS+= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 +LIB_DEPENDS+= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pixman-1 png pthread-stubs xcb +WANTLIB += pixman-1 png pthread-stubs xcb gdk_pixbuf-2.0 .endif NO_REGRESS= Yes diff --git a/net/gftp/Makefile b/net/gftp/Makefile index 86e3040760f..a73a3a65a93 100755 --- a/net/gftp/Makefile +++ b/net/gftp/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.23 2010/07/12 22:07:38 sthen Exp $ +# $OpenBSD: Makefile,v 1.24 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT= multithreaded gtk2 file transfer client DISTNAME= gftp-2.0.19 -REVISION= 4 +REVISION= 5 CATEGORIES= net HOMEPAGE= http://gftp.seul.org/ @@ -41,14 +41,14 @@ LIB_DEPENDS+= glib-2.0.>=1803::devel/glib2 CONFIGURE_ARGS+=--disable-gtkport .else USE_X11= Yes -LIB_DEPENDS+= gtk-x11-2.0.>=600.10,gdk_pixbuf-2.0.>=600.0,gdk-x11-2.0.>=600.0::x11/gtk+2 +LIB_DEPENDS+= gtk-x11-2.0.>=600.10,gdk-x11-2.0.>=600.0::x11/gtk+2 RUN_DEPENDS+= :desktop-file-utils-*:devel/desktop-file-utils WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += gthread-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 WANTLIB += png pthread pthread-stubs xcb xcb-render xcb-render-util -WANTLIB += z +WANTLIB += z gdk_pixbuf-2.0 .endif .include diff --git a/net/gmudix/Makefile b/net/gmudix/Makefile index c029123da02..e544d1865dc 100644 --- a/net/gmudix/Makefile +++ b/net/gmudix/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.15 2010/07/12 22:07:38 sthen Exp $ +# $OpenBSD: Makefile,v 1.16 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT= GNOME MUD/Moo Client DISTNAME= gmudix-0.10 -REVISION= 8 +REVISION= 9 CATEGORIES= net x11 HOMEPAGE= http://dw.nl.eu.org/mudix.html @@ -20,12 +20,12 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype glitz m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pixman-1 png pthread pthread-stubs xcb z +WANTLIB += pixman-1 png pthread pthread-stubs xcb z gdk_pixbuf-2.0 USE_X11= Yes LIB_DEPENDS= gio-2.0,glib-2.0,gmodule-2.0,gobject-2.0,gthread-2.0::devel/glib2 \ - gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 + gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 MODULES= devel/gettext diff --git a/net/mbrowse/Makefile b/net/mbrowse/Makefile index 8b125d1f2b5..16d9cd76e86 100644 --- a/net/mbrowse/Makefile +++ b/net/mbrowse/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.12 2010/03/23 19:37:34 jasper Exp $ +# $OpenBSD: Makefile,v 1.13 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT= graphical MIB browser DISTNAME= mbrowse-0.4.0 +REVISION= 0 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mbrowse/} @@ -17,7 +18,7 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png -WANTLIB += pthread-stubs xcb z +WANTLIB += pthread-stubs xcb z gdk_pixbuf-2.0 MODULES= devel/gettext @@ -28,7 +29,7 @@ CONFIGURE_ARGS+= --with-snmp-type=net \ --with-snmp-include=${LOCALBASE}/include \ --with-snmp-lib=${LOCALBASE}/lib -LIB_DEPENDS= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ netsnmp.>=6.2::net/net-snmp .include diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile index 3452a9b6d7e..fb48c8dd161 100644 --- a/net/olsrd/Makefile +++ b/net/olsrd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2010/07/12 22:07:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.11 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT-main= OLSR routing daemon COMMENT-gui= OLSR routing daemon GUI @@ -10,6 +10,7 @@ PKGNAME-main= olsrd-${VERSION} PKGNAME-gui= olsrd-gui-${VERSION} PKGNAME-plugins= olsrd-plugins-${VERSION} REVISION-main= 0 +REVISION-gui= 0 REVISION-plugins= 0 CATEGORIES= net @@ -30,14 +31,14 @@ MULTI_PACKAGES= -main -gui -plugins BUILD_DEPENDS= ::devel/bison WANTLIB-main= c -LIB_DEPENDS-gui= gtk-x11-2.0.,gdk-x11-2.0.,gdk_pixbuf-2.0.::x11/gtk+2 +LIB_DEPENDS-gui= gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 WANTLIB-gui= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \ freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 \ gthread-2.0 iconv intl m pango-1.0 pangocairo-1.0 \ pangoft2-1.0 pixman-1 png pthread pthread-stubs xcb \ - xcb-render xcb-render-util z + xcb-render xcb-render-util z gdk_pixbuf-2.0 RUN_DEPENDS-plugins=:olsrd-${VERSION}:net/olsrd diff --git a/net/pavuk/Makefile b/net/pavuk/Makefile index f1fab182af4..a12741aab7d 100644 --- a/net/pavuk/Makefile +++ b/net/pavuk/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.17 2010/07/12 22:07:40 sthen Exp $ +# $OpenBSD: Makefile,v 1.18 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT= tool to mirror contents of HTTP and FTP servers DISTNAME= pavuk-0.9.35 -REVISION= 2 +REVISION= 3 CATEGORIES= net HOMEPAGE= http://www.pavuk.org/ @@ -31,12 +31,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ .if !${FLAVOR:L:Mno_x11} USE_X11= Yes -LIB_DEPENDS+= gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 +LIB_DEPENDS+= gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xmu Xrandr Xrender atk-1.0 cairo expat WANTLIB += fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 WANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pixman-1 png pthread-stubs xcb +WANTLIB += pixman-1 png pthread-stubs xcb gdk_pixbuf-2.0 .else CONFIGURE_ARGS+= --disable-gtk .endif diff --git a/net/spectrum-tools/Makefile b/net/spectrum-tools/Makefile index feb1ab8e48a..4d07c8bd7d7 100644 --- a/net/spectrum-tools/Makefile +++ b/net/spectrum-tools/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2009/09/01 23:11:30 ckuethe Exp $ +# $OpenBSD: Makefile,v 1.9 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT-main = graphical tools for the MetaGeek Wi-spy spectrum analyser COMMENT-utils = tools for the MetaGeek Wi-spy spectrum analyser @@ -10,6 +10,8 @@ PKGNAME = spectrum-tools-$V FULLPKGNAME-main = spectrum-tools-${V:S/-//g} FULLPKGNAME-utils = spectrum-tools-utils-${V:S/-//g} +REVISION-main = 0 + CATEGORIES = net MASTER_SITES = http://www.kismetwireless.net/code/ @@ -33,16 +35,14 @@ WANTLIB-main = ${WANTLIB} \ Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig \ freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 \ iconv intl pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 \ - png pthread-stubs xcb z + png pthread-stubs xcb z gdk_pixbuf-2.0 WANTLIB-utils = ${WANTLIB} ncurses LIB_DEPENDS = :libusb-*:devel/libusb LIB_DEPENDS-main += ${LIB_DEPENDS} \ - gtk-x11-2.0::x11/gtk+2 \ - gdk-x11-2.0::x11/gtk+2 \ - gdk_pixbuf-2.0::x11/gtk+2 + gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 RUN_DEPENDS-main = :spectrum-tools-utils-*:net/spectrum-tools,-utils diff --git a/net/transmission/Makefile b/net/transmission/Makefile index 326c3e00a0f..67e303ec985 100644 --- a/net/transmission/Makefile +++ b/net/transmission/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.54 2010/05/03 17:39:33 naddy Exp $ +# $OpenBSD: Makefile,v 1.55 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT-main= lightweight BitTorrent command line and daemon client COMMENT-gui= lightweight BitTorrent client with graphical interface @@ -10,6 +10,9 @@ PKGNAME-gui= transmission-gui-${VER} CATEGORIES= net HOMEPAGE= http://www.transmissionbt.com/ +REVISION-main= 0 +REVISION-gui= 0 + MAINTAINER= Christian Weisgerber # GPLv2 @@ -60,8 +63,8 @@ WANTLIB-gui= ${WANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \ expat fontconfig freetype gio-2.0 glib-2.0 glitz \ gmodule-2.0 gobject-2.0 gthread-2.0 pango-1.0 pangoft2-1.0 \ pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \ - xcb-render xcb-render-util -LIB_DEPENDS+= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ + xcb-render xcb-render-util gdk_pixbuf-2.0 +LIB_DEPENDS+= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ dbus-glib-1::x11/dbus-glib LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPENDS} \ curl.>=14::net/curl \ diff --git a/net/unison/Makefile.inc b/net/unison/Makefile.inc index a3c18c146ba..ca5020ad15d 100644 --- a/net/unison/Makefile.inc +++ b/net/unison/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.11 2010/04/03 00:32:56 sthen Exp $ +# $OpenBSD: Makefile.inc,v 1.12 2010/09/30 07:21:20 ajacoutot Exp $ DISTNAME= unison-$V CATEGORIES= net @@ -24,14 +24,14 @@ FLAVOR?= MAKE_FLAGS= UISTYLE=text .else BUILD_DEPENDS+= ::x11/lablgtk2 -LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 MAKE_FLAGS= UISTYLE=gtk2 USE_X11= Yes WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama WANTLIB += Xrandr Xrender expat fontconfig freetype pixman-1 pthread-stubs WANTLIB += atk-1.0 iconv intl cairo glitz png xcb z WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 pango-1.0 -WANTLIB += pangocairo-1.0 pangoft2-1.0 +WANTLIB += pangocairo-1.0 pangoft2-1.0 gdk_pixbuf-2.0 .endif # CFLAGS _must_ be empty. This is an OCaml compiler. diff --git a/net/unison/snapshot/Makefile b/net/unison/snapshot/Makefile index 46e6c24e6cb..66dafca51b8 100644 --- a/net/unison/snapshot/Makefile +++ b/net/unison/snapshot/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.8 2010/07/13 21:08:01 sthen Exp $ +# $OpenBSD: Makefile,v 1.9 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT= multi-platform file synchronization tool, beta version V= 2.27.57 -REVISION= 2 +REVISION= 3 MASTER_SITES= ${HOMEPAGE}download/releases/beta/ diff --git a/net/unison/stable/Makefile b/net/unison/stable/Makefile index e05b9a06a24..b78d6be0de7 100644 --- a/net/unison/stable/Makefile +++ b/net/unison/stable/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.12 2010/07/13 21:08:01 sthen Exp $ +# $OpenBSD: Makefile,v 1.13 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT= multi-platform file synchronization tool V= 2.32.52 -REVISION= 1 +REVISION= 2 MASTER_SITES= ${HOMEPAGE}download/releases/stable/ diff --git a/print/lss/Makefile b/print/lss/Makefile index d00351be472..e301f24976f 100644 --- a/print/lss/Makefile +++ b/print/lss/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.4 2009/12/22 15:54:32 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.5 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT= LaTeX symbols selector DISTNAME= lss-0.1.6 -PKGNAME= ${DISTNAME}p2 +REVISION= 3 CATEGORIES= print x11 HOMEPAGE= http://clay.ll.pl/lss/ @@ -22,10 +22,10 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png -WANTLIB += pthread-stubs xcb z +WANTLIB += pthread-stubs xcb z gdk_pixbuf-2.0 LIB_DEPENDS= xml2::textproc/libxml \ - gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 + gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 RUN_DEPENDS= ::devel/desktop-file-utils USE_GMAKE= Yes diff --git a/productivity/grisbi/Makefile b/productivity/grisbi/Makefile index 514afd196d8..4b90f0655fe 100644 --- a/productivity/grisbi/Makefile +++ b/productivity/grisbi/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.11 2010/06/05 14:37:42 landry Exp $ +# $OpenBSD: Makefile,v 1.12 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT= personal accounting application SHARED_ONLY = Yes DISTNAME= grisbi-0.6.0 +REVISION= 0 CATEGORIES= productivity x11 @@ -25,12 +26,12 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += m osp pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png -WANTLIB += pthread pthread-stubs stdc++ xcb z pcre crypto ssl +WANTLIB += pthread pthread-stubs stdc++ xcb z pcre crypto ssl gdk_pixbuf-2.0 MODULES= devel/gettext LIB_DEPENDS= xml2.>=9::textproc/libxml \ - gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ + gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ ofx.>=3::devel/libofx RUN_DEPENDS= ::devel/desktop-file-utils diff --git a/productivity/homebank/Makefile b/productivity/homebank/Makefile index 8d145cde7fb..6f1c366186a 100644 --- a/productivity/homebank/Makefile +++ b/productivity/homebank/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.11 2010/07/08 16:08:33 pea Exp $ +# $OpenBSD: Makefile,v 1.12 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT = personal accounting application DISTNAME = homebank-4.3 +REVISION = 0 CATEGORIES = productivity x11 @@ -27,9 +28,9 @@ WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ glitz png pango-1.0 pangocairo-1.0 pangoft2-1.0 atk-1.0 \ glib-2.0 gmodule-2.0 gobject-2.0 cairo m z \ pixman-1 gio-2.0 pthread-stubs xcb osp pthread gthread-2.0 \ - xcb-render xcb-render-util + xcb-render xcb-render-util gdk_pixbuf-2.0 -LIB_DEPENDS = gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ +LIB_DEPENDS = gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ ofx.>=3::devel/libofx RUN_DEPENDS = :desktop-file-utils-*:devel/desktop-file-utils \ diff --git a/productivity/osmo/Makefile b/productivity/osmo/Makefile index 8effb9ef822..34a3b10494b 100644 --- a/productivity/osmo/Makefile +++ b/productivity/osmo/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.12 2010/04/28 11:19:15 pea Exp $ +# $OpenBSD: Makefile,v 1.13 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT= handy personal organizer DISTNAME= osmo-0.2.8 -PKGNAME= ${DISTNAME}p0 +REVISION= 1 CATEGORIES= productivity HOMEPAGE= http://clayo.org/osmo/ @@ -21,13 +21,14 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ fontconfig freetype glib-2.0 glitz gmodule-2.0 \ gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ pixman-1 png pthread z dbus-1 dbus-glib-1 gio-2.0 \ - pthread-stubs xcb gthread-2.0 xcb-render xcb-render-util + pthread-stubs xcb gthread-2.0 xcb-render xcb-render-util \ + gdk_pixbuf-2.0 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=osmo-pim/} MODULES= devel/gettext -LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ xml2.>=9::textproc/libxml \ ical,icalss,icalvcal::textproc/libical \ gringotts::security/libgringotts \ diff --git a/sysutils/bubblemon-dockapp/Makefile b/sysutils/bubblemon-dockapp/Makefile index 6a4afe964be..920f13a6065 100644 --- a/sysutils/bubblemon-dockapp/Makefile +++ b/sysutils/bubblemon-dockapp/Makefile @@ -1,8 +1,10 @@ -# $OpenBSD: Makefile,v 1.14 2010/03/25 06:23:34 jasper Exp $ +# $OpenBSD: Makefile,v 1.15 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT= wm-dockapp; display CPU and memory load DISTNAME= bubblemon-dockapp-1.46 +REVISION= 0 + CATEGORIES= sysutils x11 x11/windowmaker HOMEPAGE= http://www.ne.jp/asahi/linux/timecop/ @@ -23,9 +25,9 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png -WANTLIB += pthread-stubs xcb z +WANTLIB += pthread-stubs xcb z gdk_pixbuf-2.0 -LIB_DEPENDS= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 +LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 USE_X11= Yes USE_GMAKE= Yes diff --git a/sysutils/gkrellm/gkrellm/Makefile b/sysutils/gkrellm/gkrellm/Makefile index abfc7c7ba8c..3622002b6bb 100644 --- a/sysutils/gkrellm/gkrellm/Makefile +++ b/sysutils/gkrellm/gkrellm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.50 2010/04/27 21:53:56 sthen Exp $ +# $OpenBSD: Makefile,v 1.51 2010/09/30 07:21:20 ajacoutot Exp $ SHARED_ONLY= Yes @@ -8,7 +8,7 @@ COMMENT-client= single process stack of system monitors for GTK+2 V= 2.3.4 DISTNAME= gkrellm-${V} PKGNAME-main= gkrellm-server-${V}p1 -PKGNAME-client= gkrellm-${V}p1 +PKGNAME-client= gkrellm-${V}p2 CATEGORIES= sysutils sysutils/gkrellm HOMEPAGE= http://www.gkrellm.net/ @@ -38,14 +38,14 @@ WRKBUILD= ${WRKDIST}/server MODULES= devel/gettext LIB_DEPENDS= glib-2.0,gmodule-2.0,gthread-2.0::devel/glib2 LIB_DEPENDS-client= ${LIB_DEPENDS} \ - gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 + gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 WANTLIB-client += ${WANTLIB} WANTLIB-client += ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext WANTLIB-client += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo crypto WANTLIB-client += expat fontconfig freetype glitz m pango-1.0 pangocairo-1.0 WANTLIB-client += pangoft2-1.0 pixman-1 png pthread-stubs ssl xcb z -WANTLIB-client += gio-2.0 gobject-2.0 +WANTLIB-client += gio-2.0 gobject-2.0 gdk_pixbuf-2.0 NO_REGRESS= Yes USE_GMAKE= Yes diff --git a/sysutils/hot-babe/Makefile b/sysutils/hot-babe/Makefile index 63f16314585..dd5ac1692b8 100644 --- a/sysutils/hot-babe/Makefile +++ b/sysutils/hot-babe/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.13 2009/08/10 06:34:30 kili Exp $ +# $OpenBSD: Makefile,v 1.14 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT= small utility which displays system activity DISTNAME= hot-babe-0.2.2 -PKGNAME= ${DISTNAME}p7 +REVISION= 8 CATEGORIES= sysutils HOMEPAGE= http://dindinx.net/hotbabe/ @@ -20,12 +20,12 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender c cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png -WANTLIB += pthread-stubs xcb z +WANTLIB += pthread-stubs xcb z gdk_pixbuf-2.0 MASTER_SITES= ${HOMEPAGE}/downloads/ MODULES= devel/gettext -LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 +LIB_DEPENDS= gdk-x11-2.0::x11/gtk+2 USE_X11= Yes NO_REGRESS= Yes diff --git a/sysutils/ktsuss/Makefile b/sysutils/ktsuss/Makefile index 90f24cf6bd4..47d1a787730 100644 --- a/sysutils/ktsuss/Makefile +++ b/sysutils/ktsuss/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.3 2009/10/22 22:51:04 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.4 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT = graphical su wrapper DISTNAME = ktsuss-1.4 -PKGNAME= ${DISTNAME}p1 +REVISION = 2 CATEGORIES = sysutils MAINTAINER = Landry Breuil @@ -21,12 +21,12 @@ CFLAGS += -pthread MODULES= devel/gettext -LIB_DEPENDS = gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2,-main +LIB_DEPENDS = gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2,-main WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \ freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 \ m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png \ - pthread-stubs xcb z pthread + pthread-stubs xcb z pthread gdk_pixbuf-2.0 .include diff --git a/telephony/iaxclient/Makefile b/telephony/iaxclient/Makefile index cfac217eb80..7af473c44f4 100644 --- a/telephony/iaxclient/Makefile +++ b/telephony/iaxclient/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/09/26 15:10:39 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.6 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT-main= IAX client library COMMENT-tcl= IAX client library, tcl bindings @@ -8,9 +8,9 @@ DISTNAME= iaxclient-2.1beta3 PKGNAME-main= ${DISTNAME} REVISION-main= 1 PKGNAME-tcl= ${DISTNAME:S/iaxclient/iaxclient-tcl/} -REVISION-tcl= 0 +REVISION-tcl= 1 PKGNAME-iaxcomm= iaxcomm-1.1.0 -REVISION-iaxcomm= 1 +REVISION-iaxcomm= 2 CATEGORIES= telephony USE_LIBTOOL= Yes @@ -41,7 +41,7 @@ WANTLIB-tcl += gobject-2.0 gthread-2.0 m mp3lame ogg orc-0.4 ossaudio WANTLIB-tcl += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 WANTLIB-tcl += png pthread pthread-stubs schroedinger-1.0 sndio theora WANTLIB-tcl += vorbis vorbisenc x264 xcb xcb-render xcb-render-util -WANTLIB-tcl += z +WANTLIB-tcl += z gdk_pixbuf-2.0 WANTLIB-iaxcomm += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB-iaxcomm += Xi Xinerama Xrandr Xrender atk-1.0 avcodec avutil c @@ -61,7 +61,7 @@ LIB_DEPENDS= gsm.>=1::audio/gsm \ LIB_DEPENDS-tcl=${LIB_DEPENDS} \ iaxclient::${BASE_PKGPATH} \ - gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 + gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 RUN_DEPENDS-tcl=${MODTCL_RUN_DEPENDS} diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile index 158c4fd9622..45130d00a07 100644 --- a/textproc/gtkspell/Makefile +++ b/textproc/gtkspell/Makefile @@ -1,9 +1,11 @@ -# $OpenBSD: Makefile,v 1.28 2010/07/02 17:50:45 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.29 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT= gtk2 spelling checker DISTNAME= gtkspell-2.0.16 SHARED_LIBS= gtkspell 1.0 # .0.0 +REVISION= 0 + CATEGORIES= textproc x11 HOMEPAGE= http://gtkspell.sourceforge.net/ @@ -23,7 +25,7 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ fontconfig freetype glib-2.0 glitz gmodule-2.0 \ gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ pcre pixman-1 png pthread-stubs stdc++ xcb z gio-2.0 \ - gthread-2.0 xcb-render xcb-render-util + gthread-2.0 xcb-render xcb-render-util gdk_pixbuf-2.0 USE_X11= Yes USE_LIBTOOL= Yes @@ -33,7 +35,7 @@ MODULES= devel/gettext \ textproc/intltool LIB_DEPENDS= enchant.>=5::textproc/enchant \ - gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 + gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile index aac91aba844..91f4b64fbea 100644 --- a/www/bluefish/Makefile +++ b/www/bluefish/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.55 2009/12/22 13:02:11 sthen Exp $ +# $OpenBSD: Makefile,v 1.56 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT= HTML editor for experienced web designers DISTNAME= bluefish-1.0.7 -PKGNAME= ${DISTNAME}p5 +REVISION= 6 CATEGORIES= www HOMEPAGE= http://bluefish.openoffice.nl/ @@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB += ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender art_lgpl_2 atk-1.0 WANTLIB += bonobo-2 bonobo-activation bonoboui-2 c cairo dbus-1 -WANTLIB += expat fontconfig freetype gconf-2 gio-2.0 glib-2.0 +WANTLIB += expat fontconfig freetype gconf-2 gio-2.0 glib-2.0 gdk_pixbuf-2.0 WANTLIB += glitz gmodule-2.0 gnome-2 gnome-keyring gnomecanvas-2 WANTLIB += gnomevfs-2 gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pixman-1 png popt pthread pthread-stubs xcb xml2 z @@ -28,7 +28,7 @@ MODULES= devel/gettext RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils \ :shared-mime-info-*:misc/shared-mime-info BUILD_DEPENDS= ::misc/shared-mime-info -LIB_DEPENDS= gailutil,gtk-x11-2.0.>=0.14,gdk-x11-2.0.>=0.14,gdk_pixbuf-2.0.>=0.14::x11/gtk+2 \ +LIB_DEPENDS= gailutil,gtk-x11-2.0.>=0.14,gdk-x11-2.0.>=0.14::x11/gtk+2 \ pcre::devel/pcre \ gnomeui-2::x11/gnome/libgnomeui diff --git a/www/minimo/Makefile b/www/minimo/Makefile index 39502751a25..ef6e5dfe6c5 100644 --- a/www/minimo/Makefile +++ b/www/minimo/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.57 2010/09/26 20:08:12 martynas Exp $ +# $OpenBSD: Makefile,v 1.58 2010/09/30 07:21:20 ajacoutot Exp $ ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc64 SHARED_ONLY= Yes COMMENT= small, simple, and powerful web browser for mobile devices DISTNAME= minimo-1.8.1.19 -PKGNAME= ${DISTNAME}p3v0 +PKGNAME= ${DISTNAME}p4v0 CATEGORIES= www MASTER_SITES= http://openbsddistfiles.com/martynas/mozilla/minimo/ @@ -27,12 +27,12 @@ BUILD_DEPENDS= :zip->=2.3:archivers/zip \ :libIDL-*:devel/libIDL LIB_DEPENDS= jpeg.>=62::graphics/jpeg \ png.>=3::graphics/png \ - gdk-x11-2.0.>=600.0,gdk_pixbuf-2.0.>=600.0,gtk-x11-2.0.>=600.0::x11/gtk+2 \ + gdk-x11-2.0.>=600.0,gtk-x11-2.0.>=600.0::x11/gtk+2 \ nspr4.>=17,plc4.>=17,plds4.>=17:nspr->=4.6.4p1:devel/nspr \ nss3.>=19,nssutil3.>=22,smime3.>=19,softokn3.>=19,ssl3.>=19:nss->=3.11.4p1:security/nss WANTLIB= X11 Xcomposite Xcursor Xdamage Xext Xfixes Xft Xi Xinerama \ Xrandr Xrender Xt Xau Xdmcp expat c fontconfig freetype m \ - pthread pthread-stubs xcb z \ + pthread pthread-stubs xcb z gdk_pixbuf-2.0 \ atk-1.0.>=1011.0 glib-2.0.>=600.0 gmodule-2.0.>=600.0 \ gobject-2.0.>=600.0 pango-1.0.>=800.0 pangocairo-1.0 \ pangoft2-1.0 pixman-1 cairo glitz stdc++ gio-2.0 diff --git a/www/vteplugin/Makefile b/www/vteplugin/Makefile index 3f5e64d2088..0617b0c11e1 100644 --- a/www/vteplugin/Makefile +++ b/www/vteplugin/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.4 2010/08/30 22:15:24 sthen Exp $ +# $OpenBSD: Makefile,v 1.5 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT = npapi vte-based terminal for web browsers DISTNAME = vteplugin-0.1 -REVISION = 2 +REVISION = 3 CATEGORIES = www x11 # WTFPL @@ -17,14 +17,14 @@ EXTRACT_SUFX=.tar.bz2 MASTER_SITES = http://blog.renevier.net/public/ MODULES = devel/waf -LIB_DEPENDS = gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ +LIB_DEPENDS = gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ vte::devel/vte WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 WANTLIB += iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pixman-1 png pthread-stubs xcb z +WANTLIB += pixman-1 png pthread-stubs xcb z gdk_pixbuf-2.0 pre-configure: ${SUBST_CMD} ${WRKSRC}/wscript diff --git a/www/w3m/Makefile b/www/w3m/Makefile index 1880903a460..cc0b8fecac4 100644 --- a/www/w3m/Makefile +++ b/www/w3m/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.70 2009/08/10 06:34:56 kili Exp $ +# $OpenBSD: Makefile,v 1.71 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT= pager/text-based web browser DISTNAME= w3m-0.5.2 -PKGNAME= ${DISTNAME}p2 +REVISION= 3 CATEGORIES= www HOMEPAGE= http://w3m.sourceforge.net/ @@ -36,14 +36,14 @@ DOCS= FAQ.html HISTORY MANUAL.html README README.dict README.func \ .if ${FLAVOR:L:Mimage} USE_X11= Yes -LIB_DEPENDS+= gdk-x11-2.0.>=1000,gdk_pixbuf-2.0.>=1000,gdk_pixbuf_xlib-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 +LIB_DEPENDS+= gdk-x11-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 CONFIGURE_ARGS+=--with-imagelib=gtk2 DOCS+= README.img WANTLIB+= X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \ Xrender atk-1.0 cairo expat fontconfig freetype glib-2.0 \ glitz gmodule-2.0 gobject-2.0 pango-1.0 pangocairo-1.0 \ pangoft2-1.0 png Xcomposite Xdamage gio-2.0 pixman-1 \ - pthread-stubs xcb + pthread-stubs xcb gdk_pixbuf-2.0 gdk_pixbuf_xlib-2.0 .else CONFIGURE_ARGS+=--enable-image=no .endif diff --git a/x11/gtk2mm/Makefile b/x11/gtk2mm/Makefile index 73e04237764..85a273d9a1e 100644 --- a/x11/gtk2mm/Makefile +++ b/x11/gtk2mm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.35 2010/05/04 12:36:20 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.36 2010/09/30 07:21:20 ajacoutot Exp $ COMMENT-main= C++ interface for gtk2+ COMMENT-docs= C++ interface for gtk2+ documentation @@ -9,6 +9,8 @@ GNOME_VERSION= 2.20.3 PKGNAME-main= gtk2mm-${VERSION} PKGNAME-docs= gtk2mm-docs-${VERSION} +REVISION-main= 0 + CATEGORIES= devel x11 SHARED_LIBS += atkmm-1.6 9.0 # .2.0 @@ -27,7 +29,7 @@ MULTI_PACKAGES= -main -docs WANTLIB-main= X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \ Xcomposite Xdamage Xrender atk-1.0 cairo expat \ - fontconfig freetype pcre pixman-1 gio-2.0 \ + fontconfig freetype pcre pixman-1 gio-2.0 gdk_pixbuf-2.0 \ glib-2.0 glitz gmodule-2.0 gobject-2.0 m pango-1.0 \ pangocairo-1.0 pangoft2-1.0 png sigc-2.0 z \ pthread-stubs xcb xcb-render xcb-render-util gthread-2.0 @@ -37,7 +39,7 @@ MODULES= devel/gettext \ LIB_DEPENDS= giomm-2.4,glibmm-2.4:glib2mm->=2.18.1:devel/glib2mm \ pangomm-1.4::devel/pangomm \ - gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0:gtk+2->=2.14:x11/gtk+2 \ + gdk-x11-2.0,gtk-x11-2.0:gtk+2->=2.14:x11/gtk+2 \ cairomm-1.0::graphics/cairomm PKG_ARCH-docs= *