calibre: update to 3.26.1.

- version: 3.26.1
  date: 2018-06-15

  new features:
    - title: "Book list: Allow drag and drop of books onto other books to merge the book records."

    - title: "Check Book: External link checker: Also check HTML anchors (the part after the # in the link). Can be turned off via a checkbox at the bottom of the link checker window."

    - title: "Edit Book: Preview panel: Show previews when editing SVG files"

    - title: "Edit book: When downloading external resources, also convert data URLs into files."

    - title: "E-book viewer: When the controls are hidden show the progress in the window title."

    - title: "Library Quick switch menu: Highlight the previously switched from library in bold."

  bug fixes:
    - title: "PDF Input: Fix a regression in 3.24 that caused conversion of PDF to be significantly worse."

    - title: "E-book viewer: Fix very slow loading for HTML files with very many images on Linux."

    - title: "Content server: Fix a regression in 3.14 that removed the separator between books in the detailed list view mode."

    - title: "Edit book: Fix SVG files not being beautified by the Beautify all files tool"

    - title: "Edit book: Fix searching in selected files not searching SVG files"

    - title: "Fix Tweaks help string not being displayed translated"

    - title: "Edit metadata dialog: Fix distorted rendering of some labels in the custom metadata tab in rare circumstances."

    - title: "version 3.26.1 prevents dropping of a book onto itself from triggering the merge dialog, which should reduce accidental triggers"

  improved recipes:
    - Slate
    - New York Times Book Review
    - The Independent UK
    - NYTimes Tech Beat
    - New York Times
    - Cracked.com

  new recipes:
    - title: El Cronista
      author: Darko Miletic

- version: 3.25.0
  date: 2018-06-01

  new features:
    - title: "Kobo driver: Support the new Clara HD"

    - title: "PDF Output: Add an option to use page margins from the input document, specified via @page CSS rules."
      description: "Allows individual HTML files in the input document to have different page margins in the output PDF."

  bug fixes:
    - title: 'Fix option to "show text under buttons only if there is enough space" not working well with the option to use "two lines for the text under the buttons".'

    - title: "Update notification: When both calibre and plugin updates are available and the user updates only the plugins, fix the restart calibre button not working."

    - title: "E-book viewer: Fix printing of comics (cbz/cbr files) not working."

    - title: "EPUB3 Input: Fix Table of Contents not being recognized for some EPUB 3 books that placed their nav document in-side a sub-folder."

  improved recipes:
    - Associated Press

3 files changed, 9 insertions, 8 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 8d69d0af0c5..f8e08e2d8c2 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.203 2018/05/27 12:48:45 wiz Exp $
+# $NetBSD: Makefile,v 1.204 2018/06/17 08:19:19 wiz Exp $
 
-DISTNAME=	calibre-3.24.1
+DISTNAME=	calibre-3.26.1
 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 08b44ac495c..6e38ed36b9b 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.87 2018/05/27 12:48:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.88 2018/06/17 08:19:19 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -2200,6 +2200,7 @@ share/calibre/recipes/el_universal.recipe
 share/calibre/recipes/elclubdelebook.recipe
 share/calibre/recipes/elcohetealaluna.recipe
 share/calibre/recipes/elcomercio.recipe
+share/calibre/recipes/elcronista-arg.recipe
 share/calibre/recipes/ele.recipe
 share/calibre/recipes/elektroda_pl.recipe
 share/calibre/recipes/elet_es_irodalom.recipe
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index c05ad839c90..9267946410e 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.98 2018/05/27 12:48:45 wiz Exp $
+$NetBSD: distinfo,v 1.99 2018/06/17 08:19:19 wiz Exp $
 
-SHA1 (calibre-3.24.1.tar.xz) = 615c2feb1b9a06f01ed205971ed812d1278b4a8e
-RMD160 (calibre-3.24.1.tar.xz) = 8e56c4f7c25ca5d7aa9690513c1ebb7f3f4514a4
-SHA512 (calibre-3.24.1.tar.xz) = ad8badada76656f6b3bde331bf3c23711149343c56b8d81004bde371805f717425d982302fa35dde25422d7d8481a75ca8f354fd3e7b8e9d03e3d0c1a4f1661a
-Size (calibre-3.24.1.tar.xz) = 39131268 bytes
+SHA1 (calibre-3.26.1.tar.xz) = 7607651c1f081f72fc488912e316458b3b7dfd89
+RMD160 (calibre-3.26.1.tar.xz) = 1dd5b964d853db9d2e21062bbb20c7935733aad2
+SHA512 (calibre-3.26.1.tar.xz) = 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5
+Size (calibre-3.26.1.tar.xz) = 39109660 bytes
 SHA1 (patch-setup_build.py) = f309c8f01af375fce1d09bf5c4bac9610cf4e0c5
 SHA1 (patch-setup_build__environment.py) = 8973ede2128cea065860dcc210c45f5f688a93be
 SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662