Update to 2.31.6.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14402 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 18 insertions, 20 deletions

diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index 0a4f26bc4..5da84c60a 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -2,13 +2,12 @@
 # Date created:				09 January 2005
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
-# $FreeBSD: ports/graphics/evince/Makefile,v 1.57 2010/07/06 00:37:53 marcus Exp $
-#    $MCom: ports/graphics/evince/Makefile,v 1.137 2010/04/27 14:14:36 kwm Exp $
+# $FreeBSD$
+#    $MCom: ports/graphics/evince/Makefile,v 1.141 2010/07/07 13:43:39 kwm Exp $
 #
 
 PORTNAME=	evince
-PORTVERSION=	2.30.1
-PORTREVISION=	3
+PORTVERSION=	2.31.6.1
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -33,7 +32,8 @@ USE_GNOME=	gnomehack intlhack gnomeprefix desktopfileutils \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-GCONF_SCHEMAS=	evince.schemas \
+GLIB_SCHEMAS=	org.gnome.Evince.gschema.xml
+GCONF_SCHEMAS=	\
 		evince-thumbnailer.schemas \
 		evince-thumbnailer-ps.schemas
 
@@ -120,6 +120,7 @@ PLIST_SUB+=		COMICS="@comment "
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|execinfo.h|#|g' \
+		-e 's|" == "|" = "|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/^DOC_MODULE_VERSION/d' \
 		${WRKSRC}/help/reference/libdocument/Makefile.in \
@@ -127,5 +128,7 @@ post-patch:
 
 post-install:
 	@-update-desktop-database
+	@${INSTALL_DATA} ${WRKSRC}/data/org.gnome.Evince.gschema.xml \
+		${PREFIX}/share/glib-2.0/schemas
 
 .include <bsd.port.post.mk>
diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo
index 48317462f..9e09b23c9 100644
--- a/graphics/evince/distinfo
+++ b/graphics/evince/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evince-2.30.1.tar.bz2) = 84eb6c8bb460edd382025fdd29c3bc64
-SHA256 (gnome2/evince-2.30.1.tar.bz2) = ab6b957ab422341f023baa8ee4061bc5719389f92d6745874d239cd1e737f225
-SIZE (gnome2/evince-2.30.1.tar.bz2) = 2177738
+MD5 (gnome2/evince-2.31.6.1.tar.bz2) = 39ba23e18228ecc50c820477b3ed2446
+SHA256 (gnome2/evince-2.31.6.1.tar.bz2) = 7da36713acc40a967e8afa43b130aaff06fa35556e1a36878bf3f48640034450
+SIZE (gnome2/evince-2.31.6.1.tar.bz2) = 2348070
diff --git a/graphics/evince/files/patch-shell_ev-window.c b/graphics/evince/files/patch-shell_ev-window.c
deleted file mode 100644
index 0e8ddac0b..000000000
--- a/graphics/evince/files/patch-shell_ev-window.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- shell/ev-window.c.orig	2010-07-05 20:36:07.000000000 -0400
-+++ shell/ev-window.c	2010-07-05 20:36:10.000000000 -0400
-@@ -6107,7 +6107,7 @@ ev_window_create_last_settings_metadata 
- 	GFile *file;
- 	gchar *path;
- 
--	path = g_build_filename (ev_application_get_dot_dir (EV_APP, FALSE), "last_settings", NULL);
-+	path = g_build_filename (ev_application_get_dot_dir (EV_APP, TRUE), "last_settings", NULL);
- 	file = g_file_new_for_path (path);
- 	g_free (path);
- 
diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist
index c5fcd8580..bfe6dc9a7 100644
--- a/graphics/evince/pkg-plist
+++ b/graphics/evince/pkg-plist
@@ -20,6 +20,7 @@ include/evince/2.30/libdocument/ev-document-links.h
 include/evince/2.30/libdocument/ev-document-misc.h
 include/evince/2.30/libdocument/ev-document-print.h
 include/evince/2.30/libdocument/ev-document-security.h
+include/evince/2.30/libdocument/ev-document-text.h
 include/evince/2.30/libdocument/ev-document-thumbnails.h
 include/evince/2.30/libdocument/ev-document-transition.h
 include/evince/2.30/libdocument/ev-document-type-builtins.h
@@ -33,7 +34,7 @@ include/evince/2.30/libdocument/ev-layer.h
 include/evince/2.30/libdocument/ev-link-action.h
 include/evince/2.30/libdocument/ev-link-dest.h
 include/evince/2.30/libdocument/ev-link.h
-include/evince/2.30/libdocument/ev-mapping.h
+include/evince/2.30/libdocument/ev-mapping-list.h
 include/evince/2.30/libdocument/ev-page.h
 include/evince/2.30/libdocument/ev-render-context.h
 include/evince/2.30/libdocument/ev-selection.h
@@ -90,6 +91,7 @@ libdata/pkgconfig/evince-document-2.30.pc
 libdata/pkgconfig/evince-view-2.30.pc
 libexec/evince-convert-metadata
 libexec/evinced
+share/GConf/gsettings/evince.convert
 share/applications/evince.desktop
 share/dbus-1/services/org.gnome.evince.Daemon.service
 %%DOCSDIR%%/EggFindBar.html
@@ -317,6 +319,7 @@ 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/eo/LC_MESSAGES/evince.mo
 share/locale/en@shaw/LC_MESSAGES/evince.mo
 share/locale/en_CA/LC_MESSAGES/evince.mo
 share/locale/en_GB/LC_MESSAGES/evince.mo
@@ -336,6 +339,7 @@ share/locale/id/LC_MESSAGES/evince.mo
 share/locale/it/LC_MESSAGES/evince.mo
 share/locale/ja/LC_MESSAGES/evince.mo
 share/locale/ka/LC_MESSAGES/evince.mo
+share/locale/kk/LC_MESSAGES/evince.mo
 share/locale/kn/LC_MESSAGES/evince.mo
 share/locale/ko/LC_MESSAGES/evince.mo
 share/locale/ks/LC_MESSAGES/evince.mo
@@ -508,6 +512,8 @@ share/omf/evince/evince-zh_CN.omf
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/ks/LC_MESSAGES
 @dirrmtry share/locale/ks
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
 @dirrmtry share/locale/en@shaw/LC_MESSAGES
 @dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES