Update misc/calibre to 0.8.39

Upstream changes:

0.8.39
------

New Features

- Auto-adding: Add an option to check for duplicates when auto adding.
- Content server: Export a second record via mDNS that points to the
full OPDS feed in addition to the one pointing to the Stanza feed.
The new record is of type _calibre._tcp.
- Allow specifying a set of categories that are not partitioned even
if they contain a large number of items in the Tag Browser. Preference
is available under Look & Feel->Tag Browser
- Allow setting a URL prefix for the content server that run embedded in the
calibre GUI as well.
- Allow output of identifiers data in CSV/XML/BiBTeX catalogs
- Driver for Motorola Droid XT910, Nokia E71 and HTC EVO 3D.
- Cut down the time taken to launch worker processes by 40%
- You can now configure the calibre settings for the currently connected
device by right clicking on the device icon in the toolbar, instead of
having to go through Preferences->Plugins

Bug Fixes

- Auto-adding: Do not add incomplete files when files are downloaded
directly into the auto add folder.
- When running multiple delete from device jobs, fix the device view
sometimes marking the wrong books as being deleted, after the first delete
job completes.
- MOBI Input: Handle files that have spurious closing </body> and/or </html>i
tags in their markup.
- RTF Input: Strip out false color specifications, as they cause artifacts
when converted to MOBI

New news sources

- Vancouver Province and Windsor Star by Nick Redding
- Onda Rock by faber1971
- Il Manifesto by Giacomo Lacava

Improved news sources

- Updated Postmedia publications
- Foreign Affairs
- Read It Later
- Microwave Journal
- taggeschau.de

0.8.38
------

New Features

- Implement the ability to automatically add books to calibre from a
specified folder.
- calibre can now watch a folder on your computer and instantly add any
files you put there to the calibre library as new books. You can tell
calibre which folder to watch via Preferences->Adding Books->Automatic Adding.
- Conversion: When automatically inserting page breaks, do not put a page
break before a <h1> or <h2> tag if it is immediately preceded by another
<h1> or <h2> tag.
- Driver for EZReader T730 and Point-of-View PlayTab Pro

Bug Fixes

- Fix device entry not visible in menubar even when it has been added\
via Preferences->Toolbars.
- Fix metadata plugboards not applied when auto sending news by email
- Fix regression in 0.8.34 that broke recipes that used skip_ad_pages()
but not get_browser().
- Restore device support on FreeBSD, by using HAL
- Get books: Show no more than 10 results from the Gandalf store
- Content server: Fix metadata not being updated when sending for some
MOBI files.
- Heuristic processing: Fix the italicize common patterns algorithm
breaking on some HTML markup.
- When trying to find an ebook inside a zip file, do not fail if the zip
file itself contains other zip files.
- EPUB Input: Handle EPUBs with duplicate entries in the manifest.
- MOBI Input: Handle files that have extra </html> tags sprinkled through
out their markup.

New news sources

- Strange Horizons by Jim DeVona
- Telegraph India and Live Mint by Krittika Goyal
- High Country News by Armin Geller
- Countryfile by Dave Asbury
- Liberation (subscription version) by Remi Vanicat
- Various Italian news sources by faber1971

Improved news sources

- Metro Nieuws NL
- FHM UK

0.8.37
------

New Features

- Allow calibre to be run simultaneously in two different user accounts on
windows.
- Driver for Motorola Photon and Point of View PlayTab
- Add a checkbox to preferences->plugins to show only user installed plugins
- Add a restart calibre button to the warning dialog that pops up after
changing some preference that requires a restart

Bug Fixes

- Fix regression in 0.8.36 that caused the remove format from book
function to only delete the entry from the database and not delete the
actual file from the disk
- Fix regression in 0.8.36 that caused the calibredb command to not
properly refresh the format information in the GUI
- E-book viewer: Preserve the current position more accurately when
changing font size/other preferences.
- Conversion pipeline: Fix items in the <guide> that refer to files with
URL unsafe filenames being ignored.
- Fix calibre not running on linux systems that set LANG to an empty string
- On first run of calibre, ensure the columns are sized appropriately
- MOBI Output: Do not collapse whitespace when setting the comments metadata
in newly created MOBI files
- HTML Input: Fix handling of files with ä characters in their filenames.
- Fix the sort on startup tweak ignoring more than three levels
- Edit metadata dialog: Fix a bug that broke adding of a file to the book
that calibre did not previously know about in the books directory while
simultaneously changing the author or title of the book.

