Date: Tue, 16 Apr 2013 21:40:44 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r315909 - in head/deskutils/calibre: . files Message-ID: <201304162140.r3GLeikj019343@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Tue Apr 16 21:40:44 2013 New Revision: 315909 URL: http://svnweb.freebsd.org/changeset/ports/315909 Log: - Update to 0.9.27 - Remove support for unsupported FreeBSD versions Approved by: Rusty Nejdl <rnejdl@ringofsaturn.com> (maintainer, via email) Feature safe: yes Added: head/deskutils/calibre/files/patch-calibre_constants.py (contents, props changed) Modified: head/deskutils/calibre/Makefile head/deskutils/calibre/distinfo head/deskutils/calibre/files/patch-setup_extensions.py head/deskutils/calibre/pkg-plist Modified: head/deskutils/calibre/Makefile ============================================================================== --- head/deskutils/calibre/Makefile Tue Apr 16 21:24:17 2013 (r315908) +++ head/deskutils/calibre/Makefile Tue Apr 16 21:40:44 2013 (r315909) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= calibre -PORTVERSION= 0.9.11 -PORTREVISION= 2 +PORTVERSION= 0.9.27 CATEGORIES= deskutils python MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ @@ -59,22 +58,15 @@ MAKE_ENV+= FC_INC_DIR="${LOCALBASE}/incl OVERRIDE_CFLAGS="${CFLAGS}" \ OVERRIDE_LDFLAGS="${LDFLAGS}" \ PODOFO_LIB_DIR="${LOCALBASE}/lib" \ - PODOFO_INC_DIR="${LOCALBASE}/include/podofo" - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 800069 -MAKE_ENV+= WITH_USB=no -.else -MAKE_ENV+= WITH_USB=yes -.endif + PODOFO_INC_DIR="${LOCALBASE}/include/podofo" \ + WITH_USB=yes do-build: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ ${PYSETUP} build) do-install: -.for dir in desktop-directories applications gnome/apps mime/packages icons/hicolor/128x128/apps +.for dir in desktop-directories applications gnome/apps mime/packages icons/hicolor/128x128/apps zsh/site-functions ${MKDIR} ${PREFIX}/share/${dir} .endfor @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \ @@ -83,4 +75,4 @@ do-install: post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/deskutils/calibre/distinfo ============================================================================== --- head/deskutils/calibre/distinfo Tue Apr 16 21:24:17 2013 (r315908) +++ head/deskutils/calibre/distinfo Tue Apr 16 21:40:44 2013 (r315909) @@ -1,2 +1,2 @@ -SHA256 (calibre-0.9.11.tar.xz) = e83d62db1f27c46e2865599d3e4c4d1ba8eeca539dee982dd9eb0a213a135a4a -SIZE (calibre-0.9.11.tar.xz) = 27869620 +SHA256 (calibre-0.9.27.tar.xz) = 8fd3779c8f878420333f6919f80493bf69d4b64bf427697ebc365497d2450d1f +SIZE (calibre-0.9.27.tar.xz) = 28696180 Added: head/deskutils/calibre/files/patch-calibre_constants.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/calibre/files/patch-calibre_constants.py Tue Apr 16 21:40:44 2013 (r315909) @@ -0,0 +1,10 @@ +--- src/calibre/constants.py.orig 2013-03-29 06:15:02.000000000 +0100 ++++ src/calibre/constants.py 2013-04-09 18:11:37.710213634 +0200 +@@ -136,7 +136,6 @@ + 'freetype', + 'woff', + 'unrar', +- 'qt_hack', + ] + if iswindows: + plugins.extend(['winutil', 'wpd', 'winfonts']) Modified: head/deskutils/calibre/files/patch-setup_extensions.py ============================================================================== --- head/deskutils/calibre/files/patch-setup_extensions.py Tue Apr 16 21:24:17 2013 (r315908) +++ head/deskutils/calibre/files/patch-setup_extensions.py Tue Apr 16 21:40:44 2013 (r315909) @@ -1,6 +1,20 @@ ---- setup/extensions.py.orig 2013-01-04 06:02:00.000000000 +0100 -+++ setup/extensions.py 2013-01-05 18:07:03.534921171 +0100 -@@ -492,8 +492,9 @@ +--- setup/extensions.py.orig 2013-03-29 06:15:02.000000000 +0100 ++++ setup/extensions.py 2013-04-09 18:10:19.236217223 +0200 +@@ -183,13 +183,6 @@ + sip_files = ['calibre/gui2/progress_indicator/QProgressIndicator.sip'] + ), + +- Extension('qt_hack', +- ['calibre/ebooks/pdf/render/qt_hack.cpp'], +- inc_dirs = qt_private_inc + ['calibre/ebooks/pdf/render', 'qt-harfbuzz/src'], +- headers = ['calibre/ebooks/pdf/render/qt_hack.h'], +- sip_files = ['calibre/ebooks/pdf/render/qt_hack.sip'] +- ), +- + Extension('unrar', + ['unrar/%s.cpp'%(x.partition('.')[0]) for x in ''' + rar.o strlist.o strfn.o pathfn.o savepos.o smallfn.o global.o file.o +@@ -492,8 +485,9 @@ pro = textwrap.dedent(''' TEMPLATE = lib Modified: head/deskutils/calibre/pkg-plist ============================================================================== --- head/deskutils/calibre/pkg-plist Tue Apr 16 21:24:17 2013 (r315908) +++ head/deskutils/calibre/pkg-plist Tue Apr 16 21:40:44 2013 (r315909) @@ -11,15 +11,14 @@ bin/calibredb bin/ebook-convert bin/ebook-device bin/ebook-meta +bin/ebook-polish bin/ebook-viewer -bin/epub-fix bin/fetch-ebook-metadata bin/lrf2lrs bin/lrfviewer bin/lrs2lrf bin/markdown-calibre bin/web2disk -etc/bash_completion.d/calibre lib/calibre/calibre/__init__.py lib/calibre/calibre/constants.py lib/calibre/calibre/customize/__init__.py @@ -30,17 +29,24 @@ lib/calibre/calibre/customize/ui.py lib/calibre/calibre/customize/zipplugin.py lib/calibre/calibre/db/__init__.py lib/calibre/calibre/db/backend.py +lib/calibre/calibre/db/backup.py lib/calibre/calibre/db/cache.py +lib/calibre/calibre/db/categories.py lib/calibre/calibre/db/errors.py lib/calibre/calibre/db/fields.py lib/calibre/calibre/db/lazy.py lib/calibre/calibre/db/locking.py lib/calibre/calibre/db/schema_upgrades.py +lib/calibre/calibre/db/search.py lib/calibre/calibre/db/tables.py lib/calibre/calibre/db/tests/__init__.py lib/calibre/calibre/db/tests/base.py +lib/calibre/calibre/db/tests/filesystem.py +lib/calibre/calibre/db/tests/main.py lib/calibre/calibre/db/tests/reading.py +lib/calibre/calibre/db/tests/writing.py lib/calibre/calibre/db/view.py +lib/calibre/calibre/db/write.py lib/calibre/calibre/debug.py lib/calibre/calibre/devices/__init__.py lib/calibre/calibre/devices/android/__init__.py @@ -103,6 +109,7 @@ lib/calibre/calibre/devices/mtp/filesyst lib/calibre/calibre/devices/mtp/test.py lib/calibre/calibre/devices/mtp/unix/__init__.py lib/calibre/calibre/devices/mtp/unix/driver.py +lib/calibre/calibre/devices/mtp/unix/sysfs.py lib/calibre/calibre/devices/mtp/unix/upstream/update.py lib/calibre/calibre/devices/mtp/windows/__init__.py lib/calibre/calibre/devices/mtp/windows/driver.py @@ -197,11 +204,6 @@ lib/calibre/calibre/ebooks/djvu/__init__ lib/calibre/calibre/ebooks/djvu/djvu.py lib/calibre/calibre/ebooks/djvu/djvubzzdec.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/pages.py lib/calibre/calibre/ebooks/epub/periodical.py lib/calibre/calibre/ebooks/fb2/__init__.py @@ -301,10 +303,13 @@ lib/calibre/calibre/ebooks/metadata/snb. lib/calibre/calibre/ebooks/metadata/sources/__init__.py lib/calibre/calibre/ebooks/metadata/sources/amazon.py lib/calibre/calibre/ebooks/metadata/sources/base.py +lib/calibre/calibre/ebooks/metadata/sources/big_book_search.py lib/calibre/calibre/ebooks/metadata/sources/cli.py lib/calibre/calibre/ebooks/metadata/sources/covers.py lib/calibre/calibre/ebooks/metadata/sources/douban.py +lib/calibre/calibre/ebooks/metadata/sources/edelweiss.py lib/calibre/calibre/ebooks/metadata/sources/google.py +lib/calibre/calibre/ebooks/metadata/sources/google_images.py lib/calibre/calibre/ebooks/metadata/sources/identify.py lib/calibre/calibre/ebooks/metadata/sources/isbndb.py lib/calibre/calibre/ebooks/metadata/sources/openlibrary.py @@ -365,6 +370,16 @@ lib/calibre/calibre/ebooks/oeb/iterator/ lib/calibre/calibre/ebooks/oeb/iterator/extract_fonts.py lib/calibre/calibre/ebooks/oeb/iterator/spine.py lib/calibre/calibre/ebooks/oeb/parse_utils.py +lib/calibre/calibre/ebooks/oeb/polish/__init__.py +lib/calibre/calibre/ebooks/oeb/polish/container.py +lib/calibre/calibre/ebooks/oeb/polish/cover.py +lib/calibre/calibre/ebooks/oeb/polish/errors.py +lib/calibre/calibre/ebooks/oeb/polish/jacket.py +lib/calibre/calibre/ebooks/oeb/polish/main.py +lib/calibre/calibre/ebooks/oeb/polish/replace.py +lib/calibre/calibre/ebooks/oeb/polish/stats.py +lib/calibre/calibre/ebooks/oeb/polish/subset.py +lib/calibre/calibre/ebooks/oeb/polish/toc.py lib/calibre/calibre/ebooks/oeb/reader.py lib/calibre/calibre/ebooks/oeb/stylizer.py lib/calibre/calibre/ebooks/oeb/transforms/__init__.py @@ -418,7 +433,12 @@ lib/calibre/calibre/ebooks/pdf/render/__ lib/calibre/calibre/ebooks/pdf/render/common.py lib/calibre/calibre/ebooks/pdf/render/engine.py lib/calibre/calibre/ebooks/pdf/render/fonts.py +lib/calibre/calibre/ebooks/pdf/render/from_html.py +lib/calibre/calibre/ebooks/pdf/render/gradients.py +lib/calibre/calibre/ebooks/pdf/render/graphics.py +lib/calibre/calibre/ebooks/pdf/render/links.py lib/calibre/calibre/ebooks/pdf/render/serialize.py +lib/calibre/calibre/ebooks/pdf/render/test.py lib/calibre/calibre/ebooks/pdf/writer.py lib/calibre/calibre/ebooks/pml/__init__.py lib/calibre/calibre/ebooks/pml/pmlconverter.py @@ -534,6 +554,7 @@ lib/calibre/calibre/gui2/actions/help.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 lib/calibre/calibre/gui2/actions/preferences.py lib/calibre/calibre/gui2/actions/random.py lib/calibre/calibre/gui2/actions/restart.py @@ -542,6 +563,7 @@ lib/calibre/calibre/gui2/actions/show_bo lib/calibre/calibre/gui2/actions/show_quickview.py lib/calibre/calibre/gui2/actions/similar_books.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/view.py lib/calibre/calibre/gui2/add.py @@ -665,6 +687,7 @@ lib/calibre/calibre/gui2/dialogs/device_ lib/calibre/calibre/gui2/dialogs/device_category_editor_ui.py lib/calibre/calibre/gui2/dialogs/drm_error.py lib/calibre/calibre/gui2/dialogs/drm_error_ui.py +lib/calibre/calibre/gui2/dialogs/duplicates.py lib/calibre/calibre/gui2/dialogs/edit_authors_dialog.py lib/calibre/calibre/gui2/dialogs/edit_authors_dialog_ui.py lib/calibre/calibre/gui2/dialogs/job_view_ui.py @@ -704,7 +727,6 @@ lib/calibre/calibre/gui2/dialogs/test_em lib/calibre/calibre/gui2/dialogs/user_profiles.py lib/calibre/calibre/gui2/dialogs/user_profiles_ui.py lib/calibre/calibre/gui2/dnd.py -lib/calibre/calibre/gui2/duplicates.py lib/calibre/calibre/gui2/ebook_download.py lib/calibre/calibre/gui2/email.py lib/calibre/calibre/gui2/filename_pattern_ui.py @@ -732,6 +754,7 @@ lib/calibre/calibre/gui2/metadata/__init lib/calibre/calibre/gui2/metadata/basic_widgets.py lib/calibre/calibre/gui2/metadata/bulk_download.py lib/calibre/calibre/gui2/metadata/config.py +lib/calibre/calibre/gui2/metadata/pdf_covers.py lib/calibre/calibre/gui2/metadata/single.py lib/calibre/calibre/gui2/metadata/single_download.py lib/calibre/calibre/gui2/notify.py @@ -803,6 +826,7 @@ lib/calibre/calibre/gui2/store/config/se lib/calibre/calibre/gui2/store/config/search/search_widget.py lib/calibre/calibre/gui2/store/config/search/search_widget_ui.py lib/calibre/calibre/gui2/store/config/store.py +lib/calibre/calibre/gui2/store/loader.py lib/calibre/calibre/gui2/store/opensearch_store.py lib/calibre/calibre/gui2/store/search/__init__.py lib/calibre/calibre/gui2/store/search/adv_search_builder.py @@ -821,8 +845,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/bewrite_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/bookoteka_plugin.py @@ -842,6 +866,7 @@ lib/calibre/calibre/gui2/store/stores/fo lib/calibre/calibre/gui2/store/stores/google_books_plugin.py lib/calibre/calibre/gui2/store/stores/gutenberg_plugin.py lib/calibre/calibre/gui2/store/stores/kobo_plugin.py +lib/calibre/calibre/gui2/store/stores/koobe_plugin.py lib/calibre/calibre/gui2/store/stores/legimi_plugin.py lib/calibre/calibre/gui2/store/stores/libri_de_plugin.py lib/calibre/calibre/gui2/store/stores/litres_plugin.py @@ -858,6 +883,7 @@ lib/calibre/calibre/gui2/store/stores/mo lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog.py lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog_ui.py lib/calibre/calibre/gui2/store/stores/nexto_plugin.py +lib/calibre/calibre/gui2/store/stores/nook_uk_plugin.py lib/calibre/calibre/gui2/store/stores/open_books_plugin.py lib/calibre/calibre/gui2/store/stores/ozon_ru_plugin.py lib/calibre/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py @@ -871,7 +897,6 @@ lib/calibre/calibre/gui2/store/stores/we lib/calibre/calibre/gui2/store/stores/whsmith_uk_plugin.py lib/calibre/calibre/gui2/store/stores/woblink_plugin.py lib/calibre/calibre/gui2/store/stores/xinxii_plugin.py -lib/calibre/calibre/gui2/store/stores/zixo_plugin.py lib/calibre/calibre/gui2/store/web_control.py lib/calibre/calibre/gui2/store/web_store_dialog.py lib/calibre/calibre/gui2/store/web_store_dialog_ui.py @@ -881,6 +906,9 @@ lib/calibre/calibre/gui2/tag_browser/ui. lib/calibre/calibre/gui2/tag_browser/view.py lib/calibre/calibre/gui2/threaded_jobs.py lib/calibre/calibre/gui2/throbber.py +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/ui.py lib/calibre/calibre/gui2/update.py @@ -1016,6 +1044,7 @@ lib/calibre/calibre/utils/formatter_func lib/calibre/calibre/utils/html2text.py lib/calibre/calibre/utils/html5_entities.py lib/calibre/calibre/utils/icu.py +lib/calibre/calibre/utils/imghdr.py lib/calibre/calibre/utils/ipc/__init__.py lib/calibre/calibre/utils/ipc/job.py lib/calibre/calibre/utils/ipc/launch.py @@ -1034,6 +1063,7 @@ lib/calibre/calibre/utils/magick/draw.py lib/calibre/calibre/utils/magick/generate.py lib/calibre/calibre/utils/mdns.py lib/calibre/calibre/utils/mem.py +lib/calibre/calibre/utils/monotonic.py lib/calibre/calibre/utils/mreplace.py lib/calibre/calibre/utils/network.py lib/calibre/calibre/utils/opensearch/__init__.py @@ -1413,6 +1443,7 @@ share/applications/calibre-lrfviewer.des %%DATADIR%%/images/highlight_only_off.png %%DATADIR%%/images/highlight_only_on.png %%DATADIR%%/images/hotmail.png +%%DATADIR%%/images/icon_choose.png %%DATADIR%%/images/identifiers.png %%DATADIR%%/images/insert-link.png %%DATADIR%%/images/jobs.png @@ -1481,6 +1512,7 @@ share/applications/calibre-lrfviewer.des %%DATADIR%%/images/plugins/plugin_upgrade_valid.png %%DATADIR%%/images/plus.png %%DATADIR%%/images/plusplus.png +%%DATADIR%%/images/polish.png %%DATADIR%%/images/previous.png %%DATADIR%%/images/print-preview.png %%DATADIR%%/images/print.png @@ -1504,6 +1536,7 @@ share/applications/calibre-lrfviewer.des %%DATADIR%%/images/tags.png %%DATADIR%%/images/tb_folder.png %%DATADIR%%/images/template_funcs.png +%%DATADIR%%/images/toc.png %%DATADIR%%/images/trash.png %%DATADIR%%/images/trim.png %%DATADIR%%/images/user_profile.png @@ -1735,6 +1768,7 @@ share/applications/calibre-lrfviewer.des %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/fontdata.js %%DATADIR%%/viewer/mathjax/jax/output/SVG/jax.js %%DATADIR%%/viewer/referencing.js +share/bash-completion/calibre share/gnome/apps/calibre-ebook-viewer.desktop share/gnome/apps/calibre-gui.desktop share/gnome/apps/calibre-lrfviewer.desktop @@ -1759,6 +1793,7 @@ share/mime/application/x-sony-bbeb.xml share/mime/application/x-topaz-ebook.xml share/mime/packages/calibre-mimetypes.xml share/mime/text/lrs.xml +share/zsh/site-functions/_calibre @dirrmtry share/mime/text @dirrmtry share/mime/packages @dirrmtry share/mime/application @@ -1773,6 +1808,9 @@ share/mime/text/lrs.xml @dirrmtry share/gnome/apps @dirrmtry share/gnome @dirrmtry share/desktop-directories +@dirrmtry share/bash-completion +@dirrmtry share/zsh/site-functions +@dirrmtry share/zsh @dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular @dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter @dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Size4/Regular @@ -1886,6 +1924,7 @@ share/mime/text/lrs.xml @dirrm lib/calibre/calibre/library @dirrm lib/calibre/calibre/gui2/wizard @dirrm lib/calibre/calibre/gui2/viewer +@dirrm lib/calibre/calibre/gui2/toc @dirrm lib/calibre/calibre/gui2/tag_browser @dirrm lib/calibre/calibre/gui2/store/stores/mobileread @dirrm lib/calibre/calibre/gui2/store/stores @@ -1927,6 +1966,7 @@ share/mime/text/lrs.xml @dirrm lib/calibre/calibre/ebooks/pdb/ereader @dirrm lib/calibre/calibre/ebooks/pdb @dirrm lib/calibre/calibre/ebooks/oeb/transforms +@dirrm lib/calibre/calibre/ebooks/oeb/polish @dirrm lib/calibre/calibre/ebooks/oeb/iterator @dirrm lib/calibre/calibre/ebooks/oeb/display/test-cfi @dirrm lib/calibre/calibre/ebooks/oeb/display @@ -1953,7 +1993,6 @@ share/mime/text/lrs.xml @dirrm lib/calibre/calibre/ebooks/htmlz @dirrm lib/calibre/calibre/ebooks/html @dirrm lib/calibre/calibre/ebooks/fb2 -@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 @@ -2003,7 +2042,6 @@ share/mime/text/lrs.xml @dirrm lib/calibre/calibre/customize @dirrm lib/calibre/calibre @dirrm lib/calibre -@dirrmtry etc/bash_completion.d @exec mkdir -p %D/share/mime/packages @exec mkdir -p %D/share/icons/hicolor/128x128/apps @exec mkdir -p %D/share/gnome/apps
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304162140.r3GLeikj019343>