7 files changed, 114 insertions, 187 deletions

diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index 16c94ba6e2d5..b1b5959f75a5 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -5,37 +5,63 @@
 # $FreeBSD$
 #
 
-PORTNAME=	libdjvu++
-PORTVERSION=	2.1.1
+PORTNAME=	djvulibre
+PORTVERSION=	3.5.4
 CATEGORIES=	graphics
-MASTER_SITES=	http://djvu.research.att.com/open/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	djvu
 
 MAINTAINER=	mi@aldan.algebra.com
 
-INSTALLS_SHLIB=	yes
-IS_INTERACTIVE=	some think, the AT&T license needs to be acked by the user
-USE_NEWGCC=	yes
+LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
+		giconv:${PORTSDIR}/converters/iconv
+.ifndef WITHOUT_X11
+USE_QT_VER=	2
+#LIB_DEPENDS+=	qt2:${PORTSDIR}/x11-toolkits/qt23
+.else
+PKGNAMESUFFIX=	-nox11
+.endif
+
 HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	CXX=${CXX}
-CONFIGURE_ARGS=	--with-cxxflag="${CXXFLAGS}"
-MAKE_ARGS=	OPT="" -j 2
-
-pre-patch:
-	${SH} ${WRKSRC}/RunMe
-
-do-install:
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} c44 d44 djvutopnm djvumake \
-		djvuextract ppmcoco bzz djvuinfo ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/libdjvu++.a ${WRKSRC}/libdjvu++.so.2* \
-		 ${PREFIX}/lib
-	${LN} -sf libdjvu++.so.2* ${PREFIX}/lib/libdjvu++.so
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/djvu
-	${INSTALL_DATA} ${WRKSRC}/@Doc/* ${PREFIX}/share/doc/djvu
-
-PLIST_SUB+=	DOC=''
+CONFIGURE_ENV=	JPEG_CFLAGS=-I"${LOCALBASE}/include" \
+		JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg"
+CONFIGURE_ARGS=	--enable-threads=posix --enable-shared # --enable-rpo
+
+.ifndef WITHOUT_X11
+CONFIGURE_ENV+=	CXX=${CXX} PTHREAD_CFLAGS=-pthread PTHREAD_LIBS=-pthread \
+		MOC=${LOCALBASE}/bin/moc2 UIC=${LOCALBASE}/bin/uic \
+		QT_CFLAGS=-I"${LOCALBASE}/include/qt2" \
+		QT_LIBS="-L${LOCALBASE}/lib -lqt2"
 .else
-PLIST_SUB+=	DOC='@comment '
+CONFIGURE_ARGS+=--disable-djview
+.endif
+
+MAKE_ARGS+=	-j2
+
+.if defined(LOCALBASE) && ${LOCALBASE} != "/usr/local"
+pre-configure:
+	${PERL} -pi -e 's,/usr/local,${LOCALBASE},g' `find ${WRKSRC} \
+		-type f -print0 | xargs -0 ${GREP} -Fl --mmap /usr/local`
+.endif
+
+post-configure:
+	${PERL} -pi -e 's,-O3,,;' -e 's,-mcpu=i386,,; ' \
+		-e 's,^(OPTS =.*),\1 ${CFLAGS},' \
+		${WRKSRC}/*/Makefile ${WRKSRC}/*/*/Makefile
+
+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
+.ifndef WITHOUT_X11
+MAN1+=	djview.1 nsdejavu.1
+PLIST_SUB+=	X11=''
+.else
+PLIST_SUB+=	X11='@comment '
+.endif
+
+.ifndef NOPORTDOCS
+post-install:
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/djvulibre/distinfo b/graphics/djvulibre/distinfo
index 4e7888d75912..0212ec5dd01a 100644
--- a/graphics/djvulibre/distinfo
+++ b/graphics/djvulibre/distinfo
@@ -1 +1 @@
-MD5 (libdjvu++-2.1.1.tar.gz) = 7fe3287e218fd4f24ea9959d58a7df39
+MD5 (djvulibre-3.5.4.tar.gz) = d6e5cb5683c8b71867ef1b76c646e5ef
diff --git a/graphics/djvulibre/files/patch-ab b/graphics/djvulibre/files/patch-ab
deleted file mode 100644
index 673e68e9b1dc..000000000000
--- a/graphics/djvulibre/files/patch-ab
+++ /dev/null
@@ -1,7 +0,0 @@
---- GContainer.h.orig  Wed Mar 17 14:24:57 1999
-+++ GContainer.h       Tue Jul 20 14:33:21 1999
-@@ -981,3 +981,3 @@
-       if (data && lobound<=hibound)
--        for (int i=lobound; i<=hibound; i++)
-+        for (i=lobound; i<=hibound; i++)
-           data[i-minlo].TYPE::~TYPE();
diff --git a/graphics/djvulibre/files/patch-ac b/graphics/djvulibre/files/patch-ac
deleted file mode 100644
index 444b5236f853..000000000000
--- a/graphics/djvulibre/files/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.in.orig   Wed Mar 17 14:24:59 1999
-+++ Makefile.in        Tue Jul 20 18:08:59 1999
-@@ -36 +36 @@
--LIB= libdjvu++.a
-+LIB= libdjvu++.so
-@@ -53,4 +53,3 @@
--$(LIB): $(LIBOBJS) 
--      if [ -r $(LIB) ] ; then rm $(LIB) ; fi
--      $(AR) cq $(LIB) $(LIBOBJS)
--      $(RANLIB) $(LIB)
-+$(LIB): ${LIBOBJS:.o=.cpp}
-+	${MAKE} -f bsd.lib.mk CXX="${CXX}" OBJS="${LIBOBJS}" LIB=djvu++ \
-+		SHLIB_MAJOR=2 SHLIB_MINOR=1
-@@ -68 +67 @@
--BZZOBJS = bzz.o BSByteStream.o ZPCodec.o ByteStream.o GException.o DjVuGlobal.o
-+BZZOBJS = bzz.o
---- @Test/Makefile.in.orig     Fri Mar  5 19:42:53 1999
-+++ @Test/Makefile.in  Tue Jul 20 18:00:24 1999
-@@ -17 +17 @@
--LIB= ../libdjvu++.a
-+LIB= ../libdjvu++.so
diff --git a/graphics/djvulibre/pkg-comment b/graphics/djvulibre/pkg-comment
index a82ec017d34f..26f4bde3716f 100644
--- a/graphics/djvulibre/pkg-comment
+++ b/graphics/djvulibre/pkg-comment
@@ -1 +1 @@
-AT&T's DjVu: The Technology for Scanned Documents on the Web
+DjVu viewers, encoders and utilities
diff --git a/graphics/djvulibre/pkg-descr b/graphics/djvulibre/pkg-descr
index 0bfc4d667132..72e9e76a1575 100644
--- a/graphics/djvulibre/pkg-descr
+++ b/graphics/djvulibre/pkg-descr
@@ -1,14 +1,23 @@
-The DjVu Reference Library does not contain the entire implementation of
-the  DjVu system.  While  it  contains the  entire  decoder,  and a  big
-piece of  the encoder,  it does not  contain the  sophisticated encoding
-strategies necessary for reaching  the highest compression ratios.
+DjVu  is a  web-centric format  and software  platform for  distributing
+documents   and   images.DjVu   was  originally   developped   at   AT&T
+Labs-Research  by Leon  Bottou, Yann  LeCun, Patrick  Haffner, and  many
+others.  In March  2000,  AT&T  sold DjVu  to  LizardTech  Inc. who  now
+distributes  Windows/Mac plug-ins,  and commercial  encoders (mostly  on
+Windows)
 
