* Update to 0.6.0

* Bring startup script more in line with galeon2

6 files changed, 38 insertions, 61 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index aced6b39a7b0..f3a73020bb78 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	0.5.0
+PORTVERSION=	0.6.0
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.5
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -82,17 +82,14 @@ post-patch:
 	@${FIND} ${WRKSRC} -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|malloc\.h|stdlib.h|g'
 
-pre-install:
-	@-${X11BASE}/bin/gconftool-2 --shutdown
-
-post-install:
-	@${RM} -f ${PREFIX}/bin/epiphany
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \
+post-configure:
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; \
 		s|%%X11BASE%%|${X11BASE}|g ; \
 		s|%%MOZILLA%%|${MOZILLA}|g ; \
-		s|%%FLASHPLAYER%%|${FLASHPLAYER}|g' < ${FILESDIR}/epiphany \
-		> ${WRKSRC}/epiphany
-	@${INSTALL_SCRIPT} ${WRKSRC}/epiphany ${PREFIX}/bin/epiphany
+		s|%%FLASHPLAYER%%|${FLASHPLAYER}|g' ${WRKSRC}/src/epiphany
+
+pre-install:
+	@-${X11BASE}/bin/gconftool-2 --shutdown
 
 .include <bsd.port.post.mk>
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 9078bd8de892..fbbeb5aee2c0 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1 +1 @@
-MD5 (gnome2/epiphany-0.5.0.tar.gz) = db6ec52bf7b2bd863ceac7fde801cf5c
+MD5 (gnome2/epiphany-0.6.0.tar.gz) = 67d63a7f1b83a90543a1816b1ffcfc8e
diff --git a/www/epiphany/files/epiphany b/www/epiphany/files/epiphany
deleted file mode 100644
index 38f4b70bf621..000000000000
--- a/www/epiphany/files/epiphany
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-dist_bin=`dirname $0`
-
-if test -n "$MOZILLA_FIVE_HOME"; then
-	MOZILLA_HOME=$MOZILLA_FIVE_HOME
-elif [ -f %%X11BASE%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then
-	MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%%
-elif [ -f %%LOCALBASE%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then
-    	MOZILLA_HOME=%%LOCALBASE%%/lib/%%MOZILLA%%
-else
-	echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
-	exit
-fi
-
-LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH
-
-MOZILLA_FIVE_HOME=$MOZILLA_HOME
-export MOZILLA_FIVE_HOME
-
-MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins
-export MOZ_PLUGIN_PATH
-
-if [ -f %%FLASHPLAYER%% ]; then
-    LD_PRELOAD=%%FLASHPLAYER%%
-    export LD_PRELOAD
-fi
-
-exec %%PREFIX%%/bin/epiphany-bin "$@"
diff --git a/www/epiphany/files/patch-src_epiphany.in b/www/epiphany/files/patch-src_epiphany.in
new file mode 100644
index 000000000000..8a060f95b509
--- /dev/null
+++ b/www/epiphany/files/patch-src_epiphany.in
@@ -0,0 +1,25 @@
+--- src/epiphany.in.orig	Sat May  3 21:56:42 2003
++++ src/epiphany.in	Sat May  3 21:59:12 2003
+@@ -4,7 +4,7 @@
+ 
+ if test -n "$MOZILLA_FIVE_HOME"; then
+ 	MOZILLA_HOME=$MOZILLA_FIVE_HOME
+-elif [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then
++elif [ -f @MOZILLA_HOME@/libgtkembedmoz.so ]; then
+ 	MOZILLA_HOME=@MOZILLA_HOME@
+ else
+ 	echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
+@@ -17,4 +17,12 @@
+ MOZILLA_FIVE_HOME=$MOZILLA_HOME
+ export MOZILLA_FIVE_HOME
+ 
+-exec "$dist_bin/epiphany-bin" "$@"
++MOZ_PLUGIN_PATH=%%X11BASE%%/lib/browser_plugins
++export MOZ_PLUGIN_PATH
++
++if [ -f %%FLASHPLAYER%% ]; then
++    LD_PRELOAD=%%FLASHPLAYER%%
++    export LD_PRELOAD
++fi
++
++exec "%%PREFIX%%/bin/epiphany-bin" "$@"
diff --git a/www/epiphany/files/patch-src_prefs-dialog.c b/www/epiphany/files/patch-src_prefs-dialog.c
deleted file mode 100644
index bda3a19144aa..000000000000
--- a/www/epiphany/files/patch-src_prefs-dialog.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/prefs-dialog.c.orig	Thu Apr 24 02:14:52 2003
-+++ src/prefs-dialog.c	Thu Apr 24 02:16:05 2003
-@@ -243,13 +243,13 @@
- {
- 	GError *err;
- 	gint id;
--	err = NULL;
- 	gchar *help_preferences[] = {
- 		"ephy-preferences-appearance",
- 		"ephy-preferences-general",
- 		"ephy-preferences-ui",
- 		"ephy-preferences-advanced"
- 	};
-+	err = NULL;
- 
- 	id = gtk_notebook_get_current_page (GTK_NOTEBOOK (pd->priv->notebook));
- 
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index c527cee4a445..4c499bd8ccb3 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -26,9 +26,11 @@ etc/gconf/gconf.xml.defaults/schemas/apps/epiphany/rendering/%gconf.xml
 etc/gconf/schemas/epiphany.schemas
 libdata/bonobo/servers/GNOME_Epiphany_Automation.server
 libdata/bonobo/servers/GNOME_Epiphany_NautilusView.server
+share/gnome/application-registry/epiphany.applications
 share/gnome/applications/bme.desktop
 share/gnome/applications/epiphany.desktop
 share/gnome/epiphany/art/epiphany-bookmark-page.png
+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-fullscreen.png
@@ -39,11 +41,10 @@ share/gnome/epiphany/art/epiphany-send-link.png
 share/gnome/epiphany/art/epiphany-tab-loading.gif
 share/gnome/epiphany/art/epiphany-unsecure.png
 share/gnome/epiphany/art/epiphany-viewsource.png
-share/gnome/epiphany/art/epiphany.png
 share/gnome/epiphany/conspiracy.xhtml
 share/gnome/epiphany/default-prefs.js
 share/gnome/epiphany/epiphany-bookmark-editor-ui.xml
-share/gnome/epiphany/epiphany-toolbar-popup-ui.xml
+share/gnome/epiphany/epiphany-history-window-ui.xml
 share/gnome/epiphany/epiphany-toolbar.xml
 share/gnome/epiphany/epiphany-ui.xml
 share/gnome/epiphany/epiphany.xhtml
@@ -71,6 +72,7 @@ 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/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