New news sources

- Mumbai Mirror by Krittika Goyal
- Real Clear by TMcN
- Gazeta Wyborcza by ravcio
- The Daily News Egypt and al masry al youm by Omm Mishmishah
- Klip.me by Ken Sun

Improved news sources

- People's Daily
- Plus Info
- grantland.com
- Eret es irodalom
- Sueddeutsche.de

4 files changed, 110 insertions, 41 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index e00a755af78..14dbb99448b 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2012/02/06 12:40:55 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2012/02/16 21:29:35 gls Exp $
 #
 
-DISTNAME=	calibre-0.8.36
-PKGREVISION=	1
+DISTNAME=	calibre-0.8.39
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX=	.tar.xz
@@ -70,6 +69,7 @@ FIX_PYTHON+=	src/calibre/ebooks/chm/*.py
 FIX_PYTHON+=	src/calibre/ebooks/comic/*.py
 FIX_PYTHON+=	src/calibre/ebooks/compression/*.py
 FIX_PYTHON+=	src/calibre/ebooks/conversion/*.py
+FIX_PYTHON+=	src/calibre/ebooks/conversion/plugins/*.py
 FIX_PYTHON+=	src/calibre/ebooks/djvu/*.py
 FIX_PYTHON+=	src/calibre/ebooks/epub/fix/*.py
 FIX_PYTHON+=	src/calibre/ebooks/epub/*.py
@@ -112,6 +112,7 @@ FIX_PYTHON+=	src/calibre/gui2/tag_browser/*.py
 FIX_PYTHON+=	src/calibre/gui2/viewer/*.py
 FIX_PYTHON+=	src/calibre/gui2/wizard/*.py
 FIX_PYTHON+=	src/calibre/library/*.py
+FIX_PYTHON+=	src/calibre/library/catalogs/*.py
 FIX_PYTHON+=	src/calibre/library/server/*.py
 FIX_PYTHON+=	src/calibre/manual/*.py
 FIX_PYTHON+=	src/calibre/manual/plugin_examples/helloworld/*.py
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index 1e1261e3b34..76f9f19e3aa 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2012/01/21 17:53:32 gls Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/02/16 21:29:36 gls Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -128,11 +128,9 @@ lib/calibre/calibre/devices/user_defined/driver.py
 lib/calibre/calibre/ebooks/BeautifulSoup.py
 lib/calibre/calibre/ebooks/__init__.py
 lib/calibre/calibre/ebooks/azw4/__init__.py
-lib/calibre/calibre/ebooks/azw4/input.py
 lib/calibre/calibre/ebooks/azw4/reader.py
 lib/calibre/calibre/ebooks/chardet.py
 lib/calibre/calibre/ebooks/chm/__init__.py
-lib/calibre/calibre/ebooks/chm/input.py
 lib/calibre/calibre/ebooks/chm/metadata.py
 lib/calibre/calibre/ebooks/chm/reader.py
 lib/calibre/calibre/ebooks/comic/__init__.py
@@ -143,6 +141,44 @@ lib/calibre/calibre/ebooks/compression/tcr.py
 lib/calibre/calibre/ebooks/conversion/__init__.py
 lib/calibre/calibre/ebooks/conversion/cli.py
 lib/calibre/calibre/ebooks/conversion/config.py
+lib/calibre/calibre/ebooks/conversion/plugins/__init__.py
+lib/calibre/calibre/ebooks/conversion/plugins/azw4_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/chm_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/comic_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/djvu_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/epub_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/epub_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/fb2_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/fb2_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/html_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/html_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/htmlz_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/htmlz_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/lit_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/lit_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/lrf_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/lrf_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/mobi_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/mobi_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/odt_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/oeb_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/pdb_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/pdb_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/pdf_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/pdf_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/pml_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/pml_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/rb_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/rb_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/recipe_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/rtf_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/rtf_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/snb_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/snb_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/tcr_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/tcr_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/txt_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/txt_output.py
 lib/calibre/calibre/ebooks/conversion/plumber.py
 lib/calibre/calibre/ebooks/conversion/preprocess.py
 lib/calibre/calibre/ebooks/conversion/utils.py
@@ -150,41 +186,31 @@ lib/calibre/calibre/ebooks/cssselect.py
 lib/calibre/calibre/ebooks/djvu/__init__.py
 lib/calibre/calibre/ebooks/djvu/djvu.py
 lib/calibre/calibre/ebooks/djvu/djvubzzdec.py
-lib/calibre/calibre/ebooks/djvu/input.py
 lib/calibre/calibre/ebooks/epub/__init__.py
 lib/calibre/calibre/ebooks/epub/fix/__init__.py
 lib/calibre/calibre/ebooks/epub/fix/container.py
 lib/calibre/calibre/ebooks/epub/fix/epubcheck.py
 lib/calibre/calibre/ebooks/epub/fix/main.py
 lib/calibre/calibre/ebooks/epub/fix/unmanifested.py
-lib/calibre/calibre/ebooks/epub/input.py
-lib/calibre/calibre/ebooks/epub/output.py
 lib/calibre/calibre/ebooks/epub/pages.py
 lib/calibre/calibre/ebooks/epub/periodical.py
 lib/calibre/calibre/ebooks/fb2/__init__.py
 lib/calibre/calibre/ebooks/fb2/fb2ml.py
-lib/calibre/calibre/ebooks/fb2/input.py
-lib/calibre/calibre/ebooks/fb2/output.py
 lib/calibre/calibre/ebooks/html/__init__.py
 lib/calibre/calibre/ebooks/html/input.py
 lib/calibre/calibre/ebooks/html/meta.py
-lib/calibre/calibre/ebooks/html/output.py
 lib/calibre/calibre/ebooks/html/to_zip.py
 lib/calibre/calibre/ebooks/htmlz/__init__.py
-lib/calibre/calibre/ebooks/htmlz/input.py
 lib/calibre/calibre/ebooks/htmlz/oeb2html.py
-lib/calibre/calibre/ebooks/htmlz/output.py
 lib/calibre/calibre/ebooks/hyphenate.py
 lib/calibre/calibre/ebooks/iterator/__init__.py
 lib/calibre/calibre/ebooks/lit/__init__.py
 lib/calibre/calibre/ebooks/lit/from_any.py
-lib/calibre/calibre/ebooks/lit/input.py
 lib/calibre/calibre/ebooks/lit/lzx.py
 lib/calibre/calibre/ebooks/lit/maps/__init__.py
 lib/calibre/calibre/ebooks/lit/maps/html.py
 lib/calibre/calibre/ebooks/lit/maps/opf.py
 lib/calibre/calibre/ebooks/lit/mssha1.py
-lib/calibre/calibre/ebooks/lit/output.py
 lib/calibre/calibre/ebooks/lit/reader.py
 lib/calibre/calibre/ebooks/lit/writer.py
 lib/calibre/calibre/ebooks/lrf/__init__.py
@@ -201,7 +227,6 @@ lib/calibre/calibre/ebooks/lrf/lrs/__init__.py
 lib/calibre/calibre/ebooks/lrf/lrs/convert_from.py
 lib/calibre/calibre/ebooks/lrf/meta.py
 lib/calibre/calibre/ebooks/lrf/objects.py
-lib/calibre/calibre/ebooks/lrf/output.py
 lib/calibre/calibre/ebooks/lrf/pylrs/__init__.py
 lib/calibre/calibre/ebooks/lrf/pylrs/elements.py
 lib/calibre/calibre/ebooks/lrf/pylrs/pylrf.py
@@ -283,10 +308,8 @@ lib/calibre/calibre/ebooks/metadata/zip.py
 lib/calibre/calibre/ebooks/mobi/__init__.py
 lib/calibre/calibre/ebooks/mobi/debug.py
 lib/calibre/calibre/ebooks/mobi/huffcdic.py
-lib/calibre/calibre/ebooks/mobi/input.py
 lib/calibre/calibre/ebooks/mobi/langcodes.py
 lib/calibre/calibre/ebooks/mobi/mobiml.py
-lib/calibre/calibre/ebooks/mobi/output.py
 lib/calibre/calibre/ebooks/mobi/reader.py
 lib/calibre/calibre/ebooks/mobi/utils.py
 lib/calibre/calibre/ebooks/mobi/writer.py
@@ -300,7 +323,6 @@ lib/calibre/calibre/ebooks/oeb/__init__.py
 lib/calibre/calibre/ebooks/oeb/base.py
 lib/calibre/calibre/ebooks/oeb/display/test-cfi/run.py
 lib/calibre/calibre/ebooks/oeb/iterator.py
-lib/calibre/calibre/ebooks/oeb/output.py
 lib/calibre/calibre/ebooks/oeb/parse_utils.py
 lib/calibre/calibre/ebooks/oeb/reader.py
 lib/calibre/calibre/ebooks/oeb/stylizer.py
@@ -332,8 +354,6 @@ lib/calibre/calibre/ebooks/pdb/ereader/writer.py
 lib/calibre/calibre/ebooks/pdb/formatreader.py
 lib/calibre/calibre/ebooks/pdb/formatwriter.py
 lib/calibre/calibre/ebooks/pdb/header.py
-lib/calibre/calibre/ebooks/pdb/input.py
-lib/calibre/calibre/ebooks/pdb/output.py
 lib/calibre/calibre/ebooks/pdb/palmdoc/__init__.py
 lib/calibre/calibre/ebooks/pdb/palmdoc/reader.py
 lib/calibre/calibre/ebooks/pdb/palmdoc/writer.py
@@ -346,7 +366,6 @@ lib/calibre/calibre/ebooks/pdb/ztxt/reader.py
 lib/calibre/calibre/ebooks/pdb/ztxt/writer.py
 lib/calibre/calibre/ebooks/pdf/__init__.py
 lib/calibre/calibre/ebooks/pdf/from_comic.py
-lib/calibre/calibre/ebooks/pdf/input.py
 lib/calibre/calibre/ebooks/pdf/manipulate/__init__.py
 lib/calibre/calibre/ebooks/pdf/manipulate/cli.py
 lib/calibre/calibre/ebooks/pdf/manipulate/crop.py
@@ -357,20 +376,15 @@ lib/calibre/calibre/ebooks/pdf/manipulate/merge.py
 lib/calibre/calibre/ebooks/pdf/manipulate/reverse.py
 lib/calibre/calibre/ebooks/pdf/manipulate/rotate.py
 lib/calibre/calibre/ebooks/pdf/manipulate/split.py
-lib/calibre/calibre/ebooks/pdf/output.py
 lib/calibre/calibre/ebooks/pdf/pageoptions.py
 lib/calibre/calibre/ebooks/pdf/pdftohtml.py
 lib/calibre/calibre/ebooks/pdf/reflow.py
 lib/calibre/calibre/ebooks/pdf/verify.py
 lib/calibre/calibre/ebooks/pdf/writer.py
 lib/calibre/calibre/ebooks/pml/__init__.py
-lib/calibre/calibre/ebooks/pml/input.py
-lib/calibre/calibre/ebooks/pml/output.py
 lib/calibre/calibre/ebooks/pml/pmlconverter.py
 lib/calibre/calibre/ebooks/pml/pmlml.py
 lib/calibre/calibre/ebooks/rb/__init__.py
-lib/calibre/calibre/ebooks/rb/input.py
-lib/calibre/calibre/ebooks/rb/output.py
 lib/calibre/calibre/ebooks/rb/rbml.py
 lib/calibre/calibre/ebooks/rb/reader.py
 lib/calibre/calibre/ebooks/rb/writer.py
@@ -381,7 +395,6 @@ lib/calibre/calibre/ebooks/readability/htmls.py
 lib/calibre/calibre/ebooks/readability/readability.py
 lib/calibre/calibre/ebooks/rtf/__init__.py
 lib/calibre/calibre/ebooks/rtf/input.py
-lib/calibre/calibre/ebooks/rtf/output.py
 lib/calibre/calibre/ebooks/rtf/preprocess.py
 lib/calibre/calibre/ebooks/rtf/rtfml.py
 lib/calibre/calibre/ebooks/rtf2xml/ParseRtf.py
@@ -435,21 +448,15 @@ lib/calibre/calibre/ebooks/rtf2xml/table_info.py
 lib/calibre/calibre/ebooks/rtf2xml/tokenize.py
 lib/calibre/calibre/ebooks/sgmllib.py
 lib/calibre/calibre/ebooks/snb/__init__.py
-lib/calibre/calibre/ebooks/snb/input.py
-lib/calibre/calibre/ebooks/snb/output.py
 lib/calibre/calibre/ebooks/snb/snbfile.py
 lib/calibre/calibre/ebooks/snb/snbml.py
 lib/calibre/calibre/ebooks/tcr/__init__.py
-lib/calibre/calibre/ebooks/tcr/input.py
-lib/calibre/calibre/ebooks/tcr/output.py
 lib/calibre/calibre/ebooks/textile/__init__.py
 lib/calibre/calibre/ebooks/textile/functions.py
 lib/calibre/calibre/ebooks/textile/unsmarten.py
 lib/calibre/calibre/ebooks/txt/__init__.py
-lib/calibre/calibre/ebooks/txt/input.py
 lib/calibre/calibre/ebooks/txt/markdownml.py
 lib/calibre/calibre/ebooks/txt/newlines.py
-lib/calibre/calibre/ebooks/txt/output.py
 lib/calibre/calibre/ebooks/txt/processor.py
 lib/calibre/calibre/ebooks/txt/textileml.py
 lib/calibre/calibre/ebooks/txt/txtml.py
@@ -501,6 +508,7 @@ lib/calibre/calibre/gui2/add.py
 lib/calibre/calibre/gui2/add_wizard/__init__.py
 lib/calibre/calibre/gui2/add_wizard/scan_ui.py
 lib/calibre/calibre/gui2/add_wizard/welcome_ui.py
+lib/calibre/calibre/gui2/auto_add.py
 lib/calibre/calibre/gui2/bars.py
 lib/calibre/calibre/gui2/book_details.py
 lib/calibre/calibre/gui2/catalog/__init__.py
@@ -841,6 +849,7 @@ lib/calibre/calibre/gui2/viewer/javascript.py
 lib/calibre/calibre/gui2/viewer/keys.py
 lib/calibre/calibre/gui2/viewer/main.py
 lib/calibre/calibre/gui2/viewer/main_ui.py
+lib/calibre/calibre/gui2/viewer/position.py
 lib/calibre/calibre/gui2/viewer/printing.py
 lib/calibre/calibre/gui2/widgets.py
 lib/calibre/calibre/gui2/wizard/__init__.py
@@ -854,7 +863,12 @@ lib/calibre/calibre/gui2/wizard/stanza_ui.py
 lib/calibre/calibre/library/__init__.py
 lib/calibre/calibre/library/add_to_library.py
 lib/calibre/calibre/library/caches.py
-lib/calibre/calibre/library/catalog.py
+lib/calibre/calibre/library/catalogs/__init__.py
+lib/calibre/calibre/library/catalogs/bibtex.py
+lib/calibre/calibre/library/catalogs/csv_xml.py
+lib/calibre/calibre/library/catalogs/epub_mobi.py
+lib/calibre/calibre/library/catalogs/epub_mobi_builder.py
+lib/calibre/calibre/library/catalogs/utils.py
 lib/calibre/calibre/library/check_library.py
 lib/calibre/calibre/library/cli.py
 lib/calibre/calibre/library/coloring.py
@@ -997,7 +1011,6 @@ lib/calibre/calibre/utils/zipfile.py
 lib/calibre/calibre/web/__init__.py
 lib/calibre/calibre/web/feeds/__init__.py
 lib/calibre/calibre/web/feeds/feedparser.py
-lib/calibre/calibre/web/feeds/input.py
 lib/calibre/calibre/web/feeds/news.py
 lib/calibre/calibre/web/feeds/recipes/__init__.py
 lib/calibre/calibre/web/feeds/recipes/collection.py
@@ -1355,6 +1368,7 @@ share/calibre/recipes/aksiyon_derigisi.recipe
 share/calibre/recipes/akter.recipe
 share/calibre/recipes/al_ahram.recipe
 share/calibre/recipes/al_jazeera.recipe
+share/calibre/recipes/al_masry_al_youm.recipe
 share/calibre/recipes/alo_novine.recipe
 share/calibre/recipes/alt_om_herning.recipe
 share/calibre/recipes/alternet.recipe
@@ -1411,6 +1425,7 @@ share/calibre/recipes/bbc_fast.recipe
 share/calibre/recipes/bbc_sport.recipe
 share/calibre/recipes/bbcvietnamese.recipe
 share/calibre/recipes/benchmark_pl.recipe
+share/calibre/recipes/beppe_grillo.recipe
 share/calibre/recipes/berliner_zeitung.recipe
 share/calibre/recipes/berlingske_dk.recipe
 share/calibre/recipes/beta.recipe
@@ -1518,6 +1533,7 @@ share/calibre/recipes/cosmopolitan_de.recipe
 share/calibre/recipes/cosmopolitan_uk.recipe
 share/calibre/recipes/cotidianul.recipe
 share/calibre/recipes/counterpunch.recipe
+share/calibre/recipes/countryfile.recipe
 share/calibre/recipes/courrier.recipe
 share/calibre/recipes/courrierinternational.recipe
 share/calibre/recipes/cracked_com.recipe
@@ -1795,6 +1811,7 @@ share/calibre/recipes/heise_online.recipe
 share/calibre/recipes/heise_open.recipe
 share/calibre/recipes/helsingin_sanomat.recipe
 share/calibre/recipes/heraldo.recipe
+share/calibre/recipes/high_country_news.recipe
 share/calibre/recipes/hindu.recipe
 share/calibre/recipes/hindu_business_line.recipe
 share/calibre/recipes/hindustan_times.recipe
@@ -1833,6 +1850,7 @@ share/calibre/recipes/il_fatto.recipe
 share/calibre/recipes/il_giornale.recipe
 share/calibre/recipes/il_messaggero.recipe
 share/calibre/recipes/iliteratura_cz.recipe
+share/calibre/recipes/ilmanifesto.recipe
 share/calibre/recipes/ilsole24ore.recipe
 share/calibre/recipes/imperatortravel.recipe
 share/calibre/recipes/impulse_de.recipe
@@ -1894,6 +1912,7 @@ share/calibre/recipes/kellog_insight.recipe
 share/calibre/recipes/kidney.recipe
 share/calibre/recipes/kitsapun.recipe
 share/calibre/recipes/kleinezeitung.recipe
+share/calibre/recipes/klip_me.recipe
 share/calibre/recipes/komchadluek.recipe
 share/calibre/recipes/kommersant.recipe
 share/calibre/recipes/kompas.recipe
@@ -1925,6 +1944,7 @@ share/calibre/recipes/la_segunda.recipe
 share/calibre/recipes/la_stampa.recipe
 share/calibre/recipes/la_tercera.recipe
 share/calibre/recipes/la_tribuna.recipe
+share/calibre/recipes/la_voce.recipe
 share/calibre/recipes/lalibre_be.recipe
 share/calibre/recipes/lameuse_be.recipe
 share/calibre/recipes/lamujerdemivida.recipe
@@ -1957,6 +1977,7 @@ share/calibre/recipes/letsgetcritical.recipe
 share/calibre/recipes/levante.recipe
 share/calibre/recipes/lexpress.recipe
 share/calibre/recipes/liberation.recipe
+share/calibre/recipes/liberation_sub.recipe
 share/calibre/recipes/libero.recipe
 share/calibre/recipes/liberty_times.recipe
 share/calibre/recipes/lifehacker.recipe
@@ -1986,6 +2007,7 @@ share/calibre/recipes/mainichi_it_news.recipe
 share/calibre/recipes/malaysian_mirror.recipe
 share/calibre/recipes/marca.recipe
 share/calibre/recipes/marctv.recipe
+share/calibre/recipes/marketing_magazine.recipe
 share/calibre/recipes/matichon.recipe
 share/calibre/recipes/max_planck.recipe
 share/calibre/recipes/maximum_pc.recipe
@@ -2030,6 +2052,7 @@ share/calibre/recipes/motherjones.recipe
 share/calibre/recipes/msdnmag_en.recipe
 share/calibre/recipes/msnbc.recipe
 share/calibre/recipes/msnsankei.recipe
+share/calibre/recipes/mumbai_mirror.recipe
 share/calibre/recipes/mwjournal.recipe
 share/calibre/recipes/nacional_cro.recipe
 share/calibre/recipes/nacionred.recipe
@@ -2123,6 +2146,7 @@ share/calibre/recipes/office_space.recipe
 share/calibre/recipes/oilprice.recipe
 share/calibre/recipes/oldnewthing.recipe
 share/calibre/recipes/omgubuntu.recipe
+share/calibre/recipes/onda_rock.recipe
 share/calibre/recipes/onemagazine.recipe
 share/calibre/recipes/onionavclub.recipe
 share/calibre/recipes/open_left.recipe
@@ -2206,6 +2230,7 @@ share/calibre/recipes/rbc_ru.recipe
 share/calibre/recipes/rds.recipe
 share/calibre/recipes/readers_digest.recipe
 share/calibre/recipes/readitlater.recipe
+share/calibre/recipes/real_clear.recipe
 share/calibre/recipes/real_world_economics_review.recipe
 share/calibre/recipes/realitatea.recipe
 share/calibre/recipes/red_aragon.recipe
@@ -2251,6 +2276,7 @@ share/calibre/recipes/san_fran_chronicle.recipe
 share/calibre/recipes/sanjosemercurynews.recipe
 share/calibre/recipes/sarajevo_x.recipe
 share/calibre/recipes/saskatoon_star_phoenix.recipe
+share/calibre/recipes/satira.recipe
 share/calibre/recipes/sb_nation.recipe
 share/calibre/recipes/science_aas.recipe
 share/calibre/recipes/science_based_medicine.recipe
@@ -2312,6 +2338,7 @@ share/calibre/recipes/statesman.recipe
 share/calibre/recipes/stiintasitehnica.recipe
 share/calibre/recipes/stnn.recipe
 share/calibre/recipes/straitstimes.recipe
+share/calibre/recipes/strange_horizons.recipe
 share/calibre/recipes/strategy-business.recipe
 share/calibre/recipes/sueddeutsche.recipe
 share/calibre/recipes/sueddeutschezeitung.recipe
@@ -2331,6 +2358,7 @@ share/calibre/recipes/tanjug.recipe
 share/calibre/recipes/tasfiye_dergisi.recipe
 share/calibre/recipes/taz.recipe
 share/calibre/recipes/taz_rss.recipe
+share/calibre/recipes/tech_economy.recipe
 share/calibre/recipes/tech_world.recipe
 share/calibre/recipes/techcrunch.recipe
 share/calibre/recipes/techdirt.recipe
@@ -2338,6 +2366,7 @@ share/calibre/recipes/technology_review.recipe
 share/calibre/recipes/technology_review_de.recipe
 share/calibre/recipes/techtarget.recipe
 share/calibre/recipes/tedneward.recipe
+share/calibre/recipes/telegraph_in.recipe
 share/calibre/recipes/telegraph_uk.recipe
 share/calibre/recipes/telepolis.recipe
 share/calibre/recipes/telepolis_artikel.recipe
@@ -2347,6 +2376,7 @@ share/calibre/recipes/thairath.recipe
 share/calibre/recipes/the_age.recipe
 share/calibre/recipes/the_budget_fashionista.recipe
 share/calibre/recipes/the_clinic_online.recipe
+share/calibre/recipes/the_daily_news_egypt.recipe
 share/calibre/recipes/the_escapist.recipe
 share/calibre/recipes/the_h.recipe
 share/calibre/recipes/the_journal.recipe
@@ -2388,6 +2418,7 @@ share/calibre/recipes/todays_zaman.recipe
 share/calibre/recipes/toi.recipe
 share/calibre/recipes/tomshardware.recipe
 share/calibre/recipes/tomshardware_de.recipe
+share/calibre/recipes/tomshardware_it.recipe
 share/calibre/recipes/toronto_sun.recipe
 share/calibre/recipes/tovima.recipe
 share/calibre/recipes/toyokeizai.recipe
@@ -2420,6 +2451,7 @@ share/calibre/recipes/usnews.recipe
 share/calibre/recipes/utne.recipe
 share/calibre/recipes/utrinski.recipe
 share/calibre/recipes/vancouver_provice.recipe
+share/calibre/recipes/vancouver_province.recipe
 share/calibre/recipes/vancouver_sun.recipe
 share/calibre/recipes/vanityfair.recipe
 share/calibre/recipes/variety.recipe
@@ -2454,6 +2486,7 @@ share/calibre/recipes/wenxuecity-znjy.recipe
 share/calibre/recipes/wichita_eagle.recipe
 share/calibre/recipes/wikinews_en.recipe
 share/calibre/recipes/windows_star.recipe
+share/calibre/recipes/windsor_star.recipe
 share/calibre/recipes/winnipeg_free_press.recipe
 share/calibre/recipes/winnipeg_sun.recipe
 share/calibre/recipes/winsupersite.recipe
@@ -2472,6 +2505,7 @@ share/calibre/recipes/wprost.recipe
 share/calibre/recipes/wsj.recipe
 share/calibre/recipes/wsj_free.recipe
 share/calibre/recipes/wvhooligan.recipe
+share/calibre/recipes/wyborcza_duzy_format.recipe
 share/calibre/recipes/xkcd.recipe
 share/calibre/recipes/yagmur_dergisi.recipe
 share/calibre/recipes/yahoo_news.recipe
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 50b2e9e99d4..ff570157c7f 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.9 2012/01/21 17:53:32 gls Exp $
+$NetBSD: distinfo,v 1.10 2012/02/16 21:29:36 gls Exp $
 
-SHA1 (calibre-0.8.36.tar.xz) = f034f374e6017a110cbfe58898d22d44a9591f6b
-RMD160 (calibre-0.8.36.tar.xz) = 7ae9a76e8bbb9a4ed8c0bd521bda397a61e473ba
-Size (calibre-0.8.36.tar.xz) = 23581852 bytes
+SHA1 (calibre-0.8.39.tar.xz) = 842baff5f98c579ee4b7b28e4b8240f15e7de5e7
+RMD160 (calibre-0.8.39.tar.xz) = 3d8ed5ae5073329dea7952422cf06691f8ce1803
+Size (calibre-0.8.39.tar.xz) = 23788948 bytes
+SHA1 (patch-src_calibre_devices_scanner.py) = 3d4ba3d9075898866cdb499f65258022224e5812
 SHA1 (patch-src_calibre_ebooks_pdf_images.cpp) = 950f0302f3c387fb9b4ee41cd96d7c5103b7ad45
 SHA1 (patch-src_calibre_linux_py) = 0f4b9c09d2a6de22ca0044895e1ab35184ae7d72
diff --git a/misc/calibre/patches/patch-src_calibre_devices_scanner.py b/misc/calibre/patches/patch-src_calibre_devices_scanner.py
new file mode 100644
index 00000000000..8c4d72c51eb
--- /dev/null
+++ b/misc/calibre/patches/patch-src_calibre_devices_scanner.py
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_calibre_devices_scanner.py,v 1.1 2012/02/16 21:29:36 gls Exp $
+
+--- src/calibre/devices/scanner.py.orig	2012-02-10 04:59:10.000000000 +0000
++++ src/calibre/devices/scanner.py
+@@ -10,6 +10,8 @@ from threading import RLock
+ 
+ from calibre.constants import iswindows, isosx, plugins, islinux, isfreebsd
+ 
++isnetbsd = 'netbsd' in sys.platform.lower()
++
+ osx_scanner = win_scanner = linux_scanner = None
+ 
+ if iswindows:
+@@ -220,13 +222,18 @@ freebsd_scanner = None
+ if isfreebsd:
+     freebsd_scanner = FreeBSDScanner()
+ 
++netbsd_scanner = None
++
++''' NetBSD support currently not written yet '''
++if isnetbsd:
++    netbsd_scanner = None
+ 
+ class DeviceScanner(object):
+ 
+     def __init__(self, *args):
+         if isosx and osx_scanner is None:
+             raise RuntimeError('The Python extension usbobserver must be available on OS X.')
+-        self.scanner = win_scanner if iswindows else osx_scanner if isosx else freebsd_scanner if isfreebsd else linux_scanner
++        self.scanner = win_scanner if iswindows else osx_scanner if isosx else freebsd_scanner if isfreebsd else netbsd_scanner if isnetbsd else linux_scanner
+         self.devices = []
+ 
+     def scan(self):