Update to 1.2.6.

4 files changed, 15 insertions, 18 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 21e21e99e8e6..e06d7d907ef0 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	1.2.5
+PORTVERSION=	1.2.6
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.2
@@ -30,7 +30,7 @@ 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.7b"
+MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.7rc3"
 .else
 MOZILLA=	mozilla
 HEADERS_SUFX=
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 9ebcadcd08e4..3941cf2eef69 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/epiphany-1.2.5.tar.bz2) = 5e2be09bc1c54d2e7c1ae59a0016b16d
-SIZE (gnome2/epiphany-1.2.5.tar.bz2) = 2529219
+MD5 (gnome2/epiphany-1.2.6.tar.bz2) = 6dedf570ddb9106ecd6be624f009a35a
+SIZE (gnome2/epiphany-1.2.6.tar.bz2) = 2807440
diff --git a/www/epiphany/files/patch-lib_ephy-dialog.c b/www/epiphany/files/patch-lib_ephy-dialog.c
deleted file mode 100644
index 755eb1c43a99..000000000000
--- a/www/epiphany/files/patch-lib_ephy-dialog.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- lib/ephy-dialog.c.orig	Thu Apr 29 02:42:26 2004
-+++ lib/ephy-dialog.c	Thu Apr 29 02:42:46 2004
-@@ -584,9 +584,10 @@
- 		}
- 		else
- 		{
-+			char *v;
- 			gtk_combo_box_set_active (GTK_COMBO_BOX (info->widget), -1);
- 
--			char *v = g_strdup_value_contents (value);
-+			v = g_strdup_value_contents (value);
- 			g_warning ("Value '%s' not found in model for combo %s\n", v, info->id);
- 			g_free (v);
- 		}
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index 150a251aa3c6..d06d3228ad4b 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -87,12 +87,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
@@ -148,6 +156,8 @@ share/locale/sr/LC_MESSAGES/epiphany.mo
 share/locale/sr@Latn/LC_MESSAGES/epiphany.mo
 share/locale/sv/LC_MESSAGES/epiphany.mo
 share/locale/ta/LC_MESSAGES/epiphany.mo
+share/locale/th/LC_MESSAGES/epiphany.mo
+share/locale/tk/LC_MESSAGES/epiphany.mo
 share/locale/tr/LC_MESSAGES/epiphany.mo
 share/locale/uk/LC_MESSAGES/epiphany.mo
 share/locale/vi/LC_MESSAGES/epiphany.mo
@@ -180,3 +190,4 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
 @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-eu.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