Update to 3.5.27

* Use Makefile.common for common stuff.

Changelog:
NEW IN VERSION 3.5.27
------------------------
- simplified configuration scripts
- deadlock fixes
- miniexp under win32 uses tlsalloc instead of _thread vars (pb under xp)

NEW IN VERSION 3.5.26
------------------------
- Thread safe miniexp
- Now using the standard autotools approach (thanks to Vincent Torri).
- New windows installer (thanks to Konstantin Kravtsov).
- Fixed Russian code page issues in windows.
- General speedup thanks to lock-free smart pointers.
- ddjvu can produce one file per page.
- djvused can now set the default page orientation.
- Bug fixes all around.

7 files changed, 67 insertions, 105 deletions

diff --git a/graphics/djvulibre-lib/Makefile b/graphics/djvulibre-lib/Makefile
index 673fae46fa8..e867459cc55 100644
--- a/graphics/djvulibre-lib/Makefile
+++ b/graphics/djvulibre-lib/Makefile
@@ -1,32 +1,12 @@
-# $NetBSD: Makefile,v 1.14 2012/12/17 13:54:23 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2015/09/24 23:05:31 ryoon Exp $
 
-DISTNAME=		djvulibre-3.5.25.3
+.include "../../graphics/djvulibre-lib/Makefile.common"
 PKGNAME=		${DISTNAME:S/-/-lib-/}
-CATEGORIES=		graphics
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=djvu/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://djvu.sourceforge.net/
-COMMENT=		Compression library for scanned documents
-LICENSE=		gnu-gpl-v2
 
-USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
-USE_TOOLS+=		pkg-config
-GNU_CONFIGURE=		yes
-
-WRKSRC=			${WRKDIR}/djvulibre-3.5.25
 PKGCONFIG_OVERRIDE+=	libdjvu/ddjvuapi.pc.in
-BUILD_DIRS=		libdjvu
-INSTALL_DIRS=		libdjvu
-
-.include "../../mk/bsd.prefs.mk"
-.if !empty(MACHINE_PLATFORM:MNetBSD-[5-9]*-i386) && !empty(PKGSRC_COMPILER:Mgcc)
-# The library uses Intel atomic intrinsics which don't work with NetBSD's
-# default arch setting of "i386" because eg. cmpxchgl is 486+.
-# On NetBSD-5+, i386 is desupported so we can safely assume a 486.
-CFLAGS+= -march=i486
-.endif
+BUILD_DIRS=		libdjvu share
+INSTALL_DIRS=		libdjvu share
 
-.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/djvulibre-lib/Makefile.common b/graphics/djvulibre-lib/Makefile.common
new file mode 100644
index 00000000000..c6ca29c0cb2
--- /dev/null
+++ b/graphics/djvulibre-lib/Makefile.common
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile.common,v 1.1 2015/09/24 23:05:31 ryoon Exp $
+
+DISTNAME=		djvulibre-3.5.27
+CATEGORIES=		graphics
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=djvu/}
+
+HOMEPAGE=		http://djvu.sourceforge.net/
+COMMENT=		Compression library for scanned documents
+LICENSE=		gnu-gpl-v2
+
+PATCHDIR=		${.CURDIR}/../djvulibre-lib/patches
+DISTINFO_FILE=		${.CURDIR}/../djvulibre-lib/distinfo
+
+USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake pkg-config
+GNU_CONFIGURE=		yes
+
+PKGCONFIG_OVERRIDE+=	libdjvu/ddjvuapi.pc.in
+BUILD_DIRS=		libdjvu share
+INSTALL_DIRS=		libdjvu share
+
+.include "../../mk/bsd.prefs.mk"
+.if !empty(MACHINE_PLATFORM:MNetBSD-[5-9]*-i386) && !empty(PKGSRC_COMPILER:Mgcc)
+# The library uses Intel atomic intrinsics which don't work with NetBSD's
+# default arch setting of "i386" because eg. cmpxchgl is 486+.
+# On NetBSD-5+, i386 is desupported so we can safely assume a 486.
+CFLAGS+= -march=i486
+.endif
+
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
diff --git a/graphics/djvulibre-lib/PLIST b/graphics/djvulibre-lib/PLIST
index 4d84ac4a0ef..dd4bad6b785 100644
--- a/graphics/djvulibre-lib/PLIST
+++ b/graphics/djvulibre-lib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2012/12/17 13:54:23 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/09/24 23:05:31 ryoon Exp $
 include/libdjvu/ddjvuapi.h
 include/libdjvu/miniexp.h
 lib/libdjvulibre.la
@@ -16,3 +16,6 @@ share/djvu/osi/ja/messages.xml
 share/djvu/osi/languages.xml
 share/djvu/osi/zh/libdjvu++.xml
 share/djvu/osi/zh/messages.xml
+share/djvu/pubtext/DjVuMessages.dtd
+share/djvu/pubtext/DjVuOCR.dtd
+share/djvu/pubtext/DjVuXML-s.dtd
diff --git a/graphics/djvulibre-lib/distinfo b/graphics/djvulibre-lib/distinfo
index 61a2870a6c5..df2e02f9fb7 100644
--- a/graphics/djvulibre-lib/distinfo
+++ b/graphics/djvulibre-lib/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.12 2012/12/19 12:51:26 joerg Exp $
+$NetBSD: distinfo,v 1.13 2015/09/24 23:05:31 ryoon Exp $
 
-SHA1 (djvulibre-3.5.25.3.tar.gz) = ad35056aabb1950f385360ff59520a82a6f779ec
-RMD160 (djvulibre-3.5.25.3.tar.gz) = f91befc4d118cd5426f84abaa4f20ede920a2a2e
-Size (djvulibre-3.5.25.3.tar.gz) = 2543949 bytes
-SHA1 (patch-aa) = c819c6b1218b3178983bb48e53c4d3c0f7dd0227
+SHA1 (djvulibre-3.5.27.tar.gz) = 99c4f2c621c063bf8c8a1626030539fe5a8675f9
+RMD160 (djvulibre-3.5.27.tar.gz) = 4ebfef0e402ee621f0080243f362510754ea8333
+Size (djvulibre-3.5.27.tar.gz) = 3648522 bytes
+SHA1 (patch-aa) = 8b06dff3f537cb9ec11073aba3e89dcfc114c947
 SHA1 (patch-ab) = 5e8f6d3b925da3a2a09b87a05d2b9564f9c2e7b4
-SHA1 (patch-ac) = 0c713031903aade12eda1d898595798a1468fd0a
-SHA1 (patch-ad) = 7fe0f2d2b7c242c44720e9b4b76aa665d2551e6b
+SHA1 (patch-ac) = 405aa89829ad6ecac359287b821c13b1d8139d69
 SHA1 (patch-libdjvu_miniexp.cpp) = d63236ac02aa48d68536b0771c0fc8e17626fd33
diff --git a/graphics/djvulibre-lib/patches/patch-aa b/graphics/djvulibre-lib/patches/patch-aa
index 2cf1020c913..7181598d9eb 100644
--- a/graphics/djvulibre-lib/patches/patch-aa
+++ b/graphics/djvulibre-lib/patches/patch-aa
@@ -1,22 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/08/30 17:03:28 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2015/09/24 23:05:31 ryoon Exp $
 
---- tools/Makefile.in.orig	2005-08-23 18:49:23.000000000 +0200
+--- tools/Makefile.in.orig	2015-02-12 16:04:02.000000000 +0000
 +++ tools/Makefile.in
-@@ -47,7 +47,7 @@ TIFF_CFLAGS=@TIFF_CFLAGS@
- THREAD_LIBS = @THREAD_LIBS@
- THREAD_CFLAGS = @THREAD_CFLAGS@
+@@ -424,7 +424,7 @@ jb2cmp_SOURCES = jb2cmp/classify.cpp jb2
  
