Update to 1.3.5.

Note that this version switches to galeon-style -rpath linking, so
I brought in galeon2's files/galeon script. I don't currently have
a local FreeBSD machine, so could use some testing.


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

6 files changed, 40 insertions, 54 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 6cc8d0938..dddfccf56 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	1.3.4
-PORTREVISION=	2
+PORTVERSION=	1.3.5
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.3
@@ -79,13 +78,18 @@ post-patch:
 		's|malloc\.h|stdlib.h|g'
 
 post-configure:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; \
 		s|%%X11BASE%%|${X11BASE}|g ; \
 		s|%%MOZILLA%%|${MOZILLA}|g ; \
-		s|%%FLASHPLAYER%%|${FLASHPLAYER}|g' ${WRKSRC}/src/epiphany
+		s|%%FLASHPLAYER%%|${FLASHPLAYER}|g' <${FILESDIR}/epiphany \
+		> ${WRKDIR}/epiphany
 
 pre-install:
 	@-${X11BASE}/bin/gconftool-2 --shutdown
 
+post-install:
+		@${MV} -f ${PREFIX}/bin/epiphany ${PREFIX}/bin/epiphany-bin
+		${INSTALL_SCRIPT} ${WRKDIR}/epiphany ${PREFIX}/bin
+
 .include <bsd.port.post.mk>
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index f0a6c8efb..6daaf578c 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/epiphany-1.3.4.tar.bz2) = 33c06f2ca4c86c914e3296bed6ebeb03
-SIZE (gnome2/epiphany-1.3.4.tar.bz2) = 3072343
+MD5 (gnome2/epiphany-1.3.5.tar.bz2) = b1dff6f836dcae74dc5d5ae3eaaf73a1
+SIZE (gnome2/epiphany-1.3.5.tar.bz2) = 3093681
diff --git a/www/epiphany/files/epiphany b/www/epiphany/files/epiphany
new file mode 100644
index 000000000..504fd0240
--- /dev/null
+++ b/www/epiphany/files/epiphany
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+dist_bin=`dirname $0`
+
+MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%%
+
+if [ -z "$MOZ_PLUGIN_PATH" ]; then
+    MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins
+    export MOZ_PLUGIN_PATH
+fi
+
+if [ -n "$LD_LIBRARY_PATH" ]; then
+  LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH
+else
+  LD_LIBRARY_PATH=$MOZILLA_HOME
+fi
+export LD_LIBRARY_PATH
+
+MOZILLA_FIVE_HOME=$MOZILLA_HOME
+export MOZILLA_FIVE_HOME
+
+if [ -f %%LOCALBASE%%/lib/libflashplayer.so.1 ]; then
+    LD_PRELOAD=%%LOCALBASE%%/lib/libflashplayer.so.1
+    export LD_PRELOAD
+fi
+
+exec "%%PREFIX%%/bin/epiphany-bin" "$@"
diff --git a/www/epiphany/files/patch-configure b/www/epiphany/files/patch-configure
index b21b382d1..1a23e675b 100644
--- a/www/epiphany/files/patch-configure
+++ b/www/epiphany/files/patch-configure
@@ -1,11 +1,6 @@
---- 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
+--- configure.orig	Mon Aug 16 10:29:17 2004
++++ configure	Mon Aug 16 10:31:42 2004
+@@ -21929,7 +21929,7 @@
  	MOZILLA_VERSION=99.0 # use a high number
  fi
  
diff --git a/www/epiphany/files/patch-lib_egg_egg-toolbar-editor.c b/www/epiphany/files/patch-lib_egg_egg-toolbar-editor.c
deleted file mode 100644
index 45405d6fe..000000000
--- a/www/epiphany/files/patch-lib_egg_egg-toolbar-editor.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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/files/patch-src_epiphany.in b/www/epiphany/files/patch-src_epiphany.in
deleted file mode 100644
index 23583b77f..000000000
--- a/www/epiphany/files/patch-src_epiphany.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/epiphany.in.orig	Sat Dec 20 14:35:58 2003
-+++ src/epiphany.in	Sun Dec 28 16:44:41 2003
-@@ -5,7 +5,7 @@
- MOZILLA_HOME=@MOZILLA_HOME@
- 
- if [ -z "$MOZ_PLUGIN_PATH" ]; then
--    MOZ_PLUGIN_PATH=/usr/lib/mozilla/plugins:/usr/libexec/plugins/mozilla
-+    MOZ_PLUGIN_PATH=%%X11BASE%%/lib/browser_plugins
-     export MOZ_PLUGIN_PATH
- fi
- 
-@@ -28,4 +28,9 @@
- MOZILLA_FIVE_HOME=$MOZILLA_HOME
- export MOZILLA_FIVE_HOME
- 
--exec "$dist_bin/epiphany-bin" "$@"
-+if [ -f %%FLASHPLAYER%% ]; then
-+    LD_PRELOAD=%%FLASHPLAYER%%
-+    export LD_PRELOAD
-+fi
-+
-+exec "%%PREFIX%%/bin/epiphany-bin" "$@"