sync with epiphany update

3 files changed, 21 insertions, 9 deletions

diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 2f5372485d5..db927833616 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:44 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/13 09:55:50 drochner Exp $
 #
 
-DISTNAME=	epiphany-extensions-1.6.3
+DISTNAME=	epiphany-extensions-1.6.4
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany-extensions/1.6/}
 EXTRACT_SUFX=	.tar.bz2
@@ -20,9 +20,17 @@ USE_PKGLOCALEDIR=	YES
 CONFIGURE_ARGS+=	--enable-compile-warnings=no
 CONFIGURE_ARGS+=	--with-extensions=all
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${GECKO_PROVIDER} == "firefox"
+CPPFLAGS+=		-I${BUILDLINK_PREFIX.firefox}/include/firefox/dom
+CPPFLAGS+=		-I${BUILDLINK_PREFIX.firefox}/include/firefox/pref
+CPPFLAGS+=		-I${BUILDLINK_PREFIX.firefox}/include/firefox/webbrwsr
+.else
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/dom
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/pref
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/webbrwsr
+.endif
 
 BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
 
@@ -35,6 +43,10 @@ BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/opensp/buildlink3.mk"
 .include "../../www/epiphany/buildlink3.mk"
+.if ${GECKO_PROVIDER} == "firefox"
+.include "../../www/firefox/buildlink3.mk"
+.else
 .include "../../www/mozilla-gtk2/buildlink3.mk"
+.endif
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/epiphany-extensions/PLIST b/www/epiphany-extensions/PLIST
index dea38154755..c8afe19d9ae 100644
--- a/www/epiphany-extensions/PLIST
+++ b/www/epiphany-extensions/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/03/22 16:26:48 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/07/13 09:55:50 drochner Exp $
 lib/epiphany-1.6/extensions/actions.xml
 lib/epiphany-1.6/extensions/bookmarks-tray.xml
 lib/epiphany-1.6/extensions/certificates.xml
@@ -18,7 +18,6 @@ lib/epiphany-1.6/extensions/libselectstylesheetextension.la
 lib/epiphany-1.6/extensions/libsidebarextension.la
 lib/epiphany-1.6/extensions/libsmartbookmarksextension.la
 lib/epiphany-1.6/extensions/libtabgroupsextension.la
-lib/epiphany-1.6/extensions/libtabsmenuextension.la
 lib/epiphany-1.6/extensions/libtabstatesextension.la
 lib/epiphany-1.6/extensions/page-info.xml
 lib/epiphany-1.6/extensions/select-stylesheet.xml
@@ -26,7 +25,6 @@ lib/epiphany-1.6/extensions/sidebar.xml
 lib/epiphany-1.6/extensions/smart-bookmarks.xml
 lib/epiphany-1.6/extensions/tab-groups.xml
 lib/epiphany-1.6/extensions/tab-states.xml
-lib/epiphany-1.6/extensions/tabsmenu.xml
 share/epiphany-extensions/ephy-gestures.xml
 share/epiphany-extensions/glade/action-properties.glade
 share/epiphany-extensions/glade/actions-editor.glade
@@ -45,6 +43,7 @@ ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/epiphany-extensions-1.6.mo
 ${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/epiphany-extensions-1.6.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/epiphany-extensions-1.6.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/epiphany-extensions-1.6.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/epiphany-extensions-1.6.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/epiphany-extensions-1.6.mo
 ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/epiphany-extensions-1.6.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/epiphany-extensions-1.6.mo
@@ -67,6 +66,7 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/epiphany-extensions-1.6.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/epiphany-extensions-1.6.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/epiphany-extensions-1.6.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/epiphany-extensions-1.6.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/epiphany-extensions-1.6.mo
 @dirrm share/epiphany-extensions/xml
 @dirrm share/epiphany-extensions/glade
 @dirrm share/epiphany-extensions
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index b06ef3d7e85..a313669803c 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2005/05/02 16:10:12 drochner Exp $
+$NetBSD: distinfo,v 1.12 2005/07/13 09:55:50 drochner Exp $
 
-SHA1 (epiphany-extensions-1.6.3.tar.bz2) = 40d96d4703bc38de9a276305cfde383947a76e82
-RMD160 (epiphany-extensions-1.6.3.tar.bz2) = ec0b69d93e80837c130d7ce332f7881024c7d634
-Size (epiphany-extensions-1.6.3.tar.bz2) = 556995 bytes
+SHA1 (epiphany-extensions-1.6.4.tar.bz2) = e80f51487a00789799e10cc71c65b30df3fbccc0
+RMD160 (epiphany-extensions-1.6.4.tar.bz2) = 00970cb1e732ae00da81399d4c6d29be784cb8a4
+Size (epiphany-extensions-1.6.4.tar.bz2) = 563798 bytes