Switch to "seamonkey" backend from "mozilla" as an alternative to "firefox",

split option part to a separate file.

Remove Mozilla comment from DESCR.

Fix PLIST, bump PKGREVISION.

4 files changed, 21 insertions, 15 deletions

diff --git a/www/galeon/DESCR b/www/galeon/DESCR
index 37f44f0e3ce..c507345816b 100644
--- a/www/galeon/DESCR
+++ b/www/galeon/DESCR
@@ -1,5 +1,4 @@
 Galeon is a GNOME Web browser based on gecko (the mozilla rendering engine).
 It's fast, it has a light interface, and it is fully standards-compliant.
 
-This version uses GNOME 2, and is a development branch built against
-www/mozilla-gtk2.
+This version uses GNOME 2, and is a development branch.
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index c6b2a6bbe97..afd298fa32f 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.103 2006/09/16 12:20:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.104 2006/09/24 16:30:09 salo Exp $
 #
 
 DISTNAME=		galeon-2.0.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=galeon/}
 EXTRACT_SUFX=		.tar.bz2
@@ -20,15 +20,7 @@ USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.galeon
-.include "../../www/mozilla/gecko-options.mk"
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mfirefox)
-CONFIGURE_ARGS+=	--with-mozilla=firefox
-.else
-BUILDLINK_RPATHDIRS.mozilla-gtk2+=	lib/mozilla-gtk2
-.endif
+.include "options.mk"
 
 GCONF2_SCHEMAS=		galeon.schemas
 
@@ -44,6 +36,6 @@ CONF_FILES=		${EGDIR}/sound/events/galeon.soundlist \
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
+.include "../../www/seamonkey/gecko-depends.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../www/mozilla/gecko-depends.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/galeon/PLIST b/www/galeon/PLIST
index 096dc573296..12293ac401a 100644
--- a/www/galeon/PLIST
+++ b/www/galeon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2006/09/02 19:42:58 rillig Exp $
+@comment $NetBSD: PLIST,v 1.29 2006/09/24 16:30:09 salo Exp $
 bin/galeon
 bin/galeon-config-tool
 lib/bonobo/servers/GNOME_Galeon_Automation.server
@@ -235,6 +235,9 @@ share/sounds/galeon/clicked.wav
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @comment in gnome2-dirs: @dirrm share/gnome-2.0/ui
 @comment in GConf2: @dirrm share/gconf/schemas
+@dirrm share/galeon/chrome/global
+@dirrm share/galeon/chrome/branding
+@dirrm share/galeon/chrome
 @dirrm share/galeon
 @dirrm share/examples/galeon/sound/events
 @dirrm share/examples/galeon/sound
diff --git a/www/galeon/options.mk b/www/galeon/options.mk
new file mode 100644
index 00000000000..0156a6707fb
--- /dev/null
+++ b/www/galeon/options.mk
@@ -0,0 +1,12 @@
+# $NetBSD: options.mk,v 1.1 2006/09/24 16:30:09 salo Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.galeon
+
+.include "../../www/seamonkey/gecko-options.mk"
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mfirefox)
+CONFIGURE_ARGS+=	--with-mozilla=firefox
+.else
+BUILDLINK_RPATHDIRS.seamonkey+=	lib/seamonkey
+.endif