[Port Update]:: graphics/djvulibre 3.5.9 -> 3.5.12

	Port Update graphics/djvulibre 3.5.9 -> 3.5.12

PR:		ports/55194
Submitted by:	Sebastian Yepes F. [ESN] <esn@x123.info>

6 files changed, 73 insertions, 59 deletions

diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index 9a7e5d7c80dd..9dd7133abcee 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	djvulibre
-PORTVERSION=	3.5.9
+PORTVERSION=	3.5.12
 CATEGORIES=	graphics www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	djvu
@@ -47,7 +47,7 @@ pre-everything::
 .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`
+		-type f -print0 | ${xargs} -0 ${GREP} -Fl --mmap /usr/local`
 .endif
 
 .if !defined(WITH_OPTIMIZED_CFLAGS)
diff --git a/graphics/djvulibre/distinfo b/graphics/djvulibre/distinfo
index b591301e254d..528511ae65ba 100644
--- a/graphics/djvulibre/distinfo
+++ b/graphics/djvulibre/distinfo
@@ -1 +1 @@
-MD5 (djvulibre-3.5.9.tar.gz) = 5c404709bf1a4170b8d4b3d789e9911b
+MD5 (djvulibre-3.5.12.tar.gz) = 4adeb92beb8295aa330b9c6b042ba02d
diff --git a/graphics/djvulibre/files/patch-aa b/graphics/djvulibre/files/patch-aa
new file mode 100644
index 000000000000..b036f64c86bb
--- /dev/null
+++ b/graphics/djvulibre/files/patch-aa
@@ -0,0 +1,69 @@
+diff -ur gui/djview/Makefile.in.ori gui/djview/Makefile.in
+--- gui/djview/Makefile.in.ori	Fri Jan 24 14:02:11 2003
++++ gui/djview/Makefile.in	Fri Aug  1 14:59:13 2003
+@@ -50,7 +50,10 @@
+ X_CFLAGS = @X_CFLAGS@
+ 
+ LIBDJVU_A = ${top_builddir}/libdjvu/libdjvulibre.a
+-LIBDJVU_SO = ${top_builddir}/libdjvu/libdjvulibre-${PACKAGE_VERSION}.so
++LIBDJVU_SO = ${top_builddir}/libdjvu/libdjvulibre${PACKAGE_VERSION:R:R}.so.${PACKAGE_VERSION:R:E}
++.if defined(OBJFORMAT) && ${OBJFORMAT} == "aout"
++LIBDJVU_SO:= ${LIBDJVU_SO}.${PACKAGE_VERSION:E}
++.endif
+ @SHARED_YES@LIBDJVU = -Wl,-rpath,${libdir} ${LIBDJVU_SO}
+ @SHARED_NO@LIBDJVU = ${LIBDJVU_A}
+ 
+diff -ur gui/nsdejavu/Makefile.in.ori gui/nsdejavu/Makefile.in
+--- gui/nsdejavu/Makefile.in.ori	Fri Aug  1 16:55:31 2003
++++ gui/nsdejavu/Makefile.in	Fri Aug  1 16:56:55 2003
+@@ -25,7 +25,7 @@
+ datadir = @datadir@
+ libdir = @libdir@
+ mandir = @mandir@
+-plugindir = ${libdir}/netscape/plugins
++plugindir = ${libdir}/browser_plugins/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 -ur libdjvu/Makefile.in.ori libdjvu/Makefile.in
+--- libdjvu/Makefile.in.ori	Mon Jan  6 14:10:43 2003
++++ libdjvu/Makefile.in	Fri Aug  1 14:59:12 2003
+@@ -44,7 +44,11 @@
+ THREAD_CFLAGS = @THREAD_CFLAGS@
+ 
+ LIBDJVU_A = libdjvulibre.a
+-LIBDJVU_SO = libdjvulibre-${PACKAGE_VERSION}.so
++LIBDJVU_SO:= libdjvulibre${PACKAGE_VERSION:R:R}.so.${PACKAGE_VERSION:R:E}
++.if defined(OBJFORMAT) && ${OBJFORMAT} == "aout"
++LIBDJVU_SO:= ${LIBDJVU_SO}.${PACKAGE_VERSION:E}
++.endif
++
+ 
+ @SHARED_YES@CXXPICFLAGS = -fPIC -DPIC
+ @SHARED_NO@CXXPICFLAGS =
+diff -ur tools/Makefile.in.ori tools/Makefile.in
+--- tools/Makefile.in.ori	Mon Jan  6 14:10:47 2003
++++ tools/Makefile.in	Fri Aug  1 14:59:13 2003
+@@ -44,7 +44,11 @@
+ THREAD_CFLAGS = @THREAD_CFLAGS@
+ 
+ LIBDJVU_A = ${top_builddir}/libdjvu/libdjvulibre.a
+-LIBDJVU_SO = ${top_builddir}/libdjvu/libdjvulibre-${PACKAGE_VERSION}.so
++LIBDJVU_SO = ${top_builddir}/libdjvu/libdjvulibre${PACKAGE_VERSION:R:R}.so.${PACKAGE_VERSION:R:E}
++.if defined(OBJFORMAT) && ${OBJFORMAT} == "aout"
++LIBDJVU_SO:= ${LIBDJVU_SO}.${PACKAGE_VERSION:E}
++.endif
++
+ 
+ @SHARED_YES@LIBDJVU = -Wl,-rpath,${libdir} ${LIBDJVU_SO}
+ @SHARED_NO@LIBDJVU = ${LIBDJVU_A}
+
diff --git a/graphics/djvulibre/files/patch-gui::nsdejavu::Makefile.in b/graphics/djvulibre/files/patch-gui::nsdejavu::Makefile.in
deleted file mode 100644
index 8829f553265a..000000000000
--- a/graphics/djvulibre/files/patch-gui::nsdejavu::Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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}/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/files/patch-libname b/graphics/djvulibre/files/patch-libname
deleted file mode 100644
index 3034b8b9ddcf..000000000000
--- a/graphics/djvulibre/files/patch-libname
+++ /dev/null
@@ -1,35 +0,0 @@
-Make sure the installed shared library is named like
-libdjvulibre3.so.5.4 instead of libdjvulibre-3.5.4.so
-
-	-mi
-
---- libdjvu/Makefile.in	Mon Nov  5 21:12:24 2001
-+++ libdjvu/Makefile.in	Thu Feb  7 14:48:14 2002
-@@ -46,3 +46,6 @@
- LIBDJVU_A = libdjvulibre.a
--LIBDJVU_SO = libdjvulibre-${PACKAGE_VERSION}.so
-+LIBDJVU_SO:= libdjvulibre${PACKAGE_VERSION:R:R}.so.${PACKAGE_VERSION:R:E}
-+.if defined(OBJFORMAT) && ${OBJFORMAT} == "aout"
-+LIBDJVU_SO:= ${LIBDJVU_SO}.${PACKAGE_VERSION:E}
-+.endif
- 
---- gui/djview/Makefile.in	Thu Feb  7 14:53:32 2002
-+++ gui/djview/Makefile.in	Thu Feb  7 14:56:22 2002
-@@ -52,3 +52,6 @@
- LIBDJVU_A = ${top_builddir}/libdjvu/libdjvulibre.a
--LIBDJVU_SO = ${top_builddir}/libdjvu/libdjvulibre-${PACKAGE_VERSION}.so
-+LIBDJVU_SO = ${top_builddir}/libdjvu/libdjvulibre${PACKAGE_VERSION:R:R}.so.${PACKAGE_VERSION:R:E}
-+.if defined(OBJFORMAT) && ${OBJFORMAT} == "aout"
-+LIBDJVU_SO:= ${LIBDJVU_SO}.${PACKAGE_VERSION:E}
-+.endif
- @SHARED_YES@LIBDJVU = -Wl,-rpath,${libdir} ${LIBDJVU_SO}
---- tools/Makefile.in	Wed Jan 23 20:52:56 2002
-+++ tools/Makefile.in	Thu Feb  7 14:57:48 2002
-@@ -46,3 +46,6 @@
- LIBDJVU_A = ${top_builddir}/libdjvu/libdjvulibre.a
--LIBDJVU_SO = ${top_builddir}/libdjvu/libdjvulibre-${PACKAGE_VERSION}.so
-+LIBDJVU_SO = ${top_builddir}/libdjvu/libdjvulibre${PACKAGE_VERSION:R:R}.so.${PACKAGE_VERSION:R:E}
-+.if defined(OBJFORMAT) && ${OBJFORMAT} == "aout"
-+LIBDJVU_SO:= ${LIBDJVU_SO}.${PACKAGE_VERSION:E}
-+.endif
- 
diff --git a/graphics/djvulibre/pkg-plist b/graphics/djvulibre/pkg-plist
index b28f5bd1f5d1..06a1aed5f0cc 100644
--- a/graphics/djvulibre/pkg-plist
+++ b/graphics/djvulibre/pkg-plist
@@ -14,7 +14,7 @@ bin/djvups
 bin/djvused
 bin/djvuserve
 bin/djvutxt
-lib/libdjvulibre3.so.5.4
+lib/libdjvulibre-3.5.12.so
 %%X11%%lib/browser_plugins/nsdejavu.so
 share/djvu/osi/Chinese_PRC/libdjvu++.xml
 share/djvu/osi/Chinese_PRC/messages.xml