Update to 2.24.1:

2.24.1:
Bug fixes and translation updates.

====================================================
Epiphany 2.24.0.1
====================================================

In this release, the address entry has improved logic which should
result in faster autocompletion lookups.

Bug fixes:

* Crash when showing download notification bubble (bug #536768)
* Window title copied the status bar (bug #524587)
* Fix RDF import (bug #523414)
* Proxy password prompt missing with gecko 1.9 (bug #539417)
* Password manager doesn't remove passwords with gecko 1.9 (bug #539418)
* Printing scales incorrectly (bug #541168)
* do not activate the smart bookmark entry after middle-clicking paste
  text into it. (bug #378165)
* Address entry fixes:
 - substring suggestions (bug #151932)
 - unicode support (bug #343906)
 - diacritics in topic keywords (bug #328162)
 - completion on history items titles (bug #534218)

Enhancements:

* Update lock icon to a tango style one (bug #547936)
* Documentation updates (bug #552436, #552555, #534744)
* Enable complete-download sound with libcanberra
* revert special handling of double click in the address entry (bug
#426349)

Contributors to this release:
Diego Escalante Urrelo, Sebastian Keller, Josselin Mouette, Mike Hommey,
Paul Drain, Cosimo Cecchi, Bruce Cowan, Lucas Lommer, Colin Walters,
Loïc Minier, Vincent Untz, Christian Persch, Reinout van Schouwen

Translators:
Jorge Gonzalez (es), Kjartan Maraas (nb), Khaled Hosny (ar), Ivar Smolin
(et), Sweta Kothari, Reinout van Schouwen (nl), Daniel Nylander (sv),
Yair Hershkovitz (he), icq, Lucas Lommer (cz), Duarte Loreto (pt), Gil
Forcada (ca), Takeshi AIHANA (ja), sprasad, Theppitak Karoonboonyanan
(th), ituohela (fi), Robert-André Mauchin (fr), grakic (sr@latin), Inaki
Larranaga Murgoitio (eu), pgeyleg (dz), Hendrik Richter (de), Nguyễn
Thái Ngọc Duy (vi), Funda Wang (zh_CN), Philip Withnall (en_GB), Claude
Peroz (fr), mateju, rranjan (hi), apravi, Sankarshan Mukhopadhyay,
Gintautas Miliauskas (lt), Baris Ciçek (tr), Gabor Kelemen (hu), ifelix,
sandeeps, kelemeng, cwryu (kr), Alexander Shopov (bg), tvainika (fi),
Nickolay V. Shmyrev (ru), Mugurel Tudor (ro), Ask H. Larsen (dk)

4 files changed, 98 insertions, 75 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 8911d1a7227..58fadddf15b 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.87 2008/08/06 18:49:13 drochner Exp $
+# $NetBSD: Makefile,v 1.88 2008/10/25 11:15:16 wiz Exp $
 #
 
-DISTNAME=	epiphany-2.22.3
+DISTNAME=	epiphany-2.24.1
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany/2.22/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany/2.24/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -19,10 +19,17 @@ USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LANGUAGES=		c c++
 
-PKGCONFIG_OVERRIDE=	data/epiphany-2.22.pc
+PKGCONFIG_OVERRIDE=	data/epiphany-2.24.pc
 
 .include "options.mk"
 
+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
+
 # XXX the configure check doesn't work
 CONFIGURE_ENV+=	ac_cv_header_nsIBadCertListener_h=yes
 
@@ -31,33 +38,34 @@ GCONF_SCHEMAS+=	epiphany-fonts.schemas
 GCONF_SCHEMAS+=	epiphany-lockdown.schemas
 GCONF_SCHEMAS+=	epiphany-pango.schemas
 
-BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.12.0
-BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.10.0
-BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.14.0
-BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.14.0
-BUILDLINK_API_DEPENDS.libxml2+=		libxml2>=2.6.12
-
+.include "../../audio/libcanberra/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.18.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.14.0
 .include "../../devel/libgnome/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.14.0
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+BUILDLINK_API_DEPENDS.libnotify+=	libnotify>=0.4
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libxml2+=		libxml2>=2.6.12
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
-.include "../../mk/omf-scrollkeeper.mk"
+.include "../../www/firefox/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.14.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
-.include "../../www/seamonkey/gecko-depends.mk"
+.include "../../mk/omf-scrollkeeper.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/epiphany/PLIST b/www/epiphany/PLIST
index 8e3a181b5ad..db6a872e56c 100644
--- a/www/epiphany/PLIST
+++ b/www/epiphany/PLIST
@@ -1,54 +1,56 @@
-@comment $NetBSD: PLIST,v 1.29 2008/04/15 18:16:16 drochner Exp $
+@comment $NetBSD: PLIST,v 1.30 2008/10/25 11:15:16 wiz Exp $
 bin/epiphany
-include/epiphany/2.22/epiphany/ephy-adblock-manager.h
-include/epiphany/2.22/epiphany/ephy-adblock.h
-include/epiphany/2.22/epiphany/ephy-base-embed.h
-include/epiphany/2.22/epiphany/ephy-bookmarks-type-builtins.h
-include/epiphany/2.22/epiphany/ephy-bookmarks.h
-include/epiphany/2.22/epiphany/ephy-command-manager.h
-include/epiphany/2.22/epiphany/ephy-cookie-manager.h
-include/epiphany/2.22/epiphany/ephy-dbus.h
-include/epiphany/2.22/epiphany/ephy-dialog.h
-include/epiphany/2.22/epiphany/ephy-embed-container.h
-include/epiphany/2.22/epiphany/ephy-embed-event.h
-include/epiphany/2.22/epiphany/ephy-embed-factory.h
-include/epiphany/2.22/epiphany/ephy-embed-persist.h
-include/epiphany/2.22/epiphany/ephy-embed-prefs.h
-include/epiphany/2.22/epiphany/ephy-embed-shell.h
-include/epiphany/2.22/epiphany/ephy-embed-single.h
-include/epiphany/2.22/epiphany/ephy-embed-type-builtins.h
-include/epiphany/2.22/epiphany/ephy-embed-utils.h
-include/epiphany/2.22/epiphany/ephy-embed.h
-include/epiphany/2.22/epiphany/ephy-extension.h
-include/epiphany/2.22/epiphany/ephy-extensions-manager.h
-include/epiphany/2.22/epiphany/ephy-history-item.h
-include/epiphany/2.22/epiphany/ephy-history.h
-include/epiphany/2.22/epiphany/ephy-lib-type-builtins.h
-include/epiphany/2.22/epiphany/ephy-link.h
-include/epiphany/2.22/epiphany/ephy-loader.h
-include/epiphany/2.22/epiphany/ephy-node-db.h
-include/epiphany/2.22/epiphany/ephy-node.h
-include/epiphany/2.22/epiphany/ephy-notebook.h
-include/epiphany/2.22/epiphany/ephy-password-manager.h
-include/epiphany/2.22/epiphany/ephy-permission-manager.h
-include/epiphany/2.22/epiphany/ephy-session.h
-include/epiphany/2.22/epiphany/ephy-shell.h
-include/epiphany/2.22/epiphany/ephy-state.h
-include/epiphany/2.22/epiphany/ephy-statusbar.h
-include/epiphany/2.22/epiphany/ephy-type-builtins.h
-include/epiphany/2.22/epiphany/ephy-version.h
-include/epiphany/2.22/epiphany/ephy-window.h
-lib/epiphany/2.22/plugins/libdesktopfileplugin.la
-lib/pkgconfig/epiphany-2.22.pc
+include/epiphany/2.24/epiphany/ephy-adblock-manager.h
+include/epiphany/2.24/epiphany/ephy-adblock.h
+include/epiphany/2.24/epiphany/ephy-base-embed.h
+include/epiphany/2.24/epiphany/ephy-bookmarks-type-builtins.h
+include/epiphany/2.24/epiphany/ephy-bookmarks.h
+include/epiphany/2.24/epiphany/ephy-command-manager.h
+include/epiphany/2.24/epiphany/ephy-cookie-manager.h
+include/epiphany/2.24/epiphany/ephy-dbus.h
+include/epiphany/2.24/epiphany/ephy-dialog.h
+include/epiphany/2.24/epiphany/ephy-embed-container.h
+include/epiphany/2.24/epiphany/ephy-embed-event.h
+include/epiphany/2.24/epiphany/ephy-embed-factory.h
+include/epiphany/2.24/epiphany/ephy-embed-persist.h
+include/epiphany/2.24/epiphany/ephy-embed-prefs.h
+include/epiphany/2.24/epiphany/ephy-embed-shell.h
+include/epiphany/2.24/epiphany/ephy-embed-single.h
+include/epiphany/2.24/epiphany/ephy-embed-type-builtins.h
+include/epiphany/2.24/epiphany/ephy-embed-utils.h
+include/epiphany/2.24/epiphany/ephy-embed.h
+include/epiphany/2.24/epiphany/ephy-extension.h
+include/epiphany/2.24/epiphany/ephy-extensions-manager.h
+include/epiphany/2.24/epiphany/ephy-history-item.h
+include/epiphany/2.24/epiphany/ephy-history.h
+include/epiphany/2.24/epiphany/ephy-lib-type-builtins.h
+include/epiphany/2.24/epiphany/ephy-link.h
+include/epiphany/2.24/epiphany/ephy-loader.h
+include/epiphany/2.24/epiphany/ephy-node-db.h
+include/epiphany/2.24/epiphany/ephy-node.h
+include/epiphany/2.24/epiphany/ephy-notebook.h
+include/epiphany/2.24/epiphany/ephy-password-manager.h
+include/epiphany/2.24/epiphany/ephy-permission-manager.h
+include/epiphany/2.24/epiphany/ephy-session.h
+include/epiphany/2.24/epiphany/ephy-shell.h
+include/epiphany/2.24/epiphany/ephy-state.h
+include/epiphany/2.24/epiphany/ephy-statusbar.h
+include/epiphany/2.24/epiphany/ephy-type-builtins.h
+include/epiphany/2.24/epiphany/ephy-version.h
+include/epiphany/2.24/epiphany/ephy-window.h
+lib/epiphany/2.24/plugins/libdesktopfileplugin.a
+lib/epiphany/2.24/plugins/libdesktopfileplugin.la
+lib/epiphany/2.24/plugins/libdesktopfileplugin.so
+lib/pkgconfig/epiphany-2.24.pc
 man/man1/epiphany.1
 share/aclocal/epiphany.m4
 share/applications/bme.desktop
 share/applications/epiphany.desktop
 share/dbus-1/services/org.gnome.Epiphany.service
 share/epiphany/about.ini
+share/epiphany/chrome/app-chrome.manifest
 share/epiphany/chrome/branding/brand.dtd
 share/epiphany/chrome/branding/brand.properties
-share/epiphany/chrome/app-chrome.manifest
 share/epiphany/chrome/global/about.xhtml
 share/epiphany/default-prefs.js
 share/epiphany/ephy-xml2ini.xsl
@@ -122,6 +124,11 @@ share/gnome/help/epiphany/ca/figures/ephy-addressbar-smartbookmark-screenshot.pn
 share/gnome/help/epiphany/ca/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/ca/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/ca/figures/ephy-screenshot.png
+share/gnome/help/epiphany/cs/epiphany.xml
+share/gnome/help/epiphany/cs/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/cs/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/cs/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/cs/figures/ephy-screenshot.png
 share/gnome/help/epiphany/de/epiphany.xml
 share/gnome/help/epiphany/de/figures/ephy-addressbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/de/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
@@ -294,7 +301,7 @@ share/locale/sk/LC_MESSAGES/epiphany.mo
 share/locale/sl/LC_MESSAGES/epiphany.mo
 share/locale/sq/LC_MESSAGES/epiphany.mo
 share/locale/sr/LC_MESSAGES/epiphany.mo
-share/locale/sr@Latn/LC_MESSAGES/epiphany.mo
+share/locale/sr@latin/LC_MESSAGES/epiphany.mo
 share/locale/sv/LC_MESSAGES/epiphany.mo
 share/locale/ta/LC_MESSAGES/epiphany.mo
 share/locale/te/LC_MESSAGES/epiphany.mo
@@ -310,6 +317,7 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
 share/omf/epiphany/epiphany-C.omf
 share/omf/epiphany/epiphany-bg.omf
 share/omf/epiphany/epiphany-ca.omf
+share/omf/epiphany/epiphany-cs.omf
 share/omf/epiphany/epiphany-de.omf
 share/omf/epiphany/epiphany-el.omf
 share/omf/epiphany/epiphany-en_GB.omf
@@ -333,6 +341,16 @@ share/omf/epiphany/epiphany-uk.omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
+@dirrm share/icons/LowContrastLargePrint/48x48/apps
+@dirrm share/icons/LowContrastLargePrint/48x48
+@dirrm share/icons/LowContrastLargePrint
+@dirrm share/icons/HighContrastLargePrintInverse/48x48/apps
+@dirrm share/icons/HighContrastLargePrintInverse/48x48
+@dirrm share/icons/HighContrastLargePrintInverse
+@dirrm share/icons/HighContrastLargePrint/48x48/apps
+@dirrm share/icons/HighContrastLargePrint/48x48
+@dirrm share/icons/HighContrastLargePrint
+@comment in xdg-dirs: @dirrm share/icons
 @dirrm share/gtk-doc/html/epiphany
 @dirrm share/gnome/help/epiphany/uk/figures
 @dirrm share/gnome/help/epiphany/uk
@@ -362,6 +380,8 @@ share/omf/epiphany/epiphany-uk.omf
 @dirrm share/gnome/help/epiphany/el
 @dirrm share/gnome/help/epiphany/de/figures
 @dirrm share/gnome/help/epiphany/de
+@dirrm share/gnome/help/epiphany/cs/figures
+@dirrm share/gnome/help/epiphany/cs
 @dirrm share/gnome/help/epiphany/ca/figures
 @dirrm share/gnome/help/epiphany/ca
 @dirrm share/gnome/help/epiphany/bg/figures
@@ -402,9 +422,9 @@ share/omf/epiphany/epiphany-uk.omf
 @dirrm share/epiphany
 @comment in dbus: @dirrm share/dbus-1/services
 @comment in xdg-dirs: @dirrm share/applications
-@dirrm lib/epiphany/2.22/plugins
-@dirrm lib/epiphany/2.22
+@dirrm lib/epiphany/2.24/plugins
+@dirrm lib/epiphany/2.24
 @dirrm lib/epiphany
-@dirrm include/epiphany/2.22/epiphany
-@dirrm include/epiphany/2.22
+@dirrm include/epiphany/2.24/epiphany
+@dirrm include/epiphany/2.24
 @dirrm include/epiphany
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index ad753c194fc..5fa7166be0f 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.42 2008/08/06 18:49:13 drochner Exp $
+$NetBSD: distinfo,v 1.43 2008/10/25 11:15:16 wiz Exp $
 
-SHA1 (epiphany-2.22.3.tar.bz2) = eb99b5d073b5b3d9294ddcfb888340c5e6b45738
-RMD160 (epiphany-2.22.3.tar.bz2) = 6607cb7b7e2afb7c5f3b914ba18f0347fd8d392d
-Size (epiphany-2.22.3.tar.bz2) = 5718239 bytes
+SHA1 (epiphany-2.24.1.tar.bz2) = 1329e66c7b86cdbe906cd7bec35ea466d10f1c56
+RMD160 (epiphany-2.24.1.tar.bz2) = f340f59211d3175bf4a940a40b593c163689f3f9
+Size (epiphany-2.24.1.tar.bz2) = 5694692 bytes
diff --git a/www/epiphany/options.mk b/www/epiphany/options.mk
index a5d69ac8b0a..0712e171b36 100644
--- a/www/epiphany/options.mk
+++ b/www/epiphany/options.mk
@@ -1,17 +1,12 @@
-# $NetBSD: options.mk,v 1.1 2006/09/24 16:28:20 salo Exp $
+# $NetBSD: options.mk,v 1.2 2008/10/25 11:15:16 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.epiphany
+PKG_SUPPORTED_OPTIONS=	enchant # avahi
+PKG_SUGGESTED_OPTIONS=	enchant
 
-.include "../../www/seamonkey/gecko-options.mk"
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mfirefox)
-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
-BROKEN=		seamonkey backend is currently not supported
+.if !empty(PKG_OPTIONS:Menchant)
+CONFIGURE_ARGS+=	--enable-spell-checker
+.include "../../textproc/enchant/buildlink3.mk"
 .endif