From rnejdl@tethys.ringofsaturn.com  Tue Feb 21 03:58:34 2012
Return-Path: <rnejdl@tethys.ringofsaturn.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 52EF5106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 21 Feb 2012 03:58:34 +0000 (UTC)
	(envelope-from rnejdl@tethys.ringofsaturn.com)
Received: from tethys.ringofsaturn.com (tethys.ringofsaturn.com [71.252.219.43])
	by mx1.freebsd.org (Postfix) with ESMTP id 1E6F18FC0C
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 21 Feb 2012 03:58:33 +0000 (UTC)
Received: from ASSP.nospam (localhost [127.0.0.1])
	by tethys.ringofsaturn.com (8.14.5/8.14.5) with ESMTP id q1L3wXno036285
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 20 Feb 2012 21:58:33 -0600 (CST)
	(envelope-from rnejdl@tethys.ringofsaturn.com)
Received: from tethys.ringofsaturn.com ([127.0.0.1] helo=tethys.ringofsaturn.com)
	by ASSP.nospam with ESMTP (ASSP 1.9); 20 Feb 2012 21:58:32 -0600
Received: (from rnejdl@localhost)
	by tethys.ringofsaturn.com (8.14.5/8.14.5/Submit) id q1L3wVRE036284;
	Mon, 20 Feb 2012 21:58:31 -0600 (CST)
	(envelope-from rnejdl)
Message-Id: <assp.039846c3ff.201202210358.q1L3wVRE036284@tethys.ringofsaturn.com>
Date: Mon, 20 Feb 2012 21:58:31 -0600 (CST)
From: Rusty Nejdl <rnejdl@ringofsaturn.com>
Reply-To: Rusty Nejdl <rnejdl@ringofsaturn.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port deskutils/calibre to 0.8.40.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         165346
>Category:       ports
>Synopsis:       Update port deskutils/calibre to 0.8.40.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jgh
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 21 04:00:23 UTC 2012
>Closed-Date:    Wed Feb 22 18:29:14 UTC 2012
>Last-Modified:  Wed Feb 22 18:30:05 UTC 2012
>Originator:     Rusty Nejdl
>Release:        FreeBSD 8.3-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD tethys.ringofsaturn.com 8.3-PRERELEASE FreeBSD 8.3-PRERELEASE #3: Mon Feb 20 08:04:48 CST 2012 root@tethys.ringofsaturn.com:/usr/obj/usr/src/sys/GENERIC amd64


>Description:
	Updates calibre to 0.8.40, latest and greatest. Yes, they release every 2 weeks.

>How-To-Repeat:

>Fix:

	

--- calibre-0.8.40.diff begins here ---
diff -ruN calibre/Makefile calibre.new/Makefile
--- calibre/Makefile	2012-02-18 08:43:09.000000000 -0600
+++ calibre.new/Makefile	2012-02-20 12:54:03.000000000 -0600
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	calibre
-PORTVERSION=	0.8.38
+PORTVERSION=	0.8.40
 CATEGORIES=	deskutils python
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 
diff -ruN calibre/distinfo calibre.new/distinfo
--- calibre/distinfo	2012-02-18 08:43:09.000000000 -0600
+++ calibre.new/distinfo	2012-02-20 12:54:10.000000000 -0600
@@ -1,2 +1,2 @@
-SHA256 (calibre-0.8.38.tar.xz) = 63176dc5cb14fb2f5a2c45196904b9788106d6b0c6d9976d45b4a7fec10e3b99
-SIZE (calibre-0.8.38.tar.xz) = 23680916
+SHA256 (calibre-0.8.40.tar.xz) = 64ae7985c12635e4228baf7df2d6bf86ebd6a85e3c33b073ce9f15962081fac0
+SIZE (calibre-0.8.40.tar.xz) = 23836620
diff -ruN calibre/pkg-plist calibre.new/pkg-plist
--- calibre/pkg-plist	2012-02-18 08:43:09.000000000 -0600
+++ calibre.new/pkg-plist	2012-02-20 13:20:16.000000000 -0600
@@ -131,10 +131,8 @@
 lib/calibre/calibre/ebooks/__init__.py
 lib/calibre/calibre/ebooks/azw4/__init__.py
 lib/calibre/calibre/ebooks/azw4/reader.py
