Update to galeon-2.0.7. Use xulrunner.

XXX: Some stock icons appear to not work, is there a missing GNOME
dependency here?

2.0.7 "Surprise!"
- Works with Firefox 2/3 and Xulrunner 1.8/1.9
  - Restored support for http authentication by Mike Hommey <mh@glandium.org>
  - Restored support for remembering passwords.
  - Partially restored support for user stylesheets.
    - Effect is global rather than per page but UI doesn't reflect this.

2.0.6 "Pining for the Fjords"
- Works with Firefox 2  and 3 and xulrunner 1.8 and 1.9
  - Thanks to Alexander Sack <asac@ubuntu.com> and Loïc Minier <lool#dooz.org>
    for the xulrunner 1.9 patches.
  - With Firefox 3/xulrunner 1.9, functionality remains crippled as
    documented in the 2.0.5 release notes.
- Support for older versions of Mozilla have been removed.
  You can use 2.0.5 to build against them if you need to.
- GConf pref added to suppress close confirmation for web forms.

7 files changed, 63 insertions, 29 deletions

diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 92c435e5a38..03942c75d89 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.117 2009/07/22 09:01:51 wiz Exp $
+# $NetBSD: Makefile,v 1.118 2009/08/06 07:48:06 tnn Exp $
 #
 
-DISTNAME=		galeon-2.0.5
+DISTNAME=		galeon-2.0.7
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=galeon/}
 EXTRACT_SUFX=		.tar.bz2
@@ -20,23 +20,23 @@ USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
-.include "options.mk"
-
 GCONF_SCHEMAS=		galeon.schemas
 
 EGDIR=			${PREFIX}/share/examples/galeon
 CONF_FILES=		${EGDIR}/sound/events/galeon.soundlist \
 			${PKG_SYSCONFDIR}/sound/events/galeon.soundlist
 
+CONFIGURE_ARGS+=	--with-mozilla=libxul-embedding-unstable
+
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/xulrunner/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/omf-scrollkeeper.mk"
-.include "../../www/seamonkey/gecko-depends.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/www/galeon/distinfo b/www/galeon/distinfo
index 75a2a28fa13..e7d72385eb5 100644
--- a/www/galeon/distinfo
+++ b/www/galeon/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.47 2008/03/10 12:56:20 drochner Exp $
+$NetBSD: distinfo,v 1.48 2009/08/06 07:48:06 tnn Exp $
 
-SHA1 (galeon-2.0.5.tar.bz2) = c0ae9496db47a8f588eb1e579761d939da44b14d
-RMD160 (galeon-2.0.5.tar.bz2) = 060447fe7f004bf02c524abde8732a3457353a8a
-Size (galeon-2.0.5.tar.bz2) = 3098535 bytes
+SHA1 (galeon-2.0.7.tar.bz2) = 14ccb53a7b3f398eb3ac3f7ca6aeb63348689a62
+RMD160 (galeon-2.0.7.tar.bz2) = a443dfc11447a006d21d9e7852c616b41492a6f6
+Size (galeon-2.0.7.tar.bz2) = 3096337 bytes
 SHA1 (patch-ac) = a9369e0dc72d3347bb9a2924e92eedd41addc58f
 SHA1 (patch-ad) = db8076fb6c5fbf25e3a03d006a2801dc24002175
-SHA1 (patch-ae) = 38a6820c9f6d1bbf994a8aa09b9cc47385df735f
+SHA1 (patch-ae) = 3495acf3e66bc197c2e67177debf6baf64d775ec
+SHA1 (patch-af) = 5037f57c82c65d9e2fbaaab10f1528f626973e44
+SHA1 (patch-ag) = b099b3ce17160897134e4075bcf6fde1694c6e25
+SHA1 (patch-ah) = 3c3001795027ad75d401c1d3ed83834de35bb81d
diff --git a/www/galeon/options.mk b/www/galeon/options.mk
deleted file mode 100644
index 0156a6707fb..00000000000
--- a/www/galeon/options.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2006/09/24 16:30:09 salo Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.galeon
-
-.include "../../www/seamonkey/gecko-options.mk"
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mfirefox)
-CONFIGURE_ARGS+=	--with-mozilla=firefox
-.else
-BUILDLINK_RPATHDIRS.seamonkey+=	lib/seamonkey
-.endif
diff --git a/www/galeon/patches/patch-ae b/www/galeon/patches/patch-ae
index 80028d72957..af5cdd7230c 100644
--- a/www/galeon/patches/patch-ae
+++ b/www/galeon/patches/patch-ae
@@ -1,17 +1,17 @@
-$NetBSD: patch-ae,v 1.6 2006/10/18 21:48:42 rillig Exp $
+$NetBSD: patch-ae,v 1.7 2009/08/06 07:48:06 tnn Exp $
 
