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

12 files changed, 299 insertions, 138 deletions

diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index b82ef627bfbd..b1dee69a46d4 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -6,19 +6,17 @@
 #
 
 PORTNAME=	djvulibre
-PORTVERSION=	3.5.24
-PORTREVISION=	1
+PORTVERSION=	3.5.25.3
 CATEGORIES=	graphics www
-MASTER_SITES=	SF/djvu/DjVuLibre/${PORTVERSION}
+MASTER_SITES=	SF/djvu/DjVuLibre/${PORTVERSION:R}
 
 MAINTAINER=	bf@FreeBSD.org
-COMMENT=	DjVu viewers and browser plugin
+COMMENT=	DjVu base libraries and utilities
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		djvulibre.24:${PORTSDIR}/graphics/djvulibre-nox11
+LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
+		tiff:${PORTSDIR}/graphics/tiff
 
 USE_ICONV=	yes
 USE_GNOME=	gnomehack
@@ -28,66 +26,55 @@ CONFIGURE_ENV=	JPEG_CFLAGS="-I${LOCALBASE}/include" \
 		TIFF_CFLAGS="-I${LOCALBASE}/include" \
 		TIFF_LIBS="-L${LOCALBASE}/lib -ltiff" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		LOCALBASE="${LOCALBASE}" \
-		CXX="${CXX}"
-CONFIGURE_ARGS=	--enable-threads=pthread --enable-shared \
-		--enable-djview
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--enable-threads=pthread --enable-shared
 USE_LDCONFIG=	yes
+WRKSRC =	${WRKDIR}/${DISTNAME:R}
 
-INSTALL_TARGET=	install-gui install-i18n
+OPTIONS_DEFINE =	ANY2DJVU
+ANY2DJVU_DESC=		Install any2djvu script (requires curl)
 
-USE_QT_VER=	3
-CONFIGURE_ENV+=	QTLIBS="-L${QT_PREFIX}/lib -lqt-mt"
-MANLANG=	"" ja
-MAN1=		djview3.1 nsdejavu.1
-MLINKS=		djview3.1 djview.1
-DESKTOPDIR=	${PREFIX}/share/djvu/djview3/desktop
+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
 
-USE_WEBPLUGINS=		gecko*
-WEBPLUGINS_DIR=		${PREFIX}/lib/djvulibre/plugins
-WEBPLUGINS_FILES=	nsdejavu.so
+.include <bsd.port.options.mk>
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
+.if ${PORT_OPTIONS:MANY2DJVU}
+MAN1_EN+=	any2djvu.1
+RUN_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+PLIST_SUB+=	ANY2DJVU=""
+.else
+PLIST_SUB+=	ANY2DJVU="@comment "
+.endif
 
 post-patch:
-	@${REINPLACE_CMD} -E \
-		-e 's,(SUBDIRS_FIRST[[:space:]]+=[[:space:]]+).*,\1,' \
-		-e 's,(SUBDIRS_XML[[:space:]]+=[[:space:]]+).*,\1,' \
-		${WRKSRC}/Makefile.in
-	@${FIND} ${WRKSRC}/i18n/ -name "Makefile.in" | \
-		${XARGS} ${REINPLACE_CMD} -E -e \
-		's,(MANFILES[[:space:]]*=[[:space:]]*).*,\1$${MANFILES_GUI},'
-	@${REINPLACE_CMD} -E -e \
-		's,(LIBDJVU[[:space:]]+=[[:space:]]+).*,\1-ldjvulibre,' \
-		${WRKSRC}/gui/djview/Makefile.in \
-		${WRKSRC}/gui/bin2cpp/Makefile.in \
-		${WRKSRC}/tools/Makefile.in \
-		${WRKSRC}/xmltools/Makefile.in
-	@${REINPLACE_CMD} -e '/-O\*/d ; \
-		 s|$$OPTS -O3|$$OPTS|g ; \
-		 s|$$OPTS -O2|$$OPTS|g ; \
-		 s|$$OPTS $$opt|$$OPTS|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's,/netscape/,/djvulibre/,' \
-		 ${WRKSRC}/gui/nsdejavu/nsdejavu.1.in
-	@${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'
+	@${REINPLACE_CMD} -e \
+		's|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
+		${WRKSRC}/libdjvu/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/-[Og]\*)/d ; \
+		s|$$OPTS -O[[:digit:]]*|$$OPTS|g ; \
+		s|$$OPTS $$opt|$$OPTS|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|$${FLAGS}|| ; \
+		s|@CPPFLAGS@|$${FLAGS} &|' \
+		${WRKSRC}/tools/jb2cmp/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|_PROGRAM} -m 0755|_SCRIPT}|' \
+		${WRKSRC}/tools/Makefile.in
+.if empty(PORT_OPTIONS:MANY2DJVU)
+	@${REINPLACE_CMD} -e 's,any2djvu,,' ${WRKSRC}/tools/Makefile.in
+.endif
+
+.if ${PORT_OPTIONS:MDOC}
+PORTDOCS=	djvu2spec.djvu djvu3spec.djvu djvuchanges.txt lizard2002.djvu lizard2007.djvu
 
 post-install:
