let this use the renderer from "firefox" or "mozilla-gtk2", depending

on the GECKO_PROVIDER option
update to 1.3.21
changes:
Works with mozilla 1.7 -> 1.7.8, 1.8a3 -> 1.8b2 and trunk
Couple more focus fixes to less common cases
Fix regression since 1.3.19 that prevented helpers from working with
 file:/// urls.
Fix toolbar editor to work when the composite extension is enabled
Other bug fixes

3 files changed, 23 insertions, 8 deletions

diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 3481ebe49c6..2811249c90d 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.77 2005/05/22 20:08:45 jlam Exp $
+# $NetBSD: Makefile,v 1.78 2005/05/31 15:43:56 drochner Exp $
 #
 
-DISTNAME=	galeon-1.3.20
+DISTNAME=	galeon-1.3.21
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=galeon/}
 EXTRACT_SUFX=	.tar.bz2
@@ -21,11 +21,16 @@ USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
-WRKSRC=			${WRKDIR}/${DISTNAME:S/14a/14/}
 MOZILLA_USE_GTK2=	# defined
 MOZILLA_USE_XFT=	YES
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${GECKO_PROVIDER} == "firefox"
+CONFIGURE_ARGS+=	--with-mozilla=firefox
+.else
 BUILDLINK_RPATHDIRS.mozilla-gtk2+=  lib/mozilla-gtk2
+.endif
 
 GCONF2_SCHEMAS=		galeon.schemas
 
@@ -41,7 +46,13 @@ CONF_FILES=		${EGDIR}/sound/events/galeon.soundlist \
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
+.if ${GECKO_PROVIDER} == "firefox"
+# firefox didn't have a pkgconfig file before 1.0.4
+BUILDLINK_DEPENDS.firefox+= firefox>=1.0.4
+.include "../../www/firefox/buildlink3.mk"
+.else
 .include "../../www/mozilla-gtk2/buildlink3.mk"
+.endif
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/galeon/PLIST b/www/galeon/PLIST
index 665fcdca972..9557a3b7ddb 100644
--- a/www/galeon/PLIST
+++ b/www/galeon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2005/04/04 10:25:03 abs Exp $
+@comment $NetBSD: PLIST,v 1.26 2005/05/31 15:43:56 drochner Exp $
 bin/galeon
 bin/galeon-config-tool
 lib/bonobo/servers/GNOME_Galeon_Automation.server
@@ -167,6 +167,7 @@ ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/galeon-2.0.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/galeon-2.0.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/galeon-2.0.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/galeon-2.0.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/galeon-2.0.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/galeon-2.0.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/galeon-2.0.mo
@@ -192,14 +193,17 @@ ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/galeon-2.0.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/galeon-2.0.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/galeon-2.0.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/galeon-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/galeon-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/galeon-2.0.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/galeon-2.0.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/galeon-2.0.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/galeon-2.0.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/galeon-2.0.mo
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/galeon-2.0.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/galeon-2.0.mo
+${PKGLOCALEDIR}/locale/rw/LC_MESSAGES/galeon-2.0.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/galeon-2.0.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/galeon-2.0.mo
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/galeon-2.0.mo
diff --git a/www/galeon/distinfo b/www/galeon/distinfo
index 5109dd87715..7e29ba38d51 100644
--- a/www/galeon/distinfo
+++ b/www/galeon/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.41 2005/04/04 10:25:03 abs Exp $
+$NetBSD: distinfo,v 1.42 2005/05/31 15:43:56 drochner Exp $
 
-SHA1 (galeon-1.3.20.tar.bz2) = da5b116805f8a3a9d4b7051c868566239fe2262b
-RMD160 (galeon-1.3.20.tar.bz2) = b764c9aec7943384a126b30fb767add72ac20cbe
-Size (galeon-1.3.20.tar.bz2) = 4064521 bytes
+SHA1 (galeon-1.3.21.tar.bz2) = a0d9920c85e5ec010dc65209a12f655c3bacee36
+RMD160 (galeon-1.3.21.tar.bz2) = 9629be135a5197056d5c291d8c61033f4ccc64a6
+Size (galeon-1.3.21.tar.bz2) = 4080353 bytes
 SHA1 (patch-ac) = a9369e0dc72d3347bb9a2924e92eedd41addc58f
 SHA1 (patch-ad) = db8076fb6c5fbf25e3a03d006a2801dc24002175