---- configure.orig	2006-10-18 23:43:38.000000000 +0200
-+++ configure	2006-10-18 23:45:44.000000000 +0200
-@@ -28300,7 +28300,7 @@ fi
+--- configure.orig	2008-09-27 05:16:12.000000000 +0200
++++ configure
+@@ -29151,7 +29151,7 @@ fi
  
  
  
--if test "$gecko" == "xulrunner"; then
-+if test "$gecko" = "xulrunner"; then
+-if test "$gecko" == "xulrunner" || test "$gecko" == "libxul-embedding-unstable"; then
++if test "$gecko" = "xulrunner" || test "$gecko" = "libxul-embedding-unstable"; then
  	echo ""
  	echo "Note that Galeon has a runtime dependency on the 'cookie' and 'permission'"
  	echo "mozilla extensions. These are not built as part of the default xulrunner"
-@@ -28308,7 +28308,7 @@ if test "$gecko" == "xulrunner"; then
+@@ -29159,7 +29159,7 @@ if test "$gecko" == "xulrunner" || test 
  	echo ""
  fi
  
diff --git a/www/galeon/patches/patch-af b/www/galeon/patches/patch-af
new file mode 100644
index 00000000000..889654eb986
--- /dev/null
+++ b/www/galeon/patches/patch-af
@@ -0,0 +1,18 @@
+$NetBSD: patch-af,v 1.5 2009/08/06 07:48:06 tnn Exp $
+
+--- mozilla/EventContext.cpp.orig	2008-07-18 06:41:08.000000000 +0200
++++ mozilla/EventContext.cpp
+@@ -525,10 +525,11 @@ nsresult EventContext::GetTargetCoords (
+ 	{
+ 		PRInt32 val;
+ 		elem->GetOffsetTop(&val);	y += val;
+-		elem->GetScrollTop(&val);	y -= val;
+ 		elem->GetOffsetLeft(&val);	x += val;
++#if 0 /* XXX no such accessors, check in GNOME git if fixed ... */
++		elem->GetScrollTop(&val);	y -= val;
+ 		elem->GetScrollLeft(&val);	x -= val;
+-
++#endif
+ 		nsCOMPtr<nsIDOMElement> parent;
+ 		elem->GetOffsetParent(getter_AddRefs(parent));
+ 		elem = do_QueryInterface(parent);
diff --git a/www/galeon/patches/patch-ag b/www/galeon/patches/patch-ag
new file mode 100644
index 00000000000..8845f747564
--- /dev/null
+++ b/www/galeon/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.3 2009/08/06 07:48:06 tnn Exp $
+
+--- mozilla/MozRegisterComponents.cpp.orig	2008-09-03 05:08:44.000000000 +0200
++++ mozilla/MozRegisterComponents.cpp
+@@ -62,6 +62,7 @@
+ #include <nsServiceManagerUtils.h>
+ #include <nsDocShellCID.h>
+ #include <nsXPCOMCID.h>
++#include <nsXPCOMCIDInternal.h>
+ 
+ #include <glib.h>
+ 
diff --git a/www/galeon/patches/patch-ah b/www/galeon/patches/patch-ah
new file mode 100644
index 00000000000..d41b7c1b641
--- /dev/null
+++ b/www/galeon/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.3 2009/08/06 07:48:06 tnn Exp $
+
+--- src/Makefile.in.orig	2008-09-27 05:16:16.000000000 +0200
++++ src/Makefile.in
+@@ -199,7 +199,7 @@ EXEEXT = @EXEEXT@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+ GALEON_DEPENDENCY_CFLAGS = @GALEON_DEPENDENCY_CFLAGS@
+-GALEON_DEPENDENCY_LIBS = @GALEON_DEPENDENCY_LIBS@
++GALEON_DEPENDENCY_LIBS = @GALEON_DEPENDENCY_LIBS@ `pkg-config --libs mozilla-nspr`
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_REQUIRED = @GCONF_REQUIRED@
+ GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@