adapt for the new xulrunner infrastructure.

no breakage in bulk build & bumps done by sthen@
avsm · Jul 27, 2009 · c628f0d · c628f0d
1 parent 37b8806
commit c628f0d
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 44 deletions.
diff --git a/devel/eclipse/sdk/Makefile b/devel/eclipse/sdk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.49 2009/07/18 15:50:40 naddy Exp $
+# $OpenBSD: Makefile,v 1.50 2009/07/27 21:44:14 martynas Exp $
 
 SHARED_ONLY=		Yes
 ONLY_FOR_ARCHS=		amd64 i386
@@ -14,7 +14,7 @@ PKGNAME=		eclipse-sdk-${ECLIPSE_VER}
 PKGNAME-main=		eclipse-sdk-${ECLIPSE_VER}p10
 PKGNAME-swt=		swt-${ECLIPSE_VER}p1
 PKGNAME-gnome=		swt-gnome-${ECLIPSE_VER}p2
-PKGNAME-browser=	swt-browser-${ECLIPSE_VER}p1
+PKGNAME-browser=	swt-browser-${ECLIPSE_VER}p2
 SHARED_LIBS=		swt-atk-gtk-3236	4.0 \
 			swt-awt-gtk-3236	4.0 \
 			swt-gtk-3236		4.0 \
@@ -57,7 +57,7 @@ VMEM_WARNING=		Yes
 MODULES=		java devel/gettext
 MODJAVA_VER=		1.5+
 
-BUILD_DEPENDS=		::devel/xulrunner,-devel \
+BUILD_DEPENDS=		::devel/xulrunner/1.8,-devel \
 			:apache-ant->=1.6.1:devel/apache-ant
 
 USE_GMAKE=		Yes
@@ -88,7 +88,7 @@ LIB_DEPENDS-gnome=	gnomeui-2::x11/gnome/libgnomeui
 WANTLIB-gnome=		gnome-2 gnomevfs-2
 
 RUN_DEPENDS-browser=	:swt-${ECLIPSE_VER}:devel/eclipse/sdk,-swt
-LIB_DEPENDS-browser=	xulrunner/gtkembedmoz,xulrunner/xpcom::devel/xulrunner
+LIB_DEPENDS-browser=	xulrunner/gtkembedmoz,xulrunner/xpcom::devel/xulrunner/1.8
 WANTLIB-browser=	c nspr4 plc4 plds4
 
 MOZILLA_HOME=		${LOCALBASE}/xulrunner

diff --git a/lang/classpath/Makefile b/lang/classpath/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2009/06/19 22:28:04 kurt Exp $
+# $OpenBSD: Makefile,v 1.14 2009/07/27 21:44:15 martynas Exp $
 
 # uses gcj which is only supported on select archs
 ONLY_FOR_ARCHS=	i386 amd64 sparc64
@@ -34,7 +34,7 @@ MODULES=	converters/libiconv gcc4
 MODGCC4_ARCHES=	*
 MODGCC4_LANGS=	java
 
-BUILD_DEPENDS=	::devel/xulrunner,-devel \
+BUILD_DEPENDS=	::devel/xulrunner/1.8,-devel \
 		::lang/antlr2
 
 RUN_DEPENDS=	::lang/gcc/4.2,-java,java \

diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2009/06/11 16:05:36 naddy Exp $
+# $OpenBSD: Makefile,v 1.12 2009/07/27 21:44:14 martynas Exp $
 
 COMMENT=		collection of extensions for Epiphany
 
 GNOME_PROJECT=		epiphany-extensions
 GNOME_VERSION=		2.24.3
-PKGNAME=		${DISTNAME}p3
+PKGNAME=		${DISTNAME}p4
 
 CATEGORIES=		www
 
@@ -25,11 +25,11 @@ MODULES=		lang/python \
 WANTLIB=	nspr4 pcre plc4 plds4
 
 BUILD_DEPENDS=	:gettext-*:devel/gettext \
-		:xulrunner-devel->=1.8.1:devel/xulrunner,-devel \
+		:xulrunner-devel->=1.8.1:devel/xulrunner/1.8,-devel \
 		:epiphany->=2.24.2:www/epiphany
 RUN_DEPENDS=	:gettext-*:devel/gettext \
 		:epiphany->=2.24.2:www/epiphany
-LIB_DEPENDS=	xulrunner/gtkembedmoz,xulrunner/mozjs,xulrunner/xpcom:xulrunner->=1.8.1:devel/xulrunner
+LIB_DEPENDS=	xulrunner/gtkembedmoz,xulrunner/mozjs,xulrunner/xpcom:xulrunner->=1.8.1:devel/xulrunner/1.8
 
 USE_X11=	Yes
 

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.39 2009/07/12 20:34:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.40 2009/07/27 21:44:14 martynas Exp $
 
 SHARED_ONLY=	Yes
 