-Among other  things, The DjVu  Reference Library contains the  full DjVu
-decoder,  the  full IW44  wavelet  encoder/decoder  for continuous  tone
-images, and  the back-end  of JB2  bilevel image  compression technique.
-However, it  does not  contain the code  for separating  document images
-into foreground and  background layers, nor does it contain  the code of
-the lossy  JB2 scheme  that achieves the  highest compression  ratios on
-bitonal images.
+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.  DjVulibre-3.5 contains:
+	- a standalone DjVu viewer based on the Qt library. 
+	- A browser plugin that works with most Unix browsers.
+	- A full-fledged wavelet-based compressor for pictures. 
+	- A simple compressor for bitonal (black and white) scanned pages. 
+	- A compressor for palettized images (a la GIF/PNG). 
+	- A set of utilities to manipulate and assemble DjVu images and
+	  documents. 
+	- A set of decoders to convert DjVu to a number of other formats. 
+	- An up-to-date version of the C++ DjVu Reference Library.
 
-WWW: http://www.djvu.com/
+WWW: http://djvu.sourceforge.net/
diff --git a/graphics/djvulibre/pkg-plist b/graphics/djvulibre/pkg-plist
index 070cf80f2daa..b42fb33e6eb0 100644
--- a/graphics/djvulibre/pkg-plist
+++ b/graphics/djvulibre/pkg-plist
@@ -1,122 +1,42 @@
-bin/djvuinfo
+bin/bzz
 bin/c44
