4 files changed, 60 insertions, 19 deletions

diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index 5dad99a55aa7..254addd157b2 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	djvulibre
-PORTVERSION=	3.5.17
-PORTREVISION=	2
+PORTVERSION=	3.5.18
+PORTREVISION=	0
 CATEGORIES=	graphics www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	djvu
@@ -20,9 +20,8 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USE_ICONV=	yes
-USE_GNOME=	gnomehack
+USE_GNOME=	gnomehack gnometarget
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	JPEG_CFLAGS="-I${LOCALBASE}/include" \
 		JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg" \
 		TIFF_CFLAGS="-I${LOCALBASE}/include" \
@@ -47,7 +46,8 @@ PORTDOCS=	djvu2spec.djvu lizard2002.djvu
 USE_XLIB=	yes
 USE_QT_VER=	3
 CONFIGURE_ENV+=	QTLIBS="-L${X11BASE}/lib -lqt-mt"
-MAN1+=		djview.1 nsdejavu.1
+MAN1+=		djview3.1 nsdejavu.1
+MLINKS+=	djview3.1 djview.1
 PLIST_SUB+=	X11=''
 .else
 PKGNAMESUFFIX=	-nox11
diff --git a/graphics/djvulibre/distinfo b/graphics/djvulibre/distinfo
index 2a4bb3b64cbd..23520af5b48f 100644
--- a/graphics/djvulibre/distinfo
+++ b/graphics/djvulibre/distinfo
@@ -1,3 +1,3 @@
-MD5 (djvulibre-3.5.17.tar.gz) = 18e71eec1f7d59ef4710b405ea64650e
-SHA256 (djvulibre-3.5.17.tar.gz) = a39977be3ca99f5b1d6a01a7795133c18de538bf20ff1f2d52d652bac94647c7
-SIZE (djvulibre-3.5.17.tar.gz) = 2298690
+MD5 (djvulibre-3.5.18.tar.gz) = 73fd6d4f92832b85a91529b7bb3b7710
+SHA256 (djvulibre-3.5.18.tar.gz) = 18a23c1d7b7a1d36e8847fb15dc20b33cb7914279a38897cc72861e68c85b2e9
+SIZE (djvulibre-3.5.18.tar.gz) = 2349352
diff --git a/graphics/djvulibre/files/patch-desktopfiles_Makefile.in b/graphics/djvulibre/files/patch-desktopfiles_Makefile.in
new file mode 100644
index 000000000000..6104dba44056
--- /dev/null
+++ b/graphics/djvulibre/files/patch-desktopfiles_Makefile.in
@@ -0,0 +1,26 @@
+--- desktopfiles/Makefile.in.orig	Mon Feb  5 03:39:00 2007
++++ desktopfiles/Makefile.in	Mon Feb  5 03:39:39 2007
+@@ -28,6 +28,7 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_DATA = @INSTALL_DATA@
+ XDG_MIME = @XDG_MIME@
+ XDG_ICON_RESOURCE = @XDG_ICON_RESOURCE@
+@@ -82,13 +83,13 @@
+ 
+ install-djvu-files: FORCE
+ 	${INSTALL} -d ${DESTDIR}${datadir_djvu}
+-	${INSTALL_PROGRAM} register-djvu-mime ${DESTDIR}${datadir_djvu}
++	${INSTALL_SCRIPT} register-djvu-mime ${DESTDIR}${datadir_djvu}
+ 	${INSTALL_DATA} ${srcdir}/*djvu.png ${DESTDIR}${datadir_djvu}
+ 	${INSTALL_DATA} ${srcdir}/*mime.xml ${DESTDIR}${datadir_djvu}
+ 
+ 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} ${srcdir}/*djview3.png ${DESTDIR}${datadir_djview}
+ 	${INSTALL_DATA} ${srcdir}/*djview3.desktop ${DESTDIR}${datadir_djview}
+ 
diff --git a/graphics/djvulibre/pkg-plist b/graphics/djvulibre/pkg-plist
index 1a4f931045c3..7993c659236e 100644
--- a/graphics/djvulibre/pkg-plist
+++ b/graphics/djvulibre/pkg-plist
@@ -6,6 +6,7 @@ bin/cpaldjvu
 bin/csepdjvu
 bin/ddjvu
 %%X11%%bin/djview
+%%X11%%bin/djview3
 bin/djvm
 bin/djvmcvt
 bin/djvudigital
@@ -23,26 +24,34 @@ include/libdjvu/miniexp.h
 %%X11%%lib/djvulibre/plugins/nsdejavu.so
 lib/libdjvulibre.la
 lib/libdjvulibre.so
-lib/libdjvulibre.so.17
+lib/libdjvulibre.so.18
 libdata/pkgconfig/ddjvuapi.pc
-share/djvu/languages.xml
-%%X11%%share/djvu/osi/de/djview.qm
+%%X11%%share/djvu/djview3/de/djview.qm
+%%X11%%share/djvu/djview3/de/qt.qm
+%%X11%%share/djvu/djview3/desktop/djvulibre-djview3.desktop
+%%X11%%share/djvu/djview3/desktop/hi32-djview3.png
+%%X11%%share/djvu/djview3/desktop/register-djview-menu
+%%X11%%share/djvu/djview3/fr/djview.qm
+%%X11%%share/djvu/djview3/fr/qt.qm
+%%X11%%share/djvu/djview3/ja/djview.qm
+%%X11%%%%X11%%share/djvu/djview3/ja/qt.qm
 share/djvu/osi/de/libdjvu++.xml
 share/djvu/osi/de/messages.xml
-%%X11%%share/djvu/osi/de/qt.qm
+share/djvu/osi/desktop/djvulibre-mime.xml
+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/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/en/unixgui-shared.xml
 share/djvu/osi/en/unixgui-viewer.xml
-%%X11%%share/djvu/osi/fr/djview.qm
 share/djvu/osi/fr/libdjvu++.xml
 share/djvu/osi/fr/messages.xml
-%%X11%%share/djvu/osi/fr/qt.qm
-%%X11%%share/djvu/osi/ja/djview.qm
 share/djvu/osi/ja/libdjvu++.xml
 share/djvu/osi/ja/messages.xml
-%%X11%%share/djvu/osi/ja/qt.qm
+share/djvu/osi/languages.xml
 share/djvu/osi/zh/libdjvu++.xml
 share/djvu/osi/zh/messages.xml
 share/djvu/pubtext/DjVuMessages.dtd
@@ -56,14 +65,20 @@ share/djvu/pubtext/DjVuXML-s.dtd
 @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
+%%X11%%@dirrm share/djvu/djview3/ja
+%%X11%%@dirrm share/djvu/djview3/fr
+%%X11%%@dirrm share/djvu/djview3/desktop
+%%X11%%@dirrm share/djvu/djview3/de
+%%X11%%@dirrm share/djvu/djview3
 @dirrm share/djvu
-%%X11%%@dirrm lib/djvulibre/plugins
-%%X11%%@dirrm lib/djvulibre
-@dirrm include/libdjvu
 @dirrmtry man/fr/man1
 @dirrmtry man/fr
 @dirrmtry man/de/man1
 @dirrmtry man/de
+%%X11%%@dirrm lib/djvulibre/plugins
+%%X11%%@dirrm lib/djvulibre
+@dirrm include/libdjvu
 @unexec rmdir %%LOCALBASE%%/lib/browser_plugins 2>/dev/null || true