Update to 4.10.5

Changelog:
NEW IN VERSION 4.10
-------------------
- Bug fixes: layout, usability, preferences, locale selection
- Works with both Qt4 and Qt5
- Build uses automake/qmake hybrid (instead of autoconf/qmake).
- Layout annotations are honored in multipage mode
- Experimental OpenGL rendering
- Slideshow mode


NEW IN VERSION 4.9
------------------
- Added language selection in preference.
- Added option to override printing and saving restrictions.
- Automatic reloading of djvu documents when the file is changed.
- New chinese translations.
- Improved network code (needs Qt>=4.4.)
- Remember the last visited position for the last 50 documents.

9 files changed, 53 insertions, 211 deletions

diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile
index da3491398ea..83b54e7b178 100644
--- a/graphics/djview4/Makefile
+++ b/graphics/djview4/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2015/04/25 14:23:09 tnn Exp $
+# $NetBSD: Makefile,v 1.34 2016/01/31 07:27:04 ryoon Exp $
 #
 
-DISTNAME=	djview-4.8
+DISTNAME=	djview-4.10.5
 PKGNAME=	${DISTNAME:S/djview/djview4/}
-PKGREVISION=	17
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=djvu/}
 
@@ -14,7 +13,8 @@ LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	pkg-config
+USE_LIBTOOL=	yes
+USE_TOOLS+=	gmake pkg-config
 
 SUBST_CLASSES+=		nsdejavu
 SUBST_STAGE.nsdejavu=	post-patch
diff --git a/graphics/djview4/PLIST b/graphics/djview4/PLIST
index 1c67fc0318d..e80c371f276 100644
--- a/graphics/djview4/PLIST
+++ b/graphics/djview4/PLIST
@@ -1,17 +1,17 @@
-@comment $NetBSD: PLIST,v 1.4 2010/08/15 07:09:27 obache Exp $
+@comment $NetBSD: PLIST,v 1.5 2016/01/31 07:27:04 ryoon Exp $
 bin/djview4
-lib/netscape/plugins/nsdejavu.so
+lib/mozilla/plugins/nsdejavu.la
 man/man1/djview4.1
 man/man1/nsdejavu.1
-share/djvu/djview4/desktop/djvulibre-djview4.desktop
-share/djvu/djview4/desktop/hi-djview4.svgz
-share/djvu/djview4/desktop/hi32-djview4.png
-share/djvu/djview4/desktop/hi64-djview4.png
-share/djvu/djview4/desktop/prebuilt-hi32-djview4.png
-share/djvu/djview4/desktop/prebuilt-hi64-djview4.png
-share/djvu/djview4/desktop/register-djview-menu
+share/applications/djvulibre-djview4.desktop
 share/djvu/djview4/djview_cs.qm
 share/djvu/djview4/djview_de.qm
+share/djvu/djview4/djview_es.qm
 share/djvu/djview4/djview_fr.qm
 share/djvu/djview4/djview_ru.qm
 share/djvu/djview4/djview_uk.qm
+share/djvu/djview4/djview_zh_cn.qm
+share/djvu/djview4/djview_zh_tw.qm
+share/icons/hicolor/32x32/mimetypes/djvulibre-djview4.png
+share/icons/hicolor/64x64/mimetypes/djvulibre-djview4.png
+share/icons/hicolor/scalable/mimetypes/djvulibre-djview4.svgz
diff --git a/graphics/djview4/distinfo b/graphics/djview4/distinfo
index 9d21131babe..52f26550c47 100644
--- a/graphics/djview4/distinfo
+++ b/graphics/djview4/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 21:33:55 agc Exp $
+$NetBSD: distinfo,v 1.7 2016/01/31 07:27:04 ryoon Exp $
 
-SHA1 (djview-4.8.tar.gz) = 266d207afb63a1ee63eed054190bf88888fda572
-RMD160 (djview-4.8.tar.gz) = a1ae72440d13c6da57325571cf304882de3825b7
-SHA512 (djview-4.8.tar.gz) = 21bdf30bd4b63f95fe0bb25650c08defc43bdd3041122c7c78a93268942d0e2e92822a78a8e101e35f50c363a3b3ce5dd31d6ff1c19c163833d086bd8422402c
-Size (djview-4.8.tar.gz) = 883481 bytes
-SHA1 (patch-aa) = 0362d5c89e1e9facd2cc1a0bc48b63ce94848508
-SHA1 (patch-ab) = 35c8954f49e087669495d1defae9ad2e819aaeab
-SHA1 (patch-config_libtool.m4) = 1aa8f470e2b9ee8df9d847036e524f6a9e8002d6
-SHA1 (patch-configure) = 9f4df4c2e4e2ebfbc1f4ddff1c93f390052ee266
-SHA1 (patch-src_qdjvuwidget.cpp) = c8666e41f5ae9a8ccc9118e18b0bae7b15f54674
+SHA1 (djview-4.10.5.tar.gz) = b3ca4d638a630913cd2596e2399f8049b4559a4f
+RMD160 (djview-4.10.5.tar.gz) = 6fbdc99db79ed96d0944a6c9c32f72a57dd54936
+SHA512 (djview-4.10.5.tar.gz) = d7fa4e643e006cb1d71fe6d808fd1b200b965928bf2cdd872c9c1c1833bed71ac3c70a2967a06f31bbd83f347cb5e330f4869e42e7d9c6cd13a0db54e4354614
+Size (djview-4.10.5.tar.gz) = 1111729 bytes
+SHA1 (patch-configure) = 184199fb193c3eba562fc1fca336bcefe70eacde
+SHA1 (patch-src_Makefile.in) = 041fb914c6c7cc6b574fe06f4af97d1e4c9f2664
diff --git a/graphics/djview4/patches/patch-aa b/graphics/djview4/patches/patch-aa
deleted file mode 100644
index 2f00e989685..00000000000
--- a/graphics/djview4/patches/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2011/10/27 10:36:50 ryoon Exp $
-
---- desktopfiles/Makefile.in.orig	2011-08-17 14:24:20.000000000 +0000
-+++ desktopfiles/Makefile.in
-@@ -29,6 +29,7 @@ libdir = @libdir@
- mandir = @mandir@
- 
- INSTALL = @INSTALL@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- RSVG = @RSVG@
-@@ -54,7 +55,7 @@ hi32-djview4.png hi64-djview4.png: djvie
- 	  || cp ${srcdir}/prebuilt-$@ $@
- 
- hi-djview4.svgz: djview.svg
--	gzip <$< >$@
-+	gzip <${.ALLSRC} >$@
- 
- register-djview-menu: register-djview-menu.in
- 	sed < ${srcdir}/register-djview-menu.in > register-djview-menu \
-@@ -71,10 +72,10 @@ install: install-djview-files 
- 
- 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} *djview4.png ${DESTDIR}${datadir_djview}
- 	${INSTALL_DATA} *djview4.svgz ${DESTDIR}${datadir_djview}
--	${INSTALL_PROGRAM} ${srcdir}/*djview4.desktop ${DESTDIR}${datadir_djview}
-+	${INSTALL_DATA} ${srcdir}/*djview4.desktop ${DESTDIR}${datadir_djview}
- 	-@echo "Run ${datadir_djview}/register-djview-menu install"
- 	-@echo " to register the djview3 menu entries."
- 
diff --git a/graphics/djview4/patches/patch-ab b/graphics/djview4/patches/patch-ab
deleted file mode 100644
index fb6d15a7288..00000000000
--- a/graphics/djview4/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2011/10/27 10:36:50 ryoon Exp $
-
---- Makefile.in.orig	2011-08-17 14:24:20.000000000 +0000
-+++ Makefile.in
-@@ -82,13 +82,11 @@ install-djview-bin: FORCE
- 	${INSTALL} -d ${DESTDIR}${bindir}
- 	eval `grep '^TARGET *=' src/Makefile | sed -e 's/ *= */=/'` ; \
- 	  ${INSTALL_PROGRAM} src/$${TARGET-djview} ${DESTDIR}${bindir}/djview4
--	cd ${DESTDIR}${bindir} ; ${LN_S} djview4 djview || true
- 
- install-djview-man: FORCE
- 	${INSTALL} -d ${DESTDIR}${mandir}/man1
- 	${INSTALL_DATA} ${srcdir}/src/djview.1 \
- 	   ${DESTDIR}${mandir}/man1/djview4.1
--	cd ${DESTDIR}${mandir}/man1 ; ${LN_S} djview4.1 djview.1 || true
- 
- install-djview-qm: FORCE
- 	${INSTALL} -d ${DESTDIR}${datadir}/djvu/djview4
diff --git a/graphics/djview4/patches/patch-config_libtool.m4 b/graphics/djview4/patches/patch-config_libtool.m4
deleted file mode 100644
index e243d895b9f..00000000000
--- a/graphics/djview4/patches/patch-config_libtool.m4
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-config_libtool.m4,v 1.1 2014/04/04 18:25:51 asau Exp $
-
---- config/libtool.m4.orig	2011-08-17 14:24:20.000000000 +0000
-+++ config/libtool.m4
-@@ -2286,7 +2286,7 @@ dgux*)
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
-+freebsd1|freebsd1.*)
-   dynamic_linker=no
-   ;;
- 
-@@ -2297,7 +2297,7 @@ freebsd* | dragonfly*)
-     objformat=`/usr/bin/objformat`
-   else
-     case $host_os in
--    freebsd[[123]]*) objformat=aout ;;
-+    freebsd[[123]]|freebsd[[123]].*) objformat=aout ;;
-     *) objformat=elf ;;
-     esac
-   fi
-@@ -4723,7 +4723,7 @@ _LT_EOF
-       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-       ;;
- 
--    freebsd1*)
-+    freebsd1|freebsd1.*)
-       _LT_TAGVAR(ld_shlibs, $1)=no
-       ;;
- 
-@@ -5685,7 +5685,7 @@ if test "$_lt_caught_CXX_error" != yes; 
-         esac
-         ;;
- 
--      freebsd[[12]]*)
-+      freebsd[[12]]|freebsd[[12]].*)
-         # C++ shared libraries reported to be fairly broken before
- 	# switch to ELF
-         _LT_TAGVAR(ld_shlibs, $1)=no
diff --git a/graphics/djview4/patches/patch-configure b/graphics/djview4/patches/patch-configure
index d7c2fd44533..479d45fdd17 100644
--- a/graphics/djview4/patches/patch-configure
+++ b/graphics/djview4/patches/patch-configure
@@ -1,58 +1,13 @@
-$NetBSD: patch-configure,v 1.1 2014/04/04 18:25:51 asau Exp $
+$NetBSD: patch-configure,v 1.2 2016/01/31 07:27:04 ryoon Exp $
 
