Switch to xulrunner and bump PKGREVISION.

5 files changed, 104 insertions, 23 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index b2209e5fbb5..cbe4f75c3cd 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.96 2009/07/22 09:01:51 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2009/08/06 11:03:49 tnn Exp $
 #
 
 DISTNAME=	epiphany-2.26.3
+PKGREVISION=	1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany/2.26/}
 EXTRACT_SUFX=	.tar.bz2
@@ -38,6 +39,7 @@ BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.14.0
 .include "../../devel/libgnome/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.14.0
 .include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/xulrunner/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
diff --git a/www/epiphany/PLIST b/www/epiphany/PLIST
index 3aee16eeedc..06ef15cb675 100644
--- a/www/epiphany/PLIST
+++ b/www/epiphany/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2009/07/09 18:27:45 drochner Exp $
+@comment $NetBSD: PLIST,v 1.36 2009/08/06 11:03:49 tnn Exp $
 bin/epiphany
 include/epiphany/2.26/epiphany/ephy-adblock-manager.h
 include/epiphany/2.26/epiphany/ephy-adblock.h
@@ -50,6 +50,8 @@ share/epiphany/chrome/app-chrome.manifest
 share/epiphany/chrome/branding/brand.dtd
 share/epiphany/chrome/branding/brand.properties
 share/epiphany/chrome/global/about.xhtml
+share/epiphany/chrome/global/netError.dtd
+share/epiphany/components/epiphany.xpt
 share/epiphany/default-prefs.js
 share/epiphany/ephy-xml2ini.xsl
 share/epiphany/epiphany-bookmark-editor-ui.xml
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 34b015d5dce..5ea73977d99 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.47 2009/07/09 18:27:45 drochner Exp $
+$NetBSD: distinfo,v 1.48 2009/08/06 11:03:49 tnn Exp $
 
 SHA1 (epiphany-2.26.3.tar.bz2) = d1143fd2f287efe3eab648e1feded9f4911e3236
 RMD160 (epiphany-2.26.3.tar.bz2) = ef2474c8523a6787227d3dfa5e8fc9d443708a0c
 Size (epiphany-2.26.3.tar.bz2) = 5655997 bytes
+SHA1 (patch-aa) = b3b4e0151753eb3b4005f9e7a5ecd4399642ea7f
diff --git a/www/epiphany/options.mk b/www/epiphany/options.mk
index 7bcc3ccc999..069a13047df 100644
--- a/www/epiphany/options.mk
+++ b/www/epiphany/options.mk
@@ -1,12 +1,9 @@
-# $NetBSD: options.mk,v 1.6 2009/03/15 19:15:45 jmcneill Exp $
+# $NetBSD: options.mk,v 1.7 2009/08/06 11:03:49 tnn Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.epiphany
 PKG_SUPPORTED_OPTIONS=		avahi
 # browser crashes with enchant
-PKG_OPTIONS_OPTIONAL_GROUPS=	engine
-PKG_OPTIONS_GROUP.engine=	firefox
-PKG_SUGGESTED_OPTIONS=		avahi firefox
-PLIST_VARS=			gecko
+PKG_SUGGESTED_OPTIONS=		avahi
 
 .include "../../mk/bsd.options.mk"
 
@@ -21,18 +18,3 @@ CONFIGURE_ARGS+=	--disable-zeroconf
 CONFIGURE_ARGS+=	--enable-spell-checker
 .include "../../textproc/enchant/buildlink3.mk"
 .endif
