Update to 2.22.1

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

4 files changed, 31 insertions, 14 deletions

diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index a478e6ce1..d242f8052 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/evince/Makefile,v 1.99 2008/03/24 14:24:58 ahze Exp $
+#   $MCom: ports/graphics/evince/Makefile,v 1.100 2008/04/04 20:07:05 ahze Exp $
 #
 
 PORTNAME=	evince
-PORTVERSION=	2.22.0
-PORTREVISION=	5
+PORTVERSION=	2.22.1
+PORTREVISION=	1
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -75,8 +75,10 @@ PLIST_SUB+=		NAUTILUS="@comment "
 
 .if defined(WITH_IMPRESS)
 CONFIGURE_ARGS+=	--enable-impress
+PLIST_SUB+=		IMPRESS=""
 .else
 CONFIGURE_ARGS+=	--disable-impress
+PLIST_SUB+=		IMPRESS="@comment "
 .endif
 
 .if exists(${LOCALBASE}/bin/djview)
diff --git a/graphics/evince/distinfo b/graphics/evince/distinfo
index b498784dd..190405a39 100644
--- a/graphics/evince/distinfo
+++ b/graphics/evince/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evince-2.22.0.tar.bz2) = 9fc7eb5757549626b7515b853a5f6b97
-SHA256 (gnome2/evince-2.22.0.tar.bz2) = 293778da77d42d8474bb401dc1a50d8e7d67b40b84ddce5fd39f871fef06a7ca
-SIZE (gnome2/evince-2.22.0.tar.bz2) = 1618429
+MD5 (gnome2/evince-2.22.1.tar.bz2) = 2557205c5241d4ad756b40747586ace8
+SHA256 (gnome2/evince-2.22.1.tar.bz2) = 4b0379a3369d790d142ad95d9ea16bf38a7e5e0d946501dbd9549a14b6eba4c0
+SIZE (gnome2/evince-2.22.1.tar.bz2) = 1673261
diff --git a/graphics/evince/files/patch-configure b/graphics/evince/files/patch-configure
index 9ca1314d6..50def41e4 100644
--- a/graphics/evince/files/patch-configure
+++ b/graphics/evince/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2007-08-27 23:27:26.000000000 -0400
-+++ configure	2007-08-27 23:29:35.000000000 -0400
-@@ -25411,7 +25411,7 @@ fi
+--- configure.orig	2008-04-07 14:16:28.661972413 -0400
++++ configure	2008-04-07 14:52:51.263707127 -0400
+@@ -25726,7 +25726,7 @@
  
  
  
@@ -8,9 +8,20 @@
 +for ac_header in #
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -26204,7 +26204,7 @@ else
- echo "${ECHO_T}yes" >&6
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+@@ -26312,8 +26312,8 @@
+ 
+ 	    LIBS=$evince_save_LIBS
+ 
+-	    POPPLER_MAJOR_VERSION=`$PKG_CONFIG --modversion poppler-glib | sed 's/0\.\([0-9]*\)\(\.\([0-9]*\)\)\?/\1/'`
+-	    POPPLER_MINOR_VERSION=`$PKG_CONFIG --modversion poppler-glib | sed 's/0\.\([0-9]*\)\(\.\([0-9]*\)\)\?/\3/'`
++	    POPPLER_MAJOR_VERSION=`$PKG_CONFIG --modversion poppler-glib | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\2 /'`
++	    POPPLER_MINOR_VERSION=`$PKG_CONFIG --modversion poppler-glib | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\3 /'`
+ 	    if test -z "$POPPLER_MINOR_VERSION"; then
+ 	      POPPLER_MINOR_VERSION=0
+ 	    fi
+@@ -26400,7 +26400,7 @@
+ echo "${ECHO_T}yes" >&6; }
  	enable_cairo_pdf=yes
  fi
 -	    if test x$enable_cairo_pdf == xyes; then
@@ -18,8 +29,8 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_CAIRO_PDF 1
-@@ -26283,7 +26283,7 @@ else
- echo "${ECHO_T}yes" >&6
+@@ -26479,7 +26479,7 @@
+ echo "${ECHO_T}yes" >&6; }
  	enable_cairo_ps=yes
  fi
 -	    if test x$enable_cairo_ps == xyes; then
diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist
index 79fa10615..84a7613a2 100644
--- a/graphics/evince/pkg-plist
+++ b/graphics/evince/pkg-plist
@@ -26,6 +26,7 @@ include/evince-2.20/evince/ev-transition-effect.h
 %%COMICS%%lib/evince/backends/comicsdocument.evince-backend
 %%DJVU%%lib/evince/backends/djvudocument.evince-backend
 %%DVI%%lib/evince/backends/dvidocument.evince-backend
+%%IMPRESS%%lib/evince/backends/impressdocument.evince-backend
 %%COMICS%%lib/evince/backends/libcomicsdocument.a
 %%COMICS%%lib/evince/backends/libcomicsdocument.la
 %%COMICS%%lib/evince/backends/libcomicsdocument.so
@@ -35,6 +36,9 @@ include/evince-2.20/evince/ev-transition-effect.h
 %%DVI%%lib/evince/backends/libdvidocument.a
 %%DVI%%lib/evince/backends/libdvidocument.la
 %%DVI%%lib/evince/backends/libdvidocument.so
+%%IMPRESS%%lib/evince/backends/libimpressdocument.a
+%%IMPRESS%%lib/evince/backends/libimpressdocument.la
+%%IMPRESS%%lib/evince/backends/libimpressdocument.so
 lib/evince/backends/libpdfdocument.a
 lib/evince/backends/libpdfdocument.la
 lib/evince/backends/libpdfdocument.so