From mad@micro.madpilot.net  Thu Jan 30 09:44:45 2014
Return-Path: <mad@micro.madpilot.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 82EA934F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 30 Jan 2014 09:44:45 +0000 (UTC)
Received: from micro.madpilot.net (micro.madpilot.net [88.149.173.206])
	by mx1.freebsd.org (Postfix) with ESMTP id E41E317C2
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 30 Jan 2014 09:44:44 +0000 (UTC)
Received: from micro.madpilot.net (localhost [127.0.0.1])
	by micro.madpilot.net (Postfix) with ESMTP id 3fFGqv6mrrzCM;
	Thu, 30 Jan 2014 10:44:43 +0100 (CET)
Received: from micro.madpilot.net ([127.0.0.1])
	by micro.madpilot.net (micro.madpilot.net [127.0.0.1]) (amavisd-new, port 10026)
	with ESMTP id DITa70Rlsmbj; Thu, 30 Jan 2014 10:44:39 +0100 (CET)
Received: by micro.madpilot.net (Postfix, from userid 1000)
	id 3fFGqp6Q9szCL; Thu, 30 Jan 2014 10:44:38 +0100 (CET)
Message-Id: <3fFGqp6Q9szCL@micro.madpilot.net>
Date: Thu, 30 Jan 2014 10:44:38 +0100 (CET)
From: Guido Falsi <madpilot@FreeBSD.org>
Reply-To: Guido Falsi <madpilot@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: rnejdl@ringofsaturn.com
Subject: [update] deskutils/calibre: update to 1.21.0
X-Send-Pr-Version: 3.114
X-GNATS-Notify: rnejdl@ringofsaturn.com

>Number:         186267
>Category:       ports
>Synopsis:       [update] deskutils/calibre: update to 1.21.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    madpilot
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 30 09:50:00 UTC 2014
>Closed-Date:    Thu Jan 30 22:03:22 UTC 2014
>Last-Modified:  Thu Jan 30 22:10:02 UTC 2014
>Originator:     Guido Falsi
>Release:        FreeBSD 10.0-RELEASE amd64
>Organization:
none
>Environment:
System: FreeBSD micro.madpilot.net 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64

>Description:

- Update to 1.21.0

I intentionally removed bin/calibre-uninstall from the plist. Using
staging we can cherry pick what to put in the package. The uninstall
script isn't necessary, and in fact can be dangerous, since
uninstalling should be managed with pkg tools.

If tested in poudriere, it will complain about orphaned files. But this isn't a critical problem, cherry picking from staging is not a mistake.

>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
--- Makefile	(revision 341824)
+++ Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	calibre
-PORTVERSION=	1.13.0
-PORTREVISION=	1
+PORTVERSION=	1.21.0
 CATEGORIES=	deskutils python
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 
Index: distinfo
===================================================================
--- distinfo	(revision 341824)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (calibre-1.13.0.tar.xz) = f2290592844ecacec6fd513bd9492abe90f4fb47b0731cd9b0a87d3965401448
-SIZE (calibre-1.13.0.tar.xz) = 31093476
+SHA256 (calibre-1.21.0.tar.xz) = 30327d0b298b02dc80b9724ab847e1ff2d9b717e713705c79c4f8cf893b71c16
+SIZE (calibre-1.21.0.tar.xz) = 32437820
Index: files/patch-calibre_constants.py
===================================================================
--- files/patch-calibre_constants.py	(revision 341824)
+++ files/patch-calibre_constants.py	(working copy)
@@ -1,10 +1,10 @@
---- src/calibre/constants.py.orig	2013-11-22 09:46:59.000000000 -0600
-+++ src/calibre/constants.py	2013-11-22 09:47:07.000000000 -0600
+--- src/calibre/constants.py.orig	2014-01-24 05:56:21.000000000 +0100
++++ src/calibre/constants.py	2014-01-29 00:21:48.318819375 +0100
 @@ -138,7 +138,6 @@
                  'freetype',
                  'woff',
                  'unrar',
 -                'qt_hack',
-                 '_regex'
-             ]
-         if iswindows:
+                 '_regex',
+                 'hunspell',
+                 '_patiencediff_c',
Index: files/patch-calibre_linux.py
===================================================================
--- files/patch-calibre_linux.py	(revision 341824)
+++ files/patch-calibre_linux.py	(working copy)
@@ -1,9 +1,9 @@
---- src/calibre/linux.py.orig	2013-11-22 04:20:51.000000000 +0100
-+++ src/calibre/linux.py	2013-11-30 11:05:18.115881824 +0100
-@@ -700,9 +700,12 @@
+--- src/calibre/linux.py.orig	2014-01-24 05:56:21.000000000 +0100
++++ src/calibre/linux.py	2014-01-29 00:30:43.102775394 +0100
+@@ -712,9 +712,12 @@
                  f.close()
                  des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
-                         'calibre-ebook-viewer.desktop')
+                         'calibre-ebook-viewer.desktop', 'calibre-ebook-edit.desktop')
 +                dtpdirs = ('gnome/apps', 'applications')
                  for x in des:
 -                    cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 341824)
+++ pkg-plist	(working copy)
@@ -5,10 +5,10 @@
 bin/calibre-parallel
 bin/calibre-server
 bin/calibre-smtp
-bin/calibre-uninstall
 bin/calibredb
 bin/ebook-convert
 bin/ebook-device
+bin/ebook-edit
 bin/ebook-meta
 bin/ebook-polish
 bin/ebook-viewer
@@ -77,6 +77,7 @@
 lib/calibre/calibre/devices/cybook/__init__.py
 lib/calibre/calibre/devices/cybook/driver.py
 lib/calibre/calibre/devices/cybook/t2b.py
+lib/calibre/calibre/devices/cybook/t4b.py
 lib/calibre/calibre/devices/eb600/__init__.py
 lib/calibre/calibre/devices/eb600/driver.py
 lib/calibre/calibre/devices/edge/__init__.py
@@ -247,6 +248,7 @@
 lib/calibre/calibre/ebooks/html/input.py
 lib/calibre/calibre/ebooks/html/meta.py
 lib/calibre/calibre/ebooks/html/to_zip.py
+lib/calibre/calibre/ebooks/html_entities.py
 lib/calibre/calibre/ebooks/htmlz/__init__.py
 lib/calibre/calibre/ebooks/htmlz/oeb2html.py
 lib/calibre/calibre/ebooks/hyphenate.py
