3 files changed, 219 insertions, 11 deletions

diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index ae15c0bb925e..e7270779c0ca 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	galeon
-PORTVERSION=	0.11.5
+PORTVERSION=	0.12
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/galeon2/distinfo b/www/galeon2/distinfo
index bd4359f00463..115c20952890 100644
--- a/www/galeon2/distinfo
+++ b/www/galeon2/distinfo
@@ -1 +1 @@
-MD5 (galeon-0.11.5.tar.gz) = 199762bc10ae58b8fa98aa87d02bf338
+MD5 (galeon-0.12.tar.gz) = fd66bf27c06ecb8a764760f4bd1ae98b
diff --git a/www/galeon2/pkg-plist b/www/galeon2/pkg-plist
index 0f6b4b14f98c..61cde383f1eb 100644
--- a/www/galeon2/pkg-plist
+++ b/www/galeon2/pkg-plist
@@ -1,15 +1,69 @@
 bin/galeon
 bin/galeon-bin
+bin/galeon-config-clean
+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
+etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Filtering/%gconf.xml
+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/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/Mime/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Programs/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/galeon/Print/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/FontsColors/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/Language/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/galeon/State/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/galeon/State/bookmarks_editor/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/galeon/State/compact_bookmark_editor/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/galeon/State/history/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/galeon/State/history_dock/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/galeon/State/prefs_dialog/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/galeon/UI/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/galeon/UI/Mouse/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/galeon/UI/Tabs/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/galeon/UI/Toolbar/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/galeon/UI/Windows/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/galeon/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Crash/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Filtering/%gconf.xml
+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/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/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
+etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/FontsColors/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/Language/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/bookmarks_editor/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/compact_bookmark_editor/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/history/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/history_dock/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/prefs_dialog/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Mouse/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Tabs/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Toolbar/%gconf.xml
+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/Back.png
-share/gnome/galeon/Forward.png
-share/gnome/galeon/Go.png
-share/gnome/galeon/Home.png
-share/gnome/galeon/New.png
-share/gnome/galeon/Refresh.png
-share/gnome/galeon/Stop.png
-share/gnome/galeon/Up.png
 share/gnome/galeon/about_logo.png
 share/gnome/galeon/babelfish.png
 share/gnome/galeon/bookmarks.glade
@@ -56,6 +110,20 @@ share/gnome/galeon/rpm.png
 share/gnome/galeon/small-close.xpm
 share/gnome/galeon/small-detach.xpm
 share/gnome/galeon/small-menu.xpm
+share/gnome/galeon/smart-bm-tray.xpm
+share/gnome/galeon/spinners/crashcut/001.png
+share/gnome/galeon/spinners/crashcut/002.png
+share/gnome/galeon/spinners/crashcut/003.png
+share/gnome/galeon/spinners/crashcut/004.png
+share/gnome/galeon/spinners/crashcut/005.png
+share/gnome/galeon/spinners/crashcut/006.png
+share/gnome/galeon/spinners/crashcut/007.png
+share/gnome/galeon/spinners/crashcut/008.png
+share/gnome/galeon/spinners/crashcut/009.png
+share/gnome/galeon/spinners/crashcut/010.png
+share/gnome/galeon/spinners/crashcut/011.png
+share/gnome/galeon/spinners/crashcut/012.png
+share/gnome/galeon/spinners/crashcut/rest.png
 share/gnome/galeon/spinners/galeon/001.png
 share/gnome/galeon/spinners/galeon/002.png
 share/gnome/galeon/spinners/galeon/003.png