-
-.if !empty(PKG_OPTIONS:Mfirefox)
-CPPFLAGS+=	-I${BUILDLINK_PREFIX.firefox}/include/firefox/find
-CFLAGS+=	-I${BUILDLINK_PREFIX.firefox}/include/firefox/find
-CPPFLAGS+=	-I${BUILDLINK_PREFIX.firefox}/include/firefox/necko
-CFLAGS+=	-I${BUILDLINK_PREFIX.firefox}/include/firefox/necko
-CPPFLAGS+=	-I${BUILDLINK_PREFIX.firefox}/include/firefox/pref
-CFLAGS+=	-I${BUILDLINK_PREFIX.firefox}/include/firefox/pref
-# XXX the configure check doesn't work
-CONFIGURE_ENV+=	ac_cv_header_nsIBadCertListener_h=yes
-CONFIGURE_ARGS+=	--with-engine=mozilla
-CONFIGURE_ARGS+=	--with-gecko=firefox
-PLIST.gecko=	yes
-.include "../../www/firefox/buildlink3.mk"
-.endif
diff --git a/www/epiphany/patches/patch-aa b/www/epiphany/patches/patch-aa
new file mode 100644
index 00000000000..51c6e6dbd18
--- /dev/null
+++ b/www/epiphany/patches/patch-aa
@@ -0,0 +1,94 @@
+$NetBSD: patch-aa,v 1.11 2009/08/06 11:03:49 tnn Exp $
+
+--- configure.orig	2009-06-29 14:22:39.000000000 +0200
++++ configure
+@@ -20064,7 +20064,7 @@ _SAVE_LIBS="$LIBS"
+ if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
+ 	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-unstable)"
+ 	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-unstable)"
+-	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) ${lt_cv_dlopen_libs}"
+ else
+ 	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+ 	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
+@@ -20270,7 +20270,7 @@ _SAVE_LIBS="$LIBS"
+ if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
+ 	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-unstable)"
+ 	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-unstable)"
+-	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) ${lt_cv_dlopen_libs}"
+ else
+ 	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+ 	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
+@@ -20538,7 +20538,7 @@ _SAVE_LIBS="$LIBS"
+ if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
+ 	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-unstable)"
+ 	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-unstable)"
+-	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) ${lt_cv_dlopen_libs}"
+ else
+ 	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+ 	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
+@@ -20751,7 +20751,7 @@ _SAVE_LIBS="$LIBS"
+ if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
+ 	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-unstable)"
+ 	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-unstable)"
+-	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) ${lt_cv_dlopen_libs}"
+ else
+ 	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+ 	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
+@@ -20964,7 +20964,7 @@ _SAVE_LIBS="$LIBS"
+ if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
+ 	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-unstable)"
+ 	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-unstable)"
+-	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) ${lt_cv_dlopen_libs}"
+ else
+ 	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+ 	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
+@@ -21177,7 +21177,7 @@ _SAVE_LIBS="$LIBS"
+ if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
+ 	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-unstable)"
+ 	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-unstable)"
+-	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) ${lt_cv_dlopen_libs}"
+ else
+ 	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+ 	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
+@@ -21389,7 +21389,7 @@ _SAVE_LIBS="$LIBS"
+ if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
+ 	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-unstable)"
+ 	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-unstable)"
+-	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) ${lt_cv_dlopen_libs}"
+ else
+ 	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+ 	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
+@@ -21603,7 +21603,7 @@ _SAVE_LIBS="$LIBS"
+ if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
+ 	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-unstable)"
+ 	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-unstable)"
+-	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) ${lt_cv_dlopen_libs}"
+ else
+ 	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+ 	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
+@@ -21817,7 +21817,7 @@ _SAVE_LIBS="$LIBS"
+ if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
+ 	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-unstable)"
+ 	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-unstable)"
+-	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) ${lt_cv_dlopen_libs}"
+ else
+ 	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+ 	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
+@@ -22029,7 +22029,7 @@ _SAVE_LIBS="$LIBS"
+ if test "${gecko_cv_gecko}" = "libxul-embedding" -o "${gecko_cv_gecko}" = "libxul"; then
+ 	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-unstable)"
+ 	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-unstable)"
+-	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) -ldl"
++	LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}) ${lt_cv_dlopen_libs}"
+ else
+ 	CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
+ 	CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $_GECKO_CFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"