update to 0.8.1

This moves this pkg to the new stable gnome branch, too much to list here.

10 files changed, 137 insertions, 79 deletions

diff --git a/print/evince/Makefile b/print/evince/Makefile
index d07d1193a6a..83497941dd5 100644
--- a/print/evince/Makefile
+++ b/print/evince/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.29 2007/03/21 12:05:51 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2007/04/11 18:01:13 drochner Exp $
 #
 
 .include "../../print/evince/Makefile.common"
-PKGREVISION=		3
 
 COMMENT=		Document viewer for the GNOME Desktop
 
 GCONF2_SCHEMAS=		evince.schemas
 GCONF2_SCHEMAS+=	evince-thumbnailer.schemas
+GCONF2_SCHEMAS+=	evince-thumbnailer-ps.schemas
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.evince
 PKG_SUPPORTED_OPTIONS=	dvi djvu
diff --git a/print/evince/Makefile.common b/print/evince/Makefile.common
index fd5b1502da8..34b514b6dac 100644
--- a/print/evince/Makefile.common
+++ b/print/evince/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.12 2006/10/12 14:16:22 drochner Exp $
+# $NetBSD: Makefile.common,v 1.13 2007/04/11 18:01:13 drochner Exp $
 #
 
-DISTNAME=		evince-0.6.1
+DISTNAME=		evince-0.8.1
 CATEGORIES=		print
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evince/0.6/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evince/0.8/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
diff --git a/print/evince/PLIST b/print/evince/PLIST
index b25c2510c42..9e6c535ace8 100644
--- a/print/evince/PLIST
+++ b/print/evince/PLIST
@@ -1,23 +1,42 @@
-@comment $NetBSD: PLIST,v 1.13 2006/10/12 14:16:22 drochner Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/04/11 18:01:13 drochner Exp $
 bin/evince
 bin/evince-thumbnailer
+man/man1/evince.1
 share/applications/evince.desktop
 share/evince/evince-password.glade
+share/evince/evince-preview-toolbar.xml
 share/evince/evince-properties.glade
 share/evince/evince-toolbar.xml
 share/evince/evince-ui.xml
 share/evince/hand-open.png
+share/evince/icons/hicolor/16x16/actions/view-page-continuous.png
+share/evince/icons/hicolor/16x16/actions/view-page-facing.png
+share/evince/icons/hicolor/16x16/actions/zoom-fit-page.png
+share/evince/icons/hicolor/16x16/actions/zoom-fit-width.png
+share/evince/icons/hicolor/22x22/actions/view-page-continuous.png
+share/evince/icons/hicolor/22x22/actions/view-page-facing.png
+share/evince/icons/hicolor/22x22/actions/zoom-fit-page.png
+share/evince/icons/hicolor/22x22/actions/zoom-fit-width.png
+share/evince/icons/hicolor/24x24/actions/view-page-continuous.png
+share/evince/icons/hicolor/24x24/actions/view-page-facing.png
+share/evince/icons/hicolor/24x24/actions/zoom-fit-page.png
+share/evince/icons/hicolor/24x24/actions/zoom-fit-width.png
 ${DJVU}share/gconf/schemas/evince-thumbnailer-djvu.schemas
 ${DVI}share/gconf/schemas/evince-thumbnailer-dvi.schemas
 share/gconf/schemas/evince-thumbnailer.schemas
+share/gconf/schemas/evince-thumbnailer-ps.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/bg/evince.xml
 share/gnome/help/evince/bg/figures/evince_start_window.png
+share/gnome/help/evince/ca/evince.xml
+share/gnome/help/evince/ca/figures/evince_start_window.png
 share/gnome/help/evince/el/evince.xml
 share/gnome/help/evince/el/figures/evince_start_window.png
+share/gnome/help/evince/en_GB/evince.xml
+share/gnome/help/evince/en_GB/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/fi/evince.xml
@@ -36,10 +55,74 @@ share/gnome/help/evince/sv/evince.xml
 share/gnome/help/evince/sv/figures/evince_start_window.png
 share/gnome/help/evince/uk/evince.xml
 share/gnome/help/evince/uk/figures/evince_start_window.png
