Update calibre to 2.49.0:

New Features

E-book viewer: Add an option to allow only a single book to be viewed at a time. Trying to view a second book will cause it to replace the currently viewed book.
Kobo driver: Add support for the new firmware 3.19.5761
Linux build: Update bundled version of Qt to 5.5.1

Bug Fixes

Fix splash screen getting stuck on OSX when restarting calibre in debug mode
Get Books: Update plugins for various Polish language book stores to handle changes to the website
Amazon metadata download: Handle a change in the amazon website that prevented review metadata from being downloaded
Better algorithm for guessing the 'external' network interface that is displayed to the user
Tag Mapper: Do not allow the user to create rules with invalid regular expressions
E-book viewer: Disallow hyphenation in documents that use mathematical typesetting as the hyphenation breaks that typesetting
E-book viewer: Fix some non-ASCII characters not display in embedded MathML.
Download calibre plugins securely using HTTPS
MOBI Output: Try to autofix corrupted PNG images in the input document.
Nook Glowlight Plus: Send files by default to the NOOK/My Files folder.
E-book viewer: Fix failure to view comic files that contain non-ASCII characters int heir internal filenames.

3 files changed, 22 insertions, 12 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 607a60c52e1..c90ea106529 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.127 2016/01/06 10:46:54 adam Exp $
+# $NetBSD: Makefile,v 1.128 2016/01/15 10:39:44 wiz Exp $
 
-DISTNAME=	calibre-2.48.0
-PKGREVISION=	1
+DISTNAME=	calibre-2.49.0
 CATEGORIES=	misc
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 MASTER_SITES=	http://download.calibre-ebook.com/${PKGVERSION_NOREV}/
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index 92a61141151..ed4bd57ae01 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.51 2015/12/30 00:08:33 wiz Exp $
+@comment $NetBSD: PLIST,v 1.52 2016/01/15 10:39:44 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -1280,6 +1280,7 @@ lib/calibre/calibre/utils/icu_test.py
 lib/calibre/calibre/utils/img.py
 lib/calibre/calibre/utils/imghdr.py
 lib/calibre/calibre/utils/inotify.py
+lib/calibre/calibre/utils/ip_routing.py
 lib/calibre/calibre/utils/ipc/__init__.py
 lib/calibre/calibre/utils/ipc/job.py
 lib/calibre/calibre/utils/ipc/launch.py
@@ -1288,6 +1289,7 @@ lib/calibre/calibre/utils/ipc/proxy.py
 lib/calibre/calibre/utils/ipc/server.py
 lib/calibre/calibre/utils/ipc/simple_worker.py
 lib/calibre/calibre/utils/ipc/worker.py
+lib/calibre/calibre/utils/iphlpapi.py
 lib/calibre/calibre/utils/ipython.py
 lib/calibre/calibre/utils/linux_trash.py
 lib/calibre/calibre/utils/localization.py
@@ -2118,7 +2120,6 @@ share/calibre/recipes/diario_el_pueblo.recipe
 share/calibre/recipes/diario_extra.recipe
 share/calibre/recipes/diario_ibiza.recipe
 share/calibre/recipes/diario_la_republica.recipe
-share/calibre/recipes/diario_salto.recipe
 share/calibre/recipes/diario_sport.recipe
 share/calibre/recipes/diariovasco.recipe
 share/calibre/recipes/diepresse.recipe
@@ -2575,7 +2576,6 @@ share/calibre/recipes/kyungyhang.recipe
 share/calibre/recipes/l_espresso.recipe
 share/calibre/recipes/l_vivs_ghazieta.recipe
 share/calibre/recipes/la_cuarta.recipe
-share/calibre/recipes/la_diaria.recipe
 share/calibre/recipes/la_gazetta_del_mezzogiorno.recipe
 share/calibre/recipes/la_gazzeta_dello_sport.recipe
 share/calibre/recipes/la_jornada.recipe
@@ -2655,6 +2655,7 @@ share/calibre/recipes/london_free_press.recipe
 share/calibre/recipes/los_tiempos_bo.recipe
 share/calibre/recipes/losandes.recipe
 share/calibre/recipes/losservatoreromano_it.recipe
+share/calibre/recipes/lr21.recipe
 share/calibre/recipes/lrb.recipe
 share/calibre/recipes/lrb_payed.recipe
 share/calibre/recipes/ludwig_mises.recipe
@@ -3271,7 +3272,6 @@ share/calibre/recipes/unica.recipe
 share/calibre/recipes/uninohimitu.recipe
 share/calibre/recipes/united_daily.recipe
 share/calibre/recipes/universe_today.recipe
