Update to 0.8.48.

pkgsrc changes:
---------------
Add a patch from Neil Booth to fix PLIST.
Should fix part of pkg/46331.

Upstream changes:
-----------------
Way too long CHANGELOG to list here.
Highlights from upstream are:

E-book viewer: A whole new full screen mode. [0.8.44]
-----------------------------------------------------
Closes tickets: 959830 [External link]

The new mode has no toolbars to distract from the text and the ability to set
the width of the column of text via Preferences in the ebook viewer. Click the
Fullscreen button on the toolbar in the viewer to enter fullscreen mode (or
press the F11 or Ctrl+Shit+F keys)

Support for reading Amazon's new KF8 format [0.8.42]
----------------------------------------------------
calibre can now both view and convert MOBI files that contain Amazon's new KF8
(Kindle Fire) format

Complete changelog is here: http://calibre-ebook.com/whats-new
`

1 files changed, 97 insertions, 94 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 54b47b9d99d..094f2a9844b 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2012/03/09 12:34:19 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2012/04/22 19:33:01 gls Exp $
 #
 
-DISTNAME=	calibre-0.8.39
-PKGREVISION=	2
+DISTNAME=	calibre-0.8.48
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX=	.tar.xz
@@ -42,96 +41,100 @@ INSTALLATION_DIRS=	share/applications
 INSTALLATION_DIRS=	share/icons
 INSTALLATION_DIRS=	share/calibre/recipes
 
-FIX_PYTHON+=	recipes/*.recipe
-FIX_PYTHON+=	resources/catalog/*.py
-FIX_PYTHON+=	resources/*.py
-FIX_PYTHON+=	*.py
-FIX_PYTHON+=	setup/*.py
-FIX_PYTHON+=	setup/installer/*.py
-FIX_PYTHON+=	setup/installer/linux/*.py
-FIX_PYTHON+=	setup/installer/osx/*.py
-FIX_PYTHON+=	setup/installer/osx/app/*.py
-FIX_PYTHON+=	setup/installer/windows/*.py
-FIX_PYTHON+=	src/calibre/*.py
-FIX_PYTHON+=	src/calibre/customize/*.py
-FIX_PYTHON+=	src/calibre/db/*.py
-FIX_PYTHON+=	src/calibre/db/tests/*.py
-FIX_PYTHON+=	src/calibre/devices/*.py
-FIX_PYTHON+=	src/calibre/devices/android/*.py
-FIX_PYTHON+=	src/calibre/devices/eslick/*.py
-FIX_PYTHON+=	src/calibre/devices/folder_device/*.py
-FIX_PYTHON+=	src/calibre/devices/iriver/*.py
-FIX_PYTHON+=	src/calibre/devices/kobo/*.py
-FIX_PYTHON+=	src/calibre/devices/prs505/*.py
-FIX_PYTHON+=	src/calibre/devices/prst1/*.py
-FIX_PYTHON+=	src/calibre/devices/teclast/*.py
-FIX_PYTHON+=	src/calibre/ebooks/*.py
-FIX_PYTHON+=	src/calibre/ebooks/chm/*.py
-FIX_PYTHON+=	src/calibre/ebooks/comic/*.py
-FIX_PYTHON+=	src/calibre/ebooks/compression/*.py
-FIX_PYTHON+=	src/calibre/ebooks/conversion/*.py
-FIX_PYTHON+=	src/calibre/ebooks/conversion/plugins/*.py
-FIX_PYTHON+=	src/calibre/ebooks/djvu/*.py
-FIX_PYTHON+=	src/calibre/ebooks/epub/fix/*.py
-FIX_PYTHON+=	src/calibre/ebooks/epub/*.py
-FIX_PYTHON+=	src/calibre/ebooks/html/*.py
-FIX_PYTHON+=	src/calibre/ebooks/iterator/*.py
-FIX_PYTHON+=	src/calibre/ebooks/lit/*.py
-FIX_PYTHON+=	src/calibre/ebooks/lrf/html/*.py
-FIX_PYTHON+=	src/calibre/ebooks/lrf/*.py
-FIX_PYTHON+=	src/calibre/ebooks/lrf/pylrs/*.py
-FIX_PYTHON+=	src/calibre/ebooks/markdown/extensions/*.py
-FIX_PYTHON+=	src/calibre/ebooks/metadata/*.py
-FIX_PYTHON+=	src/calibre/ebooks/metadata/book/*.py
-FIX_PYTHON+=	src/calibre/ebooks/metadata/book/*.py
-FIX_PYTHON+=	src/calibre/ebooks/metadata/sources/*.py
-FIX_PYTHON+=	src/calibre/ebooks/mobi/*.py
-FIX_PYTHON+=	src/calibre/ebooks/mobi/writer2/*.py
-FIX_PYTHON+=	src/calibre/ebooks/odt/__init__.py
-FIX_PYTHON+=	src/calibre/ebooks/oeb/*.py
-FIX_PYTHON+=	src/calibre/ebooks/oeb/display/test-cfi/*.py
-FIX_PYTHON+=	src/calibre/ebooks/oeb/transforms/*.py
-FIX_PYTHON+=	src/calibre/ebooks/pdf/__init__.py
-FIX_PYTHON+=	src/calibre/ebooks/pdf/reflow.py
-FIX_PYTHON+=	src/calibre/ebooks/readability/*.py
-FIX_PYTHON+=	src/calibre/ebooks/rtf/*.py
-FIX_PYTHON+=	src/calibre/ebooks/rtf2xml/*.py
-FIX_PYTHON+=	src/calibre/ebooks/snb/*.py
-FIX_PYTHON+=	src/calibre/ebooks/textile/*.py
-FIX_PYTHON+=	src/calibre/ebooks/txt/*.py
-FIX_PYTHON+=	src/calibre/gui2/*.py
-FIX_PYTHON+=	src/calibre/gui2/actions/*.py
-FIX_PYTHON+=	src/calibre/gui2/add_wizard/*.py
-FIX_PYTHON+=	src/calibre/gui2/catalog/*.py
-FIX_PYTHON+=	src/calibre/gui2/convert/*.py
-FIX_PYTHON+=	src/calibre/gui2/dialogs/*.py
-FIX_PYTHON+=	src/calibre/gui2/library/*.py
-FIX_PYTHON+=	src/calibre/gui2/metadata/*.py
-FIX_PYTHON+=	src/calibre/gui2/preferences/*.py
-FIX_PYTHON+=	src/calibre/gui2/progress_indicator/*.py
-FIX_PYTHON+=	src/calibre/gui2/tag_browser/*.py
-FIX_PYTHON+=	src/calibre/gui2/viewer/*.py
-FIX_PYTHON+=	src/calibre/gui2/wizard/*.py
-FIX_PYTHON+=	src/calibre/library/*.py
-FIX_PYTHON+=	src/calibre/library/catalogs/*.py
-FIX_PYTHON+=	src/calibre/library/server/*.py
-FIX_PYTHON+=	src/calibre/manual/*.py
-FIX_PYTHON+=	src/calibre/manual/plugin_examples/helloworld/*.py
-FIX_PYTHON+=	src/calibre/manual/plugin_examples/interface_demo/*.py
-FIX_PYTHON+=	src/calibre/trac/*.py
-FIX_PYTHON+=	src/calibre/translations/*.py
-FIX_PYTHON+=	src/calibre/utils/*.py
-FIX_PYTHON+=	src/calibre/utils/fonts/*.py
-FIX_PYTHON+=	src/calibre/utils/ipc/*.py
-FIX_PYTHON+=	src/calibre/utils/magick/*.py
-FIX_PYTHON+=	src/calibre/utils/podofo/*.py
-FIX_PYTHON+=	src/calibre/utils/pyconsole/*.py
-FIX_PYTHON+=	src/calibre/utils/wmf/*.py
-FIX_PYTHON+=	src/calibre/web/feeds/*.py
-FIX_PYTHON+=	src/calibre/web/feeds/recipes/*.py
-FIX_PYTHON+=	src/calibre/web/fetch/*.py
-FIX_PYTHON+=	src/calibre/web/jsbrowser/*.py
-FIX_PYTHON+=	src/templite/*.py
+FIX_PYTHON_PATHS+=	recipes/*.recipe
+FIX_PYTHON_PATHS+=	resources/catalog/*.py
+FIX_PYTHON_PATHS+=	resources/*.py
+FIX_PYTHON_PATHS+=	*.py
+FIX_PYTHON_PATHS+=	setup/*.py
+FIX_PYTHON_PATHS+=	setup/installer/*.py
+FIX_PYTHON_PATHS+=	setup/installer/linux/*.py
+FIX_PYTHON_PATHS+=	setup/installer/osx/*.py
+FIX_PYTHON_PATHS+=	setup/installer/osx/app/*.py
+FIX_PYTHON_PATHS+=	setup/installer/windows/*.py
+FIX_PYTHON_PATHS+=	src/calibre/*.py
+FIX_PYTHON_PATHS+=	src/calibre/customize/*.py
+FIX_PYTHON_PATHS+=	src/calibre/db/*.py
+FIX_PYTHON_PATHS+=	src/calibre/db/tests/*.py
+FIX_PYTHON_PATHS+=	src/calibre/devices/*.py
+FIX_PYTHON_PATHS+=	src/calibre/devices/android/*.py
+FIX_PYTHON_PATHS+=	src/calibre/devices/eslick/*.py
+FIX_PYTHON_PATHS+=	src/calibre/devices/folder_device/*.py
+FIX_PYTHON_PATHS+=	src/calibre/devices/iriver/*.py
+FIX_PYTHON_PATHS+=	src/calibre/devices/kobo/*.py
+FIX_PYTHON_PATHS+=	src/calibre/devices/prs505/*.py
+FIX_PYTHON_PATHS+=	src/calibre/devices/prst1/*.py
+FIX_PYTHON_PATHS+=	src/calibre/devices/teclast/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/chm/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/comic/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/compression/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/conversion/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/conversion/plugins/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/djvu/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/epub/fix/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/epub/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/html/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/iterator/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/lit/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/lrf/html/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/lrf/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/lrf/pylrs/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/markdown/extensions/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/metadata/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/metadata/book/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/metadata/book/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/metadata/sources/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/mobi/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/mobi/debug/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/mobi/reader/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/mobi/writer2/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/mobi/writer8/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/odt/__init__.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/oeb/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/oeb/display/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/oeb/display/test-cfi/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/oeb/transforms/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/pdf/__init__.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/pdf/reflow.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/readability/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/rtf/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/rtf2xml/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/snb/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/textile/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/txt/*.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/*.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/actions/*.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/add_wizard/*.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/catalog/*.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/convert/*.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/dialogs/*.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/library/*.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/metadata/*.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/preferences/*.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/progress_indicator/*.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/tag_browser/*.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/viewer/*.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/wizard/*.py
+FIX_PYTHON_PATHS+=	src/calibre/library/*.py
+FIX_PYTHON_PATHS+=	src/calibre/library/catalogs/*.py
+FIX_PYTHON_PATHS+=	src/calibre/library/server/*.py
+FIX_PYTHON_PATHS+=	src/calibre/manual/*.py
+FIX_PYTHON_PATHS+=	src/calibre/manual/plugin_examples/helloworld/*.py
+FIX_PYTHON_PATHS+=	src/calibre/manual/plugin_examples/interface_demo/*.py
+FIX_PYTHON_PATHS+=	src/calibre/trac/*.py
+FIX_PYTHON_PATHS+=	src/calibre/translations/*.py
+FIX_PYTHON_PATHS+=	src/calibre/utils/*.py
+FIX_PYTHON_PATHS+=	src/calibre/utils/fonts/*.py
+FIX_PYTHON_PATHS+=	src/calibre/utils/ipc/*.py
+FIX_PYTHON_PATHS+=	src/calibre/utils/magick/*.py
+FIX_PYTHON_PATHS+=	src/calibre/utils/podofo/*.py
+FIX_PYTHON_PATHS+=	src/calibre/utils/pyconsole/*.py
+FIX_PYTHON_PATHS+=	src/calibre/utils/wmf/*.py
+FIX_PYTHON_PATHS+=	src/calibre/web/feeds/*.py
+FIX_PYTHON_PATHS+=	src/calibre/web/feeds/recipes/*.py
+FIX_PYTHON_PATHS+=	src/calibre/web/fetch/*.py
+FIX_PYTHON_PATHS+=	src/calibre/web/jsbrowser/*.py
+FIX_PYTHON_PATHS+=	src/templite/*.py
 
 SUBST_CLASSES+=		prefix
 SUBST_SED.prefix=	-e "s,^QMAKE =.*,QMAKE = '${PREFIX}/qt4/bin/qmake',"
@@ -144,7 +147,7 @@ SUBST_CLASSES+=		path
 SUBST_SED.path=		-e "s,\#! */usr/bin/env *[Pp]ython[0-9.]*,\#!${PYTHONBIN},"
 SUBST_MESSAGE.path=	Fixing path to python.
 SUBST_STAGE.path=	post-patch
-SUBST_FILES.path=	${FIX_PYTHON}
+SUBST_FILES.path=	${FIX_PYTHON_PATHS}
 
 # These ones are for replacing python[0-9*] with PYTHONBIN
 REPLACE_PYTHON+=	recipes/animal_politico.recipe