+share/gtk-doc/html/evince/EvAttachment.html
+share/gtk-doc/html/evince/EvJobPrint.html
+share/gtk-doc/html/evince/EvNavigationAction.html
+share/gtk-doc/html/evince/EvNavigationActionWidget.html
+share/gtk-doc/html/evince/EvPageAction.html
+share/gtk-doc/html/evince/EvPageActionWidget.html
+share/gtk-doc/html/evince/EvWindow.html
+share/gtk-doc/html/evince/evince-EvHistory.html
+share/gtk-doc/html/evince/evince-EvImage.html
+share/gtk-doc/html/evince/evince-EvPasswordDialog.html
+share/gtk-doc/html/evince/evince-EvPasswordView.html
+share/gtk-doc/html/evince/evince-EvRenderContext.html
+share/gtk-doc/html/evince/evince-EvSidebar.html
+share/gtk-doc/html/evince/evince-EvSidebarAttachments.html
+share/gtk-doc/html/evince/evince-EvSidebarLinks.html
+share/gtk-doc/html/evince/evince-EvSidebarThumbnails.html
+share/gtk-doc/html/evince/evince-EvTooltip.html
+share/gtk-doc/html/evince/evince-ev-async-renderer.html
+share/gtk-doc/html/evince/evince-ev-document-factory.html
+share/gtk-doc/html/evince/evince-ev-document-find.html
+share/gtk-doc/html/evince/evince-ev-document-fonts.html
+share/gtk-doc/html/evince/evince-ev-document-images.html
+share/gtk-doc/html/evince/evince-ev-document-info.html
+share/gtk-doc/html/evince/evince-ev-document-links.html
+share/gtk-doc/html/evince/evince-ev-document-misc.html
+share/gtk-doc/html/evince/evince-ev-document-security.html
+share/gtk-doc/html/evince/evince-ev-document-thumbnails.html
+share/gtk-doc/html/evince/evince-ev-document-transition.html
+share/gtk-doc/html/evince/evince-ev-document.html
+share/gtk-doc/html/evince/evince-ev-file-exporter.html
+share/gtk-doc/html/evince/evince-ev-file-helpers.html
+share/gtk-doc/html/evince/evince-ev-job-queue.html
+share/gtk-doc/html/evince/evince-ev-link-action.html
+share/gtk-doc/html/evince/evince-ev-link-dest.html
+share/gtk-doc/html/evince/evince-ev-link.html
+share/gtk-doc/html/evince/evince-ev-metadata-manager.html
+share/gtk-doc/html/evince/evince-ev-page-cache.html
+share/gtk-doc/html/evince/evince-ev-pixbuf-cache.html
+share/gtk-doc/html/evince/evince-ev-print-job.html
+share/gtk-doc/html/evince/evince-ev-properties-dialog.html
+share/gtk-doc/html/evince/evince-ev-properties-fonts.html
+share/gtk-doc/html/evince/evince-ev-selection.html
+share/gtk-doc/html/evince/evince-ev-sidebar-page.html
+share/gtk-doc/html/evince/evince-ev-stock-icons.html
+share/gtk-doc/html/evince/evince-ev-utils.html
+share/gtk-doc/html/evince/evince-ev-view-accessible.html
+share/gtk-doc/html/evince/evince-ev-view.html
+share/gtk-doc/html/evince/evince-ev-window-title.html
+share/gtk-doc/html/evince/evince.devhelp
+share/gtk-doc/html/evince/evince.devhelp2
+share/gtk-doc/html/evince/home.png
+share/gtk-doc/html/evince/index.html
+share/gtk-doc/html/evince/index.sgml
+share/gtk-doc/html/evince/ix01.html
+share/gtk-doc/html/evince/left.png
+share/gtk-doc/html/evince/pt01.html
+share/gtk-doc/html/evince/pt02.html
+share/gtk-doc/html/evince/pt03.html
+share/gtk-doc/html/evince/pt04.html
+share/gtk-doc/html/evince/right.png
+share/gtk-doc/html/evince/style.css
+share/gtk-doc/html/evince/up.png
 share/icons/hicolor/16x16/apps/evince.png
 share/icons/hicolor/22x22/apps/evince.png
+share/icons/hicolor/24x24/apps/evince.png
 share/icons/hicolor/48x48/apps/evince.png
 share/icons/hicolor/scalable/apps/evince.svg
+share/locale/ar/LC_MESSAGES/evince.mo
 share/locale/be/LC_MESSAGES/evince.mo
 share/locale/bg/LC_MESSAGES/evince.mo
 share/locale/bn/LC_MESSAGES/evince.mo
@@ -73,6 +156,7 @@ share/locale/ko/LC_MESSAGES/evince.mo
 share/locale/ku/LC_MESSAGES/evince.mo
 share/locale/lt/LC_MESSAGES/evince.mo
 share/locale/lv/LC_MESSAGES/evince.mo
+share/locale/mg/LC_MESSAGES/evince.mo
 share/locale/mk/LC_MESSAGES/evince.mo
 share/locale/ml/LC_MESSAGES/evince.mo
 share/locale/mr/LC_MESSAGES/evince.mo
@@ -105,7 +189,9 @@ share/locale/zh_HK/LC_MESSAGES/evince.mo
 share/locale/zh_TW/LC_MESSAGES/evince.mo
 share/omf/evince/evince-C.omf
 share/omf/evince/evince-bg.omf
+share/omf/evince/evince-ca.omf
 share/omf/evince/evince-el.omf
+share/omf/evince/evince-en_GB.omf
 share/omf/evince/evince-es.omf
 share/omf/evince/evince-fi.omf
 share/omf/evince/evince-fr.omf
@@ -119,9 +205,11 @@ share/omf/evince/evince-uk.omf
 @comment in scrollkeeper: @dirrm share/omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
 @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/gtk-doc/html/evince
 @dirrm share/gnome/help/evince/uk/figures
 @dirrm share/gnome/help/evince/uk
 @dirrm share/gnome/help/evince/sv/figures
@@ -140,8 +228,12 @@ share/omf/evince/evince-uk.omf
 @dirrm share/gnome/help/evince/fi
 @dirrm share/gnome/help/evince/es/figures
 @dirrm share/gnome/help/evince/es
+@dirrm share/gnome/help/evince/en_GB/figures
+@dirrm share/gnome/help/evince/en_GB
 @dirrm share/gnome/help/evince/el/figures
 @dirrm share/gnome/help/evince/el
+@dirrm share/gnome/help/evince/ca/figures
+@dirrm share/gnome/help/evince/ca
 @dirrm share/gnome/help/evince/bg/figures
 @dirrm share/gnome/help/evince/bg
 @dirrm share/gnome/help/evince/C/figures
@@ -149,5 +241,13 @@ share/omf/evince/evince-uk.omf
 @dirrm share/gnome/help/evince
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @comment in GConf2: @dirrm share/gconf/schemas
+@dirrm share/evince/icons/hicolor/24x24/actions
+@dirrm share/evince/icons/hicolor/24x24
+@dirrm share/evince/icons/hicolor/22x22/actions
+@dirrm share/evince/icons/hicolor/22x22
+@dirrm share/evince/icons/hicolor/16x16/actions
+@dirrm share/evince/icons/hicolor/16x16
+@dirrm share/evince/icons/hicolor
+@dirrm share/evince/icons
 @dirrm share/evince
 @comment in xdg-dirs: @dirrm share/applications
diff --git a/print/evince/distinfo b/print/evince/distinfo
index 376f05d0a6e..db3946a1181 100644
--- a/print/evince/distinfo
+++ b/print/evince/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.11 2007/03/21 12:11:05 wiz Exp $
+$NetBSD: distinfo,v 1.12 2007/04/11 18:01:13 drochner Exp $
 
-SHA1 (evince-0.6.1.tar.bz2) = bc314761ecc9c29d10d09294ad8e32bab3a5dbc6
-RMD160 (evince-0.6.1.tar.bz2) = ac94e1964f4f46e505fe945daa9de288c2587898
-Size (evince-0.6.1.tar.bz2) = 1212271 bytes
-SHA1 (patch-aa) = 65abdde02e6b72743d47e5c5d6156cbb4a74f0a6
-SHA1 (patch-ab) = 800d96b612b09976f8573b4caab40da1d5d838f6
-SHA1 (patch-ac) = a2f08a7d977b1e51a811c80c6abc8b8480dd3cda
-SHA1 (patch-ad) = 95563457bd1c9b0b46be4f274d645e5d18382fd2
+SHA1 (evince-0.8.1.tar.bz2) = 5f32ff51cfde32fee89062743a3ddabbdadf579f
+RMD160 (evince-0.8.1.tar.bz2) = c9d268102e3d8b7f7f6bb06930f2995b053614de
+Size (evince-0.8.1.tar.bz2) = 1472930 bytes
+SHA1 (patch-ae) = 833d535cea619fe2e7bc8540833dcd6d9e7641d1
+SHA1 (patch-af) = a6ab220605e2dd56030a17657f5e0added634271
diff --git a/print/evince/patches/patch-aa b/print/evince/patches/patch-aa
deleted file mode 100644
index c6aa1614fe0..00000000000
--- a/print/evince/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/05/31 18:17:23 drochner Exp $
-
---- backend/ev-document-links.c.orig	2006-05-29 20:14:29.000000000 +0200
-+++ backend/ev-document-links.c
-@@ -74,6 +74,8 @@ ev_document_links_get_links (EvDocumentL
- 	EvDocumentLinksIface *iface = EV_DOCUMENT_LINKS_GET_IFACE (document_links);
- 	GList *retval;
- 
-+	if (!iface)
-+		return (0);
- 	retval = iface->get_links (document_links, page);
- 
- 	return retval;
diff --git a/print/evince/patches/patch-ab b/print/evince/patches/patch-ab
deleted file mode 100644
index 80088911903..00000000000
--- a/print/evince/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/08/03 19:25:52 drochner Exp $
-
---- shell/main.c.orig	2006-06-01 16:41:11.000000000 +0200
-+++ shell/main.c
-@@ -251,7 +251,6 @@ main (int argc, char *argv[])
- 	}
- #endif
- 	
--	gdk_threads_init ();
- 	gnome_authentication_manager_init ();
- 
- 	if (enable_metadata) {
diff --git a/print/evince/patches/patch-ac b/print/evince/patches/patch-ac
deleted file mode 100644
index 4ac296d1a62..00000000000
--- a/print/evince/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/12/06 14:48:35 wiz Exp $
-
-Fix for CVE-2006-5864. From evince CVS
-http://cvs.gnome.org/viewcvs/evince/ps/ps.c?r1=1.6&r2=1.6.6.1
-
---- ps/ps.c.orig	2006-01-07 00:03:44.000000000 +0100
-+++ ps/ps.c
-@@ -1231,7 +1231,8 @@ get_next_text(line, next_char)
-     int level = 0;
-     quoted = 1;
-     line++;
--    while(*line && !(*line == ')' && level == 0)) {
-+    while(*line && !(*line == ')' && level == 0)
-+	  && (cp - text) < PSLINELENGTH - 1) {
-       if(*line == '\\') {
-         if(*(line + 1) == 'n') {
-           *cp++ = '\n';
-@@ -1302,7 +1303,8 @@ get_next_text(line, next_char)
-     }
-   }
-   else {
--    while(*line && !(*line == ' ' || *line == '\t' || *line == '\n'))
-+    while(*line && !(*line == ' ' || *line == '\t' || *line == '\n')
-+	  && (cp - text) < PSLINELENGTH - 1)
-       *cp++ = *line++;
-   }
-   *cp = '\0';
diff --git a/print/evince/patches/patch-ad b/print/evince/patches/patch-ad
deleted file mode 100644
index 75763dc0eab..00000000000
--- a/print/evince/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/03/21 12:11:07 wiz Exp $
-
---- help/C/evince.xml.orig	2006-10-09 19:06:04.000000000 +0000
-+++ help/C/evince.xml
-@@ -60,7 +60,7 @@
-         <surname>GNOME Documentation Team</surname>
-         <affiliation><orgname>Sun Microsystems</orgname></affiliation>
-       </author>
--      <author> 
-+      <author role="maintainer"> 
- 	<firstname>Nickolay V. </firstname> 
- 	<surname>Shmyrev</surname> 
- 	<affiliation> 
diff --git a/print/evince/patches/patch-ae b/print/evince/patches/patch-ae
new file mode 100644
index 00000000000..7c5b778a553
--- /dev/null
+++ b/print/evince/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2007/04/11 18:01:14 drochner Exp $
+
+--- configure.orig	2007-04-04 15:57:38.000000000 +0200
++++ configure
+@@ -25750,7 +25750,7 @@ else
+ echo "${ECHO_T}yes" >&6
+ 	enable_cairo_pdf=yes
+ fi
+-	    if test x$enable_cairo_pdf == xyes; then
++	    if test x$enable_cairo_pdf = xyes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_CAIRO_PDF 1
diff --git a/print/evince/patches/patch-af b/print/evince/patches/patch-af
new file mode 100644
index 00000000000..219df5d07ed
--- /dev/null
+++ b/print/evince/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1 2007/04/11 18:01:14 drochner Exp $
+
+--- backend/ps/ps-interpreter.c.orig	2007-04-04 16:01:22.000000000 +0200
++++ backend/ps/ps-interpreter.c
+@@ -30,6 +30,7 @@
+ #include <stdlib.h>
+ #include <sys/wait.h>
+ #include <errno.h>
++#include <signal.h>
+ 
+ #include "ps-interpreter.h"
+ #include "ps.h"