From 055f76461b2acce163241df1d50260fe2ad1722e Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sat, 13 Apr 2013 10:14:38 +0000
Subject: [PATCH] Fix after the webkit update.

---
 graphics/shotwell/Makefile |  7 +++----
 x11/gnome/devhelp/Makefile | 25 +++++++++++++------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
index c95579327b5..90e09a1327f 100644
--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2013/04/02 16:41:21 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.31 2013/04/13 10:14:58 ajacoutot Exp $
 
 # needs to allocate 512M
 VMEM_WARNING =	Yes
@@ -11,7 +11,7 @@ EXTRACT_SUFX =	.tar.xz
 CATEGORIES =	graphics
 MASTER_SITES =	http://yorba.org/download/shotwell/${V:C/^([0-9]+\.[0-9]+).*/\1/}/
 HOMEPAGE =	http://yorba.org/shotwell/
-REVISION =	0
+REVISION =	2
 
 # LGPLv2
 PERMIT_PACKAGE_CDROM=	Yes
@@ -42,9 +42,8 @@ LIB_DEPENDS =	devel/json-glib \
 		graphics/libgexiv2>=0.6.1 \
 		graphics/libgphoto2 \
 		graphics/libraw \
-		multimedia/gstreamer1/plugins-base \
 		net/librest \
-		www/webkit,gtk3
+		www/webkit,gtk3>=2.0.0
 
 # beware: configure is an horrible homemade shell script
 CONFIGURE_STYLE =	simple
diff --git a/x11/gnome/devhelp/Makefile b/x11/gnome/devhelp/Makefile
index 5903f5e9248..385232e301c 100644
--- a/x11/gnome/devhelp/Makefile
+++ b/x11/gnome/devhelp/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.68 2013/03/29 15:21:04 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.69 2013/04/13 10:14:38 ajacoutot Exp $
 
 COMMENT=	API documentation browser for GNOME
 
 GNOME_PROJECT=	devhelp
 GNOME_VERSION=	3.8.0
+REVISION=	0
 
 SHARED_LIBS +=  devhelp-3                 0.0 # 0.0
 
@@ -17,15 +18,16 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += GL ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
 WANTLIB += Xi Xinerama Xrandr Xrender Xt atk-1.0 atk-bridge-2.0
 WANTLIB += atspi c cairo cairo-gobject dbus-1 dbus-glib-1 enchant
-WANTLIB += expat ffi fontconfig freetype gailutil-3 gdk-3 gdk_pixbuf-2.0
-WANTLIB += geoclue gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
-WANTLIB += gstapp-0.10 gstaudio-0.10 gstbase-0.10 gstfft-0.10
-WANTLIB += gstinterfaces-0.10 gstpbutils-0.10 gstreamer-0.10 gstvideo-0.10
-WANTLIB += gthread-2.0 gtk-3 harfbuzz icudata icui18n icule icuuc
-WANTLIB += javascriptcoregtk-3.0 jpeg m orc-0.4 pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
-WANTLIB += soup-2.4 sqlite3 stdc++ webkitgtk-3.0 xcb xcb-render
-WANTLIB += xcb-shm xml2 xslt z
+WANTLIB += expat ffi fontconfig freetype gailutil-3 gcrypt gdk-3
+WANTLIB += gdk_pixbuf-2.0 geoclue gio-2.0 glib-2.0 gmodule-2.0
+WANTLIB += gobject-2.0 gpg-error graphite2 gstapp-1.0 gstaudio-1.0
+WANTLIB += gstbase-1.0 gstfft-1.0 gstpbutils-1.0 gstreamer-1.0
+WANTLIB += gsttag-1.0 gstvideo-1.0 gthread-2.0 gtk-3 harfbuzz
+WANTLIB += icudata icui18n icule icuuc javascriptcoregtk-3.0 jpeg
+WANTLIB += m orc-0.4 pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
+WANTLIB += pixman-1 png pthread pthread-stubs secret-1 soup-2.4
+WANTLIB += sqlite3 stdc++ webkitgtk-3.0 webp xcb xcb-render xcb-shm
+WANTLIB += xml2 xslt z
 
 MODULES=	devel/dconf \
 		devel/gettext \
@@ -33,8 +35,7 @@ MODULES=	devel/dconf \
 		x11/gnome
 
 BUILD_DEPENDS=	x11/gnome/doc-utils
-LIB_DEPENDS=	multimedia/gstreamer-0.10/plugins-base \
-		www/webkit,gtk3
+LIB_DEPENDS=	www/webkit,gtk3>=2.0.0
 
 # for convenience
 RUN_DEPENDS +=	x11/gnome/devel-docs