Update to 1.3.10.

Submitted by:	Simon Barner <barner@in.tum.de>

6 files changed, 35 insertions, 17 deletions

diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index 2cacf60ae525..63b8ac1b0ba4 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -6,21 +6,20 @@
 #
 
 PORTNAME=	galeon2
-PORTVERSION=	1.3.9
-PORTREVISION=	2
+PORTVERSION=	1.3.10
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/2$//}
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 
-MAINTAINER=	gnome@FreeBSD.org
+MAINTAINER=	gnome@freebsd.org
 COMMENT=	A GNOME 2 Web browser based on gecko (the Mozilla rendering engine)
 
 BUILD_DEPENDS=	${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers${HEADERS_SUFX} \
 		${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
 RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
 
-MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.5b"
+MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.5"
 
 MOZILLA=	mozilla-gtk2
 HEADERS_SUFX=
diff --git a/www/galeon2/distinfo b/www/galeon2/distinfo
index 696b7df9f46e..da4e1703dc07 100644
--- a/www/galeon2/distinfo
+++ b/www/galeon2/distinfo
@@ -1 +1 @@
-MD5 (galeon-1.3.9.tar.bz2) = f948047373884a0dc8d841930d11680c
+MD5 (galeon-1.3.10.tar.bz2) = 1707493228c2174e8ecd856789506ecd
diff --git a/www/galeon2/files/patch-bookmarks_xbel.c b/www/galeon2/files/patch-bookmarks_xbel.c
new file mode 100644
index 000000000000..a0cbdd61d870
--- /dev/null
+++ b/www/galeon2/files/patch-bookmarks_xbel.c
@@ -0,0 +1,11 @@
+--- bookmarks/xbel.c.orig	Tue Oct 28 00:27:13 2003
++++ bookmarks/xbel.c	Tue Oct 28 00:27:28 2003
+@@ -1065,7 +1065,7 @@
+ xbel_save_galeon_metadata_remove_metadata (xmlNodePtr node)
+ {
+         xmlNodePtr infoNode;
+-        xmlNodePtr metaNode;;
++        xmlNodePtr metaNode;
+ 	xmlNodePtr first_info = NULL;
+ 	xmlNodePtr found = NULL;
+ 	
diff --git a/www/galeon2/files/patch-mozilla_GlobalHistory.cpp b/www/galeon2/files/patch-mozilla_GlobalHistory.cpp
deleted file mode 100644
index cf345f13cb00..000000000000
--- a/www/galeon2/files/patch-mozilla_GlobalHistory.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/GlobalHistory.cpp.orig	Sun Oct 12 00:25:20 2003
-+++ mozilla/GlobalHistory.cpp	Sun Oct 12 00:25:27 2003
-@@ -99,7 +99,7 @@
- 	return NS_OK;
- }
- 
--#if MOZILLA_SNAPSHOT > 9
-+#if MOZILLA_SNAPSHOT >= 9
- NS_IMETHODIMP MozGlobalHistory::SetLastPageVisited(const char *aLastPageVisited)
- {
- 	mLastPageVisited.Assign(aLastPageVisited);
diff --git a/www/galeon2/files/patch-src_galeon-shell.c b/www/galeon2/files/patch-src_galeon-shell.c
new file mode 100644
index 000000000000..cf363fdf36ec
--- /dev/null
+++ b/www/galeon2/files/patch-src_galeon-shell.c
@@ -0,0 +1,19 @@
+--- src/galeon-shell.c.orig	Tue Oct 28 01:07:00 2003
++++ src/galeon-shell.c	Tue Oct 28 01:09:34 2003
+@@ -186,6 +186,7 @@
+ 	if (gs->priv->automation_factory == NULL)
+ 	{
+ 		GtkWidget *dialog;
++		char *text;
+ 
+ 		dialog = hig_alert_new (NULL,
+ 					GTK_DIALOG_MODAL,
+@@ -195,7 +196,7 @@
+ 					GTK_STOCK_OK,
+ 					GTK_RESPONSE_OK,
+ 					NULL);
+-		char * text = g_strdup_printf (_("Bonobo couldn't locate the file %s."),
++		text = g_strdup_printf (_("Bonobo couldn't locate the file %s."),
+ 					       "<tt>\"GNOME_Galeon_Automation.server\"</tt>");
+ 		hig_alert_set_secondary_printf (HIG_ALERT (dialog), "%s\n\n%s", text,
+ 			      _("Usually this is an indication of an incomplete installation. "
diff --git a/www/galeon2/pkg-plist b/www/galeon2/pkg-plist
index c291fd5c069b..e2c9ec5cf015 100644
--- a/www/galeon2/pkg-plist
+++ b/www/galeon2/pkg-plist
@@ -66,6 +66,7 @@ share/gnome/galeon/bookmarks-editor.glade
 share/gnome/galeon/bookmarks-find.glade
 share/gnome/galeon/bookmarks.glade
 share/gnome/galeon/bug.png
+share/gnome/galeon/certificate-dialogs.glade
 share/gnome/galeon/debian.png
 share/gnome/galeon/default-bookmarks.xbel
 share/gnome/galeon/default-prefs.js
@@ -110,7 +111,6 @@ share/gnome/galeon/new_separator.xpm
 share/gnome/galeon/new_separator_small.xpm
 share/gnome/galeon/prefs-dialog.glade
 share/gnome/galeon/print.glade
-share/gnome/galeon/prompts.glade
 share/gnome/galeon/rpm.png
 share/gnome/galeon/slack.png
 share/gnome/galeon/smart-bm-fold.png