13 files changed, 37 insertions, 43 deletions

diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile
index 540f2ddd9f77..1a8efd972f5d 100644
--- a/converters/pdf2djvu/Makefile
+++ b/converters/pdf2djvu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pdf2djvu
 PORTVERSION=	0.5.11
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFFIX}
@@ -17,7 +17,7 @@ COMMENT=	Pdf2djvu creates DjVu files from PDF files
 
 BUILD_DEPENDS=	${LOCALBASE}/include/pstreams/pstream.h:${PORTSDIR}/devel/pstreams
 LIB_DEPENDS=	poppler.6:${PORTSDIR}/graphics/poppler
-LIB_DEPENDS+=	djvulibre.23:${PORTSDIR}/graphics/djvulibre-nox11
+LIB_DEPENDS+=	djvulibre.24:${PORTSDIR}/graphics/djvulibre-nox11
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS=${PTHREAD_LIBS} \
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 42b23d4332ce..2f742d4faa90 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ImageMagick
 DISTVERSION=	6.6.7-10
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	ftp://ftp.imagemagick.org/pub/ImageMagick/ \
 		ftp://ftp.nluug.nl/pub/ImageMagick/ \
diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile
index b33b669b84a4..2da604de2924 100644
--- a/graphics/djview4/Makefile
+++ b/graphics/djview4/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	djview
-PORTVERSION=	4.5
-PORTREVISION=	3
+PORTVERSION=	4.7
+PORTREVISION=	0
 CATEGORIES=	graphics
 MASTER_SITES=	SF/djvu/DjView/${PORTVERSION}
-DISTNAME=	${PORTNAME}4-${PORTVERSION}
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Standalone Djvu viewer and plugin based on Qt4 toolkit
 
-LIB_DEPENDS=	djvulibre.23:${PORTSDIR}/graphics/djvulibre-nox11
+LIB_DEPENDS=	djvulibre.24:${PORTSDIR}/graphics/djvulibre-nox11
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	pkgconfig gnometarget
@@ -30,7 +29,6 @@ CONFIGURE_ENV=	QMAKE="${LOCALBASE}/bin/qmake-qt4" \
 		CXXFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
-WRKSRC=		${WRKDIR}/${PORTNAME}4-${PORTVERSION}
 
 .if defined(CXX) && ${CXX:M*icc}
 QMAKESPEC?=	freebsd-icc
diff --git a/graphics/djview4/distinfo b/graphics/djview4/distinfo
index aae433514132..d9f43f272f45 100644
--- a/graphics/djview4/distinfo
+++ b/graphics/djview4/distinfo
@@ -1,3 +1,2 @@
-MD5 (djview4-4.5.tar.gz) = 0461a26dbcac33dcc5eb7955ac357504
-SHA256 (djview4-4.5.tar.gz) = 8dc1d8013d51d4026a05d7ef4289c4c9b27de9d9b7d6bf960e4a9636b3b71276
-SIZE (djview4-4.5.tar.gz) = 895611
+SHA256 (djview-4.7.tar.gz) = 2c5df0f96031e2f4b1b1c05728396e918a404f715f981da7ab6fbb0ee7c8ef2d
+SIZE (djview-4.7.tar.gz) = 876307
diff --git a/graphics/djview4/files/patch-desktopfiles_Makefile.in b/graphics/djview4/files/patch-desktopfiles_Makefile.in
index 6c6e822f68e0..1c34eb9931fe 100644
--- a/graphics/djview4/files/patch-desktopfiles_Makefile.in
+++ b/graphics/djview4/files/patch-desktopfiles_Makefile.in
@@ -1,6 +1,6 @@
---- desktopfiles/Makefile.in.orig	2009-02-19 19:51:51.000000000 +0300
-+++ desktopfiles/Makefile.in	2009-08-11 15:16:25.000000000 +0400
-@@ -52,7 +52,7 @@
+--- desktopfiles/Makefile.in.orig	2011-03-31 01:20:37.000000000 -0700
++++ desktopfiles/Makefile.in	2011-03-31 01:21:48.000000000 -0700
+@@ -54,7 +54,7 @@
  	  || cp ${srcdir}/prebuilt-$@ $@
  
  hi-djview4.svgz: djview.svg
@@ -9,7 +9,7 @@
  
  register-djview-menu: register-djview-menu.in
  	sed < ${srcdir}/register-djview-menu.in > register-djview-menu \
-@@ -69,10 +69,10 @@
+@@ -71,10 +71,10 @@
  
  install-djview-files: FORCE
  	${INSTALL} -d ${DESTDIR}${datadir_djview}
diff --git a/graphics/djvulibre-nox11/Makefile b/graphics/djvulibre-nox11/Makefile
index df6f4e4038f0..65fc5b8ae285 100644
--- a/graphics/djvulibre-nox11/Makefile
+++ b/graphics/djvulibre-nox11/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	djvulibre
-PORTVERSION=	3.5.23
+PORTVERSION=	3.5.24
 PORTREVISION=	0
 CATEGORIES=	graphics www
 MASTER_SITES=	SF/djvu/DjVuLibre/${PORTVERSION}
diff --git a/graphics/djvulibre-nox11/distinfo b/graphics/djvulibre-nox11/distinfo
index bcab4b8b230b..06a720491578 100644
--- a/graphics/djvulibre-nox11/distinfo
+++ b/graphics/djvulibre-nox11/distinfo
@@ -1,2 +1,2 @@
-SHA256 (djvulibre-3.5.23.tar.gz) = 608c07e629626cfe713168c942a07d2db3b0b19df4aae1f598473f4a2daf213d
-SIZE (djvulibre-3.5.23.tar.gz) = 3028428
+SHA256 (djvulibre-3.5.24.tar.gz) = c0734c81d22a0e458c3fb5efd4c3eab051bcb6ad8740f5a5784c1f5699482534
+SIZE (djvulibre-3.5.24.tar.gz) = 2998853
diff --git a/graphics/djvulibre-nox11/files/patch-tools_any2djvu b/graphics/djvulibre-nox11/files/patch-tools_any2djvu
index b906d741f7de..1b86edc3e213 100644
--- a/graphics/djvulibre-nox11/files/patch-tools_any2djvu
+++ b/graphics/djvulibre-nox11/files/patch-tools_any2djvu
@@ -1,20 +1,15 @@
---- tools/any2djvu.orig	2008-02-17 20:18:08.000000000 +0300
-+++ tools/any2djvu	2008-02-17 20:20:31.000000000 +0300
-@@ -1,11 +1,11 @@
+--- tools/any2djvu.orig	2011-03-31 00:54:11.000000000 -0700
++++ tools/any2djvu	2011-03-31 00:56:54.000000000 -0700
+@@ -1,6 +1,6 @@
 -#! /bin/bash -f
 +#!/bin/sh
- # CVS version control block - do not edit manually
- #  $RCSfile: any2djvu,v $
- #  $Revision: 1.3 $
- #  $Date: 2007/08/10 08:08:55 $
- #  $Source: /cvsroot/djvu/djvulibre-3.5/tools/any2djvu,v $
  
 -function copyright()
 +copyright()
  {
      echo "Copyright (C) 2002 David Kreil <D.Kreil@IEEE.Org>"
      echo "Modified by Barak A. Pearlmutter <bap@debian.org>"
-@@ -14,7 +14,7 @@
+@@ -8,7 +8,7 @@
      echo "Released under the GNU GPL v2, 21-Oct-2002."
  }
  
@@ -23,7 +18,7 @@
  {
      echo "This program is distributed in the hope that it will be useful,"
      echo "but WITHOUT ANY WARRANTY; without even the implied warranty of"
-@@ -22,7 +22,7 @@
+@@ -16,7 +16,7 @@
      echo "GNU General Public License for more details."
  }
  
@@ -32,7 +27,7 @@
  {
      echo "By using this tool you accept the following disclaimer:"
      echo "  Because the any2djvu service is free of charge, there is no"
-@@ -40,7 +40,7 @@
+@@ -34,7 +34,7 @@
  ocr=1
  docformat=2
  
@@ -41,7 +36,7 @@
  {
      echo "Notes:"
      echo " - Internet connection is required."
-@@ -53,7 +53,7 @@
+@@ -47,7 +47,7 @@
      echo " - This software comes with NO WARRANTY."
  }
  
@@ -50,7 +45,7 @@
  {
      echo "Codes for the formats of the input documents to use with -f"
      echo "  1 - DjVu Document (for verification or OCR)"
-@@ -67,7 +67,7 @@
+@@ -61,7 +61,7 @@
      echo "  9 - Scanned Document - Color/Mixed - >400 dpi"
  }
  
@@ -59,7 +54,7 @@
  {
      echo "Convert files from .ps/.ps.gz/.pdf to .djvu"
      echo "Usage:	$0 [options] [url] {filename(s)}"
-@@ -123,13 +123,13 @@
+@@ -117,13 +117,13 @@
  fi
  
  # check OCR option
@@ -75,21 +70,21 @@
      format_help
      exit 0
  fi
-@@ -215,7 +215,7 @@
+@@ -209,7 +209,7 @@
              -F ocr=$ocr -F legal=1 "$rurl/$rcgi"                          \
              | eval tee "'$log'" $shellopts
      else
 -        wget $wgetopts -O - "$rurl/$rcgi?urlupload=$lurl/$in$cgiopts"   \
-+         /usr/bin/fetch$wgetopts -o - "$rurl/$rcgi?urlupload=$lurl/$in$cgiopts"   \
++        /usr/bin/fetch $wgetopts -o - "$rurl/$rcgi?urlupload=$lurl/$in$cgiopts"   \
              | eval tee "'$log'" $shellopts
      fi
      l=`egrep 'href=djvu/.*\.djvu' "$log"`
-@@ -225,7 +225,7 @@
+@@ -219,7 +219,7 @@
          echo "error: something got wrong. check log file"
          exit 1
      fi
 -    wget $wgetopts -O "$b.djvu" "$rurl/$l"
-+    /usr/bin/fetch $wgetopts -o $b.djvu "$rurl/$l"
++    /usr/bin/fetch $wgetopts -o "$b.djvu" "$rurl/$l"
  
      [ -z "$doclean" ] || rm "$log"
      [ -z $silent ]  && ls -l "$b.djvu"
diff --git a/graphics/djvulibre-nox11/pkg-plist b/graphics/djvulibre-nox11/pkg-plist
index 4c10015c2624..094049bb227a 100644
--- a/graphics/djvulibre-nox11/pkg-plist
+++ b/graphics/djvulibre-nox11/pkg-plist
@@ -20,7 +20,7 @@ bin/djvuxmlparser
 include/libdjvu/ddjvuapi.h
 include/libdjvu/miniexp.h
 lib/libdjvulibre.so
-lib/libdjvulibre.so.23
+lib/libdjvulibre.so.24
 libdata/pkgconfig/ddjvuapi.pc
 share/djvu/osi/cs/messages.xml
 share/djvu/osi/de/libdjvu++.xml
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index f371ef78b8db..e69839979aad 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	djvulibre
-PORTVERSION=	3.5.23
+PORTVERSION=	3.5.24
 CATEGORIES=	graphics www
 MASTER_SITES=	SF/djvu/DjVuLibre/${PORTVERSION}
 
@@ -17,7 +17,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		djvulibre.23:${PORTSDIR}/graphics/djvulibre-nox11
+		djvulibre.24:${PORTSDIR}/graphics/djvulibre-nox11
 
 USE_ICONV=	yes
 USE_GNOME=	gnomehack gnometarget
diff --git a/graphics/djvulibre/distinfo b/graphics/djvulibre/distinfo
index bcab4b8b230b..06a720491578 100644
--- a/graphics/djvulibre/distinfo
+++ b/graphics/djvulibre/distinfo
@@ -1,2 +1,2 @@
-SHA256 (djvulibre-3.5.23.tar.gz) = 608c07e629626cfe713168c942a07d2db3b0b19df4aae1f598473f4a2daf213d
-SIZE (djvulibre-3.5.23.tar.gz) = 3028428
+SHA256 (djvulibre-3.5.24.tar.gz) = c0734c81d22a0e458c3fb5efd4c3eab051bcb6ad8740f5a5784c1f5699482534
+SIZE (djvulibre-3.5.24.tar.gz) = 2998853
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index 82d97ede5625..da9e3f419007 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	evince
 PORTVERSION=	2.32.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -98,7 +98,7 @@ PLIST_SUB+=		IMPRESS="@comment "
 .endif
 
 .if defined(WITH_DJVU)
-LIB_DEPENDS+=		djvulibre.23:${PORTSDIR}/graphics/djvulibre-nox11
+LIB_DEPENDS+=		djvulibre.24:${PORTSDIR}/graphics/djvulibre-nox11
 CONFIGURE_ARGS+=	--enable-djvu
 GCONF_SCHEMAS+=		evince-thumbnailer-djvu.schemas
 PLIST_SUB+=		DJVU=""
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 428934960bb9..7d9796b9cc08 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	kdegraphics
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -26,7 +27,7 @@ LIB_DEPENDS=	art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \
 		chm.0:${PORTSDIR}/misc/chmlib \
 		sane.1:${PORTSDIR}/graphics/sane-backends \
 		gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
-		djvulibre.23:${PORTSDIR}/graphics/djvulibre-nox11 \
+		djvulibre.24:${PORTSDIR}/graphics/djvulibre-nox11 \
 		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
 		spectre.1:${PORTSDIR}/print/libspectre \
 		qca.2:${PORTSDIR}/devel/qca \