Update to 4.8

Changelog:
NEW IN VERSION 4.6
--------------------
- Show total page number in page combo and page info box.
- Decode percent encoding in annotation and outline hyperlinks.
- Properly handle non-ascii filenames in export and save dialogs.
- Subtle changes to PgUp/PgDn/Home/End/Space/Backspace view changes.
- Fixed suffix management in export/save/print dialogs.

NEW IN VERSION 4.7
--------------------
- Fix for crash on quick PgUp PgDn sequences.
- Fix scrollbars in continuous mode.
- Fix plugin for some webkit based browsers.

NEW IN VERSION 4.8
--------------------
- Added option to invert luminance.
- Added shortcut ctrl+g to go to the page combo.
- Fixed export issues under win32.
- Mouse wheel can be configured to control the zoom.
- Animated page movements.

4 files changed, 22 insertions, 22 deletions

diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile
index 644b3bc087c..8dee6b10237 100644
--- a/graphics/djview4/Makefile
+++ b/graphics/djview4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2011/04/22 13:43:43 obache Exp $
+# $NetBSD: Makefile,v 1.14 2011/10/27 10:36:50 ryoon Exp $
 #
 
-DISTNAME=	djview4-4.5
-PKGREVISION=	5
+DISTNAME=	djview-4.8
+PKGNAME=	${DISTNAME:S/djview/djview4/}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=djvu/}
 
diff --git a/graphics/djview4/distinfo b/graphics/djview4/distinfo
index 92c83fb5679..7eb8092b454 100644
--- a/graphics/djview4/distinfo
+++ b/graphics/djview4/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2010/08/15 07:09:27 obache Exp $
+$NetBSD: distinfo,v 1.3 2011/10/27 10:36:50 ryoon Exp $
 
-SHA1 (djview4-4.5.tar.gz) = d2fd259aa88f80393767f6dec921463da7820143
-RMD160 (djview4-4.5.tar.gz) = 256abad9cc6d661ba19caf209b74d9937eec4bce
-Size (djview4-4.5.tar.gz) = 895611 bytes
-SHA1 (patch-aa) = 1d38d0a3aadf9b01052dc087358068a18c6315b2
-SHA1 (patch-ab) = 4be439a7e9d004b74d90523adb74b3d2cc0e5ecb
+SHA1 (djview-4.8.tar.gz) = 266d207afb63a1ee63eed054190bf88888fda572
+RMD160 (djview-4.8.tar.gz) = a1ae72440d13c6da57325571cf304882de3825b7
+Size (djview-4.8.tar.gz) = 883481 bytes
+SHA1 (patch-aa) = 0362d5c89e1e9facd2cc1a0bc48b63ce94848508
+SHA1 (patch-ab) = 35c8954f49e087669495d1defae9ad2e819aaeab
diff --git a/graphics/djview4/patches/patch-aa b/graphics/djview4/patches/patch-aa
index f8d9cf75778..2f00e989685 100644
--- a/graphics/djview4/patches/patch-aa
+++ b/graphics/djview4/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.2 2010/08/15 07:09:27 obache Exp $
+$NetBSD: patch-aa,v 1.3 2011/10/27 10:36:50 ryoon Exp $
 
---- desktopfiles/Makefile.in.orig	2009-02-19 16:51:51.000000000 +0000
+--- desktopfiles/Makefile.in.orig	2011-08-17 14:24:20.000000000 +0000
 +++ desktopfiles/Makefile.in
-@@ -30,6 +30,7 @@ mandir = @mandir@
+@@ -29,6 +29,7 @@ libdir = @libdir@
+ mandir = @mandir@
  
  INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA = @INSTALL_DATA@
- CONVERT = @CONVERT@
- XDG_MIME = @XDG_MIME@
-@@ -52,7 +53,7 @@ hi32-djview4.png hi64-djview4.png: djvie
+ RSVG = @RSVG@
+@@ -54,7 +55,7 @@ hi32-djview4.png hi64-djview4.png: djvie
  	  || cp ${srcdir}/prebuilt-$@ $@
  
  hi-djview4.svgz: djview.svg
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.2 2010/08/15 07:09:27 obache Exp $
  
  register-djview-menu: register-djview-menu.in
  	sed < ${srcdir}/register-djview-menu.in > register-djview-menu \
-@@ -69,10 +70,10 @@ install: install-djview-files 
+@@ -71,10 +72,10 @@ install: install-djview-files 
  
  install-djview-files: FORCE
  	${INSTALL} -d ${DESTDIR}${datadir_djview}
diff --git a/graphics/djview4/patches/patch-ab b/graphics/djview4/patches/patch-ab
index b0a12cd9dce..fb6d15a7288 100644
--- a/graphics/djview4/patches/patch-ab
+++ b/graphics/djview4/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.2 2010/08/15 07:09:27 obache Exp $
+$NetBSD: patch-ab,v 1.3 2011/10/27 10:36:50 ryoon Exp $
 
---- Makefile.in.orig	2009-02-22 16:50:53.000000000 +0000
+--- Makefile.in.orig	2011-08-17 14:24:20.000000000 +0000
 +++ Makefile.in
-@@ -81,13 +81,11 @@ install-djview: install-djview-bin insta
- install-djview-bin: FORCE
+@@ -82,13 +82,11 @@ install-djview-bin: FORCE
  	${INSTALL} -d ${DESTDIR}${bindir}
- 	${INSTALL_PROGRAM} src/djview ${DESTDIR}${bindir}/djview4
+ 	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