Update to 0.7.1.

4 files changed, 54 insertions, 60 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 99fd4491afae..a12de21ce742 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	0.7.0
+PORTVERSION=	0.7.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.7
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 342689458235..fc33c93216a7 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1 +1 @@
-MD5 (gnome2/epiphany-0.7.0.tar.gz) = f1b12bdedefd232560de75d0dde3920e
+MD5 (gnome2/epiphany-0.7.1.tar.gz) = 17adb3ac0dc5a176631acea0c7466063
diff --git a/www/epiphany/files/patch-lib_ephy-node.c b/www/epiphany/files/patch-lib_ephy-node.c
new file mode 100644
index 000000000000..28afb360b7cb
--- /dev/null
+++ b/www/epiphany/files/patch-lib_ephy-node.c
@@ -0,0 +1,17 @@
+--- lib/ephy-node.c.orig	Sat Jun 28 11:03:58 2003
++++ lib/ephy-node.c	Sat Jun 28 11:04:22 2003
+@@ -115,12 +115,12 @@
+ static void
+ callback (long id, EphyNodeSignalData *data, gpointer *user_data)
+ {
+-        va_list valist;
++        _BSD_VA_LIST_ valist;
+ 	EphyNodeSignalType type = GPOINTER_TO_INT (user_data[1]);
+ 
+ 	if (data->type != type) return;
+ 
+-        va_copy(valist, user_data[0]);
++        valist = user_data[0];
+ 
+ 	switch (data->type)
+ 	{
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index 73308a6d0b07..745f1a868622 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -1,25 +1,15 @@
 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/downloader/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/epiphany/find/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/epiphany/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/epiphany/interface/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/epiphany/network/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/epiphany/print/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/epiphany/rendering/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/epiphany/security/%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/downloader/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/find/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/general/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/interface/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/network/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/print/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/rendering/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/security/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/web/%gconf.xml
 etc/gconf/schemas/epiphany.schemas
 libdata/bonobo/servers/GNOME_Epiphany_Automation.server
 libdata/bonobo/servers/GNOME_Epiphany_NautilusView.server
@@ -48,9 +38,6 @@ share/gnome/epiphany/glade/epiphany.glade
 share/gnome/epiphany/glade/prefs-dialog.glade
 share/gnome/epiphany/glade/print.glade
 share/gnome/epiphany/nautilus-epiphany-view.xml
-share/gnome/epiphany/starthere/index.xml
-share/gnome/epiphany/starthere/section.xsl
-share/gnome/epiphany/starthere/smartbookmarks.xml
 share/gnome/help/epiphany/C/epiphany.xml
 share/gnome/help/epiphany/C/figures/ephy-screenshot.png
 share/gnome/help/epiphany/C/legal.xml
@@ -58,58 +45,48 @@ 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/pixmaps/epiphany-bookmarks.png
 share/gnome/pixmaps/epiphany.png
-share/locale/am/LC_MESSAGES/epiphany-2.0.mo
-share/locale/be/LC_MESSAGES/epiphany-2.0.mo
-share/locale/ca/LC_MESSAGES/epiphany-2.0.mo
-share/locale/cs/LC_MESSAGES/epiphany-2.0.mo
-share/locale/da/LC_MESSAGES/epiphany-2.0.mo
-share/locale/de/LC_MESSAGES/epiphany-2.0.mo
-share/locale/el/LC_MESSAGES/epiphany-2.0.mo
-share/locale/es/LC_MESSAGES/epiphany-2.0.mo
-share/locale/fr/LC_MESSAGES/epiphany-2.0.mo
-share/locale/hu/LC_MESSAGES/epiphany-2.0.mo
-share/locale/ja/LC_MESSAGES/epiphany-2.0.mo
-share/locale/ko/LC_MESSAGES/epiphany-2.0.mo
-share/locale/li/LC_MESSAGES/epiphany-2.0.mo
-share/locale/ms/LC_MESSAGES/epiphany-2.0.mo
-share/locale/nl/LC_MESSAGES/epiphany-2.0.mo
-share/locale/no/LC_MESSAGES/epiphany-2.0.mo
-share/locale/pl/LC_MESSAGES/epiphany-2.0.mo
-share/locale/pt/LC_MESSAGES/epiphany-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/epiphany-2.0.mo
-share/locale/ru/LC_MESSAGES/epiphany-2.0.mo
-share/locale/sr/LC_MESSAGES/epiphany-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/epiphany-2.0.mo
-share/locale/sv/LC_MESSAGES/epiphany-2.0.mo
-share/locale/tr/LC_MESSAGES/epiphany-2.0.mo
-share/locale/vi/LC_MESSAGES/epiphany-2.0.mo
-share/locale/zh_TW/LC_MESSAGES/epiphany-2.0.mo
+share/locale/am/LC_MESSAGES/epiphany.mo
+share/locale/be/LC_MESSAGES/epiphany.mo
+share/locale/ca/LC_MESSAGES/epiphany.mo
+share/locale/cs/LC_MESSAGES/epiphany.mo
+share/locale/da/LC_MESSAGES/epiphany.mo
+share/locale/de/LC_MESSAGES/epiphany.mo
+share/locale/el/LC_MESSAGES/epiphany.mo
+share/locale/en_GB/LC_MESSAGES/epiphany.mo
+share/locale/es/LC_MESSAGES/epiphany.mo
+share/locale/fr/LC_MESSAGES/epiphany.mo
+share/locale/hu/LC_MESSAGES/epiphany.mo
+share/locale/ja/LC_MESSAGES/epiphany.mo
+share/locale/ko/LC_MESSAGES/epiphany.mo
+share/locale/li/LC_MESSAGES/epiphany.mo
+share/locale/ms/LC_MESSAGES/epiphany.mo
+share/locale/nl/LC_MESSAGES/epiphany.mo
+share/locale/no/LC_MESSAGES/epiphany.mo
+share/locale/pl/LC_MESSAGES/epiphany.mo
+share/locale/pt/LC_MESSAGES/epiphany.mo
+share/locale/pt_BR/LC_MESSAGES/epiphany.mo
+share/locale/ru/LC_MESSAGES/epiphany.mo
+share/locale/sr/LC_MESSAGES/epiphany.mo
+share/locale/sr@Latn/LC_MESSAGES/epiphany.mo
+share/locale/sv/LC_MESSAGES/epiphany.mo
+share/locale/tr/LC_MESSAGES/epiphany.mo
+share/locale/vi/LC_MESSAGES/epiphany.mo
+share/locale/zh_TW/LC_MESSAGES/epiphany.mo
 @dirrm share/gnome/omf/epiphany
 @dirrm share/gnome/help/epiphany/C/figures
 @dirrm share/gnome/help/epiphany/C
 @dirrm share/gnome/help/epiphany
-@dirrm share/gnome/epiphany/starthere
 @dirrm share/gnome/epiphany/glade
 @dirrm share/gnome/epiphany/art
 @dirrm share/gnome/epiphany
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/security
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/rendering
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/print
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/network
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/interface
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/web
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/general
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/find
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/downloader
 @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/security
-@dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/rendering
-@dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/print
-@dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/network
-@dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/interface
+@dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/web
 @dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/general
-@dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/find
-@dirrm etc/gconf/gconf.xml.defaults/apps/epiphany/downloader
 @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