Update to 0.4.0:

    * Depend on poppler 0.4.0
    * Pass in timestamp to to handle opening multiple windows over dbus
      better (Ryan Lortie)
    * Really quit when rendering postscript files.
    * Set textdomain to libglade.
    * Fix rotation of thumbnails multiple times
    * Fix selection for non-continuous case
    * Disable selection for rotated case
    * findbar fixes

4 files changed, 62 insertions, 44 deletions

diff --git a/print/evince/Makefile b/print/evince/Makefile
index 78148798abb..ed8102ba6ce 100644
--- a/print/evince/Makefile
+++ b/print/evince/Makefile
@@ -1,26 +1,24 @@
-# $NetBSD: Makefile,v 1.2 2005/08/29 09:52:45 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2005/10/16 12:24:38 jmmv Exp $
 #
 
-DISTNAME=		evince-0.3.2
+DISTNAME=		evince-0.4.0
 CATEGORIES=		print
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evince/0.3/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evince/0.4/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/projects/evince/
-COMMENT=		Document viewer
+COMMENT=		Document viewer for the GNOME Desktop
 
-USE_PKGLOCALEDIR=	yes
-USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake pkg-config
+USE_DIRS+=		gnome2-1.5
+USE_LIBTOOL=		yes
 USE_MSGFMT_PLURALS=	yes
+USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		gmake pkg-config
 
-CONFIGURE_ENV+=		GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
-MAKE_ENV+=		GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
-
+GCONF2_SCHEMAS=		evince.schemas
 GCONF2_SCHEMAS+=	evince-thumbnailer.schemas
-GCONF2_SCHEMAS+=	evince.schemas
 
 # XXX fake for "configure" to allow build w/o a gs installed
 # (avoid hard dependency on a specific version)
@@ -29,14 +27,18 @@ pre-configure:
 	${ECHO} "echo 8.51" >${BUILDLINK_DIR}/bin/gs
 	${CHMOD} +x ${BUILDLINK_DIR}/bin/gs
 
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../devel/GConf2/schemas.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
 .include "../../print/poppler/buildlink3.mk"
-.include "../../devel/GConf2/schemas.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/nautilus/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
+.include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/evince/PLIST b/print/evince/PLIST
index 00b9438f23e..8b4643f221c 100644
--- a/print/evince/PLIST
+++ b/print/evince/PLIST
@@ -1,18 +1,26 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/08/19 16:00:18 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/10/16 12:24:38 jmmv Exp $
 bin/evince
 bin/evince-thumbnailer
+lib/nautilus/extensions-1.0/libevince-properties-page.la
 share/applications/evince.desktop
 share/evince/evince-password.glade
 share/evince/evince-properties.glade
 share/evince/evince-toolbar.xml
 share/evince/evince-ui.xml
 share/evince/hand-open.png
-share/evince/pdf-icon.png
 share/gconf/schemas/evince-thumbnailer.schemas
 share/gconf/schemas/evince.schemas
 share/gnome/help/evince/C/evince.xml
 share/gnome/help/evince/C/figures/evince_start_window.png
 share/gnome/help/evince/C/legal.xml
+share/gnome/help/evince/el/evince.xml
+share/gnome/help/evince/el/figures/evince_start_window.png
+share/gnome/help/evince/es/evince.xml
+share/gnome/help/evince/es/figures/evince_start_window.png
+share/gnome/help/evince/sr/evince.xml
+share/gnome/help/evince/sr/figures/evince_start_window.png
+share/gnome/help/evince/uk/evince.xml
+share/gnome/help/evince/uk/figures/evince_start_window.png
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/evince.mo
@@ -22,28 +30,58 @@ ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/evince.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/evince.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/evince.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/evince.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/evince.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/evince.mo
+${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/evince.mo
+${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/evince.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/evince.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/rw/LC_MESSAGES/evince.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/evince.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/evince.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/evince.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/th/LC_MESSAGES/evince.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/evince.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/evince.mo
 share/omf/evince/evince-C.omf
+share/omf/evince/evince-el.omf
+share/omf/evince/evince-es.omf
+share/omf/evince/evince-sr.omf
+share/omf/evince/evince-uk.omf
 @dirrm share/omf/evince
+@comment in scrollkeeper: @dirrm share/omf
+@dirrm share/gnome/help/evince/uk/figures
+@dirrm share/gnome/help/evince/uk
+@dirrm share/gnome/help/evince/sr/figures
+@dirrm share/gnome/help/evince/sr
+@dirrm share/gnome/help/evince/es/figures
+@dirrm share/gnome/help/evince/es
+@dirrm share/gnome/help/evince/el/figures
+@dirrm share/gnome/help/evince/el
 @dirrm share/gnome/help/evince/C/figures
 @dirrm share/gnome/help/evince/C
 @dirrm share/gnome/help/evince
+@comment in gnome2-dirs: @dirrm share/gnome/help
 @comment in GConf2: @dirrm share/gconf/schemas
 @dirrm share/evince
+@comment in xdg-dirs: @dirrm share/applications
+@comment in nautilus: @dirrm lib/nautilus/extensions-1.0
diff --git a/print/evince/distinfo b/print/evince/distinfo
index 78d5213e452..b9c3f3f1be6 100644
--- a/print/evince/distinfo
+++ b/print/evince/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2005/09/22 13:01:15 rillig Exp $
+$NetBSD: distinfo,v 1.3 2005/10/16 12:24:38 jmmv Exp $
 
-SHA1 (evince-0.3.2.tar.bz2) = b28b9132a14c307f4b11ebbb3596e7d57301df50
-RMD160 (evince-0.3.2.tar.bz2) = b07eea0960050f7563466150b2f9d7b9db0922da
-Size (evince-0.3.2.tar.bz2) = 703251 bytes
-SHA1 (patch-aa) = df9daf757dc05ce25a262dfcf0efde65326d51fb
+SHA1 (evince-0.4.0.tar.bz2) = b143a6a2b257c5b4eb785862967b5a55fba840be
+RMD160 (evince-0.4.0.tar.bz2) = 5ec1ca9286bbcf7955227507f9e3fb7c767a6e61
+Size (evince-0.4.0.tar.bz2) = 891605 bytes
diff --git a/print/evince/patches/patch-aa b/print/evince/patches/patch-aa
deleted file mode 100644
index bc8dd8bd82e..00000000000
--- a/print/evince/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/09/22 13:01:15 rillig Exp $
-
-ISO C90 does not allow declarations after code.
-
---- shell/ev-page-action.c.orig	Sun Jun 19 15:10:20 2005
-+++ shell/ev-page-action.c	Thu Sep 22 14:28:27 2005
-@@ -181,12 +181,13 @@ page_changed_cb (EvPageCache        *pag
- 	g_assert (proxy);
- 	
- 	if (page_cache != NULL && page >= 0) {
-+		gchar *page_label;
- 	
- 		gtk_entry_set_width_chars (GTK_ENTRY (proxy->entry), 
- 					   CLAMP (ev_page_cache_get_max_label_chars (page_cache), 
- 					   4, 12));	
- 		
--		gchar *page_label = ev_page_cache_get_page_label (page_cache, page);
-+		page_label = ev_page_cache_get_page_label (page_cache, page);
- 		gtk_entry_set_text (GTK_ENTRY (proxy->entry), page_label);
- 		gtk_editable_set_position (GTK_EDITABLE (proxy->entry), -1);
- 		g_free (page_label);