-lib/calibre/calibre/ebooks/azw4/input.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
@@ -148,45 +146,73 @@
 lib/calibre/calibre/ebooks/conversion/plumber.py
 lib/calibre/calibre/ebooks/conversion/preprocess.py
 lib/calibre/calibre/ebooks/conversion/utils.py
+lib/calibre/calibre/ebooks/conversion/plugins/pml_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/htmlz_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/tcr_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/chm_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/odt_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/mobi_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/lrf_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/pdb_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/epub_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/pdb_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/pdf_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/lit_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/djvu_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/snb_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/tcr_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/rtf_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/fb2_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/__init__.py
+lib/calibre/calibre/ebooks/conversion/plugins/snb_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/azw4_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/pdf_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/mobi_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/fb2_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/rb_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/htmlz_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/txt_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/html_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/comic_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/rtf_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/lit_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/pml_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/html_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/lrf_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/oeb_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/recipe_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/txt_output.py
+lib/calibre/calibre/ebooks/conversion/plugins/epub_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/rb_input.py
 lib/calibre/calibre/ebooks/cssselect.py
 lib/calibre/calibre/ebooks/djvu/__init__.py
 lib/calibre/calibre/ebooks/djvu/djvubzzdec.py
 lib/calibre/calibre/ebooks/djvu/djvu.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/oeb2html.py
-lib/calibre/calibre/ebooks/htmlz/output.py
-lib/calibre/calibre/ebooks/htmlz/input.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
@@ -203,7 +229,6 @@
 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
@@ -285,10 +310,8 @@
 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
@@ -301,7 +324,6 @@
 lib/calibre/calibre/ebooks/oeb/__init__.py
 lib/calibre/calibre/ebooks/oeb/base.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
@@ -334,8 +356,6 @@
 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
@@ -348,7 +368,6 @@
 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
@@ -359,20 +378,15 @@
 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
@@ -383,7 +397,6 @@
 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
@@ -437,21 +450,15 @@
 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
@@ -858,7 +865,12 @@
 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/bibtex.py
+lib/calibre/calibre/library/catalogs/epub_mobi_builder.py
+lib/calibre/calibre/library/catalogs/epub_mobi.py
+lib/calibre/calibre/library/catalogs/__init__.py
+lib/calibre/calibre/library/catalogs/csv_xml.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
@@ -1001,7 +1013,6 @@
 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
@@ -1523,6 +1534,7 @@
 @dirrm lib/calibre/calibre/manual/plugin_examples
 @dirrm lib/calibre/calibre/manual
 @dirrm lib/calibre/calibre/library/server
+@dirrm lib/calibre/calibre/library/catalogs
 @dirrm lib/calibre/calibre/library
 @dirrm lib/calibre/calibre/gui2/wizard
 @dirrm lib/calibre/calibre/gui2/viewer
@@ -1591,6 +1603,7 @@
 @dirrm lib/calibre/calibre/ebooks/epub/fix
 @dirrm lib/calibre/calibre/ebooks/epub
 @dirrm lib/calibre/calibre/ebooks/djvu
+@dirrm lib/calibre/calibre/ebooks/conversion/plugins
 @dirrm lib/calibre/calibre/ebooks/conversion
 @dirrm lib/calibre/calibre/ebooks/compression
 @dirrm lib/calibre/calibre/ebooks/comic
--- calibre-0.8.40.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jgh 
Responsible-Changed-By: jgh 
Responsible-Changed-When: Tue Feb 21 04:08:18 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=165346 
State-Changed-From-To: open->closed 
State-Changed-By: jgh 
State-Changed-When: Wed Feb 22 18:29:12 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/165346: commit references a PR
Date: Wed, 22 Feb 2012 18:29:02 +0000 (UTC)

 jgh         2012-02-22 18:28:50 UTC
 
   FreeBSD ports repository
 
   Modified files:
     deskutils/calibre    Makefile distinfo pkg-plist 
   Log:
   - Update to 0.8.40
   
   PR:             ports/165346
   Submitted by:   maintainer, rnejdl@ringofsaturn.com
   
   Revision  Changes    Path
   1.30      +1 -1      ports/deskutils/calibre/Makefile
   1.17      +2 -2      ports/deskutils/calibre/distinfo
   1.17      +46 -33    ports/deskutils/calibre/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