@@ -413,8 +415,18 @@
 lib/calibre/calibre/ebooks/oeb/normalize_css.py
 lib/calibre/calibre/ebooks/oeb/parse_utils.py
 lib/calibre/calibre/ebooks/oeb/polish/__init__.py
+lib/calibre/calibre/ebooks/oeb/polish/check/__init__.py
+lib/calibre/calibre/ebooks/oeb/polish/check/base.py
+lib/calibre/calibre/ebooks/oeb/polish/check/fonts.py
+lib/calibre/calibre/ebooks/oeb/polish/check/images.py
+lib/calibre/calibre/ebooks/oeb/polish/check/links.py
+lib/calibre/calibre/ebooks/oeb/polish/check/main.py
+lib/calibre/calibre/ebooks/oeb/polish/check/opf.py
+lib/calibre/calibre/ebooks/oeb/polish/check/parsing.py
 lib/calibre/calibre/ebooks/oeb/polish/container.py
 lib/calibre/calibre/ebooks/oeb/polish/cover.py
+lib/calibre/calibre/ebooks/oeb/polish/create.py
+lib/calibre/calibre/ebooks/oeb/polish/css.py
 lib/calibre/calibre/ebooks/oeb/polish/embed.py
 lib/calibre/calibre/ebooks/oeb/polish/errors.py
 lib/calibre/calibre/ebooks/oeb/polish/jacket.py
@@ -431,6 +443,7 @@
 lib/calibre/calibre/ebooks/oeb/polish/tests/main.py
 lib/calibre/calibre/ebooks/oeb/polish/tests/parsing.py
 lib/calibre/calibre/ebooks/oeb/polish/toc.py
+lib/calibre/calibre/ebooks/oeb/polish/utils.py
 lib/calibre/calibre/ebooks/oeb/reader.py
 lib/calibre/calibre/ebooks/oeb/stylizer.py
 lib/calibre/calibre/ebooks/oeb/transforms/__init__.py
@@ -604,9 +617,9 @@
 lib/calibre/calibre/gui2/actions/edit_metadata.py
 lib/calibre/calibre/gui2/actions/fetch_news.py
 lib/calibre/calibre/gui2/actions/help.py
-lib/calibre/calibre/gui2/actions/next_match.py
 lib/calibre/calibre/gui2/actions/mark_books.py
 lib/calibre/calibre/gui2/actions/match_books.py
+lib/calibre/calibre/gui2/actions/next_match.py
 lib/calibre/calibre/gui2/actions/open.py
 lib/calibre/calibre/gui2/actions/plugin_updates.py
 lib/calibre/calibre/gui2/actions/polish.py
@@ -621,6 +634,7 @@
 lib/calibre/calibre/gui2/actions/store.py
 lib/calibre/calibre/gui2/actions/toc_edit.py
 lib/calibre/calibre/gui2/actions/tweak_epub.py
+lib/calibre/calibre/gui2/actions/unpack_book.py
 lib/calibre/calibre/gui2/actions/view.py
 lib/calibre/calibre/gui2/add.py
 lib/calibre/calibre/gui2/add_wizard/__init__.py
@@ -648,10 +662,10 @@
 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/docx_input_ui.py
-lib/calibre/calibre/gui2/convert/docx_input.py
 lib/calibre/calibre/gui2/convert/djvu_input.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
 lib/calibre/calibre/gui2/convert/epub_output_ui.py
 lib/calibre/calibre/gui2/convert/fb2_input.py
@@ -786,6 +800,7 @@
 lib/calibre/calibre/gui2/dialogs/template_dialog_ui.py
 lib/calibre/calibre/gui2/dialogs/template_line_editor.py
 lib/calibre/calibre/gui2/dialogs/test_email_ui.py
+lib/calibre/calibre/gui2/dialogs/trim_image.py
 lib/calibre/calibre/gui2/dialogs/user_profiles.py
 lib/calibre/calibre/gui2/dialogs/user_profiles_ui.py
 lib/calibre/calibre/gui2/dnd.py
@@ -913,8 +928,8 @@
 lib/calibre/calibre/gui2/store/stores/amazon_plugin.py
 lib/calibre/calibre/gui2/store/stores/amazon_uk_plugin.py
 lib/calibre/calibre/gui2/store/stores/archive_org_plugin.py
+lib/calibre/calibre/gui2/store/stores/baen_webscription_plugin.py
 lib/calibre/calibre/gui2/store/stores/beam_ebooks_de_plugin.py
-lib/calibre/calibre/gui2/store/stores/baen_webscription_plugin.py
 lib/calibre/calibre/gui2/store/stores/biblio_plugin.py
 lib/calibre/calibre/gui2/store/stores/bn_plugin.py
 lib/calibre/calibre/gui2/store/stores/cdp_plugin.py
@@ -957,8 +972,8 @@
 lib/calibre/calibre/gui2/store/stores/publio_plugin.py
 lib/calibre/calibre/gui2/store/stores/rw2010_plugin.py
 lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py
+lib/calibre/calibre/gui2/store/stores/sony_au_plugin.py
 lib/calibre/calibre/gui2/store/stores/sony_plugin.py
-lib/calibre/calibre/gui2/store/stores/sony_au_plugin.py
 lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py
 lib/calibre/calibre/gui2/store/stores/waterstones_uk_plugin.py
 lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py
@@ -979,27 +994,34 @@
 lib/calibre/calibre/gui2/toc/location.py
 lib/calibre/calibre/gui2/toc/main.py
 lib/calibre/calibre/gui2/tools.py
-lib/calibre/calibre/gui2/tweak_book/ui.py
-lib/calibre/calibre/gui2/tweak_book/preview.py
-lib/calibre/calibre/gui2/tweak_book/keyboard.py
-lib/calibre/calibre/gui2/tweak_book/main.py
-lib/calibre/calibre/gui2/tweak_book/job.py
 lib/calibre/calibre/gui2/tweak_book/__init__.py
