update to 1.6.4

changes:
-Update list of mime types
-Allow View Source for XML documents
-bugfixes
-translation updates

also allow to build against firefox, depending on the GECKO_PROVIDER
variable

3 files changed, 27 insertions, 9 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 1d4bf89e3c8..e01fae19ad0 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2005/05/22 20:08:45 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2005/07/07 17:06:57 drochner Exp $
 #
 
-DISTNAME=	epiphany-1.6.3
+DISTNAME=	epiphany-1.6.4
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany/1.6/}
 EXTRACT_SUFX=	.tar.bz2
@@ -16,17 +16,30 @@ GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
-USE_MSGFMT_PLURALS=	YES
+#USE_MSGFMT_PLURALS=	YES
 USE_PKGLOCALEDIR=	YES
 
 PKGCONFIG_OVERRIDE=	data/epiphany-1.6.pc.in
 
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
-CPPFLAGS+=		-I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/docshell
+.include "../../mk/bsd.prefs.mk"
+
+.if ${GECKO_PROVIDER} == "firefox"
+CPPFLAGS+=		-I${BUILDLINK_PREFIX.firefox}/include/firefox/find
+CFLAGS+=		-I${BUILDLINK_PREFIX.firefox}/include/firefox/find
+CPPFLAGS+=		-I${BUILDLINK_PREFIX.firefox}/include/firefox/necko
+CFLAGS+=		-I${BUILDLINK_PREFIX.firefox}/include/firefox/necko
+CPPFLAGS+=		-I${BUILDLINK_PREFIX.firefox}/include/firefox/pref
+CFLAGS+=		-I${BUILDLINK_PREFIX.firefox}/include/firefox/pref
+.else
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/find
+CFLAGS+=		-I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/find
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/necko
+CFLAGS+=		-I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/necko
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/pref
+CFLAGS+=		-I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/pref
+.endif
 
 GCONF2_SCHEMAS=		epiphany.schemas
 GCONF2_SCHEMAS+=	epiphany-lockdown.schemas
@@ -52,7 +65,11 @@ BUILDLINK_DEPENDS.pango+=	pango>=1.8.0
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
+.if ${GECKO_PROVIDER} == "firefox"
+.include "../../www/firefox/buildlink3.mk"
+.else
 .include "../../www/mozilla-gtk2/buildlink3.mk"
+.endif
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
diff --git a/www/epiphany/PLIST b/www/epiphany/PLIST
index e13e9ddd34e..92fcfa7c56d 100644
--- a/www/epiphany/PLIST
+++ b/www/epiphany/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2005/05/02 11:48:51 drochner Exp $
+@comment $NetBSD: PLIST,v 1.14 2005/07/07 17:06:57 drochner Exp $
 bin/epiphany
 include/epiphany-1.6/epiphany/ephy-bookmarks-type-builtins.h
 include/epiphany-1.6/epiphany/ephy-bookmarks.h
@@ -142,6 +142,7 @@ ${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/epiphany.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/epiphany.mo
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 6e65b59d1b8..0ab68374aac 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.21 2005/05/02 11:48:51 drochner Exp $
+$NetBSD: distinfo,v 1.22 2005/07/07 17:06:57 drochner Exp $
 
-SHA1 (epiphany-1.6.3.tar.bz2) = 1a1d26526dc5ae455dde12fc5c6b9f7326139d3e
-RMD160 (epiphany-1.6.3.tar.bz2) = fce6c356abe8aeb923ea974b4b959af6a9e47d4f
-Size (epiphany-1.6.3.tar.bz2) = 3021173 bytes
+SHA1 (epiphany-1.6.4.tar.bz2) = de2e38752ff5ae557817090cf5e11ca4d2e5c685
+RMD160 (epiphany-1.6.4.tar.bz2) = a37e7d2f3ea606fbf114afe25ad690fbd71249c7
+Size (epiphany-1.6.4.tar.bz2) = 3036153 bytes