@@ -12,7 +12,7 @@ COMMENT=	GNOME web browser based on mozilla
 
 GNOME_PROJECT=	epiphany
 GNOME_VERSION=	2.24.3
-PKGNAME=	${DISTNAME}p9
+PKGNAME=	${DISTNAME}p10
 
 M=		${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 SUBST_VARS=	M
@@ -30,15 +30,15 @@ PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 BUILD_DEPENDS=	${RUN_DEPENDS} \
-		:xulrunner-devel->=1.8.1:devel/xulrunner,-devel
+		:xulrunner-devel->=1.8.1:devel/xulrunner/1.8,-devel
 RUN_DEPENDS=	:gnome-icon-theme-*:x11/gnome/icon-theme \
 		:gnome-themes-*:x11/gnome/themes \
 		:iso-codes-*:devel/iso-codes \
 		::x11/gnome/py-gnome
 LIB_DEPENDS=	${MODPY_LIB_DEPENDS} \
 		gnome-desktop-2::x11/gnome/desktop \
 		gnomeui-2.>=1400::x11/gnome/libgnomeui \
-		xulrunner/gtkembedmoz,xulrunner/mozjs,xulrunner/xpcom,xulrunner/xul:xulrunner->=1.8.1:devel/xulrunner \
+		xulrunner/gtkembedmoz,xulrunner/mozjs,xulrunner/xpcom,xulrunner/xul:xulrunner->=1.8.1:devel/xulrunner/1.8 \
 		xml2.>=6.12::textproc/libxml \
 		xslt.>=1::textproc/libxslt \
 		execinfo::devel/libexecinfo \

diff --git a/www/galeon/Makefile b/www/galeon/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.51 2009/06/22 10:43:58 sthen Exp $
+# $OpenBSD: Makefile,v 1.52 2009/07/27 21:44:14 martynas Exp $
 
 COMMENT=	GNOME web browser based on gecko
 
 DISTNAME=	galeon-2.0.7
-PKGNAME=	${DISTNAME}p6
+PKGNAME=	${DISTNAME}p7
 
 CATEGORIES=	www
 
@@ -33,7 +33,7 @@ MODULES=	devel/gettext \
 		textproc/intltool \
 		devel/gconf2
 
-BUILD_DEPENDS=	:xulrunner-devel->=1.8.1:devel/xulrunner,-devel \
+BUILD_DEPENDS=	:xulrunner-devel->=1.8.1:devel/xulrunner/1.8,-devel \
 		::textproc/rarian \
 		${RUN_DEPENDS}
 RUN_DEPENDS=	::devel/desktop-file-utils \
@@ -43,7 +43,7 @@ RUN_DEPENDS=	::devel/desktop-file-utils \
 		::x11/gnome/themes \
 		::x11/gnome/yelp
 
-LIB_DEPENDS=	xulrunner/gtkembedmoz,xulrunner/xpcom,xulrunner/xul:xulrunner->=1.8.1:devel/xulrunner \
+LIB_DEPENDS=	xulrunner/gtkembedmoz,xulrunner/xpcom,xulrunner/xul:xulrunner->=1.8.1:devel/xulrunner/1.8 \
 		xml2::textproc/libxml \
 		gnome-desktop-2::x11/gnome/desktop \
 		gnomeui-2::x11/gnome/libgnomeui

diff --git a/www/gecko-mediaplayer/Makefile b/www/gecko-mediaplayer/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2009/06/11 18:27:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2009/07/27 21:44:14 martynas Exp $
 
 COMMENT =		gnome-mplayer browser media plugin
 DISTNAME =		gecko-mediaplayer-0.9.5
@@ -23,7 +23,7 @@ WANTLIB =		ORBit-2 dbus-1 dbus-glib-1 glib-2.0 gmodule-2.0 gobject-2.0 \
 MODULES =		devel/gettext \
 			devel/gconf2
 
-BUILD_DEPENDS =		:xulrunner-devel-*:devel/xulrunner,-devel
+BUILD_DEPENDS =		:xulrunner-devel-*:devel/xulrunner/1.8,-devel
 RUN_DEPENDS =		::x11/gnome-mplayer
 
 USE_X11 =		Yes

diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2009/06/18 20:10:07 landry Exp $
+# $OpenBSD: Makefile,v 1.11 2009/07/27 21:44:14 martynas Exp $
 
 COMMENT-main=	common files for kazehakase
 COMMENT-gecko=	lightweight gecko-based web browser
@@ -11,7 +11,7 @@ SHARED_ONLY=	Yes
 VERSION=	0.5.6
 DISTNAME=	kazehakase-${VERSION}
 PKGNAME-main=	kazehakase-common-${VERSION}p0
-PKGNAME-gecko=	${DISTNAME}p1
+PKGNAME-gecko=	${DISTNAME}p2
 PKGNAME-webkit=	kazehakase-webkit-${VERSION}p1
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=kazehakase/33533/}
 
