Fix after recent webkit update.

avsm · May 11, 2011 · 2b779d1 · 2b779d1
1 parent fa72f26
commit 2b779d1
Show file tree

Hide file tree

Showing 15 changed files with 109 additions and 99 deletions.
diff --git a/audio/gmpc-plugins/Makefile b/audio/gmpc-plugins/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2010/11/26 07:07:56 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2011/05/11 06:02:15 ajacoutot Exp $
 
 SHARED_ONLY =	Yes
 
@@ -8,9 +8,9 @@ COMMENT-wikipedia =	wikipedia plugin for gmpc
 VERSION =	0.20.0
 DISTNAME =	gmpc-plugins-${VERSION}
 PKGNAME-main =		${DISTNAME}
-REVISION-main =		1
+REVISION-main =		2
 PKGNAME-wikipedia =	gmpc-wikipedia-${VERSION}
-REVISION-wikipedia =	2
+REVISION-wikipedia =	3
 
 CATEGORIES =	audio
 
@@ -28,14 +28,16 @@ PERMIT_DISTFILES_FTP=	Yes
 MULTI_PACKAGES =	-main
 
 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "amd64"
+    ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "amd64" || \
+    ${MACHINE_ARCH} == "hppa" || ${MACHINE_ARCH} == "sparc64"
 # XXX give it a chance to build on systems where webkit is not built
 MULTI_PACKAGES+=	-wikipedia
 .else
 CONFIGURE_ARGS+=	--disable-wikipedia
 .endif
 
-MODULES =	devel/gettext
+MODULES =	devel/gettext \
+		textproc/intltool
 
 LIB_DEPENDS-main =	${LIB_DEPENDS} \
 			audio/taglib>=1.5 \
@@ -45,20 +47,20 @@ WANTLIB-main = ${WANTLIB} dbus-1 glade-2.0 tag tag_c dbus-glib-1
 WANTLIB-main += avahi-client avahi-common avahi-glib
 
 LIB_DEPENDS-wikipedia =	${LIB_DEPENDS} \
-			www/webkit
-WANTLIB-wikipedia =	${WANTLIB} ICE SM Xt enchant gcrypt gnutls gpg-error \
-			icudata icui18n icuuc jpeg soup-2.4 tasn1 xslt \
-			gailutil gstbase-0.10 gstpbutils-0.10 gstreamer-0.10 \
-			gstvideo-0.10 webkit-1.0 gstapp-0.10
-
-WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
-WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo
-WANTLIB += expat fontconfig freetype gdk-x11-2.0
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 m mpd pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png
-WANTLIB += sqlite3 stdc++ xml2 z
-WANTLIB += pthread-stubs xcb xcb-render xcb-render-util
+			www/webkit>=1.4.0
+WANTLIB-wikipedia =	${WANTLIB} \
+			ICE SM Xt enchant gailutil gstapp-0.10 gstbase-0.10 \
+			ICE SM Xt enchant gailutil gstapp-0.10 gstbase-0.10 \
+			gstinterfaces-0.10 gstpbutils-0.10 gstreamer-0.10 gstvideo-0.10 \
+			icudata icui18n icuuc jpeg soup-2.4 webkitgtk-1.0 xslt
+
+WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo drm
+WANTLIB += expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
+WANTLIB += gtk-x11-2.0 m mpd pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += pcre pixman-1 png pthread-stubs sqlite3 stdc++ xcb
+WANTLIB += xcb-render xcb-shm xml2 z
 
 RUN_DEPENDS =	audio/gmpc>=${VERSION} \
 		audio/vorbis-tools

diff --git a/cad/xtrkcad/Makefile b/cad/xtrkcad/Makefile
@@ -1,11 +1,12 @@
-# $OpenBSD: Makefile,v 1.3 2010/11/15 00:22:49 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2011/05/11 06:02:15 ajacoutot Exp $
 
 COMMENT=	CAD program for designing model railroad layouts
 
 VERSION=	4.0.3a
 DISTNAME=	xtrkcad-source-${VERSION}
 PKGNAME=	xtrkcad-${VERSION}
 CATEGORIES=	cad
+REVISION=	0
 
 HOMEPAGE=	http://www.xtrkcad.org/
 
@@ -24,12 +25,12 @@ MODULES=	devel/cmake devel/gettext
 WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm c drm expat fontconfig
 WANTLIB += freetype m pixman-1 pthread pthread-stubs xcb xcb-render
-WANTLIB += xcb-shm z cairo png gnutls webkit-1.0 soup-2.4 xml2
+WANTLIB += xcb-shm z cairo png webkitgtk-1.0 soup-2.4 xml2
 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
 WANTLIB += atk-1.0 gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 pango-1.0
 WANTLIB += pangocairo-1.0 pangoft2-1.0
 
