Update to 1.3.18. See http://galeon.sourceforge.net/Main/GaleonRelease1318

for a list of what's changed.

8 files changed, 31 insertions, 71 deletions

diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index 979c6b8..00e7af0 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	galeon2
-PORTVERSION=	1.3.17
-PORTREVISION=	1
+PORTVERSION=	1.3.18
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://osdn.dl.sourceforge.net/sourceforge/galeon/
@@ -53,7 +52,7 @@ MAN1=		galeon.1
 
 FLASHPLAYER=	${LOCALBASE}/lib/libflashplayer.so.1
 
-CONFLICTS=	galeon-*
+CONFLICTS=	galeon-[0-9]*
 
 .include <bsd.port.pre.mk>
 
@@ -76,7 +75,10 @@ pre-everything::
 	@${ECHO_MSG} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g' \
+	@${REINPLACE_CMD} -e 's|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g ; \
+		s|mozilla-xpcom|mozilla-xpcom${HEADERS_SUFX}|g ; \
+		s|$$MOZILLA-gtkmozembed|$$MOZILLA-gtkmozembed${HEADERS_SUFX}|g ; \
+		s|$$MOZILLA-xpcom|$$MOZILLA-xpcom${HEADERS_SUFX}|g' \
 		${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
 		 's|-lpthread|${PTHREAD_LIBS}|g'