@@ -46,7 +46,7 @@ USE_LIBTOOL =		Yes
 
 FAKE_FLAGS =		sysconfdir=${TRUEPREFIX}/share/examples
 
-BUILD_DEPENDS =		:xulrunner-devel->=1.8:devel/xulrunner,-devel
+BUILD_DEPENDS =		:xulrunner-devel->=1.8:devel/xulrunner/1.8,-devel
 
 RUN_DEPENDS-main =	${RUN_DEPENDS} \
 			::devel/desktop-file-utils
@@ -62,7 +62,7 @@ LIB_DEPENDS-main =	${LIB_DEPENDS} \
 
 LIB_DEPENDS-gecko =	${LIB_DEPENDS-main} \
 			lib/kazehakase/kazehakase::www/kazehakase,-main \
-			xulrunner/xpcom:xulrunner->=1.8:devel/xulrunner
+			xulrunner/xpcom:xulrunner->=1.8:devel/xulrunner/1.8
 
 LIB_DEPENDS-webkit =	${LIB_DEPENDS} \
 			webkit-1.0::www/webkit

diff --git a/www/liferea/Makefile b/www/liferea/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.27 2009/06/11 18:27:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2009/07/27 21:44:14 martynas Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT=		simple GTK desktop news aggregator
 
 DISTNAME=		liferea-1.4.19
-PKGNAME=		${DISTNAME}p4
+PKGNAME=		${DISTNAME}p5
 CATEGORIES=		www x11
 
 HOMEPAGE=		http://liferea.sourceforge.net/
@@ -31,8 +31,8 @@ MODULES=		devel/gettext \
 			textproc/intltool \
 			devel/gconf2
 
-BUILD_DEPENDS=		::devel/xulrunner,-devel
-LIB_DEPENDS=		xulrunner/gtkembedmoz,xulrunner/xpcom::devel/xulrunner,-main \
+BUILD_DEPENDS=		::devel/xulrunner/1.8,-devel
+LIB_DEPENDS=		xulrunner/gtkembedmoz,xulrunner/xpcom::devel/xulrunner/1.8,-main \
 			notify.>=2::devel/libnotify \
 			lua.>=5::lang/lua \
 			xslt.>=3.3::textproc/libxslt \

diff --git a/www/mplayerplug-in/Makefile b/www/mplayerplug-in/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2009/03/16 10:42:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2009/07/27 21:44:15 martynas Exp $
 
 SHARED_ONLY=		Yes
 
@@ -30,7 +30,7 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mplayerplug-in/}
 MODULES=		devel/gettext
 
 BUILD_DEPENDS=		${MODGNU_AUTOMAKE_DEPENDS} \
-			:xulrunner-devel-*:devel/xulrunner,-devel
+			:xulrunner-devel-*:devel/xulrunner/1.8,-devel
 LIB_DEPENDS=		gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
 RUN_DEPENDS=		::x11/mplayer
 

diff --git a/x11/gnome/py-gnome-extras/Makefile b/x11/gnome/py-gnome-extras/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2009/06/25 00:38:37 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2009/07/27 21:44:15 martynas Exp $
 
 COMMENT=	additional Python bindings for GNOME
 
 GNOME_PROJECT=	gnome-python-extras
 GNOME_VERSION=	2.19.1
-PKGNAME=	py-gnome-extras-${VERSION}p9
+PKGNAME=	py-gnome-extras-${VERSION}p10
 
 HOMEPAGE=	http://www.pygtk.org/
 
@@ -31,9 +31,9 @@ MODULES=		devel/gettext \
 			x11/gnome
 
 BUILD_DEPENDS=		${RUN_DEPENDS} \
-			:xulrunner-devel->=1.8:devel/xulrunner,-devel \
+			:xulrunner-devel->=1.8:devel/xulrunner/1.8,-devel \
 			::sysutils/libgksuui
