Update to 0.8.0.

5 files changed, 27 insertions, 84 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 12f6e470ebc4..f7c65181bbc2 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	0.7.3
-PORTREVISION=	1
+PORTVERSION=	0.8.0
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.7
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.8
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index be57fe6d8b1d..f178f922b20a 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1 +1 @@
-MD5 (gnome2/epiphany-0.7.3.tar.gz) = 31f8a414c7a4ecd22062ba94ebb2c99a
+MD5 (gnome2/epiphany-0.8.0.tar.gz) = f3648619a7c93bf6aa5b9e5b515c51a1
diff --git a/www/epiphany/files/patch-configure b/www/epiphany/files/patch-configure
index 462a30148646..0f5ae010c697 100644
--- a/www/epiphany/files/patch-configure
+++ b/www/epiphany/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Fri Jun  6 14:15:07 2003
-+++ configure	Thu Jun 12 14:59:44 2003
-@@ -18202,6 +18202,7 @@
+--- configure.orig	Tue Jul 15 14:31:11 2003
++++ configure	Tue Jul 15 14:31:11 2003
+@@ -18205,6 +18205,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,12 +8,3 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -20127,7 +20128,7 @@
- 
-       if test "x${nautilus_prefix}" != "x${epiphany_prefix}"; then
-     cat >>confdefs.h <<_ACEOF
--#define NAUTILUS_PREFIX "${nautilus_prefix}"
-+#define NAUTILUS_PREFIX "${epiphany_prefix}"
- _ACEOF
- 
-   fi
diff --git a/www/epiphany/files/patch-lib_ephy-node.c b/www/epiphany/files/patch-lib_ephy-node.c
deleted file mode 100644
index cbcc45b39905..000000000000
--- a/www/epiphany/files/patch-lib_ephy-node.c
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: lib/ephy-node.c
-===================================================================
-RCS file: /cvs/gnome/epiphany/lib/ephy-node.c,v
-retrieving revision 1.19
-diff -u -p -r1.19 ephy-node.c
---- lib/ephy-node.c	9 Jun 2003 13:06:19 -0000	1.19
-+++ lib/ephy-node.c	28 Jun 2003 22:46:29 -0000
-@@ -64,6 +64,12 @@ struct EphyNode
- 	EphyNodeDb *db;
- };
- 
-+typedef struct
-+{
-+	EphyNodeSignalType type;
-+	va_list valist;
-+} ENESCData;
-+
- /* evillish hacks to temporarily readlock->writelock and v.v. */
- static inline void
- write_lock_to_read_lock (EphyNode *node)
-@@ -113,14 +119,16 @@ int_hash (gconstpointer a)
- }
- 
- static void
--callback (long id, EphyNodeSignalData *data, gpointer *user_data)
-+callback (long id, EphyNodeSignalData *data, gpointer *dummy)
- {
--        va_list valist;
--	EphyNodeSignalType type = GPOINTER_TO_INT (user_data[1]);
-+	ENESCData *user_data;
-+	va_list valist;
- 
--	if (data->type != type) return;
-+	user_data = (ENESCData *) dummy;
- 
--        va_copy(valist, user_data[0]);
-+	valist = user_data->valist;
-+
-+	if (data->type != user_data->type) return;
- 
- 	switch (data->type)
- 	{
-@@ -155,18 +163,17 @@ callback (long id, EphyNodeSignalData *d
- static void
- ephy_node_emit_signal (EphyNode *node, EphyNodeSignalType type, ...)
- {
--	va_list valist;
--	gpointer data[2];
-+	ENESCData data;
-+
-+	va_start (data.valist, type);
- 
--	va_start (valist, type);
-+	data.type = type;
- 
--	data[0] = (gpointer)valist;
--	data[1] = GINT_TO_POINTER (type);
- 	g_hash_table_foreach (node->signals,
- 			      (GHFunc) callback,
--			      data);
-+			      &data);
- 
--	va_end (valist);
-+	va_end (data.valist);
- }
- 
- static void
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index 4dc4957ee3af..80406232a97b 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -11,6 +11,25 @@ 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/web/%gconf.xml
 etc/gconf/schemas/epiphany.schemas
+include/epiphany-1.0/epiphany/ephy-bookmarks.h
+include/epiphany-1.0/epiphany/ephy-dialog.h
+include/epiphany-1.0/epiphany/ephy-embed-event.h
+include/epiphany-1.0/epiphany/ephy-embed-persist.h
+include/epiphany-1.0/epiphany/ephy-embed-prefs.h
+include/epiphany-1.0/epiphany/ephy-embed-shell.h
+include/epiphany-1.0/epiphany/ephy-embed-single.h
+include/epiphany-1.0/epiphany/ephy-embed-types.h
+include/epiphany-1.0/epiphany/ephy-embed.h
+include/epiphany-1.0/epiphany/ephy-history.h
+include/epiphany-1.0/epiphany/ephy-langs.h
+include/epiphany-1.0/epiphany/ephy-node-db.h
+include/epiphany-1.0/epiphany/ephy-node.h
+include/epiphany-1.0/epiphany/ephy-notebook.h
+include/epiphany-1.0/epiphany/ephy-shell.h
+include/epiphany-1.0/epiphany/ephy-tab.h
+include/epiphany-1.0/epiphany/ephy-types.h
+include/epiphany-1.0/epiphany/ephy-window.h
+include/epiphany-1.0/epiphany/session.h
 libdata/bonobo/servers/GNOME_Epiphany_Automation.server
 libdata/bonobo/servers/GNOME_Epiphany_NautilusView.server
 share/gnome/application-registry/epiphany.applications
@@ -44,8 +63,8 @@ share/gnome/help/epiphany/C/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/pixmaps/epiphany-bookmarks.png
-share/gnome/pixmaps/epiphany.png
 share/locale/am/LC_MESSAGES/epiphany.mo
+share/locale/ar/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
@@ -72,6 +91,7 @@ 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_CN/LC_MESSAGES/epiphany.mo
 share/locale/zh_TW/LC_MESSAGES/epiphany.mo
 @dirrm share/gnome/omf/epiphany
 @dirrm share/gnome/help/epiphany/C/figures