From 0f6ef3eac78314639362cb708c0ca18f62cc6029 Mon Sep 17 00:00:00 2001
From: ryoon <ryoon>
Date: Sat, 26 Feb 2011 07:27:04 +0000
Subject: Update to 3.5.23.

NEW IN VERSION 3.5.23
------------------------
- Djview3 has been deprecated by djview4 whose source comes in
  its own tarball. Use configure option --enable-djview to force
  the compilation of djview3.
- Set ddjvuapi_version to 19.
- Added ddjvu_document_create_by_filename_utf8
- Generate icons with rsvg rather than imagemagick.
- djvused: correctly outputs escape characters.
- djvumake: added options to generate foreground colors.
- Various bug fixes.
---
 graphics/djvulibre-lib/Makefile         |  8 +++---
 graphics/djvulibre-lib/distinfo         | 10 +++----
 graphics/djvulibre-lib/patches/patch-ad | 50 ++++++++++++++++-----------------
 graphics/djvulibre-tools/Makefile       |  9 +++---
 4 files changed, 39 insertions(+), 38 deletions(-)

(limited to 'graphics')

diff --git a/graphics/djvulibre-lib/Makefile b/graphics/djvulibre-lib/Makefile
index 08693bd062d..e9bf1b140fe 100644
--- a/graphics/djvulibre-lib/Makefile
+++ b/graphics/djvulibre-lib/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.10 2010/12/23 11:44:35 dsainty Exp $
+# $NetBSD: Makefile,v 1.11 2011/02/26 07:27:04 ryoon Exp $
 
-DISTNAME=		djvulibre-3.5.22
-PKGNAME=		djvulibre-lib-3.5.22
+DISTNAME=		djvulibre-3.5.23
+PKGNAME=		${DISTNAME:S/-/-lib-/}
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=djvu/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://djvulibre.djvuzone.org/
+HOMEPAGE=		http://djvu.sourceforge.net/
 COMMENT=		Compression library for scanned documents
 LICENSE=		gnu-gpl-v2
 
diff --git a/graphics/djvulibre-lib/distinfo b/graphics/djvulibre-lib/distinfo
index b5bac01e526..49461487f69 100644
--- a/graphics/djvulibre-lib/distinfo
+++ b/graphics/djvulibre-lib/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2010/08/09 11:05:54 drochner Exp $
+$NetBSD: distinfo,v 1.8 2011/02/26 07:27:04 ryoon Exp $
 
-SHA1 (djvulibre-3.5.22.tar.gz) = f869d4114052a7df7b8da2d334d124934f1293a6
-RMD160 (djvulibre-3.5.22.tar.gz) = f74cec88c5fbda28976e64669d3e48833b4dfdcd
-Size (djvulibre-3.5.22.tar.gz) = 3027985 bytes
+SHA1 (djvulibre-3.5.23.tar.gz) = b19f6b461515a52eb1048aec81e04dfd836d681f
+RMD160 (djvulibre-3.5.23.tar.gz) = 66d6dc71cdaa8c2412197f52562c99bef6b924a6
+Size (djvulibre-3.5.23.tar.gz) = 3028428 bytes
 SHA1 (patch-aa) = c819c6b1218b3178983bb48e53c4d3c0f7dd0227
 SHA1 (patch-ab) = 5e8f6d3b925da3a2a09b87a05d2b9564f9c2e7b4
 SHA1 (patch-ac) = 0c713031903aade12eda1d898595798a1468fd0a
-SHA1 (patch-ad) = 1b95453c92b365a8b2f960c02d65570387dc54a0
+SHA1 (patch-ad) = 8e6b1845944fc387ca8e40c972fbac6ef928871e
diff --git a/graphics/djvulibre-lib/patches/patch-ad b/graphics/djvulibre-lib/patches/patch-ad
index c4e5b3cd872..c8330ae22f3 100644
--- a/graphics/djvulibre-lib/patches/patch-ad
+++ b/graphics/djvulibre-lib/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2010/08/09 11:05:55 drochner Exp $
+$NetBSD: patch-ad,v 1.6 2011/02/26 07:27:05 ryoon Exp $
 
---- configure.orig	2009-05-21 15:15:50.000000000 +0000
+--- configure.orig	2010-08-15 02:20:58.000000000 +0000
 +++ configure
-@@ -21124,13 +21124,12 @@ fi
+@@ -14887,13 +14887,12 @@ fi
     for opt in $saved_CXXFLAGS ; do
       case $opt in
         -g*) test $ac_debug != no && OPTS="$OPTS $opt" ;;
@@ -17,36 +17,36 @@ $NetBSD: patch-ad,v 1.5 2010/08/09 11:05:55 drochner Exp $
         *) CFLAGS="$CFLAGS $opt" ;;
       esac
     done
-@@ -21162,7 +21161,6 @@ echo $ECHO_N "checking if $CXX accepts $
-     { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+@@ -14925,7 +14924,6 @@ $as_echo_n "checking if $CXX accepts $op
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
      rm conftest.*
 -    OPTS="$OPTS -O3"
   else
-     { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-@@ -21176,7 +21174,6 @@ echo $ECHO_N "checking if $CXX accepts $
-     { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -14939,7 +14937,6 @@ $as_echo_n "checking if $CXX accepts $op
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
      rm conftest.*
 -    OPTS="$OPTS -O2"
   else
-     { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-@@ -21217,7 +21214,6 @@ echo $ECHO_N "checking if $CXX accepts $
-     { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -14980,7 +14977,6 @@ $as_echo_n "checking if $CXX accepts $op
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
      rm conftest.*
 -    OPTS="$OPTS $opt"
   else
-     { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
-@@ -27704,7 +27700,7 @@ fi
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -18486,7 +18482,7 @@ fi
  
  
-     CFLAGS="$savedCFLAGS"
--    if test "$no_xt" == "yes" ; then
-+    if test "$no_xt" = "yes" ; then
-         { echo "$as_me:$LINENO: WARNING: Xt include files not found" >&5
- echo "$as_me: WARNING: Xt include files not found" >&2;}
-     else
+         CFLAGS="$savedCFLAGS"
+-        if test "$no_xt" == "yes" ; then
++        if test "$no_xt" = "yes" ; then
+             { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Xt include files not found" >&5
+ $as_echo "$as_me: WARNING: Xt include files not found" >&2;}
+         else
diff --git a/graphics/djvulibre-tools/Makefile b/graphics/djvulibre-tools/Makefile
index 770f7ed2a60..2226adbba7d 100644
--- a/graphics/djvulibre-tools/Makefile
+++ b/graphics/djvulibre-tools/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.10 2010/12/23 11:44:35 dsainty Exp $
+# $NetBSD: Makefile,v 1.11 2011/02/26 07:27:05 ryoon Exp $
 
-DISTNAME=		djvulibre-3.5.22
-PKGNAME=		djvulibre-tools-3.5.22
+DISTNAME=		djvulibre-3.5.23
+PKGNAME=		${DISTNAME:S/-/-tools-/}
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=djvu/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://djvulibre.djvuzone.org/
+HOMEPAGE=		http://djvu.sourceforge.net/
 COMMENT=		Compression library for scanned documents
+LICENSE=		gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-- 
cgit v1.2.3