Downgrade to 0.8.1 until numerous reported problems are fixed.

4 files changed, 37 insertions, 17 deletions

diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index fbf83d85d9f7..f18c5827c8f3 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	galeon
-PORTVERSION=	0.10.6
+PORTVERSION=	0.10.5
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		${MASTER_SITE_LOCAL:S/%SUBDIR%/sobomax/}
@@ -37,8 +37,12 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-mozilla-includes="${X11BASE}/include/mozilla" \
 		--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}"
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
-			  -D_REENTRANT ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib -L${WRKSRC} ${PTHREAD_LIBS}"
+			  -D_REENTRANT ${PTHREAD_CFLAGS} -fno-rtti" \
+		LIBS="-L${LOCALBASE}/lib -L${WRKSRC} ${PTHREAD_LIBS} ${GCC_R_LIB}"
+
+.if exists(/usr/lib/libgcc_r.a)
+GCC_R_LIB=	-lgcc_r
+.endif
 
 post-extract:
 .if !defined(WITH_FULL_MOZILLA)
diff --git a/www/galeon2/distinfo b/www/galeon2/distinfo
index 0ea9f11e936e..9a192b50290f 100644
--- a/www/galeon2/distinfo
+++ b/www/galeon2/distinfo
@@ -1 +1 @@
-MD5 (galeon-0.10.6.tar.gz) = eda0f7dc904298dcdff09e871825eaf7
+MD5 (galeon-0.10.5.tar.gz) = 1368c32bd78bb730419cd4e9dd54031e
diff --git a/www/galeon2/files/patch-ab b/www/galeon2/files/patch-ab
index b13e0b2a87bc..79e523a1f68c 100644
--- a/www/galeon2/files/patch-ab
+++ b/www/galeon2/files/patch-ab
@@ -1,18 +1,15 @@
 
 $FreeBSD$
 
---- src/galeon.in	2001/05/15 11:38:39	1.1
-+++ src/galeon.in	2001/05/15 11:42:43
-@@ -1,19 +1,15 @@
+--- src/galeon.orig	Mon Apr 30 11:46:07 2001
++++ src/galeon	Thu May  3 14:37:04 2001
+@@ -1,17 +1,13 @@
  #!/bin/sh
  
 -dist_bin=`dirname $0`
 -
  if test -n "$MOZILLA_FIVE_HOME"; then
  	MOZILLA_HOME=$MOZILLA_FIVE_HOME
--elif [ -f @MOZILLA_HOME@/chrome/embed.jar ]; then
-+elif [ -f @MOZILLA_HOME@/libgtkembedmoz.so ]; then
- 	MOZILLA_HOME=@MOZILLA_HOME@
 -elif [ -f /usr/local/mozilla/chrome/embed.jar ]; then
 -	MOZILLA_HOME=/usr/local/mozilla
 -elif [ -f /usr/lib/mozilla/chrome/embed.jar ]; then
@@ -30,11 +27,10 @@ $FreeBSD$
  else
  	echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
  	exit
-@@ -34,6 +30,6 @@
+@@ -31,5 +27,5 @@
  if [ -f ./galeon-bin ]; then
  exec ./galeon-bin "$@"
  else
 -exec $dist_bin/galeon-bin "$@"
 +exec %%PREFIX%%/bin/galeon-bin "$@"
  fi
- 
diff --git a/www/galeon2/pkg-plist b/www/galeon2/pkg-plist
index 9211542c0d90..520860ac7131 100644
--- a/www/galeon2/pkg-plist
+++ b/www/galeon2/pkg-plist
@@ -19,7 +19,6 @@ share/gnome/galeon/new_folder.xpm
 share/gnome/galeon/new_item.xpm
 share/gnome/galeon/new_separator.xpm
 share/gnome/galeon/small-close.xpm
-share/gnome/galeon/small-detach.xpm
 share/gnome/galeon/spinners/crux/001.png
 share/gnome/galeon/spinners/crux/002.png
 share/gnome/galeon/spinners/crux/003.png
