# This is a patch for djvulibre to update it to djvulibre-3.5.8_1
# 
# To apply this patch:
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'applypatch' program with this patch file as input.
#
# If you do not have 'applypatch', it is part of the 'makepatch' package
# that you can fetch from the Comprehensive Perl Archive Network:
# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz
# In the above URL, 'x' should be 2 or higher.
#
# To apply this patch without the use of 'applypatch':
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'patch' program with this file as input.
#
#### End of Preamble ####

#### Patch data follows ####
diff -u 'djvulibre/Makefile' 'djvulibre-3.5.8_1/Makefile'
Index: ./Makefile
--- ./Makefile	Wed Oct  2 07:16:12 2002
+++ ./Makefile	Sun Nov 17 00:30:17 2002
@@ -2,12 +2,13 @@
 # Date Created:		20 July 1999
 # Whom:			Mikhail Teterin <mi@aldan.algebra.com>
 #
-# $FreeBSD: ports/graphics/djvulibre/Makefile,v 1.12 2002/10/02 08:15:53 kris Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	djvulibre
 PORTVERSION=	3.5.8
-CATEGORIES=	graphics
+PORTREVISION=	1
+CATEGORIES=	graphics www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	djvu
 
@@ -29,22 +30,32 @@
 CONFIGURE_ARGS=	--enable-threads=posix --enable-shared --prefix="${PREFIX}"
 
 .ifndef WITHOUT_X11
-CONFIGURE_ENV+=	CXX=${CXX} PTHREAD_CFLAGS=-pthread PTHREAD_LIBS=-pthread \
+CONFIGURE_ENV+=	CXX=${CXX} \
+		PTHREAD_CFLAGS=-pthread \
+		PTHREAD_LIBS=-pthread \
 		QTLIBS="-L${X11BASE}/lib -lqt-mt"
 .else
 CONFIGURE_ARGS+=--disable-djview
 .endif
 
+.if !defined(WITH_OPTIMIZED_CFLAGS)
+pre-everything:
+	@${ECHO_MSG} "You can enable additional compilation optimizations"
+	@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
+.endif
+
 .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
 
+.if !defined(WITH_OPTIMIZED_CFLAGS)
 post-configure:
 	${PERL} -pi -e 's,-O3,,;' -e 's,-mcpu=i386,,; ' \
 		-e 's,^(OPTS =.*),\1 ${CFLAGS},' \
 		${WRKSRC}/*/Makefile ${WRKSRC}/*/*/Makefile
+.endif
 
 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
diff -u 'djvulibre/files/patch-gui::nsdejavu::Makefile.in' 'djvulibre-3.5.8_1/files/patch-gui::nsdejavu::Makefile.in'
Index: ./files/patch-gui::nsdejavu::Makefile.in
--- ./files/patch-gui::nsdejavu::Makefile.in	Wed Oct  2 01:15:53 2002
+++ ./files/patch-gui::nsdejavu::Makefile.in	Sun Nov 17 00:35:07 2002
@@ -1,11 +1,20 @@
---- gui/nsdejavu/Makefile.in.old	Thu Jan 10 13:40:56 2002
-+++ gui/nsdejavu/Makefile.in	Fri Sep 20 14:57:15 2002
+--- gui/nsdejavu/Makefile.in.orig	Thu Jan 10 13:40:56 2002
++++ gui/nsdejavu/Makefile.in	Sun Nov 17 00:33:16 2002
 @@ -25,7 +25,7 @@
  datadir = @datadir@
  libdir = @libdir@
  mandir = @mandir@
 -plugindir = ${libdir}/netscape/plugins
-+plugindir = ${libdir}/mozilla/plugins
++plugindir = ${libdir}/browser_plugins
  
  CC = @CC@
  CXX = @CXX@
+@@ -40,7 +40,7 @@
+ OPTS = @OPTS@
+ NSDEJAVU = @NSDEJAVU@
+ NSDEJAVU_FLAGS = @NSDEJAVU_FLAGS@
+-NSDEJAVU_LIBS = @NSDEJAVU_LIBS@
++NSDEJAVU_LIBS = @NSDEJAVU_LIBS@ -lXt
+ NSDEJAVU_LINK = @NSDEJAVU_LINK@
+ 
+ INCS = \
diff -u 'djvulibre/pkg-comment' 'djvulibre-3.5.8_1/pkg-comment'
Index: ./pkg-comment
--- ./pkg-comment	Thu Feb 28 17:12:32 2002
+++ ./pkg-comment	Sat Nov 16 23:05:40 2002
@@ -1 +1 @@
-DjVu viewers, encoders and utilities
+DjVu viewers, encoders, browser plugin, and utilities
diff -u 'djvulibre/pkg-descr' 'djvulibre-3.5.8_1/pkg-descr'
Index: ./pkg-descr
--- ./pkg-descr	Thu Feb 28 17:12:32 2002
+++ ./pkg-descr	Sat Nov 16 23:06:37 2002
@@ -12,6 +12,7 @@
 suite.  DjVulibre-3.5 contains:
 	- a standalone DjVu viewer based on the Qt library. 
 	- A browser plugin that works with most Unix browsers.
+	  (such as Mozilla and Opera)
 	- 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). 
diff -u 'djvulibre/pkg-plist' 'djvulibre-3.5.8_1/pkg-plist'
Index: ./pkg-plist
--- ./pkg-plist	Wed Oct  2 07:16:12 2002
+++ ./pkg-plist	Sat Nov 16 23:08:15 2002
@@ -15,9 +15,7 @@
 bin/djvuserve
 bin/djvutxt
 lib/libdjvulibre3.so.5.4
-%%X11%%lib/mozilla/plugins/nsdejavu.so
-%%X11%%@unexec rmdir %D/lib/mozilla/plugins 2>/dev/null || true
-%%X11%%@unexec rmdir %D/lib/mozilla 2>/dev/null || true
+%%X11%%lib/browser_plugins/nsdejavu.so
 share/djvu/osi/Chinese_PRC/libdjvu++.xml
 share/djvu/osi/Chinese_PRC/messages.xml
 @dirrm share/djvu/osi/Chinese_PRC
#### End of Patch data ####

#### ApplyPatch data follows ####
# Data version        : 1.0
# Date generated      : Sun Nov 17 00:54:14 2002
# Generated by        : makepatch 2.00
# Recurse directories : Yes
# p 'Makefile' 1685 1037521817 0100644
# p 'files/patch-gui::nsdejavu::Makefile.in' 294 1037522107 0100644
# p 'pkg-comment' 37 1037516740 0100644
# p 'pkg-descr' 1234 1037516797 0100644
# p 'pkg-plist' 1233 1037516895 0100644
#### End of ApplyPatch data ####

#### End of Patch kit [created: Sun Nov 17 00:54:14 2002] ####
#### Checksum: 149 5238 11789 ####