-LIB_DEPENDS=	www/webkit
+LIB_DEPENDS=	www/webkit>=1.4.0
 
 CONFIGURE_STYLE=cmake
 CONFIGURE_ENV+=	CFLAGS=-I${PREFIX}/include \

diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2011/04/05 18:43:43 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2011/05/11 06:02:15 ajacoutot Exp $
 
 COMMENT =	digital photo organizer
 
@@ -7,6 +7,7 @@ CATEGORIES =	graphics
 MASTER_SITES =	http://yorba.org/download/shotwell/0.9/
 HOMEPAGE =	http://yorba.org/shotwell/
 EXTRACT_SUFX =	.tar.bz2
+REVISION =	0
 
 # LGPLv2
 PERMIT_PACKAGE_CDROM=	Yes
@@ -21,7 +22,7 @@ WANTLIB =	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi \
 		pthread-stubs xcb z ORBit-2 exif json-glib-1.0 gnomevfs-2 \
 		gconf-2 gthread-2.0 pthread soup-2.4 sqlite3 usb \
 		xcb-render xml2 exiv2 stdc++ gee gphoto2 gstbase-0.10 gstreamer-0.10 \
-		gphoto2_port unique-1.0 webkit-1.0 raw gexiv2 gdk-x11-2.0 \
+		gphoto2_port unique-1.0 webkitgtk-1.0 raw gexiv2 gdk-x11-2.0 \
 		gdk_pixbuf-2.0 gtk-x11-2.0 GL Xxf86vm drm xcb-shm
 
 MODULES =	devel/gettext x11/gnome devel/gconf2
@@ -37,7 +38,7 @@ LIB_DEPENDS =	x11/gtk+2 \
 		graphics/libgexiv2 \
 		graphics/libraw \
 		devel/json-glib \
-		www/webkit \
+		www/webkit>=1.4.0 \
 		devel/libunique \
 		devel/libgee \
 		graphics/libgphoto2 \

diff --git a/mail/postler/Makefile b/mail/postler/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2011/04/21 07:05:36 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2011/05/11 06:02:15 ajacoutot Exp $
 
 COMMENT =	lightweight mail user agent
 
 XFCE_VERSION =	0.1.1
 XFCE_GOODIE =	postler
 
-REVISION =	0
+REVISION =	1
 
 MAINTAINER =	Landry Breuil <[email protected]>
 CATEGORIES =	mail
@@ -22,7 +22,7 @@ MODULES =	x11/xfce4 devel/waf
 DESKTOP_FILES =	Yes
 NO_REGRESS =	Yes
 
-LIB_DEPENDS =	www/webkit \
+LIB_DEPENDS =	www/webkit>=1.4.0 \
 		devel/libnotify \
 		databases/db/v4 \
 		audio/libcanberra \
@@ -41,7 +41,7 @@ WANTLIB =	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
 		gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 intl \
 		m pango-1.0 pangocairo-1.0 pangoft2-1.0 pthread z \
 		cairo pixman-1 png pthread-stubs xcb xml2 \
-		xcb-render webkit-1.0 notify unique-1.0 soup-2.4 \
+		xcb-render webkitgtk-1.0 notify unique-1.0 soup-2.4 \
 		GL Xxf86vm drm xcb-shm crypto ssl canberra db
 
 pre-configure:

diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2011/05/10 16:23:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2011/05/11 06:02:15 ajacoutot Exp $
 
 SHARED_ONLY=		Yes
 
@@ -18,7 +18,7 @@ PKGNAME-webkit=		libproxy-webkit-${VERSION}
 REVISION-main=		0
 REVISION-gnome=		0
 REVISION-mozilla=	0
-REVISION-webkit=	0
+REVISION-webkit=	1
 
 CATEGORIES=		net
 
@@ -63,7 +63,7 @@ LIB_DEPENDS-mozilla=	${BUILD_PKGPATH}>=${VERSION} \
 
 RUN_DEPENDS-webkit=	${MODGETTEXT_RUN_DEPENDS}
 LIB_DEPENDS-webkit=	STEM->=${VERSION}:${BUILD_PKGPATH}, \
-			www/webkit
+			www/webkit>=1.4.0
 
 cWANTLIB += m stdc++
 
@@ -83,7 +83,7 @@ WANTLIB-webkit += expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
 WANTLIB-webkit += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
 WANTLIB-webkit += gtk-x11-2.0 modman pango-1.0 pangocairo-1.0
 WANTLIB-webkit += pangoft2-1.0 pixman-1 png proxy pthread-stubs soup-2.4