-lib/calibre/calibre/gui2/tweak_book/undo.py
+lib/calibre/calibre/gui2/tweak_book/boss.py
+lib/calibre/calibre/gui2/tweak_book/char_select.py
+lib/calibre/calibre/gui2/tweak_book/check.py
+lib/calibre/calibre/gui2/tweak_book/diff.py
+lib/calibre/calibre/gui2/tweak_book/editor/__init__.py
+lib/calibre/calibre/gui2/tweak_book/editor/canvas.py
+lib/calibre/calibre/gui2/tweak_book/editor/image.py
+lib/calibre/calibre/gui2/tweak_book/editor/insert_resource.py
+lib/calibre/calibre/gui2/tweak_book/editor/syntax/__init__.py
+lib/calibre/calibre/gui2/tweak_book/editor/syntax/base.py
+lib/calibre/calibre/gui2/tweak_book/editor/syntax/css.py
+lib/calibre/calibre/gui2/tweak_book/editor/syntax/html.py
+lib/calibre/calibre/gui2/tweak_book/editor/text.py
+lib/calibre/calibre/gui2/tweak_book/editor/themes.py
+lib/calibre/calibre/gui2/tweak_book/editor/widget.py
 lib/calibre/calibre/gui2/tweak_book/file_list.py
+lib/calibre/calibre/gui2/tweak_book/job.py
+lib/calibre/calibre/gui2/tweak_book/main.py
+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/templates.py
 lib/calibre/calibre/gui2/tweak_book/toc.py
-lib/calibre/calibre/gui2/tweak_book/boss.py
-lib/calibre/calibre/gui2/tweak_book/editor/themes.py
-lib/calibre/calibre/gui2/tweak_book/editor/text.py
-lib/calibre/calibre/gui2/tweak_book/editor/__init__.py
-lib/calibre/calibre/gui2/tweak_book/editor/widget.py
-lib/calibre/calibre/gui2/tweak_book/editor/syntax/css.py
-lib/calibre/calibre/gui2/tweak_book/editor/syntax/__init__.py
-lib/calibre/calibre/gui2/tweak_book/editor/syntax/base.py
-lib/calibre/calibre/gui2/tweak_book/editor/syntax/html.py
+lib/calibre/calibre/gui2/tweak_book/ui.py
+lib/calibre/calibre/gui2/tweak_book/undo.py
+lib/calibre/calibre/gui2/tweak_book/widgets.py
 lib/calibre/calibre/gui2/ui.py
 lib/calibre/calibre/gui2/update.py
 lib/calibre/calibre/gui2/viewer/__init__.py
@@ -1068,6 +1090,7 @@
 lib/calibre/calibre/libunzip.py
 lib/calibre/calibre/libwand.py
 lib/calibre/calibre/linux.py
+lib/calibre/calibre/plugins/_patiencediff_c.so
 lib/calibre/calibre/plugins/_regex.so
 lib/calibre/calibre/plugins/cPalmdoc.so
 lib/calibre/calibre/plugins/calibre_style.so
@@ -1074,6 +1097,7 @@
 lib/calibre/calibre/plugins/chm_extra.so
 lib/calibre/calibre/plugins/chmlib.so
 lib/calibre/calibre/plugins/freetype.so
+lib/calibre/calibre/plugins/hunspell.so
 lib/calibre/calibre/plugins/icu.so
 lib/calibre/calibre/plugins/lzx.so
 lib/calibre/calibre/plugins/magick.so
@@ -1105,6 +1129,7 @@
 lib/calibre/calibre/utils/config_base.py
 lib/calibre/calibre/utils/date.py
 lib/calibre/calibre/utils/dictclient.py
+lib/calibre/calibre/utils/diff/__init__.py
 lib/calibre/calibre/utils/file_associations.py
 lib/calibre/calibre/utils/filenames.py
 lib/calibre/calibre/utils/fonts/__init__.py
@@ -1121,8 +1146,8 @@
 lib/calibre/calibre/utils/fonts/sfnt/common.py
 lib/calibre/calibre/utils/fonts/sfnt/container.py
 lib/calibre/calibre/utils/fonts/sfnt/errors.py
+lib/calibre/calibre/utils/fonts/sfnt/glyf.py
 lib/calibre/calibre/utils/fonts/sfnt/gsub.py
-lib/calibre/calibre/utils/fonts/sfnt/glyf.py
 lib/calibre/calibre/utils/fonts/sfnt/head.py
 lib/calibre/calibre/utils/fonts/sfnt/kern.py
 lib/calibre/calibre/utils/fonts/sfnt/loca.py
@@ -1180,17 +1205,18 @@
 lib/calibre/calibre/utils/search_query_parser.py
 lib/calibre/calibre/utils/serve_coffee.py
 lib/calibre/calibre/utils/sftp.py
-lib/calibre/calibre/utils/sigil.py
 lib/calibre/calibre/utils/smartypants.py
 lib/calibre/calibre/utils/smtp.py
 lib/calibre/calibre/utils/smtplib.py
+lib/calibre/calibre/utils/socket_inheritance.py
 lib/calibre/calibre/utils/soupparser.py
+lib/calibre/calibre/utils/spell/__init__.py
 lib/calibre/calibre/utils/terminal.py
 lib/calibre/calibre/utils/text2int.py
 lib/calibre/calibre/utils/threadpool.py
 lib/calibre/calibre/utils/titlecase.py
+lib/calibre/calibre/utils/unrar.py
 lib/calibre/calibre/utils/unsmarten.py
-lib/calibre/calibre/utils/unrar.py
 lib/calibre/calibre/utils/wmf/__init__.py
 lib/calibre/calibre/utils/wmf/emf.py
 lib/calibre/calibre/utils/wmf/parse.py
@@ -1378,6 +1404,7 @@
 lib/calibre/routes/util.py
 lib/calibre/templite/__init__.py
 %%PYTHON_SITELIBDIR%%/init_calibre.py
+share/applications/calibre-ebook-edit.desktop
 share/applications/calibre-ebook-viewer.desktop
 share/applications/calibre-gui.desktop
 share/applications/calibre-lrfviewer.desktop
@@ -1458,8 +1485,8 @@
 %%DATADIR%%/images/add_book.png
 %%DATADIR%%/images/arrow-down.png
 %%DATADIR%%/images/arrow-up.png
+%%DATADIR%%/images/auto-reload.png
 %%DATADIR%%/images/auto_author_sort.png
-%%DATADIR%%/images/auto-reload.png
 %%DATADIR%%/images/back.png
 %%DATADIR%%/images/blank.png
 %%DATADIR%%/images/book.png
