From 8c7d16cab94aec06268148cbc089c2161234c987 Mon Sep 17 00:00:00 2001 From: Pawel Pekala Date: Thu, 7 Jun 2012 17:18:39 +0000 Subject: - Update to version 0.8.52 - Port no longer installs manpages PR: ports/168111 Submitted by: Rusty Nejdl (maintainer) --- deskutils/calibre/Makefile | 19 ++----------------- deskutils/calibre/distinfo | 4 ++-- .../calibre/files/patch-src_calibre_utils_help2man.py | 18 ------------------ deskutils/calibre/pkg-plist | 11 +++++++---- 4 files changed, 11 insertions(+), 41 deletions(-) delete mode 100644 deskutils/calibre/files/patch-src_calibre_utils_help2man.py (limited to 'deskutils') diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index c26e9b291753..6f8b0301587c 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -6,8 +6,7 @@ # PORTNAME= calibre -PORTVERSION= 0.8.50 -PORTREVISION= 2 +PORTVERSION= 0.8.52 CATEGORIES= deskutils python MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ @@ -24,7 +23,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:${PORTSDIR}/devel/py-setupto ${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 +58,6 @@ MAKE_ENV+= FC_INC_DIR="${LOCALBASE}/include/fontconfig" \ 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 --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo index f6d4ef107625..af4c2a4bc09d 100644 --- a/deskutils/calibre/distinfo +++ b/deskutils/calibre/distinfo @@ -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 --git a/deskutils/calibre/files/patch-src_calibre_utils_help2man.py b/deskutils/calibre/files/patch-src_calibre_utils_help2man.py deleted file mode 100644 index ee848bd8afde..000000000000 --- a/deskutils/calibre/files/patch-src_calibre_utils_help2man.py +++ /dev/null @@ -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 --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist index 273e1dc4ef8b..ddc18bc42004 100644 --- a/deskutils/calibre/pkg-plist +++ b/deskutils/calibre/pkg-plist @@ -347,13 +347,16 @@ lib/calibre/calibre/ebooks/odt/__init__.py 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.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/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/filenames.py 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 @@ share/gnome/apps/calibre-ebook-viewer.desktop %%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 @@ share/gnome/apps/calibre-ebook-viewer.desktop %%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 @@ share/gnome/apps/calibre-ebook-viewer.desktop @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 @@ share/gnome/apps/calibre-ebook-viewer.desktop @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 -- cgit v1.2.3