From owner-freebsd-ports-bugs@FreeBSD.ORG Fri May 18 15:40:02 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 55FD51065673 for ; Fri, 18 May 2012 15:40:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 23BE28FC12 for ; Fri, 18 May 2012 15:40:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q4IFe147044170 for ; Fri, 18 May 2012 15:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q4IFe1AU044169; Fri, 18 May 2012 15:40:01 GMT (envelope-from gnats) Resent-Date: Fri, 18 May 2012 15:40:01 GMT Resent-Message-Id: <201205181540.q4IFe1AU044169@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rusty Nejdl Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2D0CB1065673 for ; Fri, 18 May 2012 15:38:15 +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 EFA588FC19 for ; Fri, 18 May 2012 15:38:14 +0000 (UTC) Received: from ASSP.nospam (localhost [127.0.0.1]) by tethys.ringofsaturn.com (8.14.5/8.14.5) with ESMTP id q4IFcCmr081023; Fri, 18 May 2012 10:38:12 -0500 (CDT) (envelope-from rnejdl@tethys.ringofsaturn.com) Received: from anyhost.local ([127.0.0.1] helo=anyhost.local) by ASSP.nospam with ESMTPS(AES256-SHA) (ASSP 1.9); 18 May 2012 10:38:11 -0500 Received: (from rnejdl@localhost) by tethys.ringofsaturn.com (8.14.5/8.14.5/Submit) id q4IFcBON081022; Fri, 18 May 2012 10:38:11 -0500 (CDT) (envelope-from rnejdl) Message-Id: Date: Fri, 18 May 2012 10:38:11 -0500 (CDT) From: Rusty Nejdl To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: anthony@found-it.net Subject: ports/168111: Update port deskutils/calibre to 0.8.52 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Rusty Nejdl List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2012 15:40:02 -0000 >Number: 168111 >Category: ports >Synopsis: Update port deskutils/calibre to 0.8.52 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri May 18 15:40:01 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Rusty Nejdl >Release: FreeBSD 9.0-STABLE amd64 >Organization: >Environment: System: FreeBSD tethys.ringofsaturn.com 9.0-STABLE FreeBSD 9.0-STABLE #0: Fri May 4 12:02:28 CDT 2012 root@tethys.ringofsaturn.com:/usr/obj/usr/src/sys/GENERIC amd64 >Description: This updates calibre to 0.8.52. Of note, the MAN pages are no longer packaged from calibre. Also, help2man has disappeared from the package so our local patch for this goes away as well. Finally, this requires cssutils 0.9.9 or greater to fix a bug in converting between mobi and epub formats that was reported. >How-To-Repeat: >Fix: --- calibre-0.8.52.diff begins here --- diff -ruN calibre/Makefile calibre.new/Makefile --- calibre/Makefile 2012-05-09 06:42:01.000000000 -0500 +++ calibre.new/Makefile 2012-05-18 10:16:12.000000000 -0500 @@ -6,7 +6,7 @@ # PORTNAME= calibre -PORTVERSION= 0.8.50 +PORTVERSION= 0.8.52 CATEGORIES= deskutils python MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ @@ -23,7 +23,7 @@ ${PYTHON_PKGNAMEPREFIX}sip>=0:${PORTSDIR}/devel/py-sip \ ${PYTHON_PKGNAMEPREFIX}qt4-core>=0:${PORTSDIR}/devel/py-qt4-core \ ${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \ - ${PYTHON_PKGNAMEPREFIX}cssutils>=0:${PORTSDIR}/www/py-cssutils \ + ${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.9:${PORTSDIR}/www/py-cssutils \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils \ @@ -59,20 +59,6 @@ OVERRIDE_CFLAGS="${CFLAGS}" \ OVERRIDE_LDFLAGS="${LDFLAGS}" -MAN1= calibre-customize.1 \ - calibre-debug.1 \ - calibre-server.1 \ - calibre-smtp.1 \ - calibredb.1 \ - ebook-convert.1 \ - ebook-meta.1 \ - epub-fix.1 \ - fetch-ebook-metadata.1 \ - lrf2lrs.1 \ - lrs2lrf.1 \ - pdfmanipulate.1 \ - web2disk.1 - .include .if ${OSVERSION} < 800069 diff -ruN calibre/distinfo calibre.new/distinfo --- calibre/distinfo 2012-05-09 06:42:01.000000000 -0500 +++ calibre.new/distinfo 2012-05-18 10:08:46.000000000 -0500 @@ -1,2 +1,2 @@ -SHA256 (calibre-0.8.50.tar.xz) = 71314cfe4ed66b9a52e585cb01eed6718ba760d0d6ced2560e03d228f157de74 -SIZE (calibre-0.8.50.tar.xz) = 24580260 +SHA256 (calibre-0.8.52.tar.xz) = 29eebc8c82dd2cacc70e3fb5bc309020348028752a23765d8956769b79deaf2a +SIZE (calibre-0.8.52.tar.xz) = 24690364 diff -ruN calibre/files/patch-src_calibre_utils_help2man.py calibre.new/files/patch-src_calibre_utils_help2man.py --- calibre/files/patch-src_calibre_utils_help2man.py 2011-06-19 13:08:09.000000000 -0500 +++ calibre.new/files/patch-src_calibre_utils_help2man.py 1969-12-31 18:00:00.000000000 -0600 @@ -1,18 +0,0 @@ ---- src/calibre/utils/help2man.py.orig 2011-06-14 14:14:49.000000000 -0500 -+++ src/calibre/utils/help2man.py 2011-06-14 14:15:31.000000000 -0500 -@@ -3,13 +3,14 @@ - __copyright__ = '2009, Kovid Goyal ' - __docformat__ = 'restructuredtext en' - --import time, bz2 -+import time, bz2, locale - from calibre.constants import isbsd - - from calibre.constants import __version__, __appname__, __author__ - - - def create_man_page(prog, parser): -+ locale.setlocale(locale.LC_TIME, 'C') - usage = parser.usage.splitlines() - for i, line in enumerate(list(usage)): - if not line.strip(): diff -ruN calibre/pkg-plist calibre.new/pkg-plist --- calibre/pkg-plist 2012-05-09 06:42:01.000000000 -0500 +++ calibre.new/pkg-plist 2012-05-18 10:17:20.000000000 -0500 @@ -347,13 +347,16 @@ lib/calibre/calibre/ebooks/odt/input.py 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/parse_utils.py lib/calibre/calibre/ebooks/oeb/reader.py lib/calibre/calibre/ebooks/oeb/stylizer.py lib/calibre/calibre/ebooks/oeb/display/__init__.py lib/calibre/calibre/ebooks/oeb/display/webview.py lib/calibre/calibre/ebooks/oeb/display/test-cfi/run.py +lib/calibre/calibre/ebooks/oeb/iterator/book.py +lib/calibre/calibre/ebooks/oeb/iterator/bookmarks.py +lib/calibre/calibre/ebooks/oeb/iterator/__init__.py +lib/calibre/calibre/ebooks/oeb/iterator/spine.py lib/calibre/calibre/ebooks/oeb/transforms/__init__.py lib/calibre/calibre/ebooks/oeb/transforms/cover.py lib/calibre/calibre/ebooks/oeb/transforms/filenames.py @@ -883,6 +886,7 @@ 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/viewer/toc.py lib/calibre/calibre/gui2/widgets.py lib/calibre/calibre/gui2/wizard/__init__.py lib/calibre/calibre/gui2/wizard/device_ui.py @@ -981,7 +985,6 @@ lib/calibre/calibre/utils/fonts/__init__.py lib/calibre/calibre/utils/formatter.py lib/calibre/calibre/utils/formatter_functions.py -lib/calibre/calibre/utils/help2man.py lib/calibre/calibre/utils/html2text.py lib/calibre/calibre/utils/html5_entities.py lib/calibre/calibre/utils/icu.py @@ -1245,6 +1248,7 @@ %%DATADIR%%/catalog/section_list_templates.py %%DATADIR%%/catalog/stylesheet.css %%DATADIR%%/catalog/template.xhtml +%%DATADIR%%/compiled_coffeescript.zip %%DATADIR%%/content_server/av.jpg %%DATADIR%%/content_server/bg_search_box.png %%DATADIR%%/content_server/browse/browse.css @@ -1294,7 +1298,6 @@ %%DATADIR%%/content_server/star-off.png %%DATADIR%%/content_server/star-on.png %%DATADIR%%/default_tweaks.py -%%DATADIR%%/display/cfi.js %%DATADIR%%/ebook-convert-complete.pickle %%DATADIR%%/fonts/liberation/LiberationMono-Bold.ttf %%DATADIR%%/fonts/liberation/LiberationMono-BoldItalic.ttf @@ -1523,7 +1526,6 @@ @dirrm %%DATADIR%%/fonts/prs500 @dirrm %%DATADIR%%/fonts/liberation @dirrm %%DATADIR%%/fonts -@dirrm %%DATADIR%%/display @dirrm %%DATADIR%%/content_server/read @dirrm %%DATADIR%%/content_server/jquery_ui/js @dirrm %%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images @@ -1612,6 +1614,7 @@ @dirrm lib/calibre/calibre/ebooks/pdb @dirrm lib/calibre/calibre/ebooks/oeb/display/test-cfi @dirrm lib/calibre/calibre/ebooks/oeb/display +@dirrm lib/calibre/calibre/ebooks/oeb/iterator @dirrm lib/calibre/calibre/ebooks/oeb/transforms @dirrm lib/calibre/calibre/ebooks/oeb @dirrm lib/calibre/calibre/ebooks/odt --- calibre-0.8.52.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: