update DjVuLibre to 3.5.25.3 and adjust dependent ports: the QT3 GUI that was

formerly in graphics/djvulibre has been removed, and graphics/djvulibre-nox11
has been merged back into graphics/djvulibre

10 files changed, 0 insertions, 376 deletions

diff --git a/graphics/djvulibre-nox11/Makefile b/graphics/djvulibre-nox11/Makefile
deleted file mode 100644
index 73aa8d034af8..000000000000
--- a/graphics/djvulibre-nox11/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# New ports collection makefile for:	libdjvu++
-# Date Created:		20 July 1999
-# Whom:			Mikhail Teterin <mi@aldan.algebra.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	djvulibre
-PORTVERSION=	3.5.24
-PORTREVISION=	0
-CATEGORIES=	graphics www
-MASTER_SITES=	SF/djvu/DjVuLibre/${PORTVERSION}
-PKGNAMESUFFIX=	-nox11
-
-MAINTAINER=	bf@FreeBSD.org
-COMMENT=	DjVu base libraries and utilities
-
-LICENSE=	GPLv2
-
-LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff
-
-USE_ICONV=	yes
-USE_GNOME=	gnomehack
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	JPEG_CFLAGS="-I${LOCALBASE}/include" \
-		JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg" \
-		TIFF_CFLAGS="-I${LOCALBASE}/include" \
-		TIFF_LIBS="-L${LOCALBASE}/lib -ltiff" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		LOCALBASE="${LOCALBASE}"
-CONFIGURE_ARGS=	--enable-threads=pthread --enable-shared
-USE_LDCONFIG=	yes
-
-OPTIONS=	ANY2DJVU "Install any2djvu script (requires curl)" off
-
-MANLANG=	"" ja
-MAN1=		bzz.1 c44.1 cjb2.1 cpaldjvu.1 csepdjvu.1 ddjvu.1 djvm.1 \
-		djvmcvt.1 djvu.1 djvudump.1 djvuextract.1 djvumake.1 djvups.1 \
-		djvused.1 djvuserve.1 djvutxt.1
-MAN1_EN=	djvutoxml.1 djvuxml.1 djvuxmlparser.1 djvudigital.1
-
-PORTDOCS=	djvu2spec.djvu lizard2002.djvu
-
-CONFIGURE_ARGS+=	--disable-djview --without-x
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_ANY2DJVU)
-MAN1_EN+=		any2djvu.1
-RUN_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
-PLIST_SUB+=	ANY2DJVU=""
-.else
-PLIST_SUB+=	ANY2DJVU="@comment "
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
-		${WRKSRC}/libdjvu/Makefile.in
-	@${REINPLACE_CMD} -e '/-O\*/d ; \
-		 s|$$OPTS -O3|$$OPTS|g ; \
-		 s|$$OPTS -O2|$$OPTS|g ; \
-		 s|$$OPTS $$opt|$$OPTS|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|= @CPPFLAGS|= $${FLAGS} @CPPFLAGS|g ; \
-		 s|@ $${FLAGS}|@|g ; \
-		 s|} $${FLAGS}|}|g ; \
-		 s|/netscape/|/djvulibre/|g ; \
-		 s|eucjp|eucJP|g ; \
-		 s|_PROGRAM} -m|} -m|g'
-
-.if !defined(WITH_ANY2DJVU)
-	@${REINPLACE_CMD} -e 's,any2djvu,,' ${WRKSRC}/tools/Makefile.in
-.endif
-
-post-install:
-
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/graphics/djvulibre-nox11/distinfo b/graphics/djvulibre-nox11/distinfo
deleted file mode 100644
index 06a720491578..000000000000
--- a/graphics/djvulibre-nox11/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (djvulibre-3.5.24.tar.gz) = c0734c81d22a0e458c3fb5efd4c3eab051bcb6ad8740f5a5784c1f5699482534
-SIZE (djvulibre-3.5.24.tar.gz) = 2998853
diff --git a/graphics/djvulibre-nox11/files/patch-config_ltmain.sh b/graphics/djvulibre-nox11/files/patch-config_ltmain.sh
deleted file mode 100644
index db247645038a..000000000000
--- a/graphics/djvulibre-nox11/files/patch-config_ltmain.sh
+++ /dev/null
@@ -1,17 +0,0 @@
---- config/ltmain.sh.orig	2010-11-19 01:46:29.000000000 -0800
-+++ config/ltmain.sh	2010-11-19 01:46:38.000000000 -0800
-@@ -2076,14 +2076,6 @@
- 	  func_execute_cmds "$postinstall_cmds" 'exit $?'
- 	fi
- 
--	# Install the pseudo-library for information purposes.
--	func_basename "$file"
--	name="$func_basename_result"
--	instname="$dir/$name"i
--	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
--
--	# Maybe install the static library, too.
--	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
- 	;;
- 
-       *.lo)
diff --git a/graphics/djvulibre-nox11/files/patch-desktopfiles_Makefile.in b/graphics/djvulibre-nox11/files/patch-desktopfiles_Makefile.in
deleted file mode 100644
index fd218965e260..000000000000
--- a/graphics/djvulibre-nox11/files/patch-desktopfiles_Makefile.in
+++ /dev/null
@@ -1,41 +0,0 @@
---- ./desktopfiles/Makefile.in.orig	2009-07-03 16:20:19.000000000 +0400
-+++ ./desktopfiles/Makefile.in	2009-07-03 16:20:48.000000000 +0400
-@@ -30,6 +30,7 @@
- 
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- CONVERT = @CONVERT@
- XDG_MIME = @XDG_MIME@
-@@ -64,10 +65,10 @@
- 	  || cp ${srcdir}/prebuilt-$@ $@
- 
- hi-djvu.svgz: djvu.svg
--	cat $< | gzip >$@
-+	cat ${.ALLSRC} | gzip >$@
- 
- hi-djview3.svgz: djview.svg
--	cat $< | gzip >$@
-+	cat ${.ALLSRC} | gzip >$@
- 
- register-djvu-mime: register-djvu-mime.in
- 	sed < ${srcdir}/register-djvu-mime.in > register-djvu-mime \
-@@ -96,7 +97,7 @@
- 
- install-djvu-files: FORCE
- 	${INSTALL} -d ${DESTDIR}${datadir_djvu}
--	${INSTALL_PROGRAM} register-djvu-mime ${DESTDIR}${datadir_djvu}
-+	${INSTALL_SCRIPT} register-djvu-mime ${DESTDIR}${datadir_djvu}
- 	${INSTALL_DATA} *djvu.png ${DESTDIR}${datadir_djvu}
- 	${INSTALL_DATA} *djvu.svgz ${DESTDIR}${datadir_djvu}
- 	${INSTALL_DATA} ${srcdir}/*mime.xml ${DESTDIR}${datadir_djvu}
-@@ -105,7 +106,7 @@
- 
- install-djview-files: FORCE
- 	${INSTALL} -d ${DESTDIR}${datadir_djview}
--	${INSTALL_PROGRAM} register-djview-menu ${DESTDIR}${datadir_djview}
-+	${INSTALL_SCRIPT} register-djview-menu ${DESTDIR}${datadir_djview}
- 	${INSTALL_DATA} *djview3.png ${DESTDIR}${datadir_djview}
- 	${INSTALL_DATA} *djview3.svgz ${DESTDIR}${datadir_djview}
- 	${INSTALL_PROGRAM} ${srcdir}/*djview3.desktop ${DESTDIR}${datadir_djview}
diff --git a/graphics/djvulibre-nox11/files/patch-libdjvu__GSmartPointer.h b/graphics/djvulibre-nox11/files/patch-libdjvu__GSmartPointer.h
deleted file mode 100644
index 577600f5cd01..000000000000
--- a/graphics/djvulibre-nox11/files/patch-libdjvu__GSmartPointer.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- libdjvu/GSmartPointer.h.orig	2011-03-06 12:43:17.000000000 -0500
-+++ libdjvu/GSmartPointer.h	2011-11-22 09:16:50.000000000 -0500
-@@ -94,6 +94,7 @@
- #pragma warning( disable : 4243 )
- #endif
- 
-+#include <stddef.h>
- #include "DjVuGlobal.h"
- #include "atomic.h"
- 
diff --git a/graphics/djvulibre-nox11/files/patch-tools_Makefile.in b/graphics/djvulibre-nox11/files/patch-tools_Makefile.in
deleted file mode 100644
index 74a93ab39199..000000000000
--- a/graphics/djvulibre-nox11/files/patch-tools_Makefile.in
+++ /dev/null
@@ -1,38 +0,0 @@
---- tools/Makefile.in.orig	2009-07-07 17:04:26.000000000 +0200
-+++ tools/Makefile.in	2009-07-07 17:11:00.000000000 +0200
-@@ -53,7 +53,7 @@
- 
- INCS = -I${top_builddir} -I${top_srcdir} -I${top_srcdir}/libdjvu -I${srcdir}
- FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${TIFF_CFLAGS} ${THREAD_CFLAGS}
--LIBS= @LDFLAGS@ @LIBS@
-+LIBS= @LDFLAGS@ @LIBS@ @THREAD_LIBS@
- MORELIBS= @LDFLAGS@ ${TIFF_LIBS} @LIBS@
- CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@ 
- CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@ 
-@@ -83,7 +83,7 @@
- install-scripts: FORCE
- 	${INSTALL} -d ${DESTDIR}${bindir}
- 	for n in ${SCRIPTS} ; do \
--	  ${INSTALL_PROGRAM} -m 0755 ${srcdir}/$$n ${DESTDIR}${bindir} \
-+	  ${INSTALL} -m 0755 ${srcdir}/$$n ${DESTDIR}${bindir} \
- 	  || exit ; done
- 
- install-man: FORCE
-@@ -127,7 +127,7 @@
- 
- cjb2: cjb2.o ${JB2OBJS}
- 	${LIBTOOL} --mode=link \
--	  ${CXX} -o $@ ${CXXFLAGS} cjb2.o ${JB2OBJS} ${LIBDJVU} ${MORELIBS}
-+	  ${CXX} -o $@ ${CXXFLAGS} cjb2.o ${JB2OBJS} ${LIBDJVU} ${MORELIBS} ${THREAD_LIBS}
- 
- cpaldjvu: cpaldjvu.o ${JB2OBJS}
- 	${LIBTOOL} --mode=link \
-@@ -139,7 +139,7 @@
- 
- ddjvu: ddjvu.o tiff2pdf.o
- 	${LIBTOOL} --mode=link \
--	  ${CXX} -o $@ ${CXXFLAGS} ddjvu.o tiff2pdf.o ${LIBDJVU} ${MORELIBS}
-+	  ${CXX} -o $@ ${CXXFLAGS} ddjvu.o tiff2pdf.o ${LIBDJVU} ${MORELIBS} ${THREAD_LIBS}
- 
- djvm: djvm.o
- 	${LIBTOOL} --mode=link \
diff --git a/graphics/djvulibre-nox11/files/patch-tools_any2djvu b/graphics/djvulibre-nox11/files/patch-tools_any2djvu
deleted file mode 100644
index 1b86edc3e213..000000000000
--- a/graphics/djvulibre-nox11/files/patch-tools_any2djvu
+++ /dev/null
@@ -1,90 +0,0 @@
---- 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
- 
--function copyright()
-+copyright()
- {
-     echo "Copyright (C) 2002 David Kreil <D.Kreil@IEEE.Org>"
-     echo "Modified by Barak A. Pearlmutter <bap@debian.org>"
-@@ -8,7 +8,7 @@
-     echo "Released under the GNU GPL v2, 21-Oct-2002."
- }
- 
--function warranty()
-+warranty()
- {
-     echo "This program is distributed in the hope that it will be useful,"
-     echo "but WITHOUT ANY WARRANTY; without even the implied warranty of"
-@@ -16,7 +16,7 @@
-     echo "GNU General Public License for more details."
- }
- 
--function disclaimer()
-+disclaimer()
- {
-     echo "By using this tool you accept the following disclaimer:"
-     echo "  Because the any2djvu service is free of charge, there is no"
-@@ -34,7 +34,7 @@
- ocr=1
- docformat=2
- 
--function warn()
-+warn()
- {
-     echo "Notes:"
-     echo " - Internet connection is required."
-@@ -47,7 +47,7 @@
-     echo " - This software comes with NO WARRANTY."
- }
- 
--function format_help()
-+format_help()
- {
-     echo "Codes for the formats of the input documents to use with -f"
-     echo "  1 - DjVu Document (for verification or OCR)"
-@@ -61,7 +61,7 @@
-     echo "  9 - Scanned Document - Color/Mixed - >400 dpi"
- }
- 
--function usage()
-+usage()
- {
-     echo "Convert files from .ps/.ps.gz/.pdf to .djvu"
-     echo "Usage:	$0 [options] [url] {filename(s)}"
-@@ -117,13 +117,13 @@
- fi
- 
- # check OCR option
--if [ ! "x$ocr" == x0 ] && [ ! "x$ocr" == x1 ]; then
-+if [ ! "x$ocr" = x0 ] && [ ! "x$ocr" = x1 ]; then
-     echo 'error: -o OCR must be 0 or 1'
-     exit 2
- fi
- 
- # if help is requested or docformat is not specified right - show help
--if [ "x$docformat" == x'help' ]; then
-+if [ "x$docformat" = x'help' ]; then
-     format_help
-     exit 0
- fi
-@@ -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"   \
-             | eval tee "'$log'" $shellopts
-     fi
-     l=`egrep 'href=djvu/.*\.djvu' "$log"`
-@@ -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"
- 
-     [ -z "$doclean" ] || rm "$log"
-     [ -z $silent ]  && ls -l "$b.djvu"
diff --git a/graphics/djvulibre-nox11/files/patch-xmltools_Makefile.in b/graphics/djvulibre-nox11/files/patch-xmltools_Makefile.in
deleted file mode 100644
index 1b01a25406c8..000000000000
--- a/graphics/djvulibre-nox11/files/patch-xmltools_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./xmltools/Makefile.in.orig	2009-07-03 16:10:50.000000000 +0400
-+++ ./xmltools/Makefile.in	2009-07-03 16:11:10.000000000 +0400
-@@ -51,7 +51,7 @@
- 
- INCS = -I${top_builddir} -I${top_srcdir}/libdjvu -I${srcdir}
- FLAGS = ${DEFS} ${INCS} ${OPTS} ${JPEG_CFLAGS} ${THREAD_CFLAGS}
--LIBS= @LDFLAGS@ @LIBS@
-+LIBS= @LDFLAGS@ @LIBS@ ${THREAD_LIBS}
- CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@ 
- CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@ 
- 
diff --git a/graphics/djvulibre-nox11/pkg-descr b/graphics/djvulibre-nox11/pkg-descr
deleted file mode 100644
index cba2ce42d22a..000000000000
--- a/graphics/djvulibre-nox11/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-DjVu is a web-centric format and software platform for distributing
-documents and images. DjVu was originally developped at AT&T
-Labs-Research. In March 2000, AT&T sold DjVu to LizardTech Inc. who
-now distributes Windows/Mac plug-ins, and commercial encoders (mostly
-on Windows)
-
-The LizardTech released the reference implementation of DjVu under
-the GNU GPL in October 2000. DjVuLibre (which means free DjVu), is
-an enhanced version of that code maintained by the original inventors
-of DjVu. It is compatible with version 3.5 of the LizardTech DjVu
-software suite.
-
-Author:	Leon Bottou <leonb@users.sf.net>
-WWW:	http://djvu.sourceforge.net/
diff --git a/graphics/djvulibre-nox11/pkg-plist b/graphics/djvulibre-nox11/pkg-plist
deleted file mode 100644
index 094049bb227a..000000000000
--- a/graphics/djvulibre-nox11/pkg-plist
+++ /dev/null
@@ -1,68 +0,0 @@
-%%ANY2DJVU%%bin/any2djvu
-bin/bzz
-bin/c44
-bin/cjb2
-bin/cpaldjvu
-bin/csepdjvu
-bin/ddjvu
-bin/djvm
-bin/djvmcvt
-bin/djvudigital
-bin/djvudump
-bin/djvuextract
-bin/djvumake
-bin/djvups
-bin/djvused
-bin/djvuserve
-bin/djvutoxml
-bin/djvutxt
-bin/djvuxmlparser
-include/libdjvu/ddjvuapi.h
-include/libdjvu/miniexp.h
-lib/libdjvulibre.so
-lib/libdjvulibre.so.24
-libdata/pkgconfig/ddjvuapi.pc
-share/djvu/osi/cs/messages.xml
-share/djvu/osi/de/libdjvu++.xml
-share/djvu/osi/de/messages.xml
-share/djvu/osi/desktop/djvulibre-mime.xml
-share/djvu/osi/desktop/hi-djvu.svgz
-share/djvu/osi/desktop/hi22-djvu.png
-share/djvu/osi/desktop/hi32-djvu.png
-share/djvu/osi/desktop/hi48-djvu.png
-share/djvu/osi/desktop/hi64-djvu.png
-share/djvu/osi/desktop/prebuilt-hi22-djvu.png
-share/djvu/osi/desktop/prebuilt-hi32-djvu.png
-share/djvu/osi/desktop/prebuilt-hi48-djvu.png
-share/djvu/osi/desktop/prebuilt-hi64-djvu.png
-share/djvu/osi/desktop/register-djvu-mime
-share/djvu/osi/en/djvutools-reference.xml
-share/djvu/osi/en/libdjvu++.xml
-share/djvu/osi/en/messages.xml
-share/djvu/osi/en/unixgui-shared.xml
-share/djvu/osi/en/unixgui-viewer.xml
-share/djvu/osi/fr/libdjvu++.xml
-share/djvu/osi/fr/messages.xml
-share/djvu/osi/ja/libdjvu++.xml
-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
-@dirrm share/djvu/pubtext
-@dirrm share/djvu/osi/zh
-@dirrm share/djvu/osi/ja
-@dirrm share/djvu/osi/fr
-@dirrm share/djvu/osi/en
-@dirrm share/djvu/osi/desktop
-@dirrm share/djvu/osi/de
-@dirrm share/djvu/osi/cs
-@dirrm share/djvu/osi
-@dirrmtry share/djvu
-@dirrmtry man/fr/man1
-@dirrmtry man/fr
-@dirrmtry man/de/man1
-@dirrmtry man/de
-@dirrm include/libdjvu