@@ -1467,6 +1494,7 @@
 %%DATADIR%%/images/books_in_series.png
 %%DATADIR%%/images/catalog.png
 %%DATADIR%%/images/chapters.png
+%%DATADIR%%/images/character-set.png
 %%DATADIR%%/images/clear_left.png
 %%DATADIR%%/images/column.png
 %%DATADIR%%/images/config.png
@@ -1512,6 +1540,7 @@
 %%DATADIR%%/images/eject.png
 %%DATADIR%%/images/embed-fonts.png
 %%DATADIR%%/images/exec.png
+%%DATADIR%%/images/filter.png
 %%DATADIR%%/images/font.png
 %%DATADIR%%/images/font_size_larger.png
 %%DATADIR%%/images/font_size_smaller.png
@@ -1621,6 +1650,7 @@
 %%DATADIR%%/images/random.png
 %%DATADIR%%/images/rating.png
 %%DATADIR%%/images/reader.png
+%%DATADIR%%/images/resize.png
 %%DATADIR%%/images/rotate-right.png
 %%DATADIR%%/images/save.png
 %%DATADIR%%/images/scheduler.png
@@ -1635,24 +1665,25 @@
 %%DATADIR%%/images/store.png
 %%DATADIR%%/images/subset-fonts.png
 %%DATADIR%%/images/swap.png
+%%DATADIR%%/images/sync-right.png
 %%DATADIR%%/images/sync.png
-%%DATADIR%%/images/sync-right.png
 %%DATADIR%%/images/tags.png
 %%DATADIR%%/images/tb_folder.png
 %%DATADIR%%/images/template_funcs.png
-%%DATADIR%%/images/textures/light_wood.png
+%%DATADIR%%/images/textures/dark_cloth.png
 %%DATADIR%%/images/textures/dark_wood.png
-%%DATADIR%%/images/textures/dark_cloth.png
 %%DATADIR%%/images/textures/grey_wash_wall.png
+%%DATADIR%%/images/textures/light_wood.png
 %%DATADIR%%/images/textures/subtle_wood.png
 %%DATADIR%%/images/toc.png
 %%DATADIR%%/images/trash.png
 %%DATADIR%%/images/trim.png
 %%DATADIR%%/images/tweak.png
+%%DATADIR%%/images/unpack-book.png
 %%DATADIR%%/images/user_profile.png
 %%DATADIR%%/images/view-image.png
+%%DATADIR%%/images/view-refresh.png
 %%DATADIR%%/images/view.png
-%%DATADIR%%/images/view-refresh.png
 %%DATADIR%%/images/viewer.png
 %%DATADIR%%/images/welcome_wizard.png
 %%DATADIR%%/images/window-close.png
@@ -1880,9 +1911,11 @@
 %%DATADIR%%/viewer/mathjax/jax/output/SVG/jax.js
 %%DATADIR%%/viewer/referencing.js
 share/bash-completion/calibre
+share/gnome/apps/calibre-ebook-edit.desktop
 share/gnome/apps/calibre-ebook-viewer.desktop
 share/gnome/apps/calibre-gui.desktop
 share/gnome/apps/calibre-lrfviewer.desktop
+share/icons/hicolor/128x128/apps/calibre-ebook-edit.png
 share/icons/hicolor/128x128/apps/calibre-viewer.png
 share/icons/hicolor/128x128/mimetypes/application-lrf.png
 share/icons/hicolor/128x128/mimetypes/application-x-kindle-application.png
@@ -2020,6 +2053,7 @@
 @dirrm lib/calibre/calibre/web/feeds
 @dirrm lib/calibre/calibre/web
 @dirrm lib/calibre/calibre/utils/wmf
+@dirrm lib/calibre/calibre/utils/spell
 @dirrm lib/calibre/calibre/utils/pyconsole
 @dirrm lib/calibre/calibre/utils/podofo
 @dirrm lib/calibre/calibre/utils/opensearch
@@ -2029,6 +2063,7 @@
 @dirrm lib/calibre/calibre/utils/fonts/sfnt/cff
 @dirrm lib/calibre/calibre/utils/fonts/sfnt
 @dirrm lib/calibre/calibre/utils/fonts
+@dirrm lib/calibre/calibre/utils/diff
 @dirrm lib/calibre/calibre/utils/chm
 @dirrm lib/calibre/calibre/utils
 @dirrm lib/calibre/calibre/translations
@@ -2084,6 +2119,7 @@
 @dirrm lib/calibre/calibre/ebooks/pdb
 @dirrm lib/calibre/calibre/ebooks/oeb/transforms
 @dirrm lib/calibre/calibre/ebooks/oeb/polish/tests
+@dirrm lib/calibre/calibre/ebooks/oeb/polish/check
 @dirrm lib/calibre/calibre/ebooks/oeb/polish
 @dirrm lib/calibre/calibre/ebooks/oeb/iterator
 @dirrm lib/calibre/calibre/ebooks/oeb/display/test-cfi
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Jan 30 09:50:10 UTC 2014 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186267 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: rnejdl@ringofsaturn.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/186267: [update] deskutils/calibre: update to 1.21.0
Date: Thu, 30 Jan 2014 09:50:09 UT

 Maintainer of deskutils/calibre,
 
 Please note that PR ports/186267 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/186267
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->madpilot 
Responsible-Changed-By: madpilot 
Responsible-Changed-When: Thu Jan 30 10:29:34 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186267 

From: Rusty Nejdl <rnejdl@ringofsaturn.com>
To: bug-followup@freebsd.org, madpilot@freebsd.org
Cc:  
Subject: Re: ports/186267: [update] deskutils/calibre: update to 1.21.0
Date: Thu, 30 Jan 2014 14:25:29 -0600

 --=_c4e78725b2cadfdaa5e5397f622998c2
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain; charset=UTF-8
 
  
 
 This change looks great and thank you so much for picking this up! I
 apologize for not keeping up. 
 
 Rusty Nejdl 
  
 --=_c4e78725b2cadfdaa5e5397f622998c2
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/html; charset=UTF-8
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">
 <html><body style=3D'font-family: Helvetica,Arial,sans-serif'>
 <p>This change looks great and thank you so much for picking this up!&nbsp;=
  I apologize for not keeping up.</p>
 <p>Rusty Nejdl</p>
 <div>&nbsp;</div>
 </body></html>
 
 --=_c4e78725b2cadfdaa5e5397f622998c2--
 
State-Changed-From-To: feedback->open 
State-Changed-By: madpilot 
State-Changed-When: Thu Jan 30 22:01:32 UTC 2014 
State-Changed-Why:  
Maintainer has approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186267 
State-Changed-From-To: open->closed 
State-Changed-By: madpilot 
State-Changed-When: Thu Jan 30 22:03:22 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186267 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/186267: commit references a PR
Date: Thu, 30 Jan 2014 22:03:29 +0000 (UTC)

 Author: madpilot
 Date: Thu Jan 30 22:03:16 2014
 New Revision: 341891
 URL: http://svnweb.freebsd.org/changeset/ports/341891
 QAT: https://qat.redports.org/buildarchive/r341891/
 
 Log:
   - Update to 1.21.0
   
   PR:		ports/186267
   Submitted by:	Me
   Approved by:	Rusty Nejdl <rnejdl@ringofsaturn.com> (maintainer)
 
 Modified:
   head/deskutils/calibre/Makefile
   head/deskutils/calibre/distinfo
   head/deskutils/calibre/files/patch-calibre_constants.py
   head/deskutils/calibre/files/patch-calibre_linux.py
   head/deskutils/calibre/pkg-plist
 
 Modified: head/deskutils/calibre/Makefile
 ==============================================================================
 --- head/deskutils/calibre/Makefile	Thu Jan 30 21:47:00 2014	(r341890)
 +++ head/deskutils/calibre/Makefile	Thu Jan 30 22:03:16 2014	(r341891)
 @@ -2,8 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	calibre
 -PORTVERSION=	1.13.0
 -PORTREVISION=	1
 +PORTVERSION=	1.21.0
  CATEGORIES=	deskutils python
  MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
  
 
 Modified: head/deskutils/calibre/distinfo
 ==============================================================================
 --- head/deskutils/calibre/distinfo	Thu Jan 30 21:47:00 2014	(r341890)
 +++ head/deskutils/calibre/distinfo	Thu Jan 30 22:03:16 2014	(r341891)
 @@ -1,2 +1,2 @@
 -SHA256 (calibre-1.13.0.tar.xz) = f2290592844ecacec6fd513bd9492abe90f4fb47b0731cd9b0a87d3965401448
 -SIZE (calibre-1.13.0.tar.xz) = 31093476
 +SHA256 (calibre-1.21.0.tar.xz) = 30327d0b298b02dc80b9724ab847e1ff2d9b717e713705c79c4f8cf893b71c16
 +SIZE (calibre-1.21.0.tar.xz) = 32437820
 
 Modified: head/deskutils/calibre/files/patch-calibre_constants.py
 ==============================================================================
 --- head/deskutils/calibre/files/patch-calibre_constants.py	Thu Jan 30 21:47:00 2014	(r341890)
 +++ head/deskutils/calibre/files/patch-calibre_constants.py	Thu Jan 30 22:03:16 2014	(r341891)
 @@ -1,10 +1,10 @@
 ---- src/calibre/constants.py.orig	2013-11-22 09:46:59.000000000 -0600
 -+++ src/calibre/constants.py	2013-11-22 09:47:07.000000000 -0600
 +--- src/calibre/constants.py.orig	2014-01-24 05:56:21.000000000 +0100
 ++++ src/calibre/constants.py	2014-01-29 00:21:48.318819375 +0100
  @@ -138,7 +138,6 @@
                   'freetype',
                   'woff',
                   'unrar',
  -                'qt_hack',
 -                 '_regex'
 -             ]
 -         if iswindows:
 +                 '_regex',
 +                 'hunspell',
 +                 '_patiencediff_c',
 
 Modified: head/deskutils/calibre/files/patch-calibre_linux.py
 ==============================================================================
 --- head/deskutils/calibre/files/patch-calibre_linux.py	Thu Jan 30 21:47:00 2014	(r341890)
 +++ head/deskutils/calibre/files/patch-calibre_linux.py	Thu Jan 30 22:03:16 2014	(r341891)
 @@ -1,9 +1,9 @@
 ---- src/calibre/linux.py.orig	2013-11-22 04:20:51.000000000 +0100
 -+++ src/calibre/linux.py	2013-11-30 11:05:18.115881824 +0100
 -@@ -700,9 +700,12 @@
 +--- src/calibre/linux.py.orig	2014-01-24 05:56:21.000000000 +0100
 ++++ src/calibre/linux.py	2014-01-29 00:30:43.102775394 +0100
 +@@ -712,9 +712,12 @@
                   f.close()
                   des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
 -                         'calibre-ebook-viewer.desktop')
 +                         'calibre-ebook-viewer.desktop', 'calibre-ebook-edit.desktop')
  +                dtpdirs = ('gnome/apps', 'applications')
                   for x in des:
  -                    cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
 
 Modified: head/deskutils/calibre/pkg-plist
 ==============================================================================
 --- head/deskutils/calibre/pkg-plist	Thu Jan 30 21:47:00 2014	(r341890)
 +++ head/deskutils/calibre/pkg-plist	Thu Jan 30 22:03:16 2014	(r341891)
 @@ -5,10 +5,10 @@ bin/calibre-debug
  bin/calibre-parallel
  bin/calibre-server
  bin/calibre-smtp
 -bin/calibre-uninstall
  bin/calibredb
  bin/ebook-convert
  bin/ebook-device
 +bin/ebook-edit
  bin/ebook-meta
  bin/ebook-polish
  bin/ebook-viewer
 @@ -77,6 +77,7 @@ lib/calibre/calibre/devices/cli.py
  lib/calibre/calibre/devices/cybook/__init__.py
  lib/calibre/calibre/devices/cybook/driver.py
  lib/calibre/calibre/devices/cybook/t2b.py
 +lib/calibre/calibre/devices/cybook/t4b.py
  lib/calibre/calibre/devices/eb600/__init__.py
  lib/calibre/calibre/devices/eb600/driver.py
  lib/calibre/calibre/devices/edge/__init__.py
 @@ -247,6 +248,7 @@ lib/calibre/calibre/ebooks/html/__init__
  lib/calibre/calibre/ebooks/html/input.py
  lib/calibre/calibre/ebooks/html/meta.py
  lib/calibre/calibre/ebooks/html/to_zip.py
 +lib/calibre/calibre/ebooks/html_entities.py
  lib/calibre/calibre/ebooks/htmlz/__init__.py
  lib/calibre/calibre/ebooks/htmlz/oeb2html.py
  lib/calibre/calibre/ebooks/hyphenate.py
 @@ -413,8 +415,18 @@ lib/calibre/calibre/ebooks/oeb/iterator/
  lib/calibre/calibre/ebooks/oeb/normalize_css.py
  lib/calibre/calibre/ebooks/oeb/parse_utils.py
  lib/calibre/calibre/ebooks/oeb/polish/__init__.py
 +lib/calibre/calibre/ebooks/oeb/polish/check/__init__.py
 +lib/calibre/calibre/ebooks/oeb/polish/check/base.py
 +lib/calibre/calibre/ebooks/oeb/polish/check/fonts.py
 +lib/calibre/calibre/ebooks/oeb/polish/check/images.py
 +lib/calibre/calibre/ebooks/oeb/polish/check/links.py
 +lib/calibre/calibre/ebooks/oeb/polish/check/main.py
 +lib/calibre/calibre/ebooks/oeb/polish/check/opf.py
 +lib/calibre/calibre/ebooks/oeb/polish/check/parsing.py
  lib/calibre/calibre/ebooks/oeb/polish/container.py
  lib/calibre/calibre/ebooks/oeb/polish/cover.py
 +lib/calibre/calibre/ebooks/oeb/polish/create.py
 +lib/calibre/calibre/ebooks/oeb/polish/css.py
  lib/calibre/calibre/ebooks/oeb/polish/embed.py
  lib/calibre/calibre/ebooks/oeb/polish/errors.py
  lib/calibre/calibre/ebooks/oeb/polish/jacket.py
 @@ -431,6 +443,7 @@ lib/calibre/calibre/ebooks/oeb/polish/te
  lib/calibre/calibre/ebooks/oeb/polish/tests/main.py
  lib/calibre/calibre/ebooks/oeb/polish/tests/parsing.py
  lib/calibre/calibre/ebooks/oeb/polish/toc.py
 +lib/calibre/calibre/ebooks/oeb/polish/utils.py
  lib/calibre/calibre/ebooks/oeb/reader.py
  lib/calibre/calibre/ebooks/oeb/stylizer.py
  lib/calibre/calibre/ebooks/oeb/transforms/__init__.py
 @@ -604,9 +617,9 @@ lib/calibre/calibre/gui2/actions/edit_co
  lib/calibre/calibre/gui2/actions/edit_metadata.py
  lib/calibre/calibre/gui2/actions/fetch_news.py
  lib/calibre/calibre/gui2/actions/help.py
 -lib/calibre/calibre/gui2/actions/next_match.py
  lib/calibre/calibre/gui2/actions/mark_books.py
  lib/calibre/calibre/gui2/actions/match_books.py
 +lib/calibre/calibre/gui2/actions/next_match.py
  lib/calibre/calibre/gui2/actions/open.py
  lib/calibre/calibre/gui2/actions/plugin_updates.py
  lib/calibre/calibre/gui2/actions/polish.py
 @@ -621,6 +634,7 @@ lib/calibre/calibre/gui2/actions/sort.py
  lib/calibre/calibre/gui2/actions/store.py
  lib/calibre/calibre/gui2/actions/toc_edit.py
  lib/calibre/calibre/gui2/actions/tweak_epub.py
 +lib/calibre/calibre/gui2/actions/unpack_book.py
  lib/calibre/calibre/gui2/actions/view.py
  lib/calibre/calibre/gui2/add.py
  lib/calibre/calibre/gui2/add_wizard/__init__.py
 @@ -648,10 +662,10 @@ lib/calibre/calibre/gui2/convert/comic_i
  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/docx_input_ui.py
 -lib/calibre/calibre/gui2/convert/docx_input.py
  lib/calibre/calibre/gui2/convert/djvu_input.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
  lib/calibre/calibre/gui2/convert/epub_output_ui.py
  lib/calibre/calibre/gui2/convert/fb2_input.py
 @@ -786,6 +800,7 @@ lib/calibre/calibre/gui2/dialogs/templat
  lib/calibre/calibre/gui2/dialogs/template_dialog_ui.py
  lib/calibre/calibre/gui2/dialogs/template_line_editor.py
  lib/calibre/calibre/gui2/dialogs/test_email_ui.py
 +lib/calibre/calibre/gui2/dialogs/trim_image.py
  lib/calibre/calibre/gui2/dialogs/user_profiles.py
  lib/calibre/calibre/gui2/dialogs/user_profiles_ui.py
  lib/calibre/calibre/gui2/dnd.py
 @@ -913,8 +928,8 @@ lib/calibre/calibre/gui2/store/stores/am
  lib/calibre/calibre/gui2/store/stores/amazon_plugin.py
  lib/calibre/calibre/gui2/store/stores/amazon_uk_plugin.py
  lib/calibre/calibre/gui2/store/stores/archive_org_plugin.py
 -lib/calibre/calibre/gui2/store/stores/beam_ebooks_de_plugin.py
  lib/calibre/calibre/gui2/store/stores/baen_webscription_plugin.py
 +lib/calibre/calibre/gui2/store/stores/beam_ebooks_de_plugin.py
  lib/calibre/calibre/gui2/store/stores/biblio_plugin.py
  lib/calibre/calibre/gui2/store/stores/bn_plugin.py
  lib/calibre/calibre/gui2/store/stores/cdp_plugin.py
 @@ -957,8 +972,8 @@ lib/calibre/calibre/gui2/store/stores/pr
  lib/calibre/calibre/gui2/store/stores/publio_plugin.py
  lib/calibre/calibre/gui2/store/stores/rw2010_plugin.py
  lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py
 -lib/calibre/calibre/gui2/store/stores/sony_plugin.py
  lib/calibre/calibre/gui2/store/stores/sony_au_plugin.py
 +lib/calibre/calibre/gui2/store/stores/sony_plugin.py
  lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py
  lib/calibre/calibre/gui2/store/stores/waterstones_uk_plugin.py
  lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py
 @@ -979,27 +994,34 @@ lib/calibre/calibre/gui2/toc/__init__.py
  lib/calibre/calibre/gui2/toc/location.py
  lib/calibre/calibre/gui2/toc/main.py
  lib/calibre/calibre/gui2/tools.py
 -lib/calibre/calibre/gui2/tweak_book/ui.py
 -lib/calibre/calibre/gui2/tweak_book/preview.py
 -lib/calibre/calibre/gui2/tweak_book/keyboard.py
 -lib/calibre/calibre/gui2/tweak_book/main.py
 -lib/calibre/calibre/gui2/tweak_book/job.py
  lib/calibre/calibre/gui2/tweak_book/__init__.py
 -lib/calibre/calibre/gui2/tweak_book/undo.py
 -lib/calibre/calibre/gui2/tweak_book/file_list.py
 -lib/calibre/calibre/gui2/tweak_book/save.py
 -lib/calibre/calibre/gui2/tweak_book/search.py
 -lib/calibre/calibre/gui2/tweak_book/templates.py
 -lib/calibre/calibre/gui2/tweak_book/toc.py
  lib/calibre/calibre/gui2/tweak_book/boss.py
 -lib/calibre/calibre/gui2/tweak_book/editor/themes.py
 -lib/calibre/calibre/gui2/tweak_book/editor/text.py
 +lib/calibre/calibre/gui2/tweak_book/char_select.py
 +lib/calibre/calibre/gui2/tweak_book/check.py
 +lib/calibre/calibre/gui2/tweak_book/diff.py
  lib/calibre/calibre/gui2/tweak_book/editor/__init__.py
 -lib/calibre/calibre/gui2/tweak_book/editor/widget.py
 -lib/calibre/calibre/gui2/tweak_book/editor/syntax/css.py
 +lib/calibre/calibre/gui2/tweak_book/editor/canvas.py
 +lib/calibre/calibre/gui2/tweak_book/editor/image.py
 +lib/calibre/calibre/gui2/tweak_book/editor/insert_resource.py
  lib/calibre/calibre/gui2/tweak_book/editor/syntax/__init__.py
  lib/calibre/calibre/gui2/tweak_book/editor/syntax/base.py
 +lib/calibre/calibre/gui2/tweak_book/editor/syntax/css.py
  lib/calibre/calibre/gui2/tweak_book/editor/syntax/html.py
 +lib/calibre/calibre/gui2/tweak_book/editor/text.py
 +lib/calibre/calibre/gui2/tweak_book/editor/themes.py
 +lib/calibre/calibre/gui2/tweak_book/editor/widget.py
 +lib/calibre/calibre/gui2/tweak_book/file_list.py
 +lib/calibre/calibre/gui2/tweak_book/job.py
 +lib/calibre/calibre/gui2/tweak_book/main.py
 +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/templates.py
 +lib/calibre/calibre/gui2/tweak_book/toc.py
 +lib/calibre/calibre/gui2/tweak_book/ui.py
 +lib/calibre/calibre/gui2/tweak_book/undo.py
 +lib/calibre/calibre/gui2/tweak_book/widgets.py
  lib/calibre/calibre/gui2/ui.py
  lib/calibre/calibre/gui2/update.py
  lib/calibre/calibre/gui2/viewer/__init__.py
 @@ -1068,12 +1090,14 @@ lib/calibre/calibre/library/test.py
  lib/calibre/calibre/libunzip.py
  lib/calibre/calibre/libwand.py
  lib/calibre/calibre/linux.py
 +lib/calibre/calibre/plugins/_patiencediff_c.so
  lib/calibre/calibre/plugins/_regex.so
  lib/calibre/calibre/plugins/cPalmdoc.so
  lib/calibre/calibre/plugins/calibre_style.so
  lib/calibre/calibre/plugins/chm_extra.so
  lib/calibre/calibre/plugins/chmlib.so
  lib/calibre/calibre/plugins/freetype.so
 +lib/calibre/calibre/plugins/hunspell.so
  lib/calibre/calibre/plugins/icu.so
  lib/calibre/calibre/plugins/lzx.so
  lib/calibre/calibre/plugins/magick.so
 @@ -1105,6 +1129,7 @@ lib/calibre/calibre/utils/config.py
  lib/calibre/calibre/utils/config_base.py
  lib/calibre/calibre/utils/date.py
  lib/calibre/calibre/utils/dictclient.py
 +lib/calibre/calibre/utils/diff/__init__.py
  lib/calibre/calibre/utils/file_associations.py
  lib/calibre/calibre/utils/filenames.py
  lib/calibre/calibre/utils/fonts/__init__.py
 @@ -1121,8 +1146,8 @@ lib/calibre/calibre/utils/fonts/sfnt/cma
  lib/calibre/calibre/utils/fonts/sfnt/common.py
  lib/calibre/calibre/utils/fonts/sfnt/container.py
  lib/calibre/calibre/utils/fonts/sfnt/errors.py
 -lib/calibre/calibre/utils/fonts/sfnt/gsub.py
  lib/calibre/calibre/utils/fonts/sfnt/glyf.py
 +lib/calibre/calibre/utils/fonts/sfnt/gsub.py
  lib/calibre/calibre/utils/fonts/sfnt/head.py
  lib/calibre/calibre/utils/fonts/sfnt/kern.py
  lib/calibre/calibre/utils/fonts/sfnt/loca.py
 @@ -1180,17 +1205,18 @@ lib/calibre/calibre/utils/rss_gen.py
  lib/calibre/calibre/utils/search_query_parser.py
  lib/calibre/calibre/utils/serve_coffee.py
  lib/calibre/calibre/utils/sftp.py
 -lib/calibre/calibre/utils/sigil.py
  lib/calibre/calibre/utils/smartypants.py
  lib/calibre/calibre/utils/smtp.py
  lib/calibre/calibre/utils/smtplib.py
 +lib/calibre/calibre/utils/socket_inheritance.py
  lib/calibre/calibre/utils/soupparser.py
 +lib/calibre/calibre/utils/spell/__init__.py
  lib/calibre/calibre/utils/terminal.py
  lib/calibre/calibre/utils/text2int.py
  lib/calibre/calibre/utils/threadpool.py
  lib/calibre/calibre/utils/titlecase.py
 -lib/calibre/calibre/utils/unsmarten.py
  lib/calibre/calibre/utils/unrar.py
 +lib/calibre/calibre/utils/unsmarten.py
  lib/calibre/calibre/utils/wmf/__init__.py
  lib/calibre/calibre/utils/wmf/emf.py
  lib/calibre/calibre/utils/wmf/parse.py
 @@ -1378,6 +1404,7 @@ lib/calibre/routes/route.py
  lib/calibre/routes/util.py
  lib/calibre/templite/__init__.py
  %%PYTHON_SITELIBDIR%%/init_calibre.py
 +share/applications/calibre-ebook-edit.desktop
  share/applications/calibre-ebook-viewer.desktop
  share/applications/calibre-gui.desktop
  share/applications/calibre-lrfviewer.desktop
 @@ -1458,8 +1485,8 @@ share/applications/calibre-lrfviewer.des
  %%DATADIR%%/images/add_book.png
  %%DATADIR%%/images/arrow-down.png
  %%DATADIR%%/images/arrow-up.png
 -%%DATADIR%%/images/auto_author_sort.png
  %%DATADIR%%/images/auto-reload.png
 +%%DATADIR%%/images/auto_author_sort.png
  %%DATADIR%%/images/back.png
  %%DATADIR%%/images/blank.png
  %%DATADIR%%/images/book.png
 @@ -1467,6 +1494,7 @@ share/applications/calibre-lrfviewer.des
  %%DATADIR%%/images/books_in_series.png
  %%DATADIR%%/images/catalog.png
  %%DATADIR%%/images/chapters.png
 +%%DATADIR%%/images/character-set.png
  %%DATADIR%%/images/clear_left.png
  %%DATADIR%%/images/column.png
  %%DATADIR%%/images/config.png
 @@ -1512,6 +1540,7 @@ share/applications/calibre-lrfviewer.des
  %%DATADIR%%/images/eject.png
  %%DATADIR%%/images/embed-fonts.png
  %%DATADIR%%/images/exec.png
 +%%DATADIR%%/images/filter.png
  %%DATADIR%%/images/font.png
  %%DATADIR%%/images/font_size_larger.png
  %%DATADIR%%/images/font_size_smaller.png
 @@ -1621,6 +1650,7 @@ share/applications/calibre-lrfviewer.des
  %%DATADIR%%/images/random.png
  %%DATADIR%%/images/rating.png
  %%DATADIR%%/images/reader.png
 +%%DATADIR%%/images/resize.png
  %%DATADIR%%/images/rotate-right.png
  %%DATADIR%%/images/save.png
  %%DATADIR%%/images/scheduler.png
 @@ -1635,24 +1665,25 @@ share/applications/calibre-lrfviewer.des
  %%DATADIR%%/images/store.png
  %%DATADIR%%/images/subset-fonts.png
  %%DATADIR%%/images/swap.png
 -%%DATADIR%%/images/sync.png
  %%DATADIR%%/images/sync-right.png
 +%%DATADIR%%/images/sync.png
  %%DATADIR%%/images/tags.png
  %%DATADIR%%/images/tb_folder.png
  %%DATADIR%%/images/template_funcs.png
 -%%DATADIR%%/images/textures/light_wood.png
 -%%DATADIR%%/images/textures/dark_wood.png
  %%DATADIR%%/images/textures/dark_cloth.png
 +%%DATADIR%%/images/textures/dark_wood.png
  %%DATADIR%%/images/textures/grey_wash_wall.png
 +%%DATADIR%%/images/textures/light_wood.png
  %%DATADIR%%/images/textures/subtle_wood.png
  %%DATADIR%%/images/toc.png
  %%DATADIR%%/images/trash.png
  %%DATADIR%%/images/trim.png
  %%DATADIR%%/images/tweak.png
 +%%DATADIR%%/images/unpack-book.png
  %%DATADIR%%/images/user_profile.png
  %%DATADIR%%/images/view-image.png
 -%%DATADIR%%/images/view.png
  %%DATADIR%%/images/view-refresh.png
 +%%DATADIR%%/images/view.png
  %%DATADIR%%/images/viewer.png
  %%DATADIR%%/images/welcome_wizard.png
  %%DATADIR%%/images/window-close.png
 @@ -1880,9 +1911,11 @@ share/applications/calibre-lrfviewer.des
  %%DATADIR%%/viewer/mathjax/jax/output/SVG/jax.js
  %%DATADIR%%/viewer/referencing.js
  share/bash-completion/calibre
 +share/gnome/apps/calibre-ebook-edit.desktop
  share/gnome/apps/calibre-ebook-viewer.desktop
  share/gnome/apps/calibre-gui.desktop
  share/gnome/apps/calibre-lrfviewer.desktop
 +share/icons/hicolor/128x128/apps/calibre-ebook-edit.png
  share/icons/hicolor/128x128/apps/calibre-viewer.png
  share/icons/hicolor/128x128/mimetypes/application-lrf.png
  share/icons/hicolor/128x128/mimetypes/application-x-kindle-application.png
 @@ -2020,6 +2053,7 @@ share/zsh/site-functions/_calibre
  @dirrm lib/calibre/calibre/web/feeds
  @dirrm lib/calibre/calibre/web
  @dirrm lib/calibre/calibre/utils/wmf
 +@dirrm lib/calibre/calibre/utils/spell
  @dirrm lib/calibre/calibre/utils/pyconsole
  @dirrm lib/calibre/calibre/utils/podofo
  @dirrm lib/calibre/calibre/utils/opensearch
 @@ -2029,6 +2063,7 @@ share/zsh/site-functions/_calibre
  @dirrm lib/calibre/calibre/utils/fonts/sfnt/cff
  @dirrm lib/calibre/calibre/utils/fonts/sfnt
  @dirrm lib/calibre/calibre/utils/fonts
 +@dirrm lib/calibre/calibre/utils/diff
  @dirrm lib/calibre/calibre/utils/chm
  @dirrm lib/calibre/calibre/utils
  @dirrm lib/calibre/calibre/translations
 @@ -2084,6 +2119,7 @@ share/zsh/site-functions/_calibre
  @dirrm lib/calibre/calibre/ebooks/pdb
  @dirrm lib/calibre/calibre/ebooks/oeb/transforms
  @dirrm lib/calibre/calibre/ebooks/oeb/polish/tests
 +@dirrm lib/calibre/calibre/ebooks/oeb/polish/check
  @dirrm lib/calibre/calibre/ebooks/oeb/polish
  @dirrm lib/calibre/calibre/ebooks/oeb/iterator
  @dirrm lib/calibre/calibre/ebooks/oeb/display/test-cfi
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