@@ -99,12 +98,35 @@ share/gnome/galeon/spinners/pipeon/013.png
 share/gnome/galeon/spinners/pipeon/014.png
 share/gnome/galeon/spinners/pipeon/rest.png
 share/gnome/help/galeon/C/aboutbook.html
+share/gnome/help/galeon/C/authors.html
+share/gnome/help/galeon/C/bookmarks-importing.html
+share/gnome/help/galeon/C/bookmarks-my-portal.html
+share/gnome/help/galeon/C/bookmarks-nicks.html
+share/gnome/help/galeon/C/bookmarks-smart-bookmarks.html
+share/gnome/help/galeon/C/bookmarks-temporary-bookmarks.html
+share/gnome/help/galeon/C/bookmarks-toolbars.html
+share/gnome/help/galeon/C/bookmarks-with-images.html
+share/gnome/help/galeon/C/bookmarks.html
 share/gnome/help/galeon/C/browser-window.html
+share/gnome/help/galeon/C/bugs.html
+share/gnome/help/galeon/C/command-line-options.html
+share/gnome/help/galeon/C/compiling-from-source.html
+share/gnome/help/galeon/C/context-menus.html
+share/gnome/help/galeon/C/cookie-manager.html
+share/gnome/help/galeon/C/cookieman-images.html
+share/gnome/help/galeon/C/cookieman-sites.html
 share/gnome/help/galeon/C/docbook.css
+share/gnome/help/galeon/C/full-screen-mode.html
 share/gnome/help/galeon/C/getting-started.html
 share/gnome/help/galeon/C/index.html
 share/gnome/help/galeon/C/introduction.html
-share/gnome/help/galeon/C/ln23.html
+share/gnome/help/galeon/C/preferences.html
+share/gnome/help/galeon/C/prefs-advanced.html
+share/gnome/help/galeon/C/prefs-gnome-url-handlers.html
+share/gnome/help/galeon/C/prefs-handlers.html
+share/gnome/help/galeon/C/prefs-rendering.html
+share/gnome/help/galeon/C/prefs-user-interface.html
+share/gnome/help/galeon/C/statusbar.html
 share/gnome/help/galeon/C/stylesheet-images/caution.gif
 share/gnome/help/galeon/C/stylesheet-images/home.gif
 share/gnome/help/galeon/C/stylesheet-images/important.gif
@@ -117,6 +139,7 @@ share/gnome/help/galeon/C/stylesheet-images/toc-minus.gif
 share/gnome/help/galeon/C/stylesheet-images/toc-plus.gif
 share/gnome/help/galeon/C/stylesheet-images/up.gif
 share/gnome/help/galeon/C/stylesheet-images/warning.gif
+share/gnome/help/galeon/C/toolbar.html
 share/gnome/oaf/galeon.oaf
 share/gnome/pixmaps/galeon.png
 share/gnome/sounds/galeon/clicked.wav
@@ -136,7 +159,6 @@ share/locale/it/LC_MESSAGES/galeon.mo
 share/locale/ja/LC_MESSAGES/galeon.mo
 share/locale/ko/LC_MESSAGES/galeon.mo
 share/locale/lt/LC_MESSAGES/galeon.mo
-share/locale/ms/LC_MESSAGES/galeon.mo
 share/locale/nl/LC_MESSAGES/galeon.mo
 share/locale/no/LC_MESSAGES/galeon.mo
 share/locale/pl/LC_MESSAGES/galeon.mo
@@ -148,8 +170,6 @@ share/locale/sl/LC_MESSAGES/galeon.mo
 share/locale/sv/LC_MESSAGES/galeon.mo
 share/locale/tr/LC_MESSAGES/galeon.mo
 share/locale/uk/LC_MESSAGES/galeon.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/galeon.mo
-@dirrm share/gnome/sounds/galeon
 @dirrm share/gnome/help/galeon/C/stylesheet-images
 @dirrm share/gnome/help/galeon/C/fig
 @dirrm share/gnome/help/galeon/C