update to 0.5.3

changes:
-supports attachments in PDF files
-Links system is reworked allowing named links
-UI improvements
-bugfixes
-translation updates

pkgsrc change: add "dvi" option to nautilus plugin
(doesn't provide useful information yet)

6 files changed, 46 insertions, 15 deletions

diff --git a/print/evince-nautilus/Makefile b/print/evince-nautilus/Makefile
index c8d26282a41..7c09862d348 100644
--- a/print/evince-nautilus/Makefile
+++ b/print/evince-nautilus/Makefile
@@ -1,14 +1,26 @@
-# $NetBSD: Makefile,v 1.5 2006/04/17 13:46:45 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2006/05/31 18:17:23 drochner Exp $
 #
 
 .include "../../print/evince/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/evince/evince-nautilus/}
-PKGREVISION=		3
 
 COMMENT=		File properties plugin for evince files
+PKG_OPTIONS_VAR=	PKG_OPTIONS.evince PKG_SUPPORTED_OPTIONS=	dvi
+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
 
-BUILD_DIRS=		libbackend lib properties
 INSTALL_DIRS=		properties
 
 .include "../../print/libgnomeprint/buildlink3.mk"
diff --git a/print/evince/Makefile b/print/evince/Makefile
index ee5572c2717..f558ea41a59 100644
--- a/print/evince/Makefile
+++ b/print/evince/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2006/04/17 13:46:46 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2006/05/31 18:17:23 drochner Exp $
 #
 
 .include "../../print/evince/Makefile.common"
 
-PKGREVISION=		4
-
 COMMENT=		Document viewer for the GNOME Desktop
 
 GCONF2_SCHEMAS=		evince.schemas
diff --git a/print/evince/Makefile.common b/print/evince/Makefile.common
index d74f755e9c0..a2601de158d 100644
--- a/print/evince/Makefile.common
+++ b/print/evince/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.4 2006/05/22 16:33:49 drochner Exp $
+# $NetBSD: Makefile.common,v 1.5 2006/05/31 18:17:23 drochner Exp $
 #
 
-DISTNAME=		evince-0.5.2
+DISTNAME=		evince-0.5.3
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evince/0.5/}
 EXTRACT_SUFX=		.tar.bz2
@@ -9,7 +9,7 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/projects/evince/
 
-#PATCHDIR=		${.CURDIR}/../evince/patches
+PATCHDIR=		${.CURDIR}/../evince/patches
 DISTINFO_FILE=		${.CURDIR}/../evince/distinfo
 
 GNU_CONFIGURE=		yes
@@ -30,6 +30,7 @@ pre-configure:
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler-glib+=	poppler-glib>=0.5.2
 .include "../../print/poppler-glib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/print/evince/PLIST b/print/evince/PLIST
index f778aa1fe12..227e6308fca 100644
--- a/print/evince/PLIST
+++ b/print/evince/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/04/17 07:07:32 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/05/31 18:17:23 drochner Exp $
 bin/evince
 bin/evince-thumbnailer
 share/applications/evince.desktop
@@ -27,14 +27,20 @@ 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
+share/icons/hicolor/16x16/apps/evince-16.png
+share/icons/hicolor/22x22/apps/evince-22.png
+share/icons/hicolor/48x48/apps/evince.png
+share/icons/hicolor/scalable/apps/evince.svg
 share/locale/be/LC_MESSAGES/evince.mo
 share/locale/bg/LC_MESSAGES/evince.mo
 share/locale/bn/LC_MESSAGES/evince.mo
+share/locale/br/LC_MESSAGES/evince.mo
 share/locale/ca/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
 share/locale/de/LC_MESSAGES/evince.mo
+share/locale/dz/LC_MESSAGES/evince.mo
 share/locale/el/LC_MESSAGES/evince.mo
 share/locale/en_CA/LC_MESSAGES/evince.mo
 share/locale/en_GB/LC_MESSAGES/evince.mo
@@ -61,7 +67,7 @@ share/locale/mk/LC_MESSAGES/evince.mo
 share/locale/nb/LC_MESSAGES/evince.mo
 share/locale/ne/LC_MESSAGES/evince.mo
 share/locale/nl/LC_MESSAGES/evince.mo
-share/locale/no/LC_MESSAGES/evince.mo
+share/locale/nn/LC_MESSAGES/evince.mo
 share/locale/pa/LC_MESSAGES/evince.mo
 share/locale/pl/LC_MESSAGES/evince.mo
 share/locale/pt/LC_MESSAGES/evince.mo
diff --git a/print/evince/distinfo b/print/evince/distinfo
index 47a45668d28..d022dbe3ad0 100644
--- a/print/evince/distinfo
+++ b/print/evince/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2006/03/30 21:30:42 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2006/05/31 18:17:23 drochner Exp $
 
-SHA1 (evince-0.5.2.tar.bz2) = a98ee2cb2cfacf68db62d6072b782750696635a3
-RMD160 (evince-0.5.2.tar.bz2) = 2c56b5c69eeb5ad8ac2322add4e369ce620cb34c
-Size (evince-0.5.2.tar.bz2) = 1000723 bytes
+SHA1 (evince-0.5.3.tar.bz2) = 8336966d4c269065eee30912f8dd94caa76b0ba5
+RMD160 (evince-0.5.3.tar.bz2) = 6f29572326eef5f68309b3fa85e583eaaddc1eb6
+Size (evince-0.5.3.tar.bz2) = 994976 bytes
+SHA1 (patch-aa) = 65abdde02e6b72743d47e5c5d6156cbb4a74f0a6
diff --git a/print/evince/patches/patch-aa b/print/evince/patches/patch-aa
new file mode 100644
index 00000000000..c6aa1614fe0
--- /dev/null
+++ b/print/evince/patches/patch-aa
@@ -0,0 +1,13 @@
+$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;