Update to 1.2.6:

Code changes
        * Support for mozilla 1.7rc1, 1.7rc2, 17rc3, 1.7 branch and trunk
          (Christian, Marco, Carlos Romero)
        * Eliminate external protocol handlers and use prefs instead
          (Christian Biesinger)
        * Various solaris portability fixes (Brian Cameron, Christian)
        * Filter unwanted urls from history (Christian) [#142143]
        * Disable xpinstall by default (Christian) [144035]

Bugfixes
        * Fix some compile warnings (Christian)
        * Use single sign-on prompt for downloads too (Christian)
        * Fix crash with popup window and when opening windows from command line
          (Christian) (backported from HEAD) [#142184]
        * Fix compilation with gcc 2.95 (Christian)
        * Fix LD_LIBRARY_PATH setting in startup script (Christian) [#141576]
        * Fix a mem leak in the toolbar editor (Christian)
        * Fix cookies-cleared notification (Christian)
        * Fix toolbar editor dragging theme bug (Crispin Flowerday)
        * Fix reload not to use forced reload by default (C. J. N. Breame)
          [#143365]
        * Fix filechooser default filename shown from web form file inputs
          (Christian)
        * Fix opening of webcal: urls (Marco) [#139040]
        * Fix check for firefox bookmarks file import (Christian)
        * Fix contextmenu on unfocused text fields (Marco) [#139040]

Documentation translations
        * Translated to spanish (es) by Francisco F. Serrador

Translations
        * bg, el, th, tk, ru

4 files changed, 17 insertions, 23 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index fdc8690df1b..79d4b8ae469 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2004/05/04 17:16:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2004/06/20 20:15:42 jmmv Exp $
 #
 
-DISTNAME=	epiphany-1.2.5
+DISTNAME=	epiphany-1.2.6
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany/1.2/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/www/epiphany/PLIST b/www/epiphany/PLIST
index 2c4a9cc4116..78132dcc814 100644
--- a/www/epiphany/PLIST
+++ b/www/epiphany/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/05/04 17:16:26 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/06/20 20:15:42 jmmv Exp $
 bin/epiphany
 bin/epiphany-bin
 include/epiphany-1.2/epiphany/ephy-bookmarks.h
@@ -75,6 +75,12 @@ share/gnome/help/epiphany/C/figures/ephy-bookmarkbar-smartbookmark-screenshot.pn
 share/gnome/help/epiphany/C/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/C/figures/ephy-screenshot.png
 share/gnome/help/epiphany/C/legal.xml
+share/gnome/help/epiphany/es/epiphany.xml
+share/gnome/help/epiphany/es/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/es/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/es/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/es/figures/ephy-screenshot.png
+share/gnome/help/epiphany/es/legal.xml
 share/gnome/help/epiphany/eu/epiphany.xml
 share/gnome/help/epiphany/eu/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/eu/figures/ephy-screenshot.png
@@ -131,6 +137,8 @@ ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/epiphany.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/epiphany.mo
+${PKGLOCALEDIR}/locale/tk/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/epiphany.mo
@@ -138,6 +146,7 @@ ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/epiphany.mo
 share/omf/epiphany/epiphany-C.omf
+share/omf/epiphany/epiphany-es.omf
 share/omf/epiphany/epiphany-eu.omf
 share/pixmaps/epiphany-bookmarks.png
 @comment in xdg-dirs: @dirrm share/pixmaps
@@ -145,6 +154,8 @@ share/pixmaps/epiphany-bookmarks.png
 @comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/epiphany/eu/figures
 @dirrm share/gnome/help/epiphany/eu
+@dirrm share/gnome/help/epiphany/es/figures
+@dirrm share/gnome/help/epiphany/es
 @dirrm share/gnome/help/epiphany/C/figures
 @dirrm share/gnome/help/epiphany/C
 @dirrm share/gnome/help/epiphany
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 867a23d9725..3ebf731bd1f 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.8 2004/05/10 22:06:43 kristerw Exp $
+$NetBSD: distinfo,v 1.9 2004/06/20 20:15:42 jmmv Exp $
 
-SHA1 (epiphany-1.2.5.tar.bz2) = 3342d78f67374b412051c8874f4eb4459bc2c241
-Size (epiphany-1.2.5.tar.bz2) = 2529219 bytes
-SHA1 (patch-aa) = cce862cea154154f6f686d0953d5a40e95074a32
+SHA1 (epiphany-1.2.6.tar.bz2) = 0c1621c55f9e8b386fbca1c45c7374050110e155
+Size (epiphany-1.2.6.tar.bz2) = 2807440 bytes
diff --git a/www/epiphany/patches/patch-aa b/www/epiphany/patches/patch-aa
deleted file mode 100644
index cb84b99c0f6..00000000000
--- a/www/epiphany/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2004/05/10 22:06:43 kristerw Exp $
-
---- lib/ephy-dialog.c.orig	Mon May 10 23:49:04 2004
-+++ lib/ephy-dialog.c	Mon May 10 23:49:53 2004
-@@ -584,9 +584,10 @@
- 		}
- 		else
- 		{
-+			char *v;
- 			gtk_combo_box_set_active (GTK_COMBO_BOX (info->widget), -1);
- 
--			char *v = g_strdup_value_contents (value);
-+			v = g_strdup_value_contents (value);
- 			g_warning ("Value '%s' not found in model for combo %s\n", v, info->id);
- 			g_free (v);
- 		}