-#
-# Install desktop files.
-#
-	${MKDIR} ${DESKTOPDIR}
-	${INSTALL_DATA} ${WRKSRC}/desktopfiles/djvulibre-djview3.desktop \
-		${WRKSRC}/desktopfiles/hi32-djview3.png \
-		${DESKTOPDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/desktopfiles/register-djview-menu \
-		${DESKTOPDIR}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/
+.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/djvulibre/distinfo b/graphics/djvulibre/distinfo
index 06a720491578..0f7812ba82c3 100644
--- a/graphics/djvulibre/distinfo
+++ b/graphics/djvulibre/distinfo
@@ -1,2 +1,2 @@
-SHA256 (djvulibre-3.5.24.tar.gz) = c0734c81d22a0e458c3fb5efd4c3eab051bcb6ad8740f5a5784c1f5699482534
-SIZE (djvulibre-3.5.24.tar.gz) = 2998853
+SHA256 (djvulibre-3.5.25.3.tar.gz) = 898d7ed6dd2fa311a521baa95407a91b20a872d80c45e8245442d64f142cb1e0
+SIZE (djvulibre-3.5.25.3.tar.gz) = 2543949
diff --git a/graphics/djvulibre/files/patch-config_ltmain.sh b/graphics/djvulibre/files/patch-config_ltmain.sh
new file mode 100644
index 000000000000..db247645038a
--- /dev/null
+++ b/graphics/djvulibre/files/patch-config_ltmain.sh
@@ -0,0 +1,17 @@
+--- 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/files/patch-configure b/graphics/djvulibre/files/patch-configure
deleted file mode 100644
index bf21e13ba438..000000000000
--- a/graphics/djvulibre/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	2009-07-03 15:21:12.000000000 +0400
-+++ configure	2009-07-03 15:22:16.000000000 +0400
-@@ -945,7 +945,7 @@
- srcdir=
- verbose=
- x_includes=NONE
--x_libraries=NONE
-+x_libraries=${LOCALBASE}/lib
- 
- # Installation directory options.
- # These are left unexpanded so users can "make install exec_prefix=/foo"
-@@ -28076,7 +28076,7 @@
- 
-     NSDEJAVU_CFLAGS=${X_CFLAGS}
-     case "$host" in
--        *-cygwin* | *-mingw*)
-+        *-cygwin* | *-mingw* | *-freebsd*)
-             NSDEJAVU_LIBS="`echo ${X_LIBS} | sed -e 's/-lXext/-lXt -lXext/'`"
-             NSDEJAVU_LIBS="-no-undefined $NSDEJAVU_LIBS"
-             ;;
diff --git a/graphics/djvulibre/files/patch-desktopfiles_Makefile.in b/graphics/djvulibre/files/patch-desktopfiles_Makefile.in
index fd218965e260..6059dc24e4ad 100644
--- a/graphics/djvulibre/files/patch-desktopfiles_Makefile.in
+++ b/graphics/djvulibre/files/patch-desktopfiles_Makefile.in
@@ -1,27 +1,31 @@
---- ./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 @@
+--- desktopfiles/Makefile.in.orig	2012-05-07 22:56:53.000000000 -0400
++++ desktopfiles/Makefile.in	2012-06-09 21:00:25.000000000 -0400
+@@ -30,9 +30,10 @@
  
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_DATA = @INSTALL_DATA@
  CONVERT = @CONVERT@
+-INKSCAPE = @INKSCAPE@
++INKSCAPE = false
+ RSVG = @RSVG@
  XDG_MIME = @XDG_MIME@
-@@ -64,10 +65,10 @@
- 	  || cp ${srcdir}/prebuilt-$@ $@
+ XDG_ICON_RESOURCE = @XDG_ICON_RESOURCE@
+@@ -58,10 +59,10 @@
+           || ${CONVERT} -geometry $${s}x$${s} -depth 8 -background none $< $@ \
+ 	  || ${INKSCAPE} --without-gui --export-width=$${s} \
+                          --export-height=$${s} --export-png=$@ $< \
+-	  || cp ${srcdir}/prebuilt-$@ $@
++	  || if test -f ${srcdir}/prebuilt-$@ ; then cp ${srcdir}/prebuilt-$@ $@ ; fi
  
  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 @@
+@@ -80,7 +81,7 @@
  
  install-djvu-files: FORCE
  	${INSTALL} -d ${DESTDIR}${datadir_djvu}
