Update to 0.12.1.

10 files changed, 178 insertions, 94 deletions

diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index a0d6033d4b27..310cbed31d12 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	galeon
-PORTVERSION=	0.12
-PORTREVISION=	1
+PORTVERSION=	0.12.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,7 +21,7 @@ RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZIL
 
 #BROKEN=		"b0rken with Mozilla-0.9.1"
 
-WITH_FULL_MOZILLA=	"Problems with missed scrollbars when linked with mozilla-embedded"
+#WITH_FULL_MOZILLA=	"Problems with missed scrollbars when linked with mozilla-embedded"
 
 .if !defined(WITH_FULL_MOZILLA)
 MOZILLA=	mozilla-embedded
@@ -40,6 +39,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -D_REENTRANT ${PTHREAD_CFLAGS}"
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		MSGFMT=${LOCALBASE}/bin/msgfmt-new \
 		XGETTEXT=${LOCALBASE}/bin/xgettext-new
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=		galeon.1
 
diff --git a/www/galeon/distinfo b/www/galeon/distinfo
index 115c20952890..cefcc6c07236 100644
--- a/www/galeon/distinfo
+++ b/www/galeon/distinfo
@@ -1 +1 @@
-MD5 (galeon-0.12.tar.gz) = fd66bf27c06ecb8a764760f4bd1ae98b
+MD5 (galeon-0.12.1.tar.gz) = 969458a54c3bdf0486403ccbe0b8d9e1
diff --git a/www/galeon/files/patch-ab b/www/galeon/files/patch-ab
index 985baef969a1..8dbec0ff8aee 100644
--- a/www/galeon/files/patch-ab
+++ b/www/galeon/files/patch-ab
@@ -1,13 +1,10 @@
 
 $FreeBSD$
 
---- src/galeon.in.orig	Tue Jul  3 13:30:53 2001
-+++ src/galeon.in	Wed Jul  4 18:39:12 2001
-@@ -1,25 +1,15 @@
- #!/bin/sh
+--- src/galeon.in.orig	Wed Sep 12 20:50:45 2001
++++ src/galeon.in	Mon Sep 17 19:13:21 2001
+@@ -4,28 +4,14 @@
  
--dist_bin=`dirname $0`
--
  if test -n "$MOZILLA_FIVE_HOME"; then
  	MOZILLA_HOME=$MOZILLA_FIVE_HOME
 -elif [ -f @MOZILLA_HOME@/chrome/embed.jar ]; then
@@ -25,6 +22,12 @@ $FreeBSD$
 -	MOZILLA_HOME=/usr/lib/mozilla-0.9.1/
 -elif [ -f /usr/lib/mozilla-0.9.2/chrome/embed.jar ]; then
 -	MOZILLA_HOME=/usr/lib/mozilla-0.9.2/
