Update to icedtea-web 1.3.

- add a gtk3 flavor to be used by webkit-gtk3 browsers, tested with
  midori-gtk3. Mozilla doesnt care which version is installed and works
with both. Webkit only sees icedtea if the gtk version match..
- fix javaws shebang to use bash (pointed out by jiri b)

www/icedtea-web/Makefile

@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2012/09/01 14:36:58 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.5 2012/11/01 11:56:04 landry Exp $
 
 SHARED_ONLY =	Yes
 COMMENT =	Java web browser plugin
-DISTNAME =	icedtea-web-1.2
+DISTNAME =	icedtea-web-1.3
 CATEGORIES =	www
-REVISION =	1
 
 MAINTAINER =	Landry Breuil <landry@openbsd.org>
 
@@ -17,6 +16,9 @@ PERMIT_DISTFILES_FTP =	Yes
 MASTER_SITES =	http://icedtea.classpath.org/download/source/
 HOMEPAGE =	http://icedtea.classpath.org/wiki/IcedTea-Web
 
+FLAVORS =	gtk3
+FLAVOR ?=
+
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ARGS =	--with-jdk-home=${LOCALBASE}/jdk-1.7.0 \
 			--disable-docs \
@@ -32,17 +34,30 @@ MODJAVA_VER=	1.7+
 BUILD_DEPENDS =	archivers/zip \
 		archivers/gtar \
 		devel/xulrunner/1.9,-devel
+# for javaws
+RUN_DEPENDS =	shells/bash
 # otherwise PaxHeaders file get in the way
 TAR =		${LOCALBASE}/bin/gtar
 USE_GMAKE =	Yes
 
-LIB_DEPENDS =	x11/gtk+2 \
-		devel/glib2>=2.28.8p1 #for the gio/EINTR fix
+.if ${FLAVOR:L:Mgtk3}
+CONFIGURE_ARGS +=	--with-gtk=3
+LIB_DEPENDS =	x11/gtk+3
+WANTLIB += cairo-gobject gdk-3 gtk-3
 
-WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 cairo expat fontconfig freetype
-WANTLIB += gdk-x11-2.0 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 pango-1.0 pangocairo-1.0
+.else
+CONFIGURE_ARGS +=	--with-gtk=2
+LIB_DEPENDS =	x11/gtk+2
+WANTLIB += Xcomposite Xcursor Xdamage Xext Xfixes Xi
+WANTLIB += Xinerama Xrandr gdk-x11-2.0 gtk-x11-2.0
+.endif
+
+post-configure:
+	${SUBST_CMD} ${WRKSRC}/launcher/javaws.in
+
+WANTLIB += GL X11 Xrender atk-1.0 cairo expat fontconfig freetype
+WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pixman-1 png pthread-stubs stdc++ xcb
 WANTLIB += xcb-render xcb-shm z
 

www/icedtea-web/distinfo

@@ -1,5 +1,2 @@
-MD5 (icedtea-web-1.2.tar.gz) = j1DPsbZdYgp4ErWXbzlFmA==
-RMD160 (icedtea-web-1.2.tar.gz) = Noa2ZTEIgFCTS6JcisW+P8I/+Jk=
-SHA1 (icedtea-web-1.2.tar.gz) = S344sTEBrB8Y3CdvF743oO0rKN8=
-SHA256 (icedtea-web-1.2.tar.gz) = P40itlXfIHQJ3TRRugKQf2GhKsBR5N9NRLte1HxPd40=
-SIZE (icedtea-web-1.2.tar.gz) = 885793
+SHA256 (icedtea-web-1.3.tar.gz) = 1G7BBwBzLOoQPaKq5k/wHnF8sSgbg+F5fOSMxTKAtJ8=
+SIZE (icedtea-web-1.3.tar.gz) = 987785

www/icedtea-web/patches/patch-Makefile_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2012/03/27 09:04:53 landry Exp $
---- Makefile.in.orig	Mon Mar  5 18:06:46 2012
-+++ Makefile.in	Thu Mar 15 21:56:38 2012
-@@ -671,12 +671,12 @@ install-data-local:
+$OpenBSD: patch-Makefile_in,v 1.3 2012/11/01 11:56:04 landry Exp $
+--- Makefile.in.orig	Mon Aug 27 21:36:58 2012
++++ Makefile.in	Thu Nov  1 08:27:44 2012
+@@ -757,12 +757,12 @@ install-data-local:
  @ENABLE_DOCS_TRUE@	(cd ${abs_top_builddir}/docs/netx; \
  @ENABLE_DOCS_TRUE@	 for files in $$(find . -type f); \
  @ENABLE_DOCS_TRUE@	 do \
@@ -16,7 +16,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2012/03/27 09:04:53 landry Exp $
  @ENABLE_DOCS_TRUE@@ENABLE_PLUGIN_TRUE@	 done)
  
  uninstall-local:
-@@ -776,7 +776,7 @@ clean-liveconnect:
+@@ -862,7 +862,7 @@ clean-liveconnect:
  
  netx-source-files.txt:
  	find $(NETX_SRCDIR) -name '*.java' | sort > $@
@@ -25,7 +25,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2012/03/27 09:04:53 landry Exp $
  
  stamps/netx.stamp: netx-source-files.txt stamps/bootstrap-directory.stamp
  	mkdir -p $(NETX_DIR)
-@@ -786,14 +786,15 @@ stamps/netx.stamp: netx-source-files.txt stamps/bootst
+@@ -872,14 +872,15 @@ stamps/netx.stamp: netx-source-files.txt stamps/bootst
  	    -bootclasspath $(RUNTIME) \
  	    @netx-source-files.txt
  	(cd $(NETX_RESOURCE_DIR); \
@@ -44,7 +44,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2012/03/27 09:04:53 landry Exp $
  	mkdir -p stamps
  	touch $@
  
-@@ -829,9 +830,10 @@ stamps/extra-class-files.stamp: extra-source-files.txt
+@@ -915,9 +916,10 @@ stamps/extra-class-files.stamp: extra-source-files.txt
            -sourcepath $(abs_top_srcdir)/extra -cp netx.build \
            -bootclasspath $(RUNTIME) @extra-source-files.txt
  	(cd $(NETX_EXTRA_DIR); \

www/icedtea-web/patches/patch-launcher_javaws_in

@@ -0,0 +1,9 @@
+$OpenBSD: patch-launcher_javaws_in,v 1.1 2012/11/01 11:56:04 landry Exp $
+--- launcher/javaws.in.orig	Thu Nov  1 08:28:01 2012
++++ launcher/javaws.in	Thu Nov  1 08:28:14 2012
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!${LOCALBASE}/bin/bash
+ 
+ JAVA=@JAVA@
+ LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@