Updated calibre to 2.64.0.

New Features

    Custom columns: Add a new 'Short text' column type that behaves like the builtin title column

    More generally, you can now customize Comments-like columns, controlling how their headings are displayed in the Book Details panel and also specifying what kind of data they contain (plain text, HTML or even Markdown)
    Edit book: Function mode: Allow appending text to the end of the marked text when running function mode search/replace on marked text
    PDF Output: Add a new variable _TOP_LEVEL_SECTION_ for use in header/footer templates that resolves to the current top-most section in the Table of Contents
    Linux/OSX: Shutdown gracefully on receiving the interrupt or terminate Unix signals

Bug Fixes

    PDF Output: Fix a regression that caused the last page of a chapter to sometimes be dropped from the output
    Do not show an error if the user tries to quit calibre while editing a cell in the book list. Instead, just silently abort the edit.

    Closes tickets: 1610539
    E-book viewer: Fix 0px margins and percentage margins not being respected when the option to override book margins is turned off.

    Closes tickets: 1608458
    Book Details: Do not show the 'Copy link' context menu item unless there is an actual link at the cursor location.

    Closes tickets: 1605594
    Get Books: Update store plugin for nexto

New news sources

    Data News by oCkz7bJ_

Improved news sources

    Private Eye
    Prospect Magazine
    De Standaard
    Jot Down
    Weblogs SL
    Hola
    El Correo

3 files changed, 9 insertions, 14 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 3553016a1b4..563dd5a74da 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.151 2016/08/01 14:23:56 wiz Exp $
+# $NetBSD: Makefile,v 1.152 2016/08/19 16:21:59 wiz Exp $
 
-DISTNAME=	calibre-2.63.0
-PKGREVISION=	1
+DISTNAME=	calibre-2.64.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 b7f03ec9547..f2e98ab4f1a 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.64 2016/07/24 07:08:54 wiz Exp $
+@comment $NetBSD: PLIST,v 1.65 2016/08/19 16:21:59 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -900,9 +900,7 @@ lib/calibre/calibre/gui2/preferences/coloring.py
 lib/calibre/calibre/gui2/preferences/columns.py
 lib/calibre/calibre/gui2/preferences/columns_ui.py
 lib/calibre/calibre/gui2/preferences/conversion.py
-lib/calibre/calibre/gui2/preferences/conversion_ui.py
 lib/calibre/calibre/gui2/preferences/create_custom_column.py
-lib/calibre/calibre/gui2/preferences/create_custom_column_ui.py
 lib/calibre/calibre/gui2/preferences/device_debug.py
 lib/calibre/calibre/gui2/preferences/device_user_defined.py
 lib/calibre/calibre/gui2/preferences/email_ui.py
@@ -937,7 +935,6 @@ lib/calibre/calibre/gui2/preferences/texture_chooser.py
 lib/calibre/calibre/gui2/preferences/toolbar.py
 lib/calibre/calibre/gui2/preferences/toolbar_ui.py
 lib/calibre/calibre/gui2/preferences/tweaks.py
-lib/calibre/calibre/gui2/preferences/tweaks_ui.py
 lib/calibre/calibre/gui2/proceed.py
 lib/calibre/calibre/gui2/progress_indicator/__init__.py
 lib/calibre/calibre/gui2/save.py
@@ -1189,8 +1186,6 @@ 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/libmtp.so
-lib/calibre/calibre/plugins/libusb.so
 lib/calibre/calibre/plugins/lzma_binding.so
 lib/calibre/calibre/plugins/lzx.so
 lib/calibre/calibre/plugins/matcher.so
@@ -2103,6 +2098,7 @@ share/calibre/recipes/dani.recipe
 share/calibre/recipes/dark_horizons.recipe
 share/calibre/recipes/dark_reading.recipe
 share/calibre/recipes/darknet.recipe
+share/calibre/recipes/data_news.recipe
 share/calibre/recipes/datasport.recipe
 share/calibre/recipes/daum_net.recipe
 share/calibre/recipes/dawn.recipe
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index dcd5f1c22f4..7cf754595d9 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.72 2016/07/24 07:08:54 wiz Exp $
+$NetBSD: distinfo,v 1.73 2016/08/19 16:21:59 wiz Exp $
 
-SHA1 (calibre-2.63.0.tar.xz) = df6c16cbf1acbad9644a60383a1d98645bf9c809
-RMD160 (calibre-2.63.0.tar.xz) = 3e37dbda4ae69b87cdacb0ec01ee73f413df261a
-SHA512 (calibre-2.63.0.tar.xz) = 74df6febe62608ab93502360e7511679102f0cbb260b1b78b4720c1aff34703d60db51a760ecd51596cb7331892d5eb7225e6ec70aa09976c219ba973d064f9b
-Size (calibre-2.63.0.tar.xz) = 40700876 bytes
+SHA1 (calibre-2.64.0.tar.xz) = e796131f6c3181d4fa4943b4d4c8fce3142dcc12
+RMD160 (calibre-2.64.0.tar.xz) = 3a4a2ec9bc2d5060cc534a29fafe87efe0d8e7cd
+SHA512 (calibre-2.64.0.tar.xz) = e2b7a251d1fd058e3d22902af488a23b4d4f0acc65349337eeca1c1cde9b234317ac816ba2edc55d661b8e13ce8bf4e7c2207631ef305f0b8fdeab612a8ff251
+Size (calibre-2.64.0.tar.xz) = 40765340 bytes
 SHA1 (patch-setup_build.py) = 9699b5badd044aacd72b223c182ab14f38eb1dcb
 SHA1 (patch-setup_extensions.json) = a08c9c6675f9b7926fa53dbb74846ed47c4298c7
 SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662