Maintainer update.

PR:		ports/45367
Submitted by:	John Merryweather Cooper <coop9211@uidaho.edu>

5 files changed, 28 insertions, 9 deletions

diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index 7a7fc6bf5114..884aa4e3c72c 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -7,7 +7,8 @@
 
 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_ENV=	JPEG_CFLAGS=-I"${LOCALBASE}/include" \
 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 --git a/graphics/djvulibre/files/patch-gui::nsdejavu::Makefile.in b/graphics/djvulibre/files/patch-gui::nsdejavu::Makefile.in
index 1c880e6348dc..8829f553265a 100644
--- a/graphics/djvulibre/files/patch-gui::nsdejavu::Makefile.in
+++ b/graphics/djvulibre/files/patch-gui::nsdejavu::Makefile.in
@@ -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 --git a/graphics/djvulibre/pkg-comment b/graphics/djvulibre/pkg-comment
index 26f4bde3716f..330c1aeb018f 100644
--- a/graphics/djvulibre/pkg-comment
+++ b/graphics/djvulibre/pkg-comment
@@ -1 +1 @@
-DjVu viewers, encoders and utilities
+DjVu viewers, encoders, browser plugin, and utilities
diff --git a/graphics/djvulibre/pkg-descr b/graphics/djvulibre/pkg-descr
index 72e9e76a1575..b74a22d0f722 100644
--- a/graphics/djvulibre/pkg-descr
+++ b/graphics/djvulibre/pkg-descr
@@ -12,6 +12,7 @@ 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.
+	  (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 --git a/graphics/djvulibre/pkg-plist b/graphics/djvulibre/pkg-plist
index 2d80512b9b9e..b28f5bd1f5d1 100644
--- a/graphics/djvulibre/pkg-plist
+++ b/graphics/djvulibre/pkg-plist
@@ -15,9 +15,7 @@ bin/djvused
 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