-WANTLIB-webkit += webkit-1.0 xcb xcb-render xcb-shm xml2 z
+WANTLIB-webkit += webkitgtk-1.0 xcb xcb-render xcb-shm xml2 z
 
 CONFIGURE_ARGS=		-DCMAKE_C_FLAGS="${CFLAGS} -pthread" \
 			-DCMAKE_CXX_FLAGS="${CXXFLAGS} -pthread" \

diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.30 2011/04/26 13:09:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.31 2011/05/11 06:02:15 ajacoutot Exp $
 
 COMMENT=		collection of extensions for Epiphany
 
 GNOME_PROJECT=		epiphany-extensions
 GNOME_VERSION=		2.32.0
 
-REVISION=		2
+REVISION=		3
 
 # sync with www/epiphany
 API_V=		2.29
@@ -27,14 +27,15 @@ PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB += ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
 WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xt atk-1.0 cairo
-WANTLIB += enchant expat fontconfig freetype gailutil gcrypt gdk-x11-2.0
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gnutls
+WANTLIB += enchant expat fontconfig freetype gailutil gdk-x11-2.0
+WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 gstapp-0.10 gstbase-0.10 gstpbutils-0.10
 WANTLIB += gstreamer-0.10 gstvideo-0.10 gthread-2.0 gtk-x11-2.0
 WANTLIB += icudata icui18n icuuc jpeg m pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread-stubs soup-2.4
-WANTLIB += sqlite3 stdc++ tasn1 webkit-1.0 xcb xcb-render
-WANTLIB += xml2 xslt z gpg-error GL Xxf86vm drm util xcb-shm
+WANTLIB += sqlite3 stdc++ webkitgtk-1.0 xcb xcb-render
+WANTLIB += xml2 xslt z GL Xxf86vm drm xcb-shm
+WANTLIB += gstinterfaces-0.10
 
 MODULES=	devel/gettext \
 		lang/python \

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.61 2011/04/21 07:06:43 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.62 2011/05/11 06:02:15 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -11,7 +11,7 @@ COMMENT=	GNOME web browser based on webkit
 
 GNOME_PROJECT=	epiphany
 GNOME_VERSION=	2.30.6
-REVISION=	3
+REVISION=	4
 
 M=		${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 API_V=		2.29
@@ -34,15 +34,15 @@ WANTLIB += ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
 WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xt atk-1.0 c
 WANTLIB += cairo dbus-1 dbus-glib-1 enchant expat fontconfig
 WANTLIB += freetype gailutil gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
-WANTLIB += glib-2.0 gmodule-2.0 gnome-keyring gnutls gobject-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gnome-keyring gobject-2.0
 WANTLIB += gpg-error gstapp-0.10 gstbase-0.10 gstpbutils-0.10 gstreamer-0.10
 WANTLIB += gstvideo-0.10 gthread-2.0 gtk-x11-2.0 icudata icui18n
 WANTLIB += icuuc jpeg m nspr4 nss3 pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pcre pixman-1 plc4 plds4 png proxy pthread pthread-stubs
+WANTLIB += pcre pixman-1 plc4 plds4 png pthread pthread-stubs
 WANTLIB += smime3 softokn3 soup-2.4 sqlite3 ssl3 startup-notification-1
-WANTLIB += stdc++ tasn1 xcb xcb-atom xcb-aux xcb-event  xcb-render
-WANTLIB += xml2 z GL Xxf86vm drm nssutil3 util xcb-shm
-WANTLIB += xslt>=1 execinfo notify>=2 webkit-1.0>=2.1 soup-gnome-2.4>=1.1
+WANTLIB += stdc++ xcb xcb-atom xcb-aux xcb-event  xcb-render gstinterfaces-0.10
+WANTLIB += xml2 z GL Xxf86vm drm nssutil3 xcb-shm ffi girepository-1.0
+WANTLIB += xslt>=1 execinfo notify>=2 webkitgtk-1.0 soup-gnome-2.4>=1.1
 
 BUILD_DEPENDS=	devel/gobject-introspection \
 		${RUN_DEPENDS}
@@ -53,7 +53,7 @@ RUN_DEPENDS=	x11/gnome/icon-theme \
 LIB_DEPENDS=	textproc/libxslt \
 		devel/libexecinfo \
 		devel/libnotify>=0.7.2 \
-		www/webkit \
+		www/webkit>=1.4.0 \
 		devel/libsoup,-gnome
 
 MODULES=	devel/gconf2 \

diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2011/04/15 16:13:23 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.29 2011/05/11 06:02:15 ajacoutot Exp $
 
 COMMENT-main=	common files for kazehakase
 COMMENT-gecko=	lightweight gecko-based web browser
@@ -11,11 +11,11 @@ SHARED_ONLY=	Yes
 VERSION=	0.5.8
 DISTNAME=	kazehakase-${VERSION}
 PKGNAME-main=	kazehakase-common-${VERSION}
-REVISION-main=	4
+REVISION-main=	5
 PKGNAME-gecko=	${DISTNAME}
-REVISION-gecko=	4
+REVISION-gecko=	5
 PKGNAME-webkit=	kazehakase-webkit-${VERSION}
-REVISION-webkit=4
+REVISION-webkit=5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=kazehakase/43802/}
 
 HOMEPAGE=	http://kazehakase.sourceforge.jp/