+-elif [ -f /usr/lib/mozilla-0.9.3/chrome/embed.jar ]; then
+-	MOZILLA_HOME=/usr/lib/mozilla-0.9.3/
+-elif [ -f /usr/lib/mozilla-0.9.4/chrome/embed.jar ]; then
+-	MOZILLA_HOME=/usr/lib/mozilla-0.9.4/
+-elif [ -f /usr/lib/mozilla-0.9.5/chrome/embed.jar ]; then
+-	MOZILLA_HOME=/usr/lib/mozilla-0.9.5/
 -elif [ -f /opt/gnome/lib/mozilla/chrome/embed.jar ]; then
 -        MOZILLA_HOME=/opt/gnome/lib/mozilla/
 +elif [ -f %%LOCALBASE%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then
@@ -36,7 +39,7 @@ $FreeBSD$
  else
  	echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
  	exit
-@@ -31,16 +21,9 @@
+@@ -37,16 +23,9 @@
  MOZILLA_FIVE_HOME=$MOZILLA_HOME
  export MOZILLA_FIVE_HOME
  
diff --git a/www/galeon/files/patch-configure b/www/galeon/files/patch-configure
index 7f6c287774f7..49269188389f 100644
--- a/www/galeon/files/patch-configure
+++ b/www/galeon/files/patch-configure
@@ -1,20 +1,20 @@
 
 $FreeBSD$
 
---- configure	2001/07/04 17:52:53	1.1
-+++ configure	2001/07/04 17:53:44
-@@ -6043,10 +6043,10 @@
- s%@INSTALL_DATA@%$INSTALL_DATA%g
- s%@PACKAGE@%$PACKAGE%g
- s%@VERSION@%$VERSION%g
--s%@ACLOCAL@%$ACLOCAL%g
--s%@AUTOCONF@%$AUTOCONF%g
--s%@AUTOMAKE@%$AUTOMAKE%g
--s%@AUTOHEADER@%$AUTOHEADER%g
-+s%@ACLOCAL@%/usr/bin/true%g
-+s%@AUTOCONF@%/usr/bin/true%g
-+s%@AUTOMAKE@%/usr/bin/true%g
-+s%@AUTOHEADER@%/usr/bin/true%g
- s%@MAKEINFO@%$MAKEINFO%g
- s%@SET_MAKE@%$SET_MAKE%g
- s%@XML_I18N_MERGE_OAF_RULE@%$XML_I18N_MERGE_OAF_RULE%g
+--- configure.orig	Mon Sep 17 19:13:48 2001
++++ configure	Mon Sep 17 19:14:42 2001
+@@ -13060,10 +13060,10 @@
+ s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+ s,@PACKAGE@,$PACKAGE,;t t
+ s,@VERSION@,$VERSION,;t t
+-s,@ACLOCAL@,$ACLOCAL,;t t
+-s,@AUTOCONF@,$AUTOCONF,;t t
+-s,@AUTOMAKE@,$AUTOMAKE,;t t
+-s,@AUTOHEADER@,$AUTOHEADER,;t t
++s,@ACLOCAL@,/usr/bin/true,;t t
++s,@AUTOCONF@,/usr/bin/true,;t t
++s,@AUTOMAKE@,/usr/bin/true,;t t
++s,@AUTOHEADER@,/usr/bin/true,;t t
+ s,@MAKEINFO@,$MAKEINFO,;t t
+ s,@SET_MAKE@,$SET_MAKE,;t t
+ s,@build@,$build,;t t
diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist
index 61cde383f1eb..5b5d506ee3b1 100644
--- a/www/galeon/pkg-plist
+++ b/www/galeon/pkg-plist
@@ -1,6 +1,6 @@
 bin/galeon
 bin/galeon-bin
-bin/galeon-config-clean
+bin/galeon-config-tool
 etc/gconf/gconf.xml.defaults/apps/galeon/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Crash/%gconf.xml
@@ -9,11 +9,13 @@ etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Network/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Persistent/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Bookmarks/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Find/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/General/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History/Session/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Downloading/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Help/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Mime/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Programs/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Print/%gconf.xml
@@ -39,11 +41,13 @@ etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Network/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Persistent/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Bookmarks/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Find/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/General/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History/Session/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Downloading/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Help/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Mime/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Programs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Print/%gconf.xml
@@ -64,6 +68,8 @@ etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Windows/%gconf.xml
 etc/gconf/schemas/galeon.schemas
 etc/sound/events/galeon.soundlist
 share/gnome/apps/Internet/galeon.desktop
+share/gnome/galeon/BackHistory.png
+share/gnome/galeon/ForwardHistory.png
 share/gnome/galeon/about_logo.png
 share/gnome/galeon/babelfish.png
 share/gnome/galeon/bookmarks.glade
@@ -78,6 +84,8 @@ share/gnome/galeon/dir.xpm
 share/gnome/galeon/dir_open.xpm
 share/gnome/galeon/download.png
 share/gnome/galeon/drag-url-icon.png
+share/gnome/galeon/filters.glade
+share/gnome/galeon/filters.xml
 share/gnome/galeon/fonts.png
 share/gnome/galeon/freshmeat.png
 share/gnome/galeon/galeon-composite.png
@@ -89,6 +97,7 @@ share/gnome/galeon/google.png
 share/gnome/galeon/harddrive.png
 share/gnome/galeon/history.png
 share/gnome/galeon/i-bookmark.xpm
+share/gnome/galeon/insecure.xpm
 share/gnome/galeon/link.xpm
 share/gnome/galeon/logo.png
 share/gnome/galeon/mime.png
@@ -107,6 +116,7 @@ share/gnome/galeon/preferences.glade
 share/gnome/galeon/programs.png
 share/gnome/galeon/prompts.glade
 share/gnome/galeon/rpm.png
+share/gnome/galeon/secure.xpm
 share/gnome/galeon/small-close.xpm
 share/gnome/galeon/small-detach.xpm
 share/gnome/galeon/small-menu.xpm
@@ -169,6 +179,10 @@ share/gnome/galeon/spinners/pipeon/014.png
 share/gnome/galeon/spinners/pipeon/rest.png
 share/gnome/galeon/stop.png
 share/gnome/galeon/tabs.png
+share/gnome/galeon/tb_drag_arrow_down.xpm
+share/gnome/galeon/tb_drag_arrow_left.xpm
+share/gnome/galeon/tb_drag_arrow_right.xpm
+share/gnome/galeon/tb_drag_arrow_up.xpm
 share/gnome/galeon/themes/Glass/Back.png
 share/gnome/galeon/themes/Glass/Forward.png
 share/gnome/galeon/themes/Glass/Home.png
@@ -176,36 +190,46 @@ share/gnome/galeon/themes/Glass/New.png
 share/gnome/galeon/themes/Glass/Refresh.png
 share/gnome/galeon/themes/Glass/Stop.png
 share/gnome/galeon/themes/Glass/Up.png
-share/gnome/galeon/themes/GlassHuge/Back.png
-share/gnome/galeon/themes/GlassHuge/Forward.png
-share/gnome/galeon/themes/GlassHuge/Home.png
-share/gnome/galeon/themes/GlassHuge/New.png
-share/gnome/galeon/themes/GlassHuge/Refresh.png
-share/gnome/galeon/themes/GlassHuge/Stop.png
-share/gnome/galeon/themes/GlassHuge/Up.png
-share/gnome/galeon/themes/GlassLarge/Back.png
-share/gnome/galeon/themes/GlassLarge/Forward.png
-share/gnome/galeon/themes/GlassLarge/Home.png
-share/gnome/galeon/themes/GlassLarge/New.png
-share/gnome/galeon/themes/GlassLarge/Refresh.png
-share/gnome/galeon/themes/GlassLarge/Stop.png
-share/gnome/galeon/themes/GlassLarge/Up.png
 share/gnome/galeon/themes/Konqueror/Back.png
 share/gnome/galeon/themes/Konqueror/Forward.png
 share/gnome/galeon/themes/Konqueror/Home.png
 share/gnome/galeon/themes/Konqueror/Refresh.png
 share/gnome/galeon/themes/Konqueror/Stop.png
+share/gnome/galeon/themes/Micro/Back.png
+share/gnome/galeon/themes/Micro/Forward.png
+share/gnome/galeon/themes/Micro/Home.png
+share/gnome/galeon/themes/Micro/New.png
+share/gnome/galeon/themes/Micro/Refresh.png
+share/gnome/galeon/themes/Micro/Stop.png
+share/gnome/galeon/themes/Micro/Up.png
 share/gnome/galeon/themes/MozillaModern/Back.png
 share/gnome/galeon/themes/MozillaModern/Forward.png
+share/gnome/galeon/themes/MozillaModern/Go.png
 share/gnome/galeon/themes/MozillaModern/Home.png
 share/gnome/galeon/themes/MozillaModern/Print.png
 share/gnome/galeon/themes/MozillaModern/Refresh.png
 share/gnome/galeon/themes/MozillaModern/Stop.png
+share/gnome/galeon/themes/MozillaModern/Up.png
+share/gnome/galeon/themes/MozillaModernSmall/Back.png
+share/gnome/galeon/themes/MozillaModernSmall/Forward.png
+share/gnome/galeon/themes/MozillaModernSmall/Go.png
+share/gnome/galeon/themes/MozillaModernSmall/Home.png
+share/gnome/galeon/themes/MozillaModernSmall/Print.png
+share/gnome/galeon/themes/MozillaModernSmall/Refresh.png
+share/gnome/galeon/themes/MozillaModernSmall/Stop.png
+share/gnome/galeon/themes/MozillaModernSmall/Up.png
 share/gnome/galeon/themes/Netscape/Back.png
 share/gnome/galeon/themes/Netscape/Forward.png
 share/gnome/galeon/themes/Netscape/Home.png
 share/gnome/galeon/themes/Netscape/Refresh.png
 share/gnome/galeon/themes/Netscape/Stop.png
+share/gnome/galeon/themes/Orion/Back.png
+share/gnome/galeon/themes/Orion/Forward.png
+share/gnome/galeon/themes/Orion/Home.png
+share/gnome/galeon/themes/Orion/New.png
+share/gnome/galeon/themes/Orion/Refresh.png
+share/gnome/galeon/themes/Orion/Stop.png
+share/gnome/galeon/themes/Orion/Up.png
 share/gnome/galeon/themes/Plastik/Back.png
 share/gnome/galeon/themes/Plastik/Forward.png
 share/gnome/galeon/themes/Plastik/Home.png
@@ -220,9 +244,17 @@ share/gnome/galeon/themes/PlastikLarge/New.png
 share/gnome/galeon/themes/PlastikLarge/Refresh.png
 share/gnome/galeon/themes/PlastikLarge/Stop.png
 share/gnome/galeon/themes/PlastikLarge/Up.png
+share/gnome/galeon/themes/Remembrance/Back.png
+share/gnome/galeon/themes/Remembrance/Forward.png
+share/gnome/galeon/themes/Remembrance/Home.png
+share/gnome/galeon/themes/Remembrance/New.png
+share/gnome/galeon/themes/Remembrance/Refresh.png
+share/gnome/galeon/themes/Remembrance/Stop.png
+share/gnome/galeon/themes/Remembrance/Up.png
 share/gnome/galeon/themes/Ska/Back.png
 share/gnome/galeon/themes/Ska/Forward.png
 share/gnome/galeon/themes/Ska/Home.png
+share/gnome/galeon/themes/Ska/New.png
 share/gnome/galeon/themes/Ska/Refresh.png
 share/gnome/galeon/themes/Ska/Stop.png
 share/gnome/galeon/themes/Ska/Up.png
@@ -252,6 +284,7 @@ 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/find.html
 share/gnome/help/galeon/C/full-screen-mode.html
 share/gnome/help/galeon/C/getting-started.html
 share/gnome/help/galeon/C/history.html
@@ -302,8 +335,8 @@ share/locale/sv/LC_MESSAGES/galeon.mo
 share/locale/tr/LC_MESSAGES/galeon.mo
 share/locale/uk/LC_MESSAGES/galeon.mo
 share/locale/wa/LC_MESSAGES/galeon.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/galeon.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/galeon.mo
+share/locale/zh_CN/LC_MESSAGES/galeon.mo
+share/locale/zh_TW/LC_MESSAGES/galeon.mo
 @exec mkdir -p %D/share/gnome/help/galeon/C/fig
 @dirrm share/gnome/sounds/galeon
 @dirrm share/gnome/help/galeon/C/stylesheet-images
@@ -312,13 +345,15 @@ share/locale/zh_TW.Big5/LC_MESSAGES/galeon.mo
 @dirrm share/gnome/help/galeon
 @dirrm share/gnome/galeon/themes/gnome-large
 @dirrm share/gnome/galeon/themes/Ska
+@dirrm share/gnome/galeon/themes/Remembrance
 @dirrm share/gnome/galeon/themes/PlastikLarge
 @dirrm share/gnome/galeon/themes/Plastik
+@dirrm share/gnome/galeon/themes/Orion
 @dirrm share/gnome/galeon/themes/Netscape
+@dirrm share/gnome/galeon/themes/MozillaModernSmall
 @dirrm share/gnome/galeon/themes/MozillaModern
+@dirrm share/gnome/galeon/themes/Micro
 @dirrm share/gnome/galeon/themes/Konqueror
-@dirrm share/gnome/galeon/themes/GlassLarge
-@dirrm share/gnome/galeon/themes/GlassHuge
 @dirrm share/gnome/galeon/themes/Glass
 @dirrm share/gnome/galeon/themes
 @dirrm share/gnome/galeon/spinners/pipeon
@@ -343,11 +378,13 @@ share/locale/zh_TW.Big5/LC_MESSAGES/galeon.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Print
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Programs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Mime
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Help
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Downloading
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History/Session
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/General
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Find
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Bookmarks
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Persistent
@@ -373,11 +410,13 @@ share/locale/zh_TW.Big5/LC_MESSAGES/galeon.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Print
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Programs
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Mime
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Help
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Downloading
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History/Session
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/General
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Find
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Bookmarks
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Persistent
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index a0d6033d4b27..310cbed31d12 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	galeon
-PORTVERSION=	0.12
-PORTREVISION=	1
+PORTVERSION=	0.12.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,7 +21,7 @@ RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZIL
 
 #BROKEN=		"b0rken with Mozilla-0.9.1"
 
-WITH_FULL_MOZILLA=	"Problems with missed scrollbars when linked with mozilla-embedded"
+#WITH_FULL_MOZILLA=	"Problems with missed scrollbars when linked with mozilla-embedded"
 
 .if !defined(WITH_FULL_MOZILLA)
 MOZILLA=	mozilla-embedded
@@ -40,6 +39,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -D_REENTRANT ${PTHREAD_CFLAGS}"
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		MSGFMT=${LOCALBASE}/bin/msgfmt-new \
 		XGETTEXT=${LOCALBASE}/bin/xgettext-new
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 MAN1=		galeon.1
 
diff --git a/www/galeon2/distinfo b/www/galeon2/distinfo
index 115c20952890..cefcc6c07236 100644
--- a/www/galeon2/distinfo
+++ b/www/galeon2/distinfo
@@ -1 +1 @@
-MD5 (galeon-0.12.tar.gz) = fd66bf27c06ecb8a764760f4bd1ae98b
+MD5 (galeon-0.12.1.tar.gz) = 969458a54c3bdf0486403ccbe0b8d9e1
diff --git a/www/galeon2/files/patch-ab b/www/galeon2/files/patch-ab
index 985baef969a1..8dbec0ff8aee 100644
--- a/www/galeon2/files/patch-ab
+++ b/www/galeon2/files/patch-ab
@@ -1,13 +1,10 @@
 
 $FreeBSD$
 
---- src/galeon.in.orig	Tue Jul  3 13:30:53 2001
-+++ src/galeon.in	Wed Jul  4 18:39:12 2001
-@@ -1,25 +1,15 @@
- #!/bin/sh
+--- src/galeon.in.orig	Wed Sep 12 20:50:45 2001
++++ src/galeon.in	Mon Sep 17 19:13:21 2001
+@@ -4,28 +4,14 @@
  
--dist_bin=`dirname $0`
--
  if test -n "$MOZILLA_FIVE_HOME"; then
  	MOZILLA_HOME=$MOZILLA_FIVE_HOME
 -elif [ -f @MOZILLA_HOME@/chrome/embed.jar ]; then
@@ -25,6 +22,12 @@ $FreeBSD$
 -	MOZILLA_HOME=/usr/lib/mozilla-0.9.1/
 -elif [ -f /usr/lib/mozilla-0.9.2/chrome/embed.jar ]; then
 -	MOZILLA_HOME=/usr/lib/mozilla-0.9.2/
+-elif [ -f /usr/lib/mozilla-0.9.3/chrome/embed.jar ]; then
+-	MOZILLA_HOME=/usr/lib/mozilla-0.9.3/
+-elif [ -f /usr/lib/mozilla-0.9.4/chrome/embed.jar ]; then
+-	MOZILLA_HOME=/usr/lib/mozilla-0.9.4/
+-elif [ -f /usr/lib/mozilla-0.9.5/chrome/embed.jar ]; then
+-	MOZILLA_HOME=/usr/lib/mozilla-0.9.5/
 -elif [ -f /opt/gnome/lib/mozilla/chrome/embed.jar ]; then
 -        MOZILLA_HOME=/opt/gnome/lib/mozilla/
 +elif [ -f %%LOCALBASE%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then
@@ -36,7 +39,7 @@ $FreeBSD$
  else
  	echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
  	exit
-@@ -31,16 +21,9 @@
+@@ -37,16 +23,9 @@
  MOZILLA_FIVE_HOME=$MOZILLA_HOME
  export MOZILLA_FIVE_HOME
  
diff --git a/www/galeon2/files/patch-configure b/www/galeon2/files/patch-configure
index 7f6c287774f7..49269188389f 100644
--- a/www/galeon2/files/patch-configure
+++ b/www/galeon2/files/patch-configure
@@ -1,20 +1,20 @@
 
 $FreeBSD$
 
---- configure	2001/07/04 17:52:53	1.1
-+++ configure	2001/07/04 17:53:44
-@@ -6043,10 +6043,10 @@
- s%@INSTALL_DATA@%$INSTALL_DATA%g
- s%@PACKAGE@%$PACKAGE%g
- s%@VERSION@%$VERSION%g
--s%@ACLOCAL@%$ACLOCAL%g
--s%@AUTOCONF@%$AUTOCONF%g
--s%@AUTOMAKE@%$AUTOMAKE%g
--s%@AUTOHEADER@%$AUTOHEADER%g
-+s%@ACLOCAL@%/usr/bin/true%g
-+s%@AUTOCONF@%/usr/bin/true%g
-+s%@AUTOMAKE@%/usr/bin/true%g
-+s%@AUTOHEADER@%/usr/bin/true%g
- s%@MAKEINFO@%$MAKEINFO%g
- s%@SET_MAKE@%$SET_MAKE%g
- s%@XML_I18N_MERGE_OAF_RULE@%$XML_I18N_MERGE_OAF_RULE%g
+--- configure.orig	Mon Sep 17 19:13:48 2001
++++ configure	Mon Sep 17 19:14:42 2001
+@@ -13060,10 +13060,10 @@
+ s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+ s,@PACKAGE@,$PACKAGE,;t t
+ s,@VERSION@,$VERSION,;t t
+-s,@ACLOCAL@,$ACLOCAL,;t t
+-s,@AUTOCONF@,$AUTOCONF,;t t
+-s,@AUTOMAKE@,$AUTOMAKE,;t t
+-s,@AUTOHEADER@,$AUTOHEADER,;t t
++s,@ACLOCAL@,/usr/bin/true,;t t
++s,@AUTOCONF@,/usr/bin/true,;t t
++s,@AUTOMAKE@,/usr/bin/true,;t t
++s,@AUTOHEADER@,/usr/bin/true,;t t
+ s,@MAKEINFO@,$MAKEINFO,;t t
+ s,@SET_MAKE@,$SET_MAKE,;t t
+ s,@build@,$build,;t t
diff --git a/www/galeon2/pkg-plist b/www/galeon2/pkg-plist
index 61cde383f1eb..5b5d506ee3b1 100644
--- a/www/galeon2/pkg-plist
+++ b/www/galeon2/pkg-plist
@@ -1,6 +1,6 @@
 bin/galeon
 bin/galeon-bin
-bin/galeon-config-clean
+bin/galeon-config-tool
 etc/gconf/gconf.xml.defaults/apps/galeon/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Crash/%gconf.xml
@@ -9,11 +9,13 @@ etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Network/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Persistent/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Bookmarks/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Find/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/General/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History/Session/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Downloading/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Help/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Mime/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Programs/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Print/%gconf.xml
@@ -39,11 +41,13 @@ etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Network/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Persistent/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Bookmarks/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Find/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/General/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History/Session/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Downloading/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Help/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Mime/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Programs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Print/%gconf.xml
@@ -64,6 +68,8 @@ etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Windows/%gconf.xml
 etc/gconf/schemas/galeon.schemas
 etc/sound/events/galeon.soundlist
 share/gnome/apps/Internet/galeon.desktop
+share/gnome/galeon/BackHistory.png
+share/gnome/galeon/ForwardHistory.png
 share/gnome/galeon/about_logo.png
 share/gnome/galeon/babelfish.png
 share/gnome/galeon/bookmarks.glade
@@ -78,6 +84,8 @@ share/gnome/galeon/dir.xpm
 share/gnome/galeon/dir_open.xpm
 share/gnome/galeon/download.png
 share/gnome/galeon/drag-url-icon.png
+share/gnome/galeon/filters.glade
+share/gnome/galeon/filters.xml
 share/gnome/galeon/fonts.png
 share/gnome/galeon/freshmeat.png
 share/gnome/galeon/galeon-composite.png
@@ -89,6 +97,7 @@ share/gnome/galeon/google.png
 share/gnome/galeon/harddrive.png
 share/gnome/galeon/history.png
 share/gnome/galeon/i-bookmark.xpm
+share/gnome/galeon/insecure.xpm
 share/gnome/galeon/link.xpm
 share/gnome/galeon/logo.png
 share/gnome/galeon/mime.png
@@ -107,6 +116,7 @@ share/gnome/galeon/preferences.glade
 share/gnome/galeon/programs.png
 share/gnome/galeon/prompts.glade
 share/gnome/galeon/rpm.png
+share/gnome/galeon/secure.xpm
 share/gnome/galeon/small-close.xpm
 share/gnome/galeon/small-detach.xpm
 share/gnome/galeon/small-menu.xpm
@@ -169,6 +179,10 @@ share/gnome/galeon/spinners/pipeon/014.png
 share/gnome/galeon/spinners/pipeon/rest.png
 share/gnome/galeon/stop.png
 share/gnome/galeon/tabs.png
+share/gnome/galeon/tb_drag_arrow_down.xpm
+share/gnome/galeon/tb_drag_arrow_left.xpm
+share/gnome/galeon/tb_drag_arrow_right.xpm
+share/gnome/galeon/tb_drag_arrow_up.xpm
 share/gnome/galeon/themes/Glass/Back.png
 share/gnome/galeon/themes/Glass/Forward.png
 share/gnome/galeon/themes/Glass/Home.png
@@ -176,36 +190,46 @@ share/gnome/galeon/themes/Glass/New.png
 share/gnome/galeon/themes/Glass/Refresh.png
 share/gnome/galeon/themes/Glass/Stop.png
 share/gnome/galeon/themes/Glass/Up.png
-share/gnome/galeon/themes/GlassHuge/Back.png
-share/gnome/galeon/themes/GlassHuge/Forward.png
-share/gnome/galeon/themes/GlassHuge/Home.png
-share/gnome/galeon/themes/GlassHuge/New.png
-share/gnome/galeon/themes/GlassHuge/Refresh.png
-share/gnome/galeon/themes/GlassHuge/Stop.png
-share/gnome/galeon/themes/GlassHuge/Up.png
-share/gnome/galeon/themes/GlassLarge/Back.png
-share/gnome/galeon/themes/GlassLarge/Forward.png
-share/gnome/galeon/themes/GlassLarge/Home.png
-share/gnome/galeon/themes/GlassLarge/New.png
-share/gnome/galeon/themes/GlassLarge/Refresh.png
-share/gnome/galeon/themes/GlassLarge/Stop.png
-share/gnome/galeon/themes/GlassLarge/Up.png
 share/gnome/galeon/themes/Konqueror/Back.png
 share/gnome/galeon/themes/Konqueror/Forward.png
 share/gnome/galeon/themes/Konqueror/Home.png
 share/gnome/galeon/themes/Konqueror/Refresh.png
 share/gnome/galeon/themes/Konqueror/Stop.png
+share/gnome/galeon/themes/Micro/Back.png
+share/gnome/galeon/themes/Micro/Forward.png
+share/gnome/galeon/themes/Micro/Home.png
+share/gnome/galeon/themes/Micro/New.png
+share/gnome/galeon/themes/Micro/Refresh.png
+share/gnome/galeon/themes/Micro/Stop.png
+share/gnome/galeon/themes/Micro/Up.png
 share/gnome/galeon/themes/MozillaModern/Back.png
 share/gnome/galeon/themes/MozillaModern/Forward.png
+share/gnome/galeon/themes/MozillaModern/Go.png
 share/gnome/galeon/themes/MozillaModern/Home.png
 share/gnome/galeon/themes/MozillaModern/Print.png
 share/gnome/galeon/themes/MozillaModern/Refresh.png
 share/gnome/galeon/themes/MozillaModern/Stop.png
+share/gnome/galeon/themes/MozillaModern/Up.png
+share/gnome/galeon/themes/MozillaModernSmall/Back.png
+share/gnome/galeon/themes/MozillaModernSmall/Forward.png
+share/gnome/galeon/themes/MozillaModernSmall/Go.png
+share/gnome/galeon/themes/MozillaModernSmall/Home.png
+share/gnome/galeon/themes/MozillaModernSmall/Print.png
+share/gnome/galeon/themes/MozillaModernSmall/Refresh.png
+share/gnome/galeon/themes/MozillaModernSmall/Stop.png
+share/gnome/galeon/themes/MozillaModernSmall/Up.png
 share/gnome/galeon/themes/Netscape/Back.png
 share/gnome/galeon/themes/Netscape/Forward.png
 share/gnome/galeon/themes/Netscape/Home.png
 share/gnome/galeon/themes/Netscape/Refresh.png
 share/gnome/galeon/themes/Netscape/Stop.png
+share/gnome/galeon/themes/Orion/Back.png
+share/gnome/galeon/themes/Orion/Forward.png
+share/gnome/galeon/themes/Orion/Home.png
+share/gnome/galeon/themes/Orion/New.png
+share/gnome/galeon/themes/Orion/Refresh.png
+share/gnome/galeon/themes/Orion/Stop.png
+share/gnome/galeon/themes/Orion/Up.png
 share/gnome/galeon/themes/Plastik/Back.png
 share/gnome/galeon/themes/Plastik/Forward.png
 share/gnome/galeon/themes/Plastik/Home.png
@@ -220,9 +244,17 @@ share/gnome/galeon/themes/PlastikLarge/New.png
 share/gnome/galeon/themes/PlastikLarge/Refresh.png
 share/gnome/galeon/themes/PlastikLarge/Stop.png
 share/gnome/galeon/themes/PlastikLarge/Up.png
+share/gnome/galeon/themes/Remembrance/Back.png
+share/gnome/galeon/themes/Remembrance/Forward.png
+share/gnome/galeon/themes/Remembrance/Home.png
+share/gnome/galeon/themes/Remembrance/New.png
+share/gnome/galeon/themes/Remembrance/Refresh.png
+share/gnome/galeon/themes/Remembrance/Stop.png
+share/gnome/galeon/themes/Remembrance/Up.png
 share/gnome/galeon/themes/Ska/Back.png
 share/gnome/galeon/themes/Ska/Forward.png
 share/gnome/galeon/themes/Ska/Home.png
+share/gnome/galeon/themes/Ska/New.png
 share/gnome/galeon/themes/Ska/Refresh.png
 share/gnome/galeon/themes/Ska/Stop.png
 share/gnome/galeon/themes/Ska/Up.png
@@ -252,6 +284,7 @@ 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/find.html
 share/gnome/help/galeon/C/full-screen-mode.html
 share/gnome/help/galeon/C/getting-started.html
 share/gnome/help/galeon/C/history.html
@@ -302,8 +335,8 @@ share/locale/sv/LC_MESSAGES/galeon.mo
 share/locale/tr/LC_MESSAGES/galeon.mo
 share/locale/uk/LC_MESSAGES/galeon.mo
 share/locale/wa/LC_MESSAGES/galeon.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/galeon.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/galeon.mo
+share/locale/zh_CN/LC_MESSAGES/galeon.mo
+share/locale/zh_TW/LC_MESSAGES/galeon.mo
 @exec mkdir -p %D/share/gnome/help/galeon/C/fig
 @dirrm share/gnome/sounds/galeon
 @dirrm share/gnome/help/galeon/C/stylesheet-images
@@ -312,13 +345,15 @@ share/locale/zh_TW.Big5/LC_MESSAGES/galeon.mo
 @dirrm share/gnome/help/galeon
 @dirrm share/gnome/galeon/themes/gnome-large
 @dirrm share/gnome/galeon/themes/Ska
+@dirrm share/gnome/galeon/themes/Remembrance
 @dirrm share/gnome/galeon/themes/PlastikLarge
 @dirrm share/gnome/galeon/themes/Plastik
+@dirrm share/gnome/galeon/themes/Orion
 @dirrm share/gnome/galeon/themes/Netscape
+@dirrm share/gnome/galeon/themes/MozillaModernSmall
 @dirrm share/gnome/galeon/themes/MozillaModern
+@dirrm share/gnome/galeon/themes/Micro
 @dirrm share/gnome/galeon/themes/Konqueror
-@dirrm share/gnome/galeon/themes/GlassLarge
-@dirrm share/gnome/galeon/themes/GlassHuge
 @dirrm share/gnome/galeon/themes/Glass
 @dirrm share/gnome/galeon/themes
 @dirrm share/gnome/galeon/spinners/pipeon
@@ -343,11 +378,13 @@ share/locale/zh_TW.Big5/LC_MESSAGES/galeon.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Print
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Programs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Mime
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Help
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Downloading
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History/Session
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/General
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Find
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Bookmarks
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Persistent
@@ -373,11 +410,13 @@ share/locale/zh_TW.Big5/LC_MESSAGES/galeon.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Print
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Programs
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Mime
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Help
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Downloading
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History/Session
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/General
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Find
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Bookmarks
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Persistent