@@ -101,6 +169,71 @@ 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/themes/Glass/Back.png
+share/gnome/galeon/themes/Glass/Forward.png
+share/gnome/galeon/themes/Glass/Home.png
+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/MozillaModern/Back.png
+share/gnome/galeon/themes/MozillaModern/Forward.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/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/Plastik/Back.png
+share/gnome/galeon/themes/Plastik/Forward.png
+share/gnome/galeon/themes/Plastik/Home.png
+share/gnome/galeon/themes/Plastik/New.png
+share/gnome/galeon/themes/Plastik/Refresh.png
+share/gnome/galeon/themes/Plastik/Stop.png
+share/gnome/galeon/themes/Plastik/Up.png
+share/gnome/galeon/themes/PlastikLarge/Back.png
+share/gnome/galeon/themes/PlastikLarge/Forward.png
+share/gnome/galeon/themes/PlastikLarge/Home.png
+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/Ska/Back.png
+share/gnome/galeon/themes/Ska/Forward.png
+share/gnome/galeon/themes/Ska/Home.png
+share/gnome/galeon/themes/Ska/Refresh.png
+share/gnome/galeon/themes/Ska/Stop.png
+share/gnome/galeon/themes/Ska/Up.png
+share/gnome/galeon/themes/gnome-large/Back.png
+share/gnome/galeon/themes/gnome-large/Forward.png
+share/gnome/galeon/themes/gnome-large/Go.png
+share/gnome/galeon/themes/gnome-large/Home.png
+share/gnome/galeon/themes/gnome-large/New.png
+share/gnome/galeon/themes/gnome-large/Refresh.png
+share/gnome/galeon/themes/gnome-large/Stop.png
+share/gnome/galeon/themes/gnome-large/Up.png
 share/gnome/galeon/toolbars.png
 share/gnome/galeon/windows.png
 share/gnome/help/galeon/C/aboutbook.html
@@ -135,10 +268,11 @@ share/gnome/help/galeon/C/prefs-user-interface.html
 share/gnome/help/galeon/C/statusbar.html
 share/gnome/help/galeon/C/tabbed-browsing.html
 share/gnome/help/galeon/C/toolbar.html
-share/gnome/oaf/galeon.oaf
+share/gnome/oaf/GNOME_Galeon_Automation.oaf
 share/gnome/pixmaps/galeon.png
 share/gnome/sounds/galeon/clicked.wav
 share/locale/az/LC_MESSAGES/galeon.mo
+share/locale/bg/LC_MESSAGES/galeon.mo
 share/locale/ca/LC_MESSAGES/galeon.mo
 share/locale/cs/LC_MESSAGES/galeon.mo
 share/locale/da/LC_MESSAGES/galeon.mo
@@ -147,6 +281,7 @@ share/locale/es/LC_MESSAGES/galeon.mo
 share/locale/et/LC_MESSAGES/galeon.mo
 share/locale/fi/LC_MESSAGES/galeon.mo
 share/locale/fr/LC_MESSAGES/galeon.mo
+share/locale/gl/LC_MESSAGES/galeon.mo
 share/locale/hr/LC_MESSAGES/galeon.mo
 share/locale/hu/LC_MESSAGES/galeon.mo
 share/locale/it/LC_MESSAGES/galeon.mo
@@ -166,6 +301,7 @@ 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/wa/LC_MESSAGES/galeon.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/galeon.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/galeon.mo
 @exec mkdir -p %D/share/gnome/help/galeon/C/fig
@@ -174,7 +310,79 @@ share/locale/zh_TW.Big5/LC_MESSAGES/galeon.mo
 @dirrm share/gnome/help/galeon/C/fig
 @dirrm share/gnome/help/galeon/C
 @dirrm share/gnome/help/galeon
+@dirrm share/gnome/galeon/themes/gnome-large
+@dirrm share/gnome/galeon/themes/Ska
+@dirrm share/gnome/galeon/themes/PlastikLarge
+@dirrm share/gnome/galeon/themes/Plastik
+@dirrm share/gnome/galeon/themes/Netscape
+@dirrm share/gnome/galeon/themes/MozillaModern
+@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
 @dirrm share/gnome/galeon/spinners/galeon
+@dirrm share/gnome/galeon/spinners/crashcut
 @dirrm share/gnome/galeon/spinners
 @dirrm share/gnome/galeon
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Windows
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Toolbar
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Tabs
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Mouse
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/prefs_dialog
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/history_dock
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/history
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/compact_bookmark_editor
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/bookmarks_editor
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/Language
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/FontsColors
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering
+@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/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/Bookmarks
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Persistent
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Network
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Filtering
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Crash
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Windows
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Toolbar
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Tabs
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Mouse
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/prefs_dialog
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/history_dock
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/history
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/compact_bookmark_editor
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/bookmarks_editor
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/Language
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/FontsColors
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Rendering
+@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/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/Bookmarks
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Persistent
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Network
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Filtering
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Crash
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced
+@dirrm etc/gconf/gconf.xml.defaults/apps/galeon