-LIB_DEPENDS=		xulrunner/gtkembedmoz,xulrunner/xpcom:xulrunner->=1.8:devel/xulrunner \
+LIB_DEPENDS=		xulrunner/gtkembedmoz,xulrunner/xpcom:xulrunner->=1.8:devel/xulrunner/1.8 \
 			gksu2::sysutils/libgksu \
 			gtkspell::textproc/gtkspell \
 			gdl-1::x11/gnome/gdl \

diff --git a/x11/gnome/seahorse-plugins/Makefile b/x11/gnome/seahorse-plugins/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2009/07/16 13:26:08 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2009/07/27 21:44:15 martynas Exp $
 
 SHARED_ONLY=	Yes
 
@@ -35,7 +35,7 @@ LIB_DEPENDS=	cryptui::x11/gnome/seahorse \
 		gtksourceview-2.0.>=2::x11/gtksourceview \
 		nautilus-extension.>=2::x11/gnome/nautilus\
 		panel-applet-2.>=1::x11/gnome/panel \
-		xulrunner/gtkembedmoz,xulrunner/xpcom:xulrunner->=1.8.1:devel/xulrunner
+		xulrunner/gtkembedmoz,xulrunner/xpcom:xulrunner->=1.8.1:devel/xulrunner/1.8
 
 RUN_DEPENDS=	:shared-mime-info->=0.21:misc/shared-mime-info \
 		::x11/gnome/gedit \

diff --git a/x11/gnome/yelp/Makefile b/x11/gnome/yelp/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.42 2009/06/11 18:38:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.43 2009/07/27 21:44:15 martynas Exp $
 
 COMMENT=		GNOME help browser
 
 GNOME_PROJECT=		yelp
 GNOME_VERSION=		2.24.0
-PKGNAME=		${DISTNAME}p7
+PKGNAME=		${DISTNAME}p8
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
@@ -28,14 +28,14 @@ MODULES=		devel/gettext \
 			x11/gnome \
 			devel/gconf2
 
-BUILD_DEPENDS=		::devel/xulrunner,-devel \
+BUILD_DEPENDS=		::devel/xulrunner/1.8,-devel \
 			::x11/gnome/doc-utils
 RUN_DEPENDS=		::misc/shared-mime-info \
 			::textproc/docbook-dsssl \
 			::x11/gnome/users-guide \
 			::x11/gnome/doc-utils
 LIB_DEPENDS=		startup-notification-1::devel/startup-notification \
-			xulrunner/gtkembedmoz,xulrunner/xpcom,xulrunner/xul::devel/xulrunner,-main \
+			xulrunner/gtkembedmoz,xulrunner/xpcom,xulrunner/xul::devel/xulrunner/1.8,-main \
 			gnomeui-2::x11/gnome/libgnomeui \
 			exslt,xslt::textproc/libxslt \
 			lzmadec::archivers/lzma \

diff --git a/x11/gtk-vnc/Makefile b/x11/gtk-vnc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2009/04/26 11:01:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2009/07/27 21:44:15 martynas Exp $
 
 COMMENT-main=		VNC viewer widget for GTK
 COMMENT-plugin=		gtk-vnc browser plugin
@@ -56,7 +56,7 @@ CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS+=	--enable-plugin=no
 .else
 MULTI_PACKAGES+=	-plugin
-BUILD_DEPENDS+=		::devel/xulrunner,-devel
+BUILD_DEPENDS+=		::devel/xulrunner/1.8,-devel
 CONFIGURE_ARGS+=	--enable-plugin=yes
 CONFIGURE_ENV+=		MOZILLA_PLUGIN_CFLAGS="-I${LOCALBASE}/xulrunner/include/plugin \
 				-I${LOCALBASE}/xulrunner/include/java \

diff --git a/x11/vlc/Makefile b/x11/vlc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.81 2009/07/19 22:49:12 sthen Exp $
+# $OpenBSD: Makefile,v 1.82 2009/07/27 21:44:15 martynas Exp $
 
 SHARED_ONLY=	Yes
 
@@ -174,7 +174,7 @@ FLAVOR?=
 MULTI_PACKAGES+=-web
 COMMENT-web=	mozilla plugin for embedded media playback
 PKGNAME-web=	vlc-web-${V}p0
-BUILD_DEPENDS+=	:xulrunner-devel-*:devel/xulrunner,-devel
+BUILD_DEPENDS+=	:xulrunner-devel-*:devel/xulrunner/1.8,-devel
 CONFIGURE_ARGS+=--enable-mozilla
 CONFIGURE_ENV+=	MOZILLA_CONFIG="${LOCALBASE}/bin/xulrunner-config" \
 		XPIDL="${LOCALBASE}/xulrunner/xpidl"