Update to 1.2.14 which is the latest release of 1.2. This features support

for Mozilla 1.7, but will have no future Mozilla support.  While I'm here,
use the new GConf schema policy.

4 files changed, 20 insertions, 174 deletions

diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index d6197296cb97..e45d8190ad9f 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	galeon
-PORTVERSION=	1.2.13
-PORTREVISION=	2
+PORTVERSION=	1.2.14
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,21 +17,10 @@ COMMENT=	A GNOME Web browser based on gecko (the Mozilla rendering engine)
 BUILD_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
 RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
 
-MOZ_CONFIGURE_ARGS=--with-mozilla-snapshot="trunk"
+MOZ_CONFIGURE_ARGS=--with-mozilla-snapshot="1.7"
 
-.if !defined(WITH_MOZILLA)
 MOZILLA=	mozilla-gtk1
 HEADERS_SUFX=
-.else
-.if ${WITH_MOZILLA}=="mozilla-devel-gtk1"
-MOZILLA=	${WITH_MOZILLA}
-HEADERS_SUFX=	-devel-gtk1
-MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="trunk"
-.else
-MOZILLA=	mozilla-gtk1
-HEADERS_SUFX=
-.endif
-.endif
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack bonobo libglade gnomevfs gnometarget
@@ -60,14 +48,6 @@ NO_WERROR=	yes
 CONFIGURE_ARGS+=	--disable-werror
 .endif
 
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} " By default the port uses www/mozilla-gtk1 for html rendering, but you can"
-	@${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:"
-	@${ECHO_MSG}
-	@${ECHO_MSG} "  mozilla-devel-gtk1 "
-	@${ECHO_MSG} ""
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|' \
 			  -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
diff --git a/www/galeon/distinfo b/www/galeon/distinfo
index c7f1420c5444..e600f680fe06 100644
--- a/www/galeon/distinfo
+++ b/www/galeon/distinfo
@@ -1,2 +1,2 @@
-MD5 (galeon-1.2.13.tar.gz) = 62f0c497b8165fc567f8d2016b40a319
-SIZE (galeon-1.2.13.tar.gz) = 4220496
+MD5 (galeon-1.2.14.tar.gz) = 2101bab3f076905ecfcedd2878f4e753
+SIZE (galeon-1.2.14.tar.gz) = 4353701
diff --git a/www/galeon/files/patch-hairy b/www/galeon/files/patch-hairy
index 0410935075ca..7c398646339d 100644
--- a/www/galeon/files/patch-hairy
+++ b/www/galeon/files/patch-hairy
@@ -715,9 +715,19 @@ $FreeBSD$
 +END_GNOME_DECLS
 +
 +#endif /* NAUTILUS_VIEW_H */
---- src/Makefile.in.orig	Mon Mar 24 14:30:07 2003
-+++ src/Makefile.in	Mon Mar 24 14:31:36 2003
-@@ -251,7 +251,8 @@
+--- src/Makefile.in.orig	Sun Jun 27 20:19:43 2004
++++ src/Makefile.in	Sun Jun 27 20:21:00 2004
+@@ -87,7 +87,8 @@
+ 	window_callbacks.c window_notifiers.c window_notifiers.h \
+ 	xbel.c xlink.c xlink.h mozilla/gcc2abi.cpp \
+ 	galeon-nautilus-view.c galeon-nautilus-view.h eel-gtk-macros.h
+-am__objects_1 = galeon-nautilus-view.$(OBJEXT)
++am__objects_1 = galeon-nautilus-view.$(OBJEXT) \
++		nautstub.$(OBJEXT)
+ @ENABLE_NAUTILUS_VIEW_TRUE@am__objects_2 = $(am__objects_1)
+ am_galeon_bin_OBJECTS = GaleonAutomation-common.$(OBJEXT) \
+ 	Galeon-impl.$(OBJEXT) GaleonAutomation-stubs.$(OBJEXT) \
+@@ -441,7 +442,8 @@
  NAUTILUS_VIEW_SRC = \
  	galeon-nautilus-view.c \
  	galeon-nautilus-view.h \
@@ -725,15 +735,5 @@ $FreeBSD$
 +	eel-gtk-macros.h \
 +	nautstub.c
  
- 
  @ENABLE_NAUTILUS_VIEW_TRUE@NAUTILUS_VIEW_SRC_TO_COMPILE = $(NAUTILUS_VIEW_SRC)
-@@ -445,7 +446,8 @@
- 	window_notifiers.c window_notifiers.h xbel.c xlink.c xlink.h \
- 	mozilla/gcc2abi.cpp galeon-nautilus-view.c \
- 	galeon-nautilus-view.h eel-gtk-macros.h
--am__objects_1 = galeon-nautilus-view.$(OBJEXT)
-+am__objects_1 = galeon-nautilus-view.$(OBJEXT) \
-+		nautstub.$(OBJEXT)
- @ENABLE_NAUTILUS_VIEW_TRUE@am__objects_2 = $(am__objects_1)
- am_galeon_bin_OBJECTS = GaleonAutomation-common.$(OBJEXT) \
- 	Galeon-impl.$(OBJEXT) GaleonAutomation-stubs.$(OBJEXT) \
+ galeon_bin_SOURCES = \
diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist
index 2a00deb03f66..34cd9702f383 100644
--- a/www/galeon/pkg-plist
+++ b/www/galeon/pkg-plist
@@ -1,75 +1,9 @@
 bin/galeon
 bin/galeon-bin
 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
-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/Advanced/Security/%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/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/js_console/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/State/page_info/%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/Advanced/Security/%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/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/js_console/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/page_info/%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
+@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/galeon.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/galeon.schemas
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/galeon.schemas > /dev/null || /usr/bin/true
 etc/sound/events/galeon.soundlist
 lib/galeon/components/libgaleon-xpcom.so
 share/gnome/apps/Internet/galeon.desktop
@@ -414,71 +348,3 @@ share/locale/zh_TW/LC_MESSAGES/galeon.mo
 @dirrm share/gnome/galeon
 @dirrm lib/galeon/components
 @dirrm lib/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/page_info
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/js_console
-@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/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/Security
-@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/page_info
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/js_console
-@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/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/Security
-@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