Update to 1.3.3. This should fix a problem where the spinner disappears

after updating to libbonoboui-2.2.0.1.

5 files changed, 24 insertions, 38 deletions

diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index 6f6bbef8f7e..683744ff4de 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	galeon2
-PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTVERSION=	1.3.3
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/2$//}
@@ -21,10 +20,10 @@ BUILD_DEPENDS=	${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed
 LIB_DEPENDS=	gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
 RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
 
-MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.3b"
+MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.3"
 
-MOZILLA=	mozilla-devel-gtk2
-HEADERS_SUFX=	-devel
+MOZILLA=	mozilla-gtk2
+HEADERS_SUFX=
 
 #.if !defined(WITH_MOZILLA)
 #MOZILLA=	mozilla-gtk2
@@ -56,6 +55,8 @@ CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=		galeon.1
 
+FLASHPLAYER=	${LOCALBASE}/lib/libflashplayer.so.1
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} > 500000
@@ -84,7 +85,8 @@ post-configure:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; \
 		s|%%X11BASE%%|${X11BASE}|g ; \
-		s|%%MOZILLA%%|${MOZILLA}|g' ${WRKSRC}/src/galeon
+		s|%%MOZILLA%%|${MOZILLA}|g ; \
+		s|%%FLASHPLAYER%%|${FLASHPLAYER}|g' ${WRKSRC}/src/galeon
 
 pre-install:
 	@-${X11BASE}/bin/gconftool --shutdown
diff --git a/www/galeon2/distinfo b/www/galeon2/distinfo
index c9f8007194c..9f2f14fc13f 100644
--- a/www/galeon2/distinfo
+++ b/www/galeon2/distinfo
@@ -1 +1 @@
-MD5 (galeon-1.3.2.tar.gz) = bbec6131a4fecd655f389193a4e35beb
+MD5 (galeon-1.3.3.tar.gz) = e08a66e4c263d24532aacdd695bc75e5
diff --git a/www/galeon2/files/patch-ab b/www/galeon2/files/patch-ab
index 7624969406f..b81cef0f453 100644
--- a/www/galeon2/files/patch-ab
+++ b/www/galeon2/files/patch-ab
@@ -1,5 +1,5 @@
---- src/galeon.in.orig	Sat Dec 28 23:28:29 2002
-+++ src/galeon.in	Sat Dec 28 23:31:42 2002
+--- src/galeon.in.orig	Thu Dec 27 19:13:42 2001
++++ src/galeon.in	Mon Mar 10 11:20:39 2003
 @@ -4,18 +4,14 @@
  
  if test -n "$MOZILLA_FIVE_HOME"; then
@@ -26,7 +26,7 @@
  else
  	echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
  	exit
-@@ -27,16 +23,12 @@
+@@ -27,16 +23,17 @@
  MOZILLA_FIVE_HOME=$MOZILLA_HOME
  export MOZILLA_FIVE_HOME
  
@@ -35,9 +35,13 @@
 -	if [ "`cat /etc/redhat-release`" = "Red Hat Linux release 7.1 (Seawolf)"  ]; then
 -   	 export LD_ASSUME_KERNEL=2.2.5
 -	fi
--fi
 +MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins
 +export MOZ_PLUGIN_PATH
++
++if [ -f %%FLASHPLAYER%% ]; then
++    LD_PRELOAD=%%FLASHPLAYER%%
++    export LD_PRELOAD
+ fi
  
  if [ -f ./galeon-bin ]; then
  exec ./galeon-bin "$@"
diff --git a/www/galeon2/files/patch-mozilla_ContentHandler.cpp b/www/galeon2/files/patch-mozilla_ContentHandler.cpp
deleted file mode 100644
index f392add3efb..00000000000
--- a/www/galeon2/files/patch-mozilla_ContentHandler.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
---- mozilla/ContentHandler.cpp.orig	Fri Feb 21 00:06:59 2003
-+++ mozilla/ContentHandler.cpp	Fri Feb 21 00:04:32 2003
-@@ -427,11 +427,11 @@
- 
- NS_METHOD GContentHandler::FindHelperApp (void)
- {
--	if (mUrlHelper)
--	{
-+//	if (mUrlHelper)
-+//	{
- 		return LaunchHelperApp ();
--	}
--	else
-+//	}
-+/*	else
- 	{
- 		if (NS_SUCCEEDED(SynchroniseMIMEInfo()))
- 		{
-@@ -441,7 +441,7 @@
- 		{
- 				return NS_ERROR_FAILURE;
- 		}
--	}
-+	}*/
- }
- 
- NS_METHOD GContentHandler::LaunchHelperApp (void)
diff --git a/www/galeon2/pkg-plist b/www/galeon2/pkg-plist
index ad07e76b584..88b3e427046 100644
--- a/www/galeon2/pkg-plist
+++ b/www/galeon2/pkg-plist
@@ -66,8 +66,11 @@ share/gnome/galeon/about_logo.png
 share/gnome/galeon/autoscroll.xpm
 share/gnome/galeon/bookmarks-editor.glade
 share/gnome/galeon/bookmarks.glade
+share/gnome/galeon/bug.png
+share/gnome/galeon/debian.png
 share/gnome/galeon/default-bookmarks.xbel
 share/gnome/galeon/fetch_favicon.xpm
+share/gnome/galeon/fonts.png
 share/gnome/galeon/freshmeat.png
 share/gnome/galeon/galeon-bookmark-alias-mark.png
 share/gnome/galeon/galeon-bookmark.png
@@ -81,6 +84,7 @@ share/gnome/galeon/galeon-separator.png
 share/gnome/galeon/galeon-viewsource.png
 share/gnome/galeon/galeon.glade
 share/gnome/galeon/galeon.png
+share/gnome/galeon/general.png
 share/gnome/galeon/gnu.png
 share/gnome/galeon/google.png
 share/gnome/galeon/google_groups.png
@@ -88,6 +92,7 @@ share/gnome/galeon/google_images.png
 share/gnome/galeon/imdb_movies.png
 share/gnome/galeon/logo.png
 share/gnome/galeon/myportal.css
+share/gnome/galeon/network.png
 share/gnome/galeon/new_alias.xpm
 share/gnome/galeon/new_alias_small.xpm
 share/gnome/galeon/new_folder.xpm
@@ -160,6 +165,8 @@ share/gnome/galeon/spinners/pipeon/013.png
 share/gnome/galeon/spinners/pipeon/014.png
 share/gnome/galeon/spinners/pipeon/rest.png
 share/gnome/galeon/stocks.png
+share/gnome/galeon/stop.png
+share/gnome/galeon/tabs.png
 share/gnome/galeon/toc.css
 share/gnome/galeon/toolbar-editor.glade
 share/gnome/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml