update to 2.28.1

This switches to the gnome-2.28 release branch.

6 files changed, 42 insertions, 82 deletions

diff --git a/print/evince/Makefile b/print/evince/Makefile
index f18c1b18bf9..169921ad692 100644
--- a/print/evince/Makefile
+++ b/print/evince/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.55 2009/08/26 19:57:00 sno Exp $
+# $NetBSD: Makefile,v 1.56 2009/10/21 17:28:02 drochner Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../print/evince/Makefile.common"
-PKGREVISION=		1
 
 COMMENT=		Document viewer
 
@@ -15,6 +14,7 @@ GCONF_SCHEMAS+=	evince-thumbnailer-ps.schemas
 .include "options.mk"
 
 CONFIGURE_ARGS+=	--enable-comics
+CONFIGURE_ARGS+=	--disable-nautilus
 GCONF_SCHEMAS+=		evince-thumbnailer-comics.schemas
 
 BUILDLINK_DEPMETHOD.libXt?=	build
diff --git a/print/evince/Makefile.common b/print/evince/Makefile.common
index 5ccd1b9e36e..b682170cbbb 100644
--- a/print/evince/Makefile.common
+++ b/print/evince/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.29 2009/07/22 09:01:42 wiz Exp $
+# $NetBSD: Makefile.common,v 1.30 2009/10/21 17:28:02 drochner Exp $
 #
 # used by print/evince/Makefile
 # used by print/evince-nautilus/Makefile
 
-DISTNAME=		evince-2.26.2
+DISTNAME=		evince-2.28.1
 CATEGORIES=		print
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evince/2.26/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evince/2.28/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -31,7 +31,6 @@ pre-configure:
 .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.gnome-icon-theme+=	gnome-icon-theme>=2.17.1
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/print/evince/PLIST b/print/evince/PLIST
index d81ea22b772..5fd8b27ca14 100644
--- a/print/evince/PLIST
+++ b/print/evince/PLIST
@@ -1,11 +1,14 @@
-@comment $NetBSD: PLIST,v 1.26 2009/06/14 18:11:55 joerg Exp $
+@comment $NetBSD: PLIST,v 1.27 2009/10/21 17:28:02 drochner Exp $
 bin/evince
+bin/evince-previewer
 bin/evince-thumbnailer
 include/evince/2.25/evince-document.h
 include/evince/2.25/evince-view.h
+include/evince/2.25/libdocument/ev-annotation.h
 include/evince/2.25/libdocument/ev-async-renderer.h
 include/evince/2.25/libdocument/ev-attachment.h
 include/evince/2.25/libdocument/ev-backends-manager.h
+include/evince/2.25/libdocument/ev-document-annotations.h
 include/evince/2.25/libdocument/ev-document-factory.h
 include/evince/2.25/libdocument/ev-document-find.h
 include/evince/2.25/libdocument/ev-document-fonts.h
@@ -15,6 +18,7 @@ include/evince/2.25/libdocument/ev-document-info.h
 include/evince/2.25/libdocument/ev-document-layers.h
 include/evince/2.25/libdocument/ev-document-links.h
 include/evince/2.25/libdocument/ev-document-misc.h
+include/evince/2.25/libdocument/ev-document-print.h
 include/evince/2.25/libdocument/ev-document-security.h
 include/evince/2.25/libdocument/ev-document-thumbnails.h
 include/evince/2.25/libdocument/ev-document-transition.h
@@ -29,6 +33,7 @@ include/evince/2.25/libdocument/ev-layer.h
 include/evince/2.25/libdocument/ev-link-action.h
 include/evince/2.25/libdocument/ev-link-dest.h
 include/evince/2.25/libdocument/ev-link.h
+include/evince/2.25/libdocument/ev-mapping.h
 include/evince/2.25/libdocument/ev-page.h
 include/evince/2.25/libdocument/ev-render-context.h
 include/evince/2.25/libdocument/ev-selection.h
@@ -37,6 +42,7 @@ include/evince/2.25/libdocument/ev-version.h
 include/evince/2.25/libview/ev-job-scheduler.h
 include/evince/2.25/libview/ev-jobs.h
 include/evince/2.25/libview/ev-page-cache.h
+include/evince/2.25/libview/ev-stock-icons.h
 include/evince/2.25/libview/ev-view-type-builtins.h
 include/evince/2.25/libview/ev-view.h
 lib/evince/1/backends/comicsdocument.evince-backend
@@ -57,6 +63,7 @@ lib/pkgconfig/evince-document-2.25.pc
 lib/pkgconfig/evince-view-2.25.pc
 man/man1/evince.1
 share/applications/evince.desktop
+share/evince/evince-previewer-ui.xml
 share/evince/evince-toolbar.xml
 share/evince/evince-ui.xml
 share/evince/hand-open.png
@@ -78,6 +85,9 @@ share/evince/icons/hicolor/24x24/actions/zoom-fit-width.png
 share/evince/icons/hicolor/24x24/actions/zoom.png
 share/evince/icons/hicolor/32x32/actions/view-page-continuous.png
 share/evince/icons/hicolor/32x32/actions/view-page-facing.png
+share/evince/icons/hicolor/48x48/actions/close.png
+share/evince/icons/hicolor/48x48/actions/resize-se.png
+share/evince/icons/hicolor/48x48/actions/resize-sw.png
 share/evince/icons/hicolor/48x48/actions/view-page-continuous.png
 share/evince/icons/hicolor/48x48/actions/view-page-facing.png
 share/gconf/schemas/evince-thumbnailer-comics.schemas
@@ -127,6 +137,8 @@ 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/gnome/help/evince/vi/evince.xml
+share/gnome/help/evince/vi/figures/evince_start_window.png
 share/gnome/help/evince/zh_CN/evince.xml
 share/gnome/help/evince/zh_CN/figures/evince_start_window.png
 share/gtk-doc/html/evince/EvNavigationAction.html
@@ -139,12 +151,11 @@ share/gtk-doc/html/evince/evince-EvPasswordView.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-EvSidebarPage.html
 share/gtk-doc/html/evince/evince-EvSidebarThumbnails.html
 share/gtk-doc/html/evince/evince-ev-metadata-manager.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-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-window-title.html
 share/gtk-doc/html/evince/evince.devhelp
@@ -158,12 +169,25 @@ share/gtk-doc/html/evince/pt01.html
 share/gtk-doc/html/evince/right.png
 share/gtk-doc/html/evince/style.css
 share/gtk-doc/html/evince/up.png
+share/gtk-doc/html/libevdocument/EvAsyncRenderer.html
 share/gtk-doc/html/libevdocument/EvAttachment.html
+share/gtk-doc/html/libevdocument/EvDocument.html
+share/gtk-doc/html/libevdocument/EvDocumentFind.html
+share/gtk-doc/html/libevdocument/EvDocumentFonts.html
+share/gtk-doc/html/libevdocument/EvDocumentForms.html
+share/gtk-doc/html/libevdocument/EvDocumentImages.html
+share/gtk-doc/html/libevdocument/EvDocumentLayers.html
+share/gtk-doc/html/libevdocument/EvDocumentLinks.html
+share/gtk-doc/html/libevdocument/EvDocumentSecurity.html
+share/gtk-doc/html/libevdocument/EvDocumentThumbnails.html
+share/gtk-doc/html/libevdocument/EvDocumentTransition.html
+share/gtk-doc/html/libevdocument/EvFileExporter.html
 share/gtk-doc/html/libevdocument/EvFormFieldSignature.html
 share/gtk-doc/html/libevdocument/EvImage.html
 share/gtk-doc/html/libevdocument/EvLayer.html
 share/gtk-doc/html/libevdocument/EvPage.html
 share/gtk-doc/html/libevdocument/EvRenderContext.html
+share/gtk-doc/html/libevdocument/EvSelection.html
 share/gtk-doc/html/libevdocument/data.html
 share/gtk-doc/html/libevdocument/helper.html
 share/gtk-doc/html/libevdocument/home.png
@@ -171,42 +195,30 @@ share/gtk-doc/html/libevdocument/index.html
 share/gtk-doc/html/libevdocument/index.sgml
 share/gtk-doc/html/libevdocument/interfaces.html
 share/gtk-doc/html/libevdocument/left.png
-share/gtk-doc/html/libevdocument/libevdocument-ev-async-renderer.html
 share/gtk-doc/html/libevdocument/libevdocument-ev-backends-manager.html
 share/gtk-doc/html/libevdocument/libevdocument-ev-document-factory.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-document-find.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-document-fonts.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-document-forms.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-document-images.html
 share/gtk-doc/html/libevdocument/libevdocument-ev-document-info.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-document-layers.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-document-links.html
 share/gtk-doc/html/libevdocument/libevdocument-ev-document-misc.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-document-security.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-document-thumbnails.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-document-transition.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-document.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-file-exporter.html
 share/gtk-doc/html/libevdocument/libevdocument-ev-file-helpers.html
 share/gtk-doc/html/libevdocument/libevdocument-ev-init.html
 share/gtk-doc/html/libevdocument/libevdocument-ev-link-action.html
 share/gtk-doc/html/libevdocument/libevdocument-ev-link-dest.html
 share/gtk-doc/html/libevdocument/libevdocument-ev-link.html
-share/gtk-doc/html/libevdocument/libevdocument-ev-selection.html
 share/gtk-doc/html/libevdocument/libevdocument-ev-transition-effect.html
 share/gtk-doc/html/libevdocument/libevdocument.devhelp
 share/gtk-doc/html/libevdocument/libevdocument.devhelp2
 share/gtk-doc/html/libevdocument/right.png
 share/gtk-doc/html/libevdocument/style.css
 share/gtk-doc/html/libevdocument/up.png
-share/gtk-doc/html/libevview/EvJobExport.html
 share/gtk-doc/html/libevview/ch01.html
 share/gtk-doc/html/libevview/home.png
 share/gtk-doc/html/libevview/index.html
 share/gtk-doc/html/libevview/index.sgml
 share/gtk-doc/html/libevview/left.png
+share/gtk-doc/html/libevview/libevview-EvJobPrint.html
 share/gtk-doc/html/libevview/libevview-ev-job-scheduler.html
 share/gtk-doc/html/libevview/libevview-ev-page-cache.html
+share/gtk-doc/html/libevview/libevview-ev-stock-icons.html
 share/gtk-doc/html/libevview/libevview-ev-view.html
 share/gtk-doc/html/libevview/libevview.devhelp
 share/gtk-doc/html/libevview/libevview.devhelp2
@@ -229,6 +241,7 @@ share/locale/bn/LC_MESSAGES/evince.mo
 share/locale/bn_IN/LC_MESSAGES/evince.mo
 share/locale/br/LC_MESSAGES/evince.mo
 share/locale/ca/LC_MESSAGES/evince.mo
+share/locale/ca@valencia/LC_MESSAGES/evince.mo
 share/locale/cs/LC_MESSAGES/evince.mo
 share/locale/cy/LC_MESSAGES/evince.mo
 share/locale/da/LC_MESSAGES/evince.mo
@@ -315,4 +328,5 @@ share/omf/evince/evince-ru.omf
 share/omf/evince/evince-sr.omf
 share/omf/evince/evince-sv.omf
 share/omf/evince/evince-uk.omf
+share/omf/evince/evince-vi.omf
 share/omf/evince/evince-zh_CN.omf
diff --git a/print/evince/distinfo b/print/evince/distinfo
index 27c0e1b3b36..2126d5ed77f 100644
--- a/print/evince/distinfo
+++ b/print/evince/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.27 2009/05/19 23:53:34 wiz Exp $
+$NetBSD: distinfo,v 1.28 2009/10/21 17:28:02 drochner Exp $
 