@@ -30,12 +34,3 @@
  	${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/files/patch-gui_djview_Makefile.in b/graphics/djvulibre/files/patch-gui_djview_Makefile.in
deleted file mode 100644
index 677986aaad72..000000000000
--- a/graphics/djvulibre/files/patch-gui_djview_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/djview/Makefile.in.orig	2009-07-08 18:38:28.000000000 +0400
-+++ gui/djview/Makefile.in	2009-07-08 18:38:52.000000000 +0400
-@@ -161,7 +161,7 @@
- MISCFLAGS = ${JPEG_CFLAGS} ${THREAD_CFLAGS} ${QT_CFLAGS} ${X_CFLAGS}
- FLAGS = ${DEFS} ${INCS} ${OPTS} ${MISCFLAGS}
- 
--LIBS= @LDFLAGS@ ${QT_LIBS} ${X_LIBS} @LIBS@
-+LIBS= @LDFLAGS@ ${QT_LIBS} ${X_LIBS} @LIBS@ ${THREAD_LIBS}
- 
- CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@ 
- 
diff --git a/graphics/djvulibre/files/patch-libdjvu__miniexp.cpp b/graphics/djvulibre/files/patch-libdjvu__miniexp.cpp
new file mode 100644
index 000000000000..87c57b2b5e7f
--- /dev/null
+++ b/graphics/djvulibre/files/patch-libdjvu__miniexp.cpp
@@ -0,0 +1,11 @@
+--- libdjvu/miniexp.cpp.orig	2012-05-07 22:56:53.000000000 -0400
++++ libdjvu/miniexp.cpp	2012-06-12 07:23:54.000000000 -0400
+@@ -1008,7 +1008,7 @@
+   if (io == &miniexp_io && !CompatCounter::count)
+     return (*minilisp_getc)(); /* compatibility hack */
+   FILE *f = (io->data[0]) ? (FILE*)(io->data[0]) : stdin;
+-  return ::getc(f);
++  return getc(f);
+ }
+ 
+ static int 
diff --git a/graphics/djvulibre/files/patch-tools_Makefile.in b/graphics/djvulibre/files/patch-tools_Makefile.in
new file mode 100644
index 000000000000..74a93ab39199
--- /dev/null
+++ b/graphics/djvulibre/files/patch-tools_Makefile.in
@@ -0,0 +1,38 @@
+--- 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/files/patch-tools_any2djvu b/graphics/djvulibre/files/patch-tools_any2djvu
new file mode 100644
index 000000000000..1b86edc3e213
--- /dev/null
+++ b/graphics/djvulibre/files/patch-tools_any2djvu
@@ -0,0 +1,90 @@
+--- 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/files/patch-xmltools_Makefile.in b/graphics/djvulibre/files/patch-xmltools_Makefile.in
new file mode 100644
index 000000000000..1b01a25406c8
--- /dev/null
+++ b/graphics/djvulibre/files/patch-xmltools_Makefile.in
@@ -0,0 +1,11 @@
+--- ./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/pkg-descr b/graphics/djvulibre/pkg-descr
index cba2ce42d22a..bc24c20fbaf6 100644
--- a/graphics/djvulibre/pkg-descr
+++ b/graphics/djvulibre/pkg-descr
@@ -1,12 +1,12 @@
 DjVu is a web-centric format and software platform for distributing
-documents and images. DjVu was originally developped at AT&T
+documents and images. DjVu was originally developed 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)
+on Windows).
 
-The LizardTech released the reference implementation of DjVu under
+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
+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.
 
diff --git a/graphics/djvulibre/pkg-plist b/graphics/djvulibre/pkg-plist
index d2f54f5e40be..3710bc4fcd10 100644
--- a/graphics/djvulibre/pkg-plist
+++ b/graphics/djvulibre/pkg-plist
@@ -1,23 +1,66 @@
-bin/djview
-bin/djview3
-lib/djvulibre/plugins/nsdejavu.so
-share/djvu/djview3/cs/djview.qm
-share/djvu/djview3/cs/qt.qm
-share/djvu/djview3/de/djview.qm
-share/djvu/djview3/de/qt.qm
-share/djvu/djview3/desktop/djvulibre-djview3.desktop
-share/djvu/djview3/desktop/hi32-djview3.png
-share/djvu/djview3/desktop/register-djview-menu
-share/djvu/djview3/fr/djview.qm
-share/djvu/djview3/fr/qt.qm
-share/djvu/djview3/ja/djview.qm
-share/djvu/djview3/ja/qt.qm
-@dirrm share/djvu/djview3/ja
-@dirrm share/djvu/djview3/fr
-@dirrm share/djvu/djview3/desktop
-@dirrm share/djvu/djview3/de
-@dirrm share/djvu/djview3/cs
-@dirrm share/djvu/djview3
+%%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.25
+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/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
-@dirrm lib/djvulibre/plugins
-@dirrm lib/djvulibre
+@dirrmtry man/fr/man1
+@dirrmtry man/fr
+@dirrmtry man/de/man1
+@dirrmtry man/de
+@dirrm include/libdjvu