Update to 1.3.17.

7 files changed, 55 insertions, 88 deletions

diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index 7cf7af6..ded25d0 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	galeon2
-PORTVERSION=	1.3.16
-PORTREVISION=	2
+PORTVERSION=	1.3.17
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://osdn.dl.sourceforge.net/sourceforge/galeon/
@@ -86,13 +85,18 @@ post-patch:
 		${WRKSRC}/ui/galeon-bookmarks-editor-ui.xml.in
 
 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/galeon
+		s|%%FLASHPLAYER%%|${FLASHPLAYER}|g' < ${FILESDIR}/galeon \
+		> ${WRKDIR}/galeon
 
 pre-install:
 	@-${X11BASE}/bin/gconftool-2 --shutdown
 
+post-install:
+	@${MV} -f ${PREFIX}/bin/galeon ${PREFIX}/bin/galeon-bin
+	${INSTALL_SCRIPT} ${WRKDIR}/galeon ${PREFIX}/bin
+
 .include <bsd.port.post.mk>
diff --git a/www/galeon2/distinfo b/www/galeon2/distinfo
index 237f90a..f563b8b 100644
--- a/www/galeon2/distinfo
+++ b/www/galeon2/distinfo
@@ -1,2 +1,2 @@
-MD5 (galeon-1.3.16.tar.bz2) = 539f8c4672a7e7448745f35110ec1529
-SIZE (galeon-1.3.16.tar.bz2) = 3572080
+MD5 (galeon-1.3.17.tar.bz2) = 781ac1c9e15fa4c2b367b195e78d1ab2
+SIZE (galeon-1.3.17.tar.bz2) = 3635524
diff --git a/www/galeon2/files/galeon b/www/galeon2/files/galeon
new file mode 100644
index 0000000..4b824ad
--- /dev/null
+++ b/www/galeon2/files/galeon
@@ -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/galeon-bin" "$@"
diff --git a/www/galeon2/files/patch-ab b/www/galeon2/files/patch-ab
deleted file mode 100644
index 2f0e0e8..0000000
--- a/www/galeon2/files/patch-ab
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/galeon.in.orig	Thu Apr  3 15:08:00 2003
-+++ src/galeon.in	Sat Apr 19 23:10:10 2003
-@@ -4,18 +4,14 @@
- 
- 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@
--elif [ -f /usr/local/mozilla/chrome/comm.jar ]; then
--	MOZILLA_HOME=/usr/local/mozilla
--elif [ -f /usr/lib/mozilla/chrome/comm.jar ]; then
--	MOZILLA_HOME=/usr/lib/mozilla
--elif [ -f /opt/mozilla/chrome/comm.jar ]; then
--	MOZILLA_HOME=/opt/mozilla
--elif [ -f /usr/lib/mozilla-0.9.7/chrome/comm.jar ]; then
--	MOZILLA_HOME=/usr/lib/mozilla-0.9.7/
--elif [ -f /opt/gnome/lib/mozilla/chrome/comm.jar ]; then
--        MOZILLA_HOME=/opt/gnome/lib/mozilla/
-+elif [ -f %%LOCALBASE%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then
-+    	MOZILLA_HOME=%%LOCALBASE%%/lib/%%MOZILLA%%
-+elif [ -f %%X11BASE%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then
-+    	MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%%
-+elif [ -f %%PREFIX%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then
-+    	MOZILLA_HOME=%%PREFIX%%/lib/%%MOZILLA%%
- else
- 	echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
- 	exit
-@@ -27,11 +23,12 @@
- MOZILLA_FIVE_HOME=$MOZILLA_HOME
- export MOZILLA_FIVE_HOME
- 
--# for some reason this lets Galeon start properly on Red Hat 7.1 systems
--if [ -f /etc/redhat-release ]; then
--	if [ "`cat /etc/redhat-release`" = "Red Hat Linux release 7.1 (Seawolf)"  ]; then
--   	 export LD_ASSUME_KERNEL=2.2.5
--	fi
-+MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins
-+export MOZ_PLUGIN_PATH
-+
-+if [ -f %%FLASHPLAYER%% ]; then
-+    LD_PRELOAD=%%FLASHPLAYER%%
-+    export LD_PRELOAD
- fi
- 
--exec "$dist_bin/galeon-bin" "$@"
-+exec "%%PREFIX%%/bin/galeon-bin" "$@"
diff --git a/www/galeon2/files/patch-configure b/www/galeon2/files/patch-configure
index d627d9d..c9c3f46 100644
--- a/www/galeon2/files/patch-configure
+++ b/www/galeon2/files/patch-configure
@@ -1,37 +1,6 @@
---- configure.orig	Sat Jul  3 16:37:01 2004
-+++ configure	Sat Jul  3 16:40:21 2004
-@@ -1705,30 +1705,7 @@
- echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
- 
--if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
--  # Keeping the `.' argument allows $(mkdir_p) to be used without
--  # argument.  Indeed, we sometimes output rules like
--  #   $(mkdir_p) $(somedir)
--  # where $(somedir) is conditionally defined.
--  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
--  # expensive solution, as it forces Make to start a sub-shell.)
-   mkdir_p='mkdir -p -- .'
--else
--  # On NextStep and OpenStep, the `mkdir' command does not
--  # recognize any option.  It will interpret all options as
--  # directories to create, and then abort because `.' already
--  # exists.
--  for d in ./-p ./--version;
--  do
--    test -d $d && rmdir $d
--  done
--  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
--  if test -f "$ac_aux_dir/mkinstalldirs"; then
--    mkdir_p='$(mkinstalldirs)'
--  else
--    mkdir_p='$(install_sh) -d'
--  fi
--fi
- 
- for ac_prog in gawk mawk nawk awk
- do
-@@ -22732,11 +22709,11 @@
+--- configure.orig	Mon Aug  9 23:57:15 2004
++++ configure	Mon Aug  9 23:57:15 2004
+@@ -22744,11 +22744,11 @@
  echo "$as_me:$LINENO: result: $MOZILLA_VERSION$autodetect" >&5
  echo "${ECHO_T}$MOZILLA_VERSION$autodetect" >&6
  
diff --git a/www/galeon2/files/patch-src_popup-commands.c b/www/galeon2/files/patch-src_popup-commands.c
new file mode 100644
index 0000000..510f87b
--- /dev/null
+++ b/www/galeon2/files/patch-src_popup-commands.c
@@ -0,0 +1,15 @@
+--- src/popup-commands.c.orig	Tue Aug 10 00:31:14 2004
++++ src/popup-commands.c	Tue Aug 10 00:31:21 2004
+@@ -333,11 +333,11 @@
+ 			GaleonPopup *popup)
+ {
+ 	GaleonEmbed *embed;
++	char *location;
+ 
+ 	embed = galeon_popup_get_embed (popup);
+ 	g_return_if_fail (GALEON_IS_EMBED (embed));
+ 		
+-	char *location;
+ 	galeon_embed_get_location (embed, FALSE, FALSE, &location);
+ 	popup_copy_to_clipboard (popup, location);
+ 	g_free (location);
diff --git a/www/galeon2/pkg-plist b/www/galeon2/pkg-plist
index 763d55b..62e40d6 100644
--- a/www/galeon2/pkg-plist
+++ b/www/galeon2/pkg-plist
@@ -15,7 +15,6 @@ share/gnome/galeon/about_logo.png
 share/gnome/galeon/autoscroll.xpm
 share/gnome/galeon/bookmarks-editor-small.glade
 share/gnome/galeon/bookmarks-editor.glade
-share/gnome/galeon/bookmarks-find.glade
 share/gnome/galeon/bookmarks.glade
 share/gnome/galeon/bug.png
 share/gnome/galeon/certificate-dialogs.glade