@@ -71,23 +71,25 @@ LIB_DEPENDS-gecko =	${LIB_DEPENDS-main} \
 			${BUILD_PKGPATH},-main
 
 LIB_DEPENDS-webkit =	${LIB_DEPENDS} \
-			www/webkit
+			www/webkit>=1.4.0
 
 WANTLIB =		ICE SM X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama \
 			Xrandr Xrender Xcomposite Xdamage expat fontconfig \
 			freetype m z png cairo atk-1.0 gio-2.0 glib-2.0 \
 			gmodule-2.0 gobject-2.0 gthread-2.0 pango-1.0 \
-			pangocairo-1.0 pangoft2-1.0 pcre pixman-1 tasn1 \
-			pthread-stubs xcb xcb-render GL Xxf86vm drm gmp \
-			gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 hogweed nettle \
+			pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \
+			pthread-stubs xcb xcb-render GL Xxf86vm drm \
+			gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 \
 			xcb-shm
 
-WANTLIB-main =		${WANTLIB} dbus-glib-1 dbus-1 gnutls c gcrypt gpg-error pthread
-WANTLIB-gecko =		${WANTLIB} gnutls stdc++ gcrypt gpg-error lib/kazehakase/kazehakase
-WANTLIB-webkit =	${WANTLIB} Xt enchant gailutil gcrypt gnutls gpg-error \
+WANTLIB-main =		${WANTLIB} dbus-glib-1 dbus-1 gnutls c gcrypt gpg-error pthread \
+			hogweed nettle gmp tasn1
+WANTLIB-gecko =		${WANTLIB} gnutls stdc++ gcrypt gpg-error lib/kazehakase/kazehakase \
+			hogweed nettle gmp tasn1
+WANTLIB-webkit =	${WANTLIB} Xt enchant gailutil \
 			icudata icui18n icuuc jpeg soup-2.4 sqlite3 stdc++ xml2 xslt \
 			gstbase-0.10 gstpbutils-0.10 gstreamer-0.10 gstvideo-0.10 \
-			gstapp-0.10 webkit-1.0
+			gstapp-0.10 webkitgtk-1.0 gstinterfaces-0.10
 
 
 .include <bsd.port.mk>
diff --git a/www/liferea/Makefile b/www/liferea/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2011/04/21 07:06:43 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.42 2011/05/11 06:02:15 ajacoutot Exp $
 
 SHARED_ONLY=		Yes
 
@@ -7,7 +7,7 @@ COMMENT=		simple GTK desktop news aggregator
 DISTNAME=		liferea-1.6.5
 CATEGORIES=		www x11
 
-REVISION=		1
+REVISION=		2
 
 HOMEPAGE=		http://liferea.sourceforge.net/
 
@@ -28,8 +28,8 @@ WANTLIB += gstapp-0.10 gstbase-0.10 gstpbutils-0.10 gstreamer-0.10
 WANTLIB += gstvideo-0.10 gthread-2.0 gtk-x11-2.0 icudata icui18n
 WANTLIB += icuuc jpeg lua m notify pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pcre pixman-1 png pthread pthread-stubs soup-2.4 sqlite3
-WANTLIB += stdc++ webkit-1.0 xcb xcb-render xcb-shm xml2 xslt
-WANTLIB += z
+WANTLIB += stdc++ webkitgtk-1.0 xcb xcb-render xcb-shm xml2 xslt
+WANTLIB += z gstinterfaces-0.10
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=liferea/}
 
@@ -42,7 +42,7 @@ LIB_DEPENDS=		lang/lua \
 			devel/libglade2 \
 			devel/libsoup,-main \
 			textproc/enchant \
-			www/webkit
+			www/webkit>=1.4.0
 
 RUN_DEPENDS=		devel/desktop-file-utils \
 			x11/hicolor-icon-theme