Updated calibre to 2.57.1.

New Features
Driver for the Bq Cervantes 3
A new "Ornamental" cover design for the "Generate cover" feature
Windows: Use a helper process that does not load any calibre DLLs to display file open/save dialogs. This should fix most crashes caused by poorly designed windows shell extensions.
Allow pressing Alt+O as a shortcut for click the OK button in the Add from ISBN dialog.
Remove the calibre dependency on ImageMagick -- reduces calibre install size by ~ 15MB
Edit book: Add a new image filter: Normalize -- to improve the contrast in images
Edit book: Add a filter to make images look like oil paintings
Use 'Not rated' for zero stars in all rating spin boxes

Bug Fixes
Edit Book: Fix a crash in the Insert Link tool if one of the HTML files contains an empty id.
Fix tag like custom columns not sorted when displayed in the Book Details panel.
Fix transient window shown during Edit Book startup
Preserve booklist horizontal scroll position when merging books.
Google Images metadata download plugin: Fix error when searching for books with non-English characters in the title or author names.
Template language: Fix an error formatting dates when the underlying date does not have a day.
Preferences->Keyboard: Fix unable to use Alt+A and Alt+S as custom shortcuts.
Version 2.57.1 is a hotfix to fix a regression that broke conversion of ODT files in 2.57.0

3 files changed, 15 insertions, 13 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index ebfe0831b05..424923d6460 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.138 2016/05/05 11:22:00 wiz Exp $
+# $NetBSD: Makefile,v 1.139 2016/05/21 06:37:00 wiz Exp $
 
-DISTNAME=	calibre-2.56.0
+DISTNAME=	calibre-2.57.1
 CATEGORIES=	misc
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 MASTER_SITES=	http://download.calibre-ebook.com/${PKGVERSION_NOREV}/
@@ -123,8 +123,6 @@ BUILDLINK_API_DEPENDS.libmtp+=	libmtp>=1.1.5
 BUILDLINK_API_DEPENDS.libusb+=	libusb>=0.1.12
 .include "../../devel/libusb/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
-BUILDLINK_API_DEPENDS.ImageMagick+=	ImageMagick>=6.5.9
-.include "../../graphics/ImageMagick/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.6
 .include "../../graphics/py-imaging/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libwmf+=	libwmf>=0.2.8
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index 454b57f5148..f6346f63f89 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.58 2016/05/05 11:22:00 wiz Exp $
+@comment $NetBSD: PLIST,v 1.59 2016/05/21 06:37:00 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -771,7 +771,6 @@ lib/calibre/calibre/gui2/device_drivers/mtp_folder_browser.py
 lib/calibre/calibre/gui2/dialogs/__init__.py
 lib/calibre/calibre/gui2/dialogs/add_empty_book.py
 lib/calibre/calibre/gui2/dialogs/add_from_isbn.py
-lib/calibre/calibre/gui2/dialogs/add_from_isbn_ui.py
 lib/calibre/calibre/gui2/dialogs/authors_edit.py
 lib/calibre/calibre/gui2/dialogs/book_info.py
 lib/calibre/calibre/gui2/dialogs/catalog.py
@@ -1119,6 +1118,7 @@ lib/calibre/calibre/gui2/viewer/toc.py
 lib/calibre/calibre/gui2/viewer/ui.py
 lib/calibre/calibre/gui2/widgets.py
 lib/calibre/calibre/gui2/widgets2.py
+lib/calibre/calibre/gui2/win_file_dialogs.py
 lib/calibre/calibre/gui2/wizard/__init__.py
 lib/calibre/calibre/gui2/wizard/device_ui.py
 lib/calibre/calibre/gui2/wizard/finish_ui.py
@@ -1176,10 +1176,10 @@ lib/calibre/calibre/plugins/freetype.so
 lib/calibre/calibre/plugins/html.so
 lib/calibre/calibre/plugins/hunspell.so
 lib/calibre/calibre/plugins/icu.so
