Update to 1.4.0:

=========================
Epiphany Extensions 1.4.0
=========================

New extensions

	* Smart bookmarks extension, written by Jean-François Rameau
	* Page info extension, written by Adam Hooper
	* CSS Stylesheet extension, written by Adam Hooper

Translation updates

	* Changwoo Ryu (ko)


=========================
Epiphany Extensions 1.1.4
=========================

New extensions

	* Tab grouping extension, written by Justin Wake

Translation updates

	* Xavier Conde Rueda (ca)
	* Laurent Dhima (sq)


=========================
Epiphany Extensions 1.1.3
=========================

Code changes

	* Minor cleanup of certificates extension (Christian)
	* Make gestures extension support unloading/reloading (Adam)

Updated translation:

	* Changwoo Ryu (ko)


=========================
Epiphany Extensions 1.1.2
=========================

Updated translations

	* Francisco Javier F. Serrador (es)
	* Gabor Kelemen (hu)
	* Laurent Dhima (sq)
	* Rostislav Raykov (bg)


=========================
Epiphany Extensions 1.1.1
=========================

Removed features:

	* Popup blocker. It is now integrated in Epiphany. (Adam)
	* Removed support for mozilla < 1.7 (Christian)

Code changes

	* Ported to mozilla embed strings (Christian) [#144237]
	* Fix C99-ism in error viewer (Adam) [#144053]

Bug fixes

	* Fix crash when closing the last window (Christian) [#144850]
	* Fix includes (Adam) [#143818]


Translations

	* Rostislav Raykov (bg)
	* 相花 毅 (ja)
	* Estêvão Samuel Procópio (pt_BR)
	* Marcel Telka (sk)
	* Laurent Dhima (sq)


=========================
Epiphany Extensions 1.1.0
=========================

Code changes

	* Adapt to Epiphany API changes (Christian)
	* Portability fix for FreeBSD (Christian, taken from FreeBSD ports)
	* Adapt to mozilla API changes (Christian, Adam)
	* Refactored link checker (Adam)
	* Use public epiphany API to get at the statusbar security icon (Christian)

Bug fixes

	* Build fixes (Christian, Adam)
	* Mem leak fix (Christian)
	* Fix link checker stuck busy cursor (Adam)
	* Fix handling of invalid encodings (Adam)
	* Fix stupid bug, connect to the right signal on tab-remove (Christian)

Translations

	* Xavier Conde Rueda (ca)
	* Miloslav Trmac (cs)
	* Adam Weinberger (en_CA)
	* Francesco Marletta (it)
	* Žygimantas Beručka  (lt)
	* Reinout van Schouwen (nl)
	* GNOME PL Team (pl)
	* Duarte Loreto (pt)
	* Dmitry G. Mastrukov (ru)
	* Christian Rose (sv)
	* Yuriy Syrota (uk)
	* Pablo Saratxaga (wa)
	* Liu Songhe (zh_CN)

6 files changed, 101 insertions, 108 deletions

diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 12723545472..2356381be76 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2004/05/19 05:44:39 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2004/09/21 17:21:53 jmmv Exp $
 #
 
-DISTNAME=	epiphany-extensions-0.8.2
-PKGREVISION=	1
+DISTNAME=	epiphany-extensions-1.4.0
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany-extensions/0.8/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany-extensions/1.4/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -16,6 +15,8 @@ USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 
+CPPFLAGS+=		-I${BUILDLINK_PREFIX.mozilla-gtk2}/include/mozilla-gtk2/webbrwsr
+
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/www/epiphany-extensions/PLIST b/www/epiphany-extensions/PLIST
index cb36a23f993..46aca267d9b 100644
--- a/www/epiphany-extensions/PLIST
+++ b/www/epiphany-extensions/PLIST
@@ -1,61 +1,77 @@
-@comment $NetBSD: PLIST,v 1.2 2004/04/13 20:26:31 jmmv Exp $
-lib/epiphany/extensions/libcertificatesextension.a
-lib/epiphany/extensions/libcertificatesextension.la
-lib/epiphany/extensions/libcertificatesextension.so
-lib/epiphany/extensions/libcertificatesextension.so.0
-lib/epiphany/extensions/libcertificatesextension.so.0.0
-lib/epiphany/extensions/liberrorviewerextension.a
-lib/epiphany/extensions/liberrorviewerextension.la
-lib/epiphany/extensions/liberrorviewerextension.so
-lib/epiphany/extensions/liberrorviewerextension.so.0
-lib/epiphany/extensions/liberrorviewerextension.so.0.0
-lib/epiphany/extensions/libgesturesextension.a
-lib/epiphany/extensions/libgesturesextension.la
-lib/epiphany/extensions/libgesturesextension.so
-lib/epiphany/extensions/libgesturesextension.so.0
-lib/epiphany/extensions/libgesturesextension.so.0.0
-lib/epiphany/extensions/libpopupblockerextension.a
-lib/epiphany/extensions/libpopupblockerextension.la
-lib/epiphany/extensions/libpopupblockerextension.so
-lib/epiphany/extensions/libpopupblockerextension.so.0
-lib/epiphany/extensions/libpopupblockerextension.so.0.0
-lib/epiphany/extensions/libtabsmenuextension.a
-lib/epiphany/extensions/libtabsmenuextension.la
-lib/epiphany/extensions/libtabsmenuextension.so
-lib/epiphany/extensions/libtabsmenuextension.so.0
-lib/epiphany/extensions/libtabsmenuextension.so.0.0
+@comment $NetBSD: PLIST,v 1.3 2004/09/21 17:21:53 jmmv Exp $
+lib/epiphany-1.4/extensions/libcertificatesextension.a
+lib/epiphany-1.4/extensions/libcertificatesextension.la
+lib/epiphany-1.4/extensions/libcertificatesextension.so
+lib/epiphany-1.4/extensions/libcertificatesextension.so.0
+lib/epiphany-1.4/extensions/libcertificatesextension.so.0.0
+lib/epiphany-1.4/extensions/liberrorviewerextension.a
+lib/epiphany-1.4/extensions/liberrorviewerextension.la
+lib/epiphany-1.4/extensions/liberrorviewerextension.so
+lib/epiphany-1.4/extensions/liberrorviewerextension.so.0
+lib/epiphany-1.4/extensions/liberrorviewerextension.so.0.0
+lib/epiphany-1.4/extensions/libgesturesextension.a
+lib/epiphany-1.4/extensions/libgesturesextension.la
+lib/epiphany-1.4/extensions/libgesturesextension.so
+lib/epiphany-1.4/extensions/libgesturesextension.so.0
+lib/epiphany-1.4/extensions/libgesturesextension.so.0.0
+lib/epiphany-1.4/extensions/libpageinfoextension.a
+lib/epiphany-1.4/extensions/libpageinfoextension.la
+lib/epiphany-1.4/extensions/libpageinfoextension.so
+lib/epiphany-1.4/extensions/libpageinfoextension.so.0
+lib/epiphany-1.4/extensions/libpageinfoextension.so.0.0
+lib/epiphany-1.4/extensions/libselectstylesheetextension.a
+lib/epiphany-1.4/extensions/libselectstylesheetextension.la
+lib/epiphany-1.4/extensions/libselectstylesheetextension.so
+lib/epiphany-1.4/extensions/libselectstylesheetextension.so.0
+lib/epiphany-1.4/extensions/libselectstylesheetextension.so.0.0
+lib/epiphany-1.4/extensions/libsmartbookmarksextension.a
+lib/epiphany-1.4/extensions/libsmartbookmarksextension.la
+lib/epiphany-1.4/extensions/libsmartbookmarksextension.so
+lib/epiphany-1.4/extensions/libsmartbookmarksextension.so.0
+lib/epiphany-1.4/extensions/libsmartbookmarksextension.so.0.0
+lib/epiphany-1.4/extensions/libtabsmenuextension.a
+lib/epiphany-1.4/extensions/libtabsmenuextension.la
+lib/epiphany-1.4/extensions/libtabsmenuextension.so
+lib/epiphany-1.4/extensions/libtabsmenuextension.so.0
+lib/epiphany-1.4/extensions/libtabsmenuextension.so.0.0
 share/epiphany-extensions/ephy-gestures.xml
 share/epiphany-extensions/glade/error-viewer.glade
-share/epiphany-extensions/icons/popup-blocker.svg
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/epiphany-extensions-1.0.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/epiphany-extensions-1.0.mo
-@dirrm share/epiphany-extensions/icons
+share/epiphany-extensions/glade/page-info.glade
+share/epiphany-extensions/glade/smart-bookmarks.glade
+share/epiphany-extensions/xml/page-info-context-ui.xml
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/epiphany-extensions-1.2.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/epiphany-extensions-1.2.mo
+@dirrm share/epiphany-extensions/xml
 @dirrm share/epiphany-extensions/glade
 @dirrm share/epiphany-extensions
-@dirrm lib/epiphany/extensions
-@comment in epiphany: @dirrm lib/epiphany
+@dirrm lib/epiphany-1.4/extensions
+@dirrm lib/epiphany-1.4
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index 4ba06484607..842219b8dfc 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.5 2004/09/18 22:04:00 jmmv Exp $
+$NetBSD: distinfo,v 1.6 2004/09/21 17:21:53 jmmv Exp $
 
-SHA1 (epiphany-extensions-0.8.2.tar.bz2) = 4e1ef145cbe67a7abedc0a0b4737782fabb172ef
-Size (epiphany-extensions-0.8.2.tar.bz2) = 378136 bytes
-SHA1 (patch-aa) = a08cbddfbd206cd6e279bbad9877cd0ea54e9631
-SHA1 (patch-ab) = 444b29d945d3f2de34e6bac88d9443c6c105e467
-SHA1 (patch-ac) = 4a9fc6e845e78378272f2077b954393b2248b297
+SHA1 (epiphany-extensions-1.4.0.tar.bz2) = 54cc93e1509bc4b7e24ea6bd7d45ed4320243e74
+Size (epiphany-extensions-1.4.0.tar.bz2) = 434780 bytes
+SHA1 (patch-ac) = 7b777e3c238f234292d6e5d203afbfe38fdd479d
diff --git a/www/epiphany-extensions/patches/patch-aa b/www/epiphany-extensions/patches/patch-aa
deleted file mode 100644
index 9f60075038c..00000000000
--- a/www/epiphany-extensions/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/05/14 15:59:51 kristerw Exp $
-
---- extensions/error-viewer/opensp/validate.cpp.orig	Fri May 14 17:39:05 2004
-+++ extensions/error-viewer/opensp/validate.cpp	Fri May 14 17:39:22 2004
-@@ -35,6 +35,7 @@
- #include <glib/gi18n-lib.h>
- 
- #include <iostream>
-+#include <string>
- 
- using namespace std;
- 
diff --git a/www/epiphany-extensions/patches/patch-ab b/www/epiphany-extensions/patches/patch-ab
deleted file mode 100644
index f8775d5fcab..00000000000
--- a/www/epiphany-extensions/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/05/14 15:59:51 kristerw Exp $
-
---- extensions/error-viewer/sgml-validator.c.orig	Fri May 14 17:40:37 2004
-+++ extensions/error-viewer/sgml-validator.c	Fri May 14 17:42:40 2004
-@@ -438,12 +438,14 @@
- {
- 	g_return_if_fail (data != NULL);
- 
-+	{
- 	SgmlValidatorAppendCBData *append_data =
- 		(SgmlValidatorAppendCBData *) data;
- 
- 	error_viewer_append (append_data->validator->priv->error_viewer,
- 			     append_data->error_type,
- 			     append_data->message);
-+	}
- 
- 	return FALSE;
- }
diff --git a/www/epiphany-extensions/patches/patch-ac b/www/epiphany-extensions/patches/patch-ac
index 57d2734d5ac..6ad1dfa9bdb 100644
--- a/www/epiphany-extensions/patches/patch-ac
+++ b/www/epiphany-extensions/patches/patch-ac
@@ -1,12 +1,21 @@
-$NetBSD: patch-ac,v 1.2 2004/09/18 22:04:00 jmmv Exp $
+$NetBSD: patch-ac,v 1.3 2004/09/21 17:21:53 jmmv Exp $
 
---- configure.orig	2004-04-13 14:38:25.000000000 +0200
+--- configure.orig	2004-08-30 10:53:57.000000000 +0200
 +++ configure
-@@ -23137,6 +23137,7 @@ case "$MOZILLA_VERSION" in
-  1.7a) MOZILLA_SNAPSHOT=14 ;;
-  1.7b) MOZILLA_SNAPSHOT=15 ;;
-   1.7) MOZILLA_SNAPSHOT=15 ;;
-+1.7.*) MOZILLA_SNAPSHOT=15 ;;
- trunk) MOZILLA_SNAPSHOT=15 ;;
-     *) { { echo "$as_me:$LINENO: error:
- *******************************************************************************
+@@ -23314,11 +23314,15 @@ fi;
+ echo "$as_me:$LINENO: result: $MOZILLA_VERSION$autodetect" >&5
+ echo "${ECHO_T}$MOZILLA_VERSION$autodetect" >&6
+ 
+-if test $MOZILLA_VERSION == "trunk"; then
++if test $MOZILLA_VERSION = "trunk"; then
+ 	MOZILLA_VERSION=99.0 # use a high number
+ fi
+ 
++if test `uname` = NetBSD; then
++version=$(echo $MOZILLA_VERSION | sed -E -e 's/([0-9]+|[a-z]+)/\1 /g' -e 's/\.//g')
++else
+ version=$(echo $MOZILLA_VERSION | sed -e 's/\([0-9]\+\|[a-z]\+\)/\1 /g' -e 's/\.//g')
++fi
+ 
+ set -- $version;
+