-share/calibre/recipes/unoticias.recipe
 share/calibre/recipes/unperiodico.recipe
 share/calibre/recipes/upi.recipe
 share/calibre/recipes/usatoday.recipe
@@ -3395,10 +3395,19 @@ share/calibre/viewer/hyphenation.js
 share/calibre/viewer/images.js
 share/calibre/viewer/jquery_scrollTo.js
 share/calibre/viewer/mathjax/MathJax.js
+share/calibre/viewer/mathjax/extensions/AssistiveMML.js
+share/calibre/viewer/mathjax/extensions/CHTML-preview.js
 share/calibre/viewer/mathjax/extensions/FontWarnings.js
+share/calibre/viewer/mathjax/extensions/HTML-CSS/handle-floats.js
+share/calibre/viewer/mathjax/extensions/HelpDialog.js
+share/calibre/viewer/mathjax/extensions/MatchWebFonts.js
 share/calibre/viewer/mathjax/extensions/MathEvents.js
+share/calibre/viewer/mathjax/extensions/MathML/content-mathml.js
+share/calibre/viewer/mathjax/extensions/MathML/mml3.js
 share/calibre/viewer/mathjax/extensions/MathMenu.js
 share/calibre/viewer/mathjax/extensions/MathZoom.js
+share/calibre/viewer/mathjax/extensions/Safe.js
+share/calibre/viewer/mathjax/extensions/TeX/AMScd.js
 share/calibre/viewer/mathjax/extensions/TeX/AMSmath.js
 share/calibre/viewer/mathjax/extensions/TeX/AMSsymbols.js
 share/calibre/viewer/mathjax/extensions/TeX/HTML.js
@@ -3413,6 +3422,7 @@ share/calibre/viewer/mathjax/extensions/TeX/color.js
 share/calibre/viewer/mathjax/extensions/TeX/enclose.js
 share/calibre/viewer/mathjax/extensions/TeX/extpfeil.js
 share/calibre/viewer/mathjax/extensions/TeX/mathchoice.js
+share/calibre/viewer/mathjax/extensions/TeX/mediawiki-texvc.js
 share/calibre/viewer/mathjax/extensions/TeX/mhchem.js
 share/calibre/viewer/mathjax/extensions/TeX/newcommand.js
 share/calibre/viewer/mathjax/extensions/TeX/noErrors.js
@@ -3420,6 +3430,7 @@ share/calibre/viewer/mathjax/extensions/TeX/noUndefined.js
 share/calibre/viewer/mathjax/extensions/TeX/unicode.js
 share/calibre/viewer/mathjax/extensions/TeX/verb.js
 share/calibre/viewer/mathjax/extensions/asciimath2jax.js
+share/calibre/viewer/mathjax/extensions/fast-preview.js
 share/calibre/viewer/mathjax/extensions/jsMath2jax.js
 share/calibre/viewer/mathjax/extensions/mml2jax.js
 share/calibre/viewer/mathjax/extensions/tex2jax.js
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 5cf2db9ee19..5a6d9f80457 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.57 2016/01/03 11:29:40 wiz Exp $
+$NetBSD: distinfo,v 1.58 2016/01/15 10:39:44 wiz Exp $
 
-SHA1 (calibre-2.48.0.tar.xz) = 1943fb3a612fed5ffdeab16eb7010c4287fc1603
-RMD160 (calibre-2.48.0.tar.xz) = af018fb2dd24ad19bf93aad9a09a93d4d14eaccf
-SHA512 (calibre-2.48.0.tar.xz) = 0e77e3f52ce19067724aecabca32201530e62510c00d692735302232848ce309efaf2d18f70e5c327cfadd46c03845d51a8830e99a8769fd071b14a126cdc75d
-Size (calibre-2.48.0.tar.xz) = 39015244 bytes
+SHA1 (calibre-2.49.0.tar.xz) = dc95d0001d181294556d854e83991f979b01d39e
+RMD160 (calibre-2.49.0.tar.xz) = b06ae9fbed28fee4132a99d06a3db70443056ba8
+SHA512 (calibre-2.49.0.tar.xz) = 26ec285612cdc29ee5ec49ba34325bdc5e6008e66b4d6b0c6e24999cae8b0396101f6ec05a4b3b474858e666a42f7c9c74d5c50ea24a08f84743584c5ab611e1
+Size (calibre-2.49.0.tar.xz) = 39155200 bytes
 SHA1 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c
 SHA1 (patch-setup_extensions.py) = 698abb3609a3f576ae1d194422d10ffaa698e3db
 SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662