+lib/calibre/calibre/plugins/imageops.so
 lib/calibre/calibre/plugins/libheadless.so
 lib/calibre/calibre/plugins/lzma_binding.so
 lib/calibre/calibre/plugins/lzx.so
-lib/calibre/calibre/plugins/magick.so
 lib/calibre/calibre/plugins/matcher.so
 lib/calibre/calibre/plugins/monotonic.so
 lib/calibre/calibre/plugins/msdes.so
@@ -1311,7 +1311,7 @@ lib/calibre/calibre/utils/logging.py
 lib/calibre/calibre/utils/lru_cache.py
 lib/calibre/calibre/utils/magick/__init__.py
 lib/calibre/calibre/utils/magick/draw.py
-lib/calibre/calibre/utils/magick/generate.py
+lib/calibre/calibre/utils/magick/legacy.py
 lib/calibre/calibre/utils/matcher.py
 lib/calibre/calibre/utils/mdns.py
 lib/calibre/calibre/utils/mem.py
@@ -1350,6 +1350,7 @@ lib/calibre/calibre/utils/smtp.py
 lib/calibre/calibre/utils/smtplib.py
 lib/calibre/calibre/utils/socket_inheritance.py
 lib/calibre/calibre/utils/soupparser.py
+lib/calibre/calibre/utils/speedups.py
 lib/calibre/calibre/utils/spell/__init__.py
 lib/calibre/calibre/utils/terminal.py
 lib/calibre/calibre/utils/text2int.py
@@ -1376,6 +1377,7 @@ lib/calibre/calibre/web/feeds/recipes/model.py
 lib/calibre/calibre/web/feeds/templates.py
 lib/calibre/calibre/web/fetch/__init__.py
 lib/calibre/calibre/web/fetch/simple.py
+lib/calibre/calibre/web/fetch/utils.py
 lib/calibre/css_selectors/__init__.py
 lib/calibre/css_selectors/errors.py
 lib/calibre/css_selectors/ordered_set.py
@@ -1473,6 +1475,8 @@ share/calibre/content-server/empty.html
 share/calibre/content-server/index-generated.html
 share/calibre/content-server/index.html
 share/calibre/content-server/locales.zip
+share/calibre/content-server/mathjax.version
+share/calibre/content-server/mathjax.zip.xz
 share/calibre/content-server/mobile.css
 share/calibre/content-server/reset.css
 share/calibre/content_server/av.jpg
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index c27e8403b0c..2ea84412087 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.64 2016/05/05 11:22:00 wiz Exp $
+$NetBSD: distinfo,v 1.65 2016/05/21 06:37:00 wiz Exp $
 
-SHA1 (calibre-2.56.0.tar.xz) = 37e21fcd786e14a7a8eef86a72dbede67c9f003a
-RMD160 (calibre-2.56.0.tar.xz) = cf93028dfcfed83dbb21d413941ce916979b5c09
-SHA512 (calibre-2.56.0.tar.xz) = 1ce74c9bf2e193911c0d23589669b38835eea5938aca5c55a0fa827bae30655e98156657ef2adc168bf96899c4442c922686d3345594b6f236870a568a8b8d71
-Size (calibre-2.56.0.tar.xz) = 39900812 bytes
+SHA1 (calibre-2.57.1.tar.xz) = 25ac0fcc480c2416f70e3231192642df78f36792
+RMD160 (calibre-2.57.1.tar.xz) = e762ea9889e12ab30ecfe036d9613f7e2c7cdcff
+SHA512 (calibre-2.57.1.tar.xz) = 482dec810d0ca2220a7c2b291750aefd3133c9969a0237841283995ee5c07bda0e6fa2a266a7fd876be283dcfb71d5bb8aca6c9270e7f6772ab40cc0cb410ca0
+Size (calibre-2.57.1.tar.xz) = 40495212 bytes
 SHA1 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c
 SHA1 (patch-setup_extensions.py) = 698abb3609a3f576ae1d194422d10ffaa698e3db
 SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662