diff --git a/www/galeon2/distinfo b/www/galeon2/distinfo
index f563b8b..b2d9942 100644
--- a/www/galeon2/distinfo
+++ b/www/galeon2/distinfo
@@ -1,2 +1,2 @@
-MD5 (galeon-1.3.17.tar.bz2) = 781ac1c9e15fa4c2b367b195e78d1ab2
-SIZE (galeon-1.3.17.tar.bz2) = 3635524
+MD5 (galeon-1.3.18.tar.bz2) = d04164ebf26c65fdfd23fc1278edfce1
+SIZE (galeon-1.3.18.tar.bz2) = 3866453
diff --git a/www/galeon2/files/patch-configure b/www/galeon2/files/patch-configure
deleted file mode 100644
index c9c3f46..0000000
--- a/www/galeon2/files/patch-configure
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.orig	Mon Aug  9 23:57:15 2004
-+++ configure	Mon Aug  9 23:57:15 2004
-@@ -22744,11 +22744,11 @@
- echo "$as_me:$LINENO: result: $MOZILLA_VERSION$autodetect" >&5
- echo "${ECHO_T}$MOZILLA_VERSION$autodetect" >&6
- 
--if test $MOZILLA_VERSION == "trunk"; then
-+if test $MOZILLA_VERSION = "trunk"; then
- 	MOZILLA_VERSION=99.0 # use a high number
- fi
- 
--version=$(echo $MOZILLA_VERSION | sed -e 's/\([0-9]\+\|[a-z]\+\)/\1 /g' -e 's/\.//g')
-+version=$(echo $MOZILLA_VERSION | sed -E -e 's/([0-9]+|[a-z]+)/\1 /g' -e 's/\.//g')
- 
- set -- $version;
- 
diff --git a/www/galeon2/files/patch-libegg_egg-toolbar-editor.c b/www/galeon2/files/patch-libegg_egg-toolbar-editor.c
deleted file mode 100644
index e0a4fa1..0000000
--- a/www/galeon2/files/patch-libegg_egg-toolbar-editor.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- libegg/egg-toolbar-editor.c.orig	Sat Jul  3 16:37:44 2004
-+++ libegg/egg-toolbar-editor.c	Sat Jul  3 16:38:00 2004
-@@ -102,12 +102,12 @@
- static gint
- compare_actions (gconstpointer a, gconstpointer b)
- {
--  g_return_val_if_fail (GTK_IS_ACTION (a), 0);
--  g_return_val_if_fail (GTK_IS_ACTION (b), 0);
--
-   GValue value_a = { 0, }, value_b = { 0, };
-   const char *short_label_a, *short_label_b;
-   int ret;
-+
-+  g_return_val_if_fail (GTK_IS_ACTION (a), 0);
-+  g_return_val_if_fail (GTK_IS_ACTION (b), 0);
- 
-   g_value_init (&value_a, G_TYPE_STRING);
-   g_object_get_property (G_OBJECT (a), "short_label", &value_a);
diff --git a/www/galeon2/files/patch-mozilla_MozillaPrivate.cpp b/www/galeon2/files/patch-mozilla_MozillaPrivate.cpp
new file mode 100644
index 0000000..c583ea9
--- /dev/null
+++ b/www/galeon2/files/patch-mozilla_MozillaPrivate.cpp
@@ -0,0 +1,18 @@
+--- mozilla/MozillaPrivate.cpp.orig	Sun Oct 24 15:14:57 2004
++++ mozilla/MozillaPrivate.cpp	Sun Oct 24 15:17:17 2004
+@@ -109,6 +109,7 @@
+ 		tmp = paperPrefix + NS_LITERAL_CSTRING("width_mm");
+ 		rv = pref->GetIntPref(tmp.get(), &width);
+ 
++#if defined(_NL_PAPER_HEIGHT) && defined(_NL_PAPER_WIDTH)
+ 		// mark locale default paper size so that print dialog can use
+ 		// it as best guess when switching printers
+ 		if (height == (int) (long int) nl_langinfo (_NL_PAPER_HEIGHT) &&
+@@ -116,6 +117,7 @@
+ 		{
+ 			info->paper = i;
+ 		}
++#endif
+ 
+ 		PRBool is_inch;
+ 		tmp = paperPrefix + NS_LITERAL_CSTRING("is_inch");
diff --git a/www/galeon2/files/patch-src_galeon-encoding-dialog.c b/www/galeon2/files/patch-src_galeon-encoding-dialog.c
deleted file mode 100644
index 6740699..0000000
--- a/www/galeon2/files/patch-src_galeon-encoding-dialog.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/galeon-encoding-dialog.c.orig	Sat Jul  3 16:45:02 2004
-+++ src/galeon-encoding-dialog.c	Sat Jul  3 16:45:11 2004
-@@ -282,10 +282,10 @@
- tree_view_selection_changed_cb (GtkTreeSelection *selection, 
- 				GaleonEncodingDialog *dialog)
- {
--	if (dialog->priv->update_tag == TRUE) return;
--
- 	GtkTreeModel *model;
- 	GtkTreeIter iter;
-+
-+	if (dialog->priv->update_tag == TRUE) return;
- 
- 	if (gtk_tree_selection_get_selected (selection, &model, &iter))
- 	{
diff --git a/www/galeon2/files/patch-src_popup-commands.c b/www/galeon2/files/patch-src_popup-commands.c
deleted file mode 100644
index 510f87b..0000000
--- a/www/galeon2/files/patch-src_popup-commands.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/popup-commands.c.orig	Tue Aug 10 00:31:14 2004
-+++ src/popup-commands.c	Tue Aug 10 00:31:21 2004
-@@ -333,11 +333,11 @@
- 			GaleonPopup *popup)
- {
- 	GaleonEmbed *embed;
-+	char *location;
- 
- 	embed = galeon_popup_get_embed (popup);
- 	g_return_if_fail (GALEON_IS_EMBED (embed));
- 		
--	char *location;
- 	galeon_embed_get_location (embed, FALSE, FALSE, &location);
- 	popup_copy_to_clipboard (popup, location);
- 	g_free (location);
diff --git a/www/galeon2/pkg-plist b/www/galeon2/pkg-plist
index ccc5012..cee09a1 100644
--- a/www/galeon2/pkg-plist
+++ b/www/galeon2/pkg-plist
@@ -25,11 +25,12 @@ share/gnome/galeon/default-prefs.js
 share/gnome/galeon/fetch_favicon.xpm
 share/gnome/galeon/freshmeat.png
 share/gnome/galeon/galeon-bookmark-alias-mark.png
-share/gnome/galeon/galeon-bookmark.png
 share/gnome/galeon/galeon-default.png
 share/gnome/galeon/galeon-download.png
 share/gnome/galeon/galeon-egg-ui-toolbar.xml
 share/gnome/galeon/galeon-egg-ui.xml
+share/gnome/galeon/galeon-entry.png
+share/gnome/galeon/galeon-filter.png
 share/gnome/galeon/galeon-folder.png
 share/gnome/galeon/galeon-history.png
 share/gnome/galeon/galeon-insecure.png
@@ -171,6 +172,7 @@ share/locale/am/LC_MESSAGES/galeon-2.0.mo
 share/locale/az/LC_MESSAGES/galeon-2.0.mo
 share/locale/be/LC_MESSAGES/galeon-2.0.mo
 share/locale/bg/LC_MESSAGES/galeon-2.0.mo
+share/locale/bs/LC_MESSAGES/galeon-2.0.mo
 share/locale/ca/LC_MESSAGES/galeon-2.0.mo
 share/locale/cs/LC_MESSAGES/galeon-2.0.mo
 share/locale/da/LC_MESSAGES/galeon-2.0.mo
@@ -196,9 +198,11 @@ share/locale/mk/LC_MESSAGES/galeon-2.0.mo
 share/locale/ml/LC_MESSAGES/galeon-2.0.mo
 share/locale/mn/LC_MESSAGES/galeon-2.0.mo
 share/locale/ms/LC_MESSAGES/galeon-2.0.mo
+share/locale/nb/LC_MESSAGES/galeon-2.0.mo
 share/locale/nl/LC_MESSAGES/galeon-2.0.mo
 share/locale/nn/LC_MESSAGES/galeon-2.0.mo
 share/locale/no/LC_MESSAGES/galeon-2.0.mo
+share/locale/pa/LC_MESSAGES/galeon-2.0.mo
 share/locale/pl/LC_MESSAGES/galeon-2.0.mo
 share/locale/pt/LC_MESSAGES/galeon-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/galeon-2.0.mo