Update to 2.24.1:

================
Evince  2.24.1
================

Bug fixes:

    * Disable toggle function of F5 when in presentation mode
      (#556162, Dave Neary)
    * Create a loading thumbnail for every different page size
      (#556264, Carlos Garcia Campos)
    * Fix several memory leaks (Carlos Garcia Campos)
    * Do not show bad titles like 'Microsoft Word' in the window title
      bar (#534684, Robin Sonefors and Nickolay V. Shmyrev)
    * Fix mailto links which were considered as http uris (#555801,
      Carlos Garcia Campos)
    * Fix launching external applications (#554500, Carlos Garcia Campos)
    * Other bugs fixed (#552382, #553369, #555134, Carlos Garcia Campos)

Translation updates:

    * Ihar Hrachyshka (be@latin)
    * Adrian Guniš (cs)
    * Kenneth Nielsen (da)
    * Ivar Smolin (et)
    * Takeshi AIHANA (ja)

6 files changed, 64 insertions, 54 deletions

diff --git a/print/evince-nautilus/Makefile b/print/evince-nautilus/Makefile
index 4553110608a..79246244c31 100644
--- a/print/evince-nautilus/Makefile
+++ b/print/evince-nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2008/06/12 02:14:43 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2008/10/25 00:11:13 wiz Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -7,26 +7,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PKGNAME=		${DISTNAME:S/evince/evince-nautilus/}
 COMMENT=		File properties plugin for evince files
-PKG_OPTIONS_VAR=	PKG_OPTIONS.evince
-PKG_SUPPORTED_OPTIONS=	dvi djvu
-PKG_SUGGESTED_OPTIONS=	# none
 
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mdvi)
-CONFIGURE_ARGS+=	--enable-dvi
-#BUILD_DIRS=		pdf dvi backend lib properties
-# need shared libkpathsea
-BUILDLINK_API_DEPENDS.teTeX-bin+=	teTeX-bin>=3.0nb13
-.include "../../print/teTeX3-bin/buildlink3.mk"
-.else
-#BUILD_DIRS=		pdf backend lib properties
-.endif
-
-.if !empty(PKG_OPTIONS:Mdjvu)
-CONFIGURE_ARGS+=	--enable-djvu
-.include	"../../graphics/djvulibre-lib/buildlink3.mk"
-.endif
+.include "options.mk"
 
 INSTALL_DIRS=		properties
 
diff --git a/print/evince-nautilus/options.mk b/print/evince-nautilus/options.mk
new file mode 100644
index 00000000000..a02463ae58f
--- /dev/null
+++ b/print/evince-nautilus/options.mk
@@ -0,0 +1,22 @@
+# $NetBSD: options.mk,v 1.1 2008/10/25 00:11:13 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.evince
+PKG_SUPPORTED_OPTIONS=	dvi djvu
+PKG_SUGGESTED_OPTIONS=	# none
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdvi)
+CONFIGURE_ARGS+=	--enable-dvi
+#BUILD_DIRS=		pdf dvi backend lib properties
+# need shared libkpathsea
+BUILDLINK_API_DEPENDS.teTeX-bin+=	teTeX-bin>=3.0nb13
+.include "../../print/teTeX3-bin/buildlink3.mk"
+#.else
+#BUILD_DIRS=		pdf backend lib properties
+.endif
+
+.if !empty(PKG_OPTIONS:Mdjvu)
+CONFIGURE_ARGS+=	--enable-djvu
+.include	"../../graphics/djvulibre-lib/buildlink3.mk"
+.endif
diff --git a/print/evince/Makefile b/print/evince/Makefile
index 3df8d30f436..2ad57485f3c 100644
--- a/print/evince/Makefile
+++ b/print/evince/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2008/10/19 17:42:29 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2008/10/25 00:11:13 wiz Exp $
+#
 
 PKG_DESTDIR_SUPPORT=	user-destdir
-PKGREVISION=		1
 
 .include "../../print/evince/Makefile.common"
 
@@ -11,27 +11,7 @@ GCONF_SCHEMAS=		evince.schemas
 GCONF_SCHEMAS+=	evince-thumbnailer.schemas
 GCONF_SCHEMAS+=	evince-thumbnailer-ps.schemas
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.evince
-PKG_SUPPORTED_OPTIONS=	dvi djvu
-PKG_SUGGESTED_OPTIONS=	# none
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
-
-.if !empty(PKG_OPTIONS:Mdvi)
-CONFIGURE_ARGS+=	--enable-dvi
-PLIST.dvi=		yes
-GCONF_SCHEMAS+=	evince-thumbnailer-dvi.schemas
-.include "../../mk/tex.buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mdjvu)
-CONFIGURE_ARGS+=	--enable-djvu
-PLIST.djvu=		yes
-GCONF_SCHEMAS+=	evince-thumbnailer-djvu.schemas
-.include "../../graphics/djvulibre-lib/buildlink3.mk"
-.endif
+.include "options.mk"
 
 CONFIGURE_ARGS+=	--enable-comics
 GCONF_SCHEMAS+=		evince-thumbnailer-comics.schemas
@@ -42,6 +22,7 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
+BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.70
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 
diff --git a/print/evince/Makefile.common b/print/evince/Makefile.common
index 6fc24a34623..ed49e496815 100644
--- a/print/evince/Makefile.common
+++ b/print/evince/Makefile.common
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile.common,v 1.22 2008/10/16 16:19:00 drochner Exp $
+# $NetBSD: Makefile.common,v 1.23 2008/10/25 00:11:13 wiz Exp $
 #
+# used by print/evince/Makefile
+# used by print/evince-nautilus/Makefile
 
-DISTNAME=		evince-2.24.0
+DISTNAME=		evince-2.24.1
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evince/2.24/}
 EXTRACT_SUFX=		.tar.bz2
@@ -26,21 +28,21 @@ pre-configure:
 	${ECHO} "echo 8.51" >${BUILDLINK_DIR}/bin/gs
 	${CHMOD} +x ${BUILDLINK_DIR}/bin/gs
 
-BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.16.1
-BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.10.0
-BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.14.0
-BUILDLINK_API_DEPENDS.poppler-glib+=	poppler-glib>=0.5.9
-
 .include "../../databases/shared-mime-info/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+=   glib2>=2.15.6
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.14.0
 .include "../../devel/libgnomeui/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.17.1
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../print/libspectre/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler-glib+=	poppler-glib>=0.8.0
 .include "../../print/poppler-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
+BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.10.0
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/print/evince/distinfo b/print/evince/distinfo
index 06dd1ec7ff9..1537cad1fea 100644
--- a/print/evince/distinfo
+++ b/print/evince/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.21 2008/10/16 16:19:00 drochner Exp $
+$NetBSD: distinfo,v 1.22 2008/10/25 00:11:13 wiz Exp $
 
-SHA1 (evince-2.24.0.tar.bz2) = 125e4a3a88daa742cd7f12c09eb21187071c94cb
-RMD160 (evince-2.24.0.tar.bz2) = 271e6ecc6b63e86226be11db1056f72f24ae320a
-Size (evince-2.24.0.tar.bz2) = 1646964 bytes
+SHA1 (evince-2.24.1.tar.bz2) = e25e9df5b0830e28bba690c9969e341116ccbec0
+RMD160 (evince-2.24.1.tar.bz2) = d0839847a1a466859e655d7f3748624517a28fc4
+Size (evince-2.24.1.tar.bz2) = 1704083 bytes
 SHA1 (patch-aa) = 83ee189d752c0f8770c565130ca578a2456058e7
diff --git a/print/evince/options.mk b/print/evince/options.mk
new file mode 100644
index 00000000000..623913aaa10
--- /dev/null
+++ b/print/evince/options.mk
@@ -0,0 +1,23 @@
+# $NetBSD: options.mk,v 1.1 2008/10/25 00:11:13 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.evince
+PKG_SUPPORTED_OPTIONS=	dvi djvu
+PKG_SUGGESTED_OPTIONS=	# none
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
+
+.if !empty(PKG_OPTIONS:Mdvi)
+CONFIGURE_ARGS+=	--enable-dvi
+PLIST.dvi=		yes
+GCONF_SCHEMAS+=	evince-thumbnailer-dvi.schemas
+.include "../../mk/tex.buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mdjvu)
+CONFIGURE_ARGS+=	--enable-djvu
+PLIST.djvu=		yes
+GCONF_SCHEMAS+=	evince-thumbnailer-djvu.schemas
+.include "../../graphics/djvulibre-lib/buildlink3.mk"
+.endif