-bin/d44
-bin/djvutopnm
-bin/djvumake
+bin/cjb2
+bin/cpaldjvu
+bin/csepdjvu
+bin/ddjvu
+%%X11%%bin/djview
+bin/djvm
+bin/djvmcvt
+bin/djvudump
 bin/djvuextract
-bin/ppmcoco
-bin/bzz
-lib/libdjvu++.a
-lib/libdjvu++.so
-lib/libdjvu++.so.2.1
-%%DOC%%share/doc/djvu/ATTLicense.h.html
-%%DOC%%share/doc/djvu/ATTLicense.html
-%%DOC%%share/doc/djvu/ATTSourceCodeAgreement.html
-%%DOC%%share/doc/djvu/BSByteStream.h.html
-%%DOC%%share/doc/djvu/BSByteStream.html
-%%DOC%%share/doc/djvu/BitContext.html
-%%DOC%%share/doc/djvu/ByteStream.h.html
-%%DOC%%share/doc/djvu/ByteStream.html
-%%DOC%%share/doc/djvu/ClassGraph.class
-%%DOC%%share/doc/djvu/ClassGraphPanel.class
-%%DOC%%share/doc/djvu/ClassLayout.class
-%%DOC%%share/doc/djvu/CompilingtheLibrarySystemsotherthanUnix.html
-%%DOC%%share/doc/djvu/CompilingtheLibraryUnix.html
-%%DOC%%share/doc/djvu/DJVUVERSION.html
-%%DOC%%share/doc/djvu/DJVUVERSION_TOO_NEW.html
-%%DOC%%share/doc/djvu/DJVUVERSION_TOO_OLD.html
-%%DOC%%share/doc/djvu/DecodingDjVuContent.html
-%%DOC%%share/doc/djvu/DjVuAnno.html
-%%DOC%%share/doc/djvu/DjVuFileStructure.html
-%%DOC%%share/doc/djvu/DjVuGlobal.h.html
-%%DOC%%share/doc/djvu/DjVuImage.h.html
-%%DOC%%share/doc/djvu/DjVuImage.html
-%%DOC%%share/doc/djvu/DjVuImageFiles.html
-%%DOC%%share/doc/djvu/DjVuInfo.html
-%%DOC%%share/doc/djvu/DjVuInterface.html
-%%DOC%%share/doc/djvu/DjVuMemory.html
-%%DOC%%share/doc/djvu/DjVuNames.html
-%%DOC%%share/doc/djvu/DjVuProgress.html
-%%DOC%%share/doc/djvu/DjVuversionconstants.html
-%%DOC%%share/doc/djvu/ExperimentalFeatures..html
-%%DOC%%share/doc/djvu/GArray.html
-%%DOC%%share/doc/djvu/GBitmap.h.html
-%%DOC%%share/doc/djvu/GBitmap.html
-%%DOC%%share/doc/djvu/GBitmapScaler.html
-%%DOC%%share/doc/djvu/GContainer.h.html
-%%DOC%%share/doc/djvu/GContainer.html
-%%DOC%%share/doc/djvu/GContainerBase.html
-%%DOC%%share/doc/djvu/GException.h.html
-%%DOC%%share/doc/djvu/GException.html
-%%DOC%%share/doc/djvu/GList.html
-%%DOC%%share/doc/djvu/GMap.html
-%%DOC%%share/doc/djvu/GMonitor.html
-%%DOC%%share/doc/djvu/GMonitorLock.html
-%%DOC%%share/doc/djvu/GOS.h.html
-%%DOC%%share/doc/djvu/GOS.html
-%%DOC%%share/doc/djvu/GP.html
-%%DOC%%share/doc/djvu/GPBase.html
-%%DOC%%share/doc/djvu/GPEnabled.html
-%%DOC%%share/doc/djvu/GPixel.html
-%%DOC%%share/doc/djvu/GPixmap.h.html
-%%DOC%%share/doc/djvu/GPixmap.html
-%%DOC%%share/doc/djvu/GPixmapScaler.html
-%%DOC%%share/doc/djvu/GPosition.html
-%%DOC%%share/doc/djvu/GRect.h.html
-%%DOC%%share/doc/djvu/GRect.html
-%%DOC%%share/doc/djvu/GRectMapper.html
-%%DOC%%share/doc/djvu/GSArray.html
-%%DOC%%share/doc/djvu/GScaler.h.html
-%%DOC%%share/doc/djvu/GScaler.html
-%%DOC%%share/doc/djvu/GSmartPointer.h.html
-%%DOC%%share/doc/djvu/GString.h.html
-%%DOC%%share/doc/djvu/GString.html
-%%DOC%%share/doc/djvu/GThread.html
-%%DOC%%share/doc/djvu/GThreads.h.html
-%%DOC%%share/doc/djvu/General.html
-%%DOC%%share/doc/djvu/GettingStarted.html
-%%DOC%%share/doc/djvu/HIER.html
-%%DOC%%share/doc/djvu/HIERjava.html
-%%DOC%%share/doc/djvu/Hashfunctions.html
-%%DOC%%share/doc/djvu/IFFByteStream.h.html
-%%DOC%%share/doc/djvu/IFFByteStream.html
-%%DOC%%share/doc/djvu/IW44ImageFiles.html
-%%DOC%%share/doc/djvu/IWBitmap.html
-%%DOC%%share/doc/djvu/IWEncoderParms.html
-%%DOC%%share/doc/djvu/IWImage.h.html
-%%DOC%%share/doc/djvu/IWPixmap.html
-%%DOC%%share/doc/djvu/Introduction.html
-%%DOC%%share/doc/djvu/JB2Blit.html
-%%DOC%%share/doc/djvu/JB2Image.h.html
-%%DOC%%share/doc/djvu/JB2Image.html
-%%DOC%%share/doc/djvu/JB2Shape.html
-%%DOC%%share/doc/djvu/LibraryReference.html
-%%DOC%%share/doc/djvu/MemoryByteStream.html
-%%DOC%%share/doc/djvu/NavigatorButton.class
-%%DOC%%share/doc/djvu/PNMandRLEfileformats.html
-%%DOC%%share/doc/djvu/StaticByteStream.html
-%%DOC%%share/doc/djvu/StdioByteStream.html
-%%DOC%%share/doc/djvu/UtilityPrograms.html
-%%DOC%%share/doc/djvu/ZPCodec.h.html
-%%DOC%%share/doc/djvu/ZPCodec.html
-%%DOC%%share/doc/djvu/ZPCodecExamples.html
-%%DOC%%share/doc/djvu/bzz.html
-%%DOC%%share/doc/djvu/c44.html
-%%DOC%%share/doc/djvu/d44.html
-%%DOC%%share/doc/djvu/djvuextract.html
-%%DOC%%share/doc/djvu/djvuinfo.2.html
-%%DOC%%share/doc/djvu/djvumake.html
-%%DOC%%share/doc/djvu/djvutopnm.html
-%%DOC%%share/doc/djvu/down.gif
-%%DOC%%share/doc/djvu/hash.2.html
-%%DOC%%share/doc/djvu/hash.3.html
-%%DOC%%share/doc/djvu/hash.4.html
-%%DOC%%share/doc/djvu/hash.5.html
-%%DOC%%share/doc/djvu/hash.6.html
-%%DOC%%share/doc/djvu/hash.html
-%%DOC%%share/doc/djvu/icon1.gif
-%%DOC%%share/doc/djvu/icon2.gif
-%%DOC%%share/doc/djvu/index.html
-%%DOC%%share/doc/djvu/logo.gif
-%%DOC%%share/doc/djvu/ppmcoco.html
-%%DOC%%@dirrm share/doc/djvu
+bin/djvumake
+bin/djvups
+bin/djvused
+bin/djvuserve
+bin/djvutxt
+lib/libdjvulibre3.so.5.4
+%%X11%%lib/netscape/plugins/nsdejavu.so
+share/djvu/osi/Chinese_PRC/libdjvu++.xml
+share/djvu/osi/Chinese_PRC/messages.xml
+@dirrm share/djvu/osi/Chinese_PRC
+share/djvu/osi/de_DE/libdjvu++.xml
+share/djvu/osi/de_DE/messages.xml
+@dirrm share/djvu/osi/de_DE
+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
+@dirrm share/djvu/osi/en
+share/djvu/osi/fr_FR/libdjvu++.xml
+share/djvu/osi/fr_FR/messages.xml
+@dirrm share/djvu/osi/fr_FR
+share/djvu/osi/ja_JP/libdjvu++.xml
+share/djvu/osi/ja_JP/messages.xml
+@dirrm share/djvu/osi/ja_JP
+@dirrm share/djvu/osi
+share/djvu/languages.xml
+@dirrm share/djvu
+%%PORTDOCS%%share/doc/djvulibre/djvu2spec.djvu
+%%PORTDOCS%%share/doc/djvulibre/djvu3changes.txt
+%%PORTDOCS%%@dirrm share/doc/djvulibre