--LIBDJVU = ${top_builddir}/libdjvu/libdjvulibre.la
-+LIBDJVU = ${prefix}/lib/libdjvulibre.la
- 
- INCS = -I${top_builddir} -I${top_srcdir} -I${top_srcdir}/libdjvu -I${srcdir}
- FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${TIFF_CFLAGS} ${THREAD_CFLAGS}
-@@ -81,7 +81,7 @@ install-bin: ${PROGRAMS} FORCE
- install-scripts: FORCE
- 	${INSTALL} -d ${DESTDIR}${bindir}
- 	for n in ${SCRIPTS} ; do \
--	  ${INSTALL_PROGRAM} -m 0755 ${srcdir}/$$n ${DESTDIR}${bindir} \
-+	  ${INSTALL_SCRIPT} -m 0755 ${srcdir}/$$n ${DESTDIR}${bindir} \
- 	  || exit ; done
- 
- install-man: FORCE
+ AM_CPPFLAGS = -I$(top_srcdir)/libdjvu
+ AM_CXXFLAGS = $(PTHREAD_CFLAGS)
+-DJLIB = $(top_builddir)/libdjvu/libdjvulibre.la
++DJLIB = $(prefix)/lib/libdjvulibre.la
+ bzz_SOURCES = bzz.cpp common.h
+ bzz_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+ c44_SOURCES = c44.cpp common.h
diff --git a/graphics/djvulibre-lib/patches/patch-ac b/graphics/djvulibre-lib/patches/patch-ac
index 1e38ed61285..3a28b1c158c 100644
--- a/graphics/djvulibre-lib/patches/patch-ac
+++ b/graphics/djvulibre-lib/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/08/30 17:03:28 drochner Exp $
+$NetBSD: patch-ac,v 1.2 2015/09/24 23:05:31 ryoon Exp $
 
---- xmltools/Makefile.in.orig	2006-08-30 17:02:59.000000000 +0200
+--- xmltools/Makefile.in.orig	2015-02-12 16:04:02.000000000 +0000
 +++ xmltools/Makefile.in
-@@ -45,7 +45,7 @@ JPEG_CFLAGS=@JPEG_CFLAGS@
- THREAD_LIBS = @THREAD_LIBS@
- THREAD_CFLAGS = @THREAD_CFLAGS@
- 
--LIBDJVU = ${top_builddir}/libdjvu/libdjvulibre.la
-+LIBDJVU = ${prefix}/lib/libdjvulibre.la
- 
- INCS = -I${top_builddir} -I${top_srcdir}/libdjvu -I${srcdir}
- FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
+@@ -335,7 +335,7 @@ top_srcdir = @top_srcdir@
+ version_info = @version_info@
+ AM_CPPFLAGS = -I$(top_srcdir)/libdjvu -I$(top_srcdir)/tools
+ AM_CXXFLAGS = $(PTHREAD_CFLAGS)
+-DJLIB = $(top_builddir)/libdjvu/libdjvulibre.la
++DJLIB = $(prefix)/lib/libdjvulibre.la
+ djvutoxml_SOURCES = djvutoxml.cpp
+ djvutoxml_LDADD = $(DJLIB) $(PTHREAD_LIBS)
+ djvuxmlparser_SOURCES = djvuxmlparser.cpp
diff --git a/graphics/djvulibre-lib/patches/patch-ad b/graphics/djvulibre-lib/patches/patch-ad
deleted file mode 100644
index 225a2ebb959..00000000000
--- a/graphics/djvulibre-lib/patches/patch-ad
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2011/10/27 10:32:56 ryoon Exp $
-
---- configure.orig	2010-08-15 02:20:58.000000000 +0000
-+++ configure
-@@ -14887,13 +14887,12 @@ fi
-    for opt in $saved_CXXFLAGS ; do
-      case $opt in
-        -g*) test $ac_debug != no && OPTS="$OPTS $opt" ;;
--       -O*) ;;
-        *) CXXFLAGS="$CXXFLAGS $opt" ;;
-      esac
-    done
-    for opt in $saved_CFLAGS ; do
-      case $opt in
--       -O*|-g*) ;;
-+       -g*) ;;
-        *) CFLAGS="$CFLAGS $opt" ;;
-      esac
-    done
-@@ -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
-     { $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
-     { $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
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }