update to 3.5.22, from Ryo ONODERA per PR pkg/43711

changes: Various bug fixes

(tested the lib part with evince)

3 files changed, 24 insertions, 23 deletions

diff --git a/graphics/djvulibre-lib/Makefile b/graphics/djvulibre-lib/Makefile
index a50665fb992..663e2e14509 100644
--- a/graphics/djvulibre-lib/Makefile
+++ b/graphics/djvulibre-lib/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.8 2010/01/18 09:58:57 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/08/09 11:05:54 drochner Exp $
 
-DISTNAME=		djvulibre-3.5.21
-PKGNAME=		djvulibre-lib-3.5.21
-PKGREVISION=		3
+DISTNAME=		djvulibre-3.5.22
+PKGNAME=		djvulibre-lib-3.5.22
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=djvu/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://djvulibre.djvuzone.org/
 COMMENT=		Compression library for scanned documents
+LICENSE=		gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/graphics/djvulibre-lib/distinfo b/graphics/djvulibre-lib/distinfo
index 354aa9da630..b5bac01e526 100644
--- a/graphics/djvulibre-lib/distinfo
+++ b/graphics/djvulibre-lib/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2009/02/20 10:52:56 drochner Exp $
+$NetBSD: distinfo,v 1.7 2010/08/09 11:05:54 drochner Exp $
 
-SHA1 (djvulibre-3.5.21.tar.gz) = a6ef5cb1445baa333883754c703abd75cc5b34f6
-RMD160 (djvulibre-3.5.21.tar.gz) = 2163b784d705cc7b55bb3d9c9eb85edec44f28a7
-Size (djvulibre-3.5.21.tar.gz) = 2993718 bytes
+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 (patch-aa) = c819c6b1218b3178983bb48e53c4d3c0f7dd0227
 SHA1 (patch-ab) = 5e8f6d3b925da3a2a09b87a05d2b9564f9c2e7b4
 SHA1 (patch-ac) = 0c713031903aade12eda1d898595798a1468fd0a
-SHA1 (patch-ad) = 66b149594453d70afd47ed03e6067d6356288191
+SHA1 (patch-ad) = 1b95453c92b365a8b2f960c02d65570387dc54a0
diff --git a/graphics/djvulibre-lib/patches/patch-ad b/graphics/djvulibre-lib/patches/patch-ad
index a38bb96d164..c4e5b3cd872 100644
--- a/graphics/djvulibre-lib/patches/patch-ad
+++ b/graphics/djvulibre-lib/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2009/02/20 10:52:57 drochner Exp $
+$NetBSD: patch-ad,v 1.5 2010/08/09 11:05:55 drochner Exp $
 
---- configure.orig	2008-07-03 00:43:52.000000000 +0200
+--- configure.orig	2009-05-21 15:15:50.000000000 +0000
 +++ configure
-@@ -21069,13 +21069,12 @@ fi
+@@ -21124,13 +21124,12 @@ fi
     for opt in $saved_CXXFLAGS ; do
       case $opt in
         -g*) test $ac_debug != no && OPTS="$OPTS $opt" ;;
@@ -17,7 +17,7 @@ $NetBSD: patch-ad,v 1.4 2009/02/20 10:52:57 drochner Exp $
         *) CFLAGS="$CFLAGS $opt" ;;
       esac
     done
-@@ -21107,7 +21106,6 @@ echo $ECHO_N "checking if $CXX accepts $
+@@ -21162,7 +21161,6 @@ echo $ECHO_N "checking if $CXX accepts $
      { echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6; }
      rm conftest.*
@@ -25,7 +25,7 @@ $NetBSD: patch-ad,v 1.4 2009/02/20 10:52:57 drochner Exp $
   else
      { echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6; }
-@@ -21121,7 +21119,6 @@ echo $ECHO_N "checking if $CXX accepts $
+@@ -21176,7 +21174,6 @@ echo $ECHO_N "checking if $CXX accepts $
      { echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6; }
      rm conftest.*
@@ -33,7 +33,7 @@ $NetBSD: patch-ad,v 1.4 2009/02/20 10:52:57 drochner Exp $
   else
      { echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6; }
-@@ -21162,7 +21159,6 @@ echo $ECHO_N "checking if $CXX accepts $
+@@ -21217,7 +21214,6 @@ echo $ECHO_N "checking if $CXX accepts $
      { echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6; }
      rm conftest.*
@@ -41,11 +41,12 @@ $NetBSD: patch-ad,v 1.4 2009/02/20 10:52:57 drochner Exp $
   else
      { echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6; }
-@@ -21691,6 +21687,7 @@ main ()
- __sync_lock_test_and_set(&l,1);
-   __sync_lock_release(&l);
-   __sync_add_and_fetch(&l,1);
-+  __sync_bool_compare_and_swap(&l,0,1);
-   return 0;
-   ;
-   return 0;
+@@ -27704,7 +27700,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