Update to 1.3.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2456 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 73 insertions, 63 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index a3bdaec8a..18154f408 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTVERSION=	1.3.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.3
@@ -19,8 +18,6 @@ COMMENT=	An extremely lightweight and simple web browser for GNOME 2
 BUILD_DEPENDS=	${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.7"
-
 MOZILLA=	mozilla
 HEADERS_SUFX=
 
@@ -31,7 +28,6 @@ HEADERS_SUFX=
 .if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2"
 MOZILLA=	mozilla-devel
 HEADERS_SUFX=	-devel
-MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.8a"
 .else
 MOZILLA=	mozilla
 HEADERS_SUFX=
@@ -45,8 +41,7 @@ USE_LIBTOOL_VER=13
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \
-		--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \
-		${MOZ_CONFIGURE_ARGS}
+		--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}"
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 9b0636859..28854de19 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/epiphany-1.3.0.tar.bz2) = 6d4f1e2015b63fea498c4a7c2a3b1ac6
-SIZE (gnome2/epiphany-1.3.0.tar.bz2) = 2535534
+MD5 (gnome2/epiphany-1.3.1.tar.bz2) = b7f8e743f78abcca618a8febf1f97290
+SIZE (gnome2/epiphany-1.3.1.tar.bz2) = 2902818
diff --git a/www/epiphany/files/patch-configure b/www/epiphany/files/patch-configure
new file mode 100644
index 000000000..b21b382d1
--- /dev/null
+++ b/www/epiphany/files/patch-configure
@@ -0,0 +1,16 @@
+--- configure.orig	Sat Jul  3 16:37:01 2004
++++ configure	Sat Jul  3 16:40:21 2004
+@@ -22732,11 +22709,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/epiphany/files/patch-embed_mozilla_GtkNSSKeyPairDialogs.cpp b/www/epiphany/files/patch-embed_mozilla_GtkNSSKeyPairDialogs.cpp
deleted file mode 100644
index e97822fea..000000000
--- a/www/epiphany/files/patch-embed_mozilla_GtkNSSKeyPairDialogs.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- embed/mozilla/GtkNSSKeyPairDialogs.cpp.orig	Tue Jun 29 16:51:48 2004
-+++ embed/mozilla/GtkNSSKeyPairDialogs.cpp	Tue Jun 29 16:52:26 2004
-@@ -91,7 +91,7 @@
- 	NS_DECL_ISUPPORTS
- 	NS_DECL_NSIDOMWINDOWINTERNAL
- 	NS_DECL_NSIDOMWINDOW
--#if MOZILLA_SNAPSHOT >= 19
-+#if MOZILLA_SNAPSHOT >= 16
- 	NS_DECL_NSIDOMWINDOW2
- #endif
- 
-@@ -101,7 +101,7 @@
- 	gboolean close_called;
- };
- 
--#if MOZILLA_SNAPSHOT >= 19
-+#if MOZILLA_SNAPSHOT >= 16
- NS_IMPL_ISUPPORTS3(KeyPairHelperWindow, nsIDOMWindowInternal, nsIDOMWindow, nsIDOMWindow2)
- #else
- NS_IMPL_ISUPPORTS2(KeyPairHelperWindow, nsIDOMWindowInternal, nsIDOMWindow)
-@@ -249,7 +249,7 @@
-     MOZ_NOT_IMPLEMENTED
- }
- 
--#if MOZILLA_SNAPSHOT >= 19
-+#if MOZILLA_SNAPSHOT >= 16
- NS_IMETHODIMP KeyPairHelperWindow::GetWindowRoot(nsIDOMEventTarget * *aEvent)
- {
-     MOZ_NOT_IMPLEMENTED
diff --git a/www/epiphany/files/patch-embed_mozilla_Makefile.in b/www/epiphany/files/patch-embed_mozilla_Makefile.in
new file mode 100644
index 000000000..d9be4935d
--- /dev/null
+++ b/www/epiphany/files/patch-embed_mozilla_Makefile.in
@@ -0,0 +1,18 @@
+--- embed/mozilla/Makefile.in.orig	Tue Jul  6 18:36:11 2004
++++ embed/mozilla/Makefile.in	Tue Jul  6 18:38:39 2004
+@@ -218,6 +218,7 @@
+ 	-I$(MOZILLA_INCLUDE_ROOT)/docshell		\
+ 	-I$(MOZILLA_INCLUDE_ROOT)/dom			\
+ 	-I$(MOZILLA_INCLUDE_ROOT)/exthandler		\
++	-I$(MOZILLA_INCLUDE_ROOT)/find			\
+ 	-I$(MOZILLA_INCLUDE_ROOT)/gfx			\
+ 	-I$(MOZILLA_INCLUDE_ROOT)/helperAppDlg		\
+ 	-I$(MOZILLA_INCLUDE_ROOT)/history		\
+@@ -228,6 +229,7 @@
+ 	-I$(MOZILLA_INCLUDE_ROOT)/nkcache		\
+ 	-I$(MOZILLA_INCLUDE_ROOT)/pipboot		\
+ 	-I$(MOZILLA_INCLUDE_ROOT)/pipnss		\
++	-I$(MOZILLA_INCLUDE_ROOT)/pref			\
+ 	-I$(MOZILLA_INCLUDE_ROOT)/shistory		\
+ 	-I$(MOZILLA_INCLUDE_ROOT)/uriloader		\
+ 	-I$(MOZILLA_INCLUDE_ROOT)/uconv			\
diff --git a/www/epiphany/files/patch-lib_egg_egg-toolbar-editor.c b/www/epiphany/files/patch-lib_egg_egg-toolbar-editor.c
new file mode 100644
index 000000000..45405d6fe
--- /dev/null
+++ b/www/epiphany/files/patch-lib_egg_egg-toolbar-editor.c
@@ -0,0 +1,18 @@
+--- lib/egg/egg-toolbar-editor.c.orig	Sat Jul  3 16:37:44 2004
++++ lib/egg/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/epiphany/pkg-plist b/www/epiphany/pkg-plist
index ddff8ab44..523aae570 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -1,19 +1,11 @@
 bin/epiphany
 bin/epiphany-bin
-etc/gconf/gconf.xml.defaults/apps/epiphany/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/epiphany/dialogs/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/epiphany/directories/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/epiphany/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/epiphany/lockdown/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/epiphany/web/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/dialogs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/directories/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/lockdown/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/web/%gconf.xml
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/epiphany-lockdown.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/epiphany-lockdown.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/epiphany-lockdown.schemas > /dev/null || /usr/bin/true
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/epiphany.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/epiphany.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/epiphany.schemas > /dev/null || /usr/bin/true
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-bookmarks.h
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-command-manager.h
 include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-cookie-manager.h
@@ -70,13 +62,14 @@ share/gnome/epiphany/art/epiphany-bookmarks.png
 share/gnome/epiphany/art/epiphany-download.png
 share/gnome/epiphany/art/epiphany-entry.png
 share/gnome/epiphany/art/epiphany-history.png
+share/gnome/epiphany/art/epiphany-popup-hidden.png
 share/gnome/epiphany/art/epiphany-secure.png
-share/gnome/epiphany/art/epiphany-tab-loading.gif
 share/gnome/epiphany/art/epiphany-unsecure.png
 share/gnome/epiphany/art/hand-open.png
 share/gnome/epiphany/conspiracy.xhtml
 share/gnome/epiphany/default-prefs.js
 share/gnome/epiphany/epiphany-bookmark-editor-ui.xml
+share/gnome/epiphany/epiphany-bookmarksbar.xml
 share/gnome/epiphany/epiphany-fs-toolbar.xml
 share/gnome/epiphany/epiphany-history-window-ui.xml
 share/gnome/epiphany/epiphany-toolbar.xml
@@ -93,12 +86,20 @@ share/gnome/help/epiphany/C/figures/ephy-bookmarkbar-smartbookmark-screenshot.pn
 share/gnome/help/epiphany/C/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/C/figures/ephy-screenshot.png
 share/gnome/help/epiphany/C/legal.xml
+share/gnome/help/epiphany/es/epiphany.xml
+share/gnome/help/epiphany/es/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/es/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/es/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/es/figures/ephy-screenshot.png
+share/gnome/help/epiphany/es/legal.xml
 share/gnome/help/epiphany/eu/epiphany.xml
 share/gnome/help/epiphany/eu/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/eu/figures/ephy-screenshot.png
 share/gnome/help/epiphany/eu/legal.xml
 share/gnome/omf/epiphany/epiphany-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/epiphany/epiphany-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/epiphany/epiphany-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/epiphany/epiphany-es.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/epiphany/epiphany-eu.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/epiphany/epiphany-eu.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/epiphany-bookmarks.png
@@ -165,6 +166,8 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
 @dirrm share/gnome/omf/epiphany
 @dirrm share/gnome/help/epiphany/eu/figures
 @dirrm share/gnome/help/epiphany/eu
+@dirrm share/gnome/help/epiphany/es/figures
+@dirrm share/gnome/help/epiphany/es
 @dirrm share/gnome/help/epiphany/C/figures
 @dirrm share/gnome/help/epiphany/C
 @dirrm share/gnome/help/epiphany
@@ -174,17 +177,6 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
 @dirrm %%DOCSDIR%%
 @dirrm include/epiphany-%%EPHY_VERSION%%/epiphany
 @dirrm include/epiphany-%%EPHY_VERSION%%
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/web
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/lockdown
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/general
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/directories
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/dialogs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany
-@dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/web
-@dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/lockdown
-@dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/general
-@dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/directories
-@dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/dialogs
-@dirrm etc/gconf/gconf.xml.defaults/apps/epiphany
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/epiphany/epiphany-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/epiphany/epiphany-es.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/epiphany/epiphany-eu.omf 2>/dev/null || /usr/bin/true