Update to 1.33. Remove patch that was sent upstream and integrated.

New Features

    Edit book: Add a tool to check spellings, access it via
    Tools->Check spelling
    Kobo driver: Support firmware version 3.3
    Device driver for Tolino Vision on windows

Bug Fixes

    Amazon metadata download: Fix Editorial Reviews not downloading
    into the comments section for some books
    DOCX Input: Fix some text highlighting colors in the DOCX file
    not being correctly translated during conversion.
    Wireless device driver: Fix incorrect syncing behavior when
    book matching is run for a second time while connected. This
    happens when the user changes the library or selects 'Update
    cached metadata on device'.
    Searching: Fix searching by date not using the system locale
    to interpret dd/mm vs mm/dd dates on windows

4 files changed, 29 insertions, 23 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 68d427cab0a..98af3a13ecf 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.70 2014/04/17 13:01:13 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2014/04/18 08:56:22 wiz Exp $
 
-DISTNAME=	calibre-1.32.0
+DISTNAME=	calibre-1.33.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX=	.tar.xz
@@ -153,6 +153,7 @@ 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/spell/*.py
 FIX_PYTHON_PATHS+=	src/calibre/translations/*.py
 FIX_PYTHON_PATHS+=	src/calibre/utils/*.py
 FIX_PYTHON_PATHS+=	src/calibre/utils/fonts/*.py
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index ad09314ffb5..89c3c4316e1 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2014/04/17 13:01:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.18 2014/04/18 08:56:22 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -440,6 +440,7 @@ lib/calibre/calibre/ebooks/oeb/polish/opf.py
 lib/calibre/calibre/ebooks/oeb/polish/parsing.py
 lib/calibre/calibre/ebooks/oeb/polish/pretty.py
 lib/calibre/calibre/ebooks/oeb/polish/replace.py
+lib/calibre/calibre/ebooks/oeb/polish/spell.py
 lib/calibre/calibre/ebooks/oeb/polish/split.py
 lib/calibre/calibre/ebooks/oeb/polish/stats.py
 lib/calibre/calibre/ebooks/oeb/polish/subset.py
@@ -668,7 +669,6 @@ lib/calibre/calibre/gui2/convert/comic_input.py
 lib/calibre/calibre/gui2/convert/comic_input_ui.py
 lib/calibre/calibre/gui2/convert/debug.py
 lib/calibre/calibre/gui2/convert/debug_ui.py
-lib/calibre/calibre/gui2/convert/djvu_input_ui.py
 lib/calibre/calibre/gui2/convert/docx_input.py
 lib/calibre/calibre/gui2/convert/docx_input_ui.py
 lib/calibre/calibre/gui2/convert/epub_output.py
@@ -1025,6 +1025,7 @@ lib/calibre/calibre/gui2/tweak_book/preferences.py
 lib/calibre/calibre/gui2/tweak_book/preview.py
 lib/calibre/calibre/gui2/tweak_book/save.py
 lib/calibre/calibre/gui2/tweak_book/search.py
+lib/calibre/calibre/gui2/tweak_book/spell.py
 lib/calibre/calibre/gui2/tweak_book/templates.py
 lib/calibre/calibre/gui2/tweak_book/toc.py
 lib/calibre/calibre/gui2/tweak_book/ui.py
@@ -1123,6 +1124,10 @@ lib/calibre/calibre/plugins/unrar.so
 lib/calibre/calibre/plugins/woff.so
 lib/calibre/calibre/ptempfile.py
 lib/calibre/calibre/rpdb.py
+lib/calibre/calibre/spell/__init__.py
+lib/calibre/calibre/spell/break_iterator.py
+lib/calibre/calibre/spell/dictionary.py
+lib/calibre/calibre/spell/import_from.py
 lib/calibre/calibre/startup.py
 lib/calibre/calibre/test_build.py
 lib/calibre/calibre/translations/__init__.py
@@ -1305,7 +1310,6 @@ share/applications/calibre-ebook-edit.desktop
 share/applications/calibre-ebook-viewer.desktop
 share/applications/calibre-gui.desktop
 share/applications/calibre-lrfviewer.desktop
-share/bash_completion.d/calibre
 share/calibre/builtin_recipes.xml
 share/calibre/builtin_recipes.zip
 share/calibre/calibre-ebook-root-CA.crt
@@ -1367,6 +1371,15 @@ share/calibre/content_server/star-half.png
 share/calibre/content_server/star-off.png
 share/calibre/content_server/star-on.png
 share/calibre/default_tweaks.py
+share/calibre/dictionaries/en-GB/en-GB.aff
+share/calibre/dictionaries/en-GB/en-GB.dic
+share/calibre/dictionaries/en-GB/locales
+share/calibre/dictionaries/en-US/en-US.aff
+share/calibre/dictionaries/en-US/en-US.dic
+share/calibre/dictionaries/en-US/locales
+share/calibre/dictionaries/es-ES/es-ES.aff
+share/calibre/dictionaries/es-ES/es-ES.dic
+share/calibre/dictionaries/es-ES/locales
 share/calibre/ebook-convert-complete.pickle
 share/calibre/fonts/calibreSymbols.otf
 share/calibre/fonts/liberation/LiberationMono-Bold.ttf
@@ -1566,6 +1579,7 @@ share/calibre/images/search_copy_saved.png
 share/calibre/images/search_delete_saved.png
 share/calibre/images/series.png
 share/calibre/images/smarten-punctuation.png
+share/calibre/images/spell-check.png
 share/calibre/images/store.png
 share/calibre/images/subset-fonts.png
 share/calibre/images/swap.png
@@ -2168,6 +2182,7 @@ share/calibre/recipes/googlemobileblog.recipe
 share/calibre/recipes/gosc_full.recipe
 share/calibre/recipes/gosc_niedzielny.recipe
 share/calibre/recipes/gram_pl.recipe
+share/calibre/recipes/grandes_corresponsales_es.recipe
 share/calibre/recipes/granma.recipe
 share/calibre/recipes/grantland.recipe
 share/calibre/recipes/greensboro_news_and_record.recipe
@@ -2217,6 +2232,8 @@ share/calibre/recipes/histmag.recipe
 share/calibre/recipes/historia_news.recipe
 share/calibre/recipes/historia_pl.recipe
 share/calibre/recipes/historiaro.recipe
+share/calibre/recipes/historias_del_mundo_es.recipe
+share/calibre/recipes/histories_del_mon_ca.recipe
 share/calibre/recipes/history_today.recipe
 share/calibre/recipes/hitro.recipe
 share/calibre/recipes/hln.recipe
@@ -2393,6 +2410,7 @@ share/calibre/recipes/las_vegas_review.recipe
 share/calibre/recipes/latimes.recipe
 share/calibre/recipes/latribuna.recipe
 share/calibre/recipes/lavanguardia.recipe
+share/calibre/recipes/lavanguardia_corresponsales_es.recipe
 share/calibre/recipes/lavenir_be.recipe
 share/calibre/recipes/le_gorafi.recipe
 share/calibre/recipes/le_journal.recipe
@@ -2664,7 +2682,6 @@ share/calibre/recipes/oriental_daily.recipe
 share/calibre/recipes/origo_hu.recipe
 share/calibre/recipes/orlando_sentinel.recipe
 share/calibre/recipes/orsai.recipe
-share/calibre/recipes/osnews_pl.recipe
 share/calibre/recipes/osw.recipe
 share/calibre/recipes/osworld_pl.recipe
 share/calibre/recipes/ottawa_citizen.recipe
@@ -2697,6 +2714,7 @@ share/calibre/recipes/penguin_news.recipe
 share/calibre/recipes/people_daily.recipe
 share/calibre/recipes/people_us_mashup.recipe
 share/calibre/recipes/perfil.recipe
+share/calibre/recipes/periodismo_humano_es.recipe
 share/calibre/recipes/pescanik.recipe
 share/calibre/recipes/peterschiff.recipe
 share/calibre/recipes/phd_comics.recipe
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 229ff024cd4..c7c0e2ffc6b 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.16 2014/04/17 13:01:13 wiz Exp $
+$NetBSD: distinfo,v 1.17 2014/04/18 08:56:22 wiz Exp $
 
-SHA1 (calibre-1.32.0.tar.xz) = 536881dee5acaeb6af1ae87ff8d917437823b537
-RMD160 (calibre-1.32.0.tar.xz) = 27c937c3f5f86d2fd27c12116e1b1cd11cd37afa
-Size (calibre-1.32.0.tar.xz) = 33183068 bytes
+SHA1 (calibre-1.33.0.tar.xz) = f4dd3f5063b0680ad93b99eed65a3551c64c53a4
+RMD160 (calibre-1.33.0.tar.xz) = c036af273aa5157365bfe407797a4c2bbb69f2fa
+Size (calibre-1.33.0.tar.xz) = 33898440 bytes
 SHA1 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 745f9ebf091696c0d5403ce691dc28c039d77b9e
 RMD160 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 1e7bb099d5d1cda0b663cebe207c846c8d04750d
 Size (qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467 bytes
-SHA1 (patch-recipes_mojegotowanie.recipe) = d633337bec19ea466cb6d939e06d4aae18f75287
 SHA1 (patch-setup_extensions.py) = 285ab1aff5b0d5f7c0a016f68e705d312a120d65
 SHA1 (patch-src_calibre_linux.py) = 06e953e3a437ae76783d80bf0986bbbece991431
diff --git a/misc/calibre/patches/patch-recipes_mojegotowanie.recipe b/misc/calibre/patches/patch-recipes_mojegotowanie.recipe
deleted file mode 100644
index c8ca2a6ea7c..00000000000
--- a/misc/calibre/patches/patch-recipes_mojegotowanie.recipe
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-recipes_mojegotowanie.recipe,v 1.1 2014/04/17 13:01:13 wiz Exp $
-
-Fix shebang line.
-
---- recipes/mojegotowanie.recipe.orig	2014-04-11 02:51:32.000000000 +0000
-+++ recipes/mojegotowanie.recipe
-@@ -1,4 +1,4 @@
--#!usr/bin/env python
-+#!/usr/bin/env python
- 
- __license__ = 'GPL v3'
- __copyright__ = 'MrStefan, teepel'