-SHA1 (evince-2.26.2.tar.bz2) = 1a789e078b4c95f3e3387a45092ae2f222135013
-RMD160 (evince-2.26.2.tar.bz2) = 00dd3dfa006dc019f8f951a356d7260283bf8bab
-Size (evince-2.26.2.tar.bz2) = 2033141 bytes
-SHA1 (patch-aa) = 546d38dd316cb01d05459d342fb39890d78daee4
+SHA1 (evince-2.28.1.tar.bz2) = 28fb2b9fa0bbe126d0275badcf6091e6e56d0e01
+RMD160 (evince-2.28.1.tar.bz2) = 6658e0516faffacd926de781da39c26e174ae182
+Size (evince-2.28.1.tar.bz2) = 2033193 bytes
diff --git a/print/evince/options.mk b/print/evince/options.mk
index a5363448b21..1da5e49c225 100644
--- a/print/evince/options.mk
+++ b/print/evince/options.mk
@@ -1,8 +1,7 @@
-# $NetBSD: options.mk,v 1.4 2009/03/18 00:16:46 jmcneill Exp $
+# $NetBSD: options.mk,v 1.5 2009/10/21 17:28:02 drochner Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.evince
-PKG_SUPPORTED_OPTIONS=	dvi djvu gnome
-PKG_SUGGESTED_OPTIONS=	gnome
+PKG_SUPPORTED_OPTIONS=	dvi djvu
 
 .include "../../mk/bsd.options.mk"
 
@@ -21,11 +20,3 @@ PLIST.djvu=		yes
 GCONF_SCHEMAS+=	evince-thumbnailer-djvu.schemas
 .include "../../graphics/djvulibre-lib/buildlink3.mk"
 .endif
-
-.if !empty(PKG_OPTIONS:Mgnome)
-COMMENT+=		for the GNOME Desktop
-.else
-COMMENT+=		(GTK version)
-CONFIGURE_ARGS+=	--disable-nautilus
-.endif
-
diff --git a/print/evince/patches/patch-aa b/print/evince/patches/patch-aa
deleted file mode 100644
index 9409f9f3fa1..00000000000
--- a/print/evince/patches/patch-aa
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2009/05/19 23:53:34 wiz Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=583276
-
---- backend/pdf/ev-poppler.cc.orig	2008-08-29 19:38:51.000000000 +0200
-+++ backend/pdf/ev-poppler.cc
-@@ -885,9 +885,11 @@ ev_link_dest_from_dest (PdfDocument *pdf
- 			g_object_unref (poppler_page);
- 		}
- 			break;
--	        case POPPLER_DEST_FIT:
-+	        case POPPLER_DEST_FITB:
-+		case POPPLER_DEST_FIT:
- 			ev_dest = ev_link_dest_new_fit (dest->page_num - 1);
- 			break;
-+		case POPPLER_DEST_FITBH:
- 	        case POPPLER_DEST_FITH: {
- 			PopplerPage *poppler_page;
- 			double height;
-@@ -901,6 +903,7 @@ ev_link_dest_from_dest (PdfDocument *pdf
- 			g_object_unref (poppler_page);
- 		}
- 			break;
-+		case POPPLER_DEST_FITBV:
- 	        case POPPLER_DEST_FITV:
- 			ev_dest = ev_link_dest_new_fitv (dest->page_num - 1,
- 							 dest->left,
-@@ -921,6 +924,7 @@ ev_link_dest_from_dest (PdfDocument *pdf
- 			g_object_unref (poppler_page);
- 		}
- 			break;
-+#if 0
- 	        case POPPLER_DEST_FITB:
- 			unimplemented_dest = "POPPLER_DEST_FITB";
- 			break;
-@@ -930,6 +934,7 @@ ev_link_dest_from_dest (PdfDocument *pdf
- 	        case POPPLER_DEST_FITBV:
- 			unimplemented_dest = "POPPLER_DEST_FITBV";
- 			break;
-+#endif
- 	        case POPPLER_DEST_NAMED:
- 			ev_dest = ev_link_dest_new_named (dest->named_dest);
- 			break;