- Update graphics/djvulibre* to 3.5.25. [1]

- Update djview4 to version 4.7.
- Bump up portrevisions of all dependent ports.

PR:		ports/155742 [1]
Submitted by:	Takefu <takefu@airport.fm>

4 files changed, 17 insertions, 22 deletions

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