---- configure.orig	2014-04-03 17:59:03.942029000 +0000
+--- configure.orig	2016-01-07 12:28:36.000000000 +0000
 +++ configure
-@@ -9242,7 +9242,7 @@ if test -z "$aix_libpath"; then aix_libp
-       hardcode_shlibpath_var=no
-       ;;
- 
--    freebsd1*)
-+    freebsd1|freebsd1.*)
-       ld_shlibs=no
-       ;;
- 
-@@ -10117,7 +10117,7 @@ dgux*)
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
-+freebsd1|freebsd1.*)
-   dynamic_linker=no
-   ;;
- 
-@@ -10128,7 +10128,7 @@ freebsd* | dragonfly*)
-     objformat=`/usr/bin/objformat`
-   else
-     case $host_os in
--    freebsd[123]*) objformat=aout ;;
-+    freebsd[123]|freebsd[123].*) objformat=aout ;;
-     *) objformat=elf ;;
-     esac
-   fi
-@@ -11824,7 +11824,7 @@ if test -z "$aix_libpath"; then aix_libp
-         esac
-         ;;
- 
--      freebsd[12]*)
-+      freebsd[12]|freebsd[12].*)
-         # C++ shared libraries reported to be fairly broken before
- 	# switch to ELF
-         ld_shlibs_CXX=no
-@@ -13585,7 +13585,7 @@ dgux*)
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--freebsd1*)
-+freebsd1|freebsd1.*)
-   dynamic_linker=no
-   ;;
- 
-@@ -13596,7 +13596,7 @@ freebsd* | dragonfly*)
-     objformat=`/usr/bin/objformat`
-   else
-     case $host_os in
--    freebsd[123]*) objformat=aout ;;
-+    freebsd[123]|freebsd[123].*) objformat=aout ;;
-     *) objformat=elf ;;
-     esac
-   fi
+@@ -20132,7 +20132,7 @@ $as_echo "$as_me: WARNING: Disabling plu
+     fi
+ fi
+ 
+-if test "$ac_nsdejavu" != no && test "$qtversion" == "qt4" ; then
++if test "$ac_nsdejavu" != no && test "$qtversion" = "qt4" ; then
+     ac_qt_x11=no
+     ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
diff --git a/graphics/djview4/patches/patch-src_Makefile.in b/graphics/djview4/patches/patch-src_Makefile.in
new file mode 100644
index 00000000000..b5d81448c2d
--- /dev/null
+++ b/graphics/djview4/patches/patch-src_Makefile.in
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2016/01/31 07:27:04 ryoon Exp $
+
+--- src/Makefile.in.orig	2016-01-07 12:28:37.000000000 +0000
++++ src/Makefile.in
+@@ -410,7 +410,7 @@ install-binSCRIPTS: $(bin_SCRIPTS)
+ 	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ 	     test -z "$$files" || { \
+ 	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
++	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir/djview4" || exit $$?; \
+ 	     } \
+ 	; done
+ 
+@@ -457,7 +457,7 @@ install-man1: $(dist_man1_MANS)
+ 	while read files; do \
+ 	  test -z "$$files" || { \
+ 	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
++	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)/djview4.1" || exit $$?; }; \
+ 	done; }
+ 
+ uninstall-man1:
diff --git a/graphics/djview4/patches/patch-src_qdjvuwidget.cpp b/graphics/djview4/patches/patch-src_qdjvuwidget.cpp
deleted file mode 100644
index b916883bd95..00000000000
--- a/graphics/djview4/patches/patch-src_qdjvuwidget.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-src_qdjvuwidget.cpp,v 1.1 2012/02/16 04:44:26 ryoon Exp $
-
-Avoid conflicted name, swap.
-
---- src/qdjvuwidget.cpp.orig	2011-08-17 14:24:20.000000000 +0000
-+++ src/qdjvuwidget.cpp
-@@ -153,7 +153,7 @@ all_numbers(const char *s)
- }
- 
- template<class T> static inline void 
--swap(T& x, T& y)
-+swap_(T& x, T& y)
- {
-   T tmp;
-   tmp = x;
-@@ -173,11 +173,12 @@ ksmallest(T *v, int n, int k)
-       /* Sort v[lo], v[m], v[hi] by insertion */
-       m = (lo+hi)/2;
-       if (v[lo]>v[m])
--        swap(v[lo],v[m]);
-+        swap_(v[lo],v[m]);
-       if (v[m]>v[hi]) {
--        swap(v[m],v[hi]);
-+        swap_(v[m],v[hi]);
-         if (v[lo]>v[m])
--          swap(v[lo],v[m]);
-+          swap_(v[lo],v[m]);
-+
-       }
-       /* Extract pivot, place sentinel */
-       pivot = v[m];
-@@ -191,7 +192,7 @@ ksmallest(T *v, int n, int k)
-       do ++l; while (v[l]<pivot);
-       do --h; while (v[h]>pivot);
-       if (l < h) { 
--        swap(v[l],v[h]); 
-+        swap_(v[l],v[h]); 
-         goto loop; 
-       }
-       /* Finish up */