From owner-svn-ports-all@freebsd.org Mon Apr 22 07:41:40 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6A49A1591D30; Mon, 22 Apr 2019 07:41:40 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0935376362; Mon, 22 Apr 2019 07:41:40 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D7AFE9CA2; Mon, 22 Apr 2019 07:41:39 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3M7fdKw019412; Mon, 22 Apr 2019 07:41:39 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3M7fdu7019409; Mon, 22 Apr 2019 07:41:39 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201904220741.x3M7fdu7019409@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 22 Apr 2019 07:41:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r499610 - head/deskutils/calibre X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: head/deskutils/calibre X-SVN-Commit-Revision: 499610 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0935376362 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.971,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Apr 2019 07:41:40 -0000 Author: madpilot Date: Mon Apr 22 07:41:38 2019 New Revision: 499610 URL: https://svnweb.freebsd.org/changeset/ports/499610 Log: Update calibre to 3.41.3 Modified: head/deskutils/calibre/Makefile head/deskutils/calibre/distinfo head/deskutils/calibre/pkg-plist Modified: head/deskutils/calibre/Makefile ============================================================================== --- head/deskutils/calibre/Makefile Mon Apr 22 06:57:54 2019 (r499609) +++ head/deskutils/calibre/Makefile Mon Apr 22 07:41:38 2019 (r499610) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= calibre -PORTVERSION= 3.40.1 -PORTREVISION= 1 +PORTVERSION= 3.41.3 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ @@ -33,7 +32,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ ${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:www/py-beautifulsoup32@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mechanize>=0:www/py-mechanize@${PY_FLAVOR} \ @@ -58,8 +57,9 @@ USE_GNOME= glib20 USE_XORG= xrender xext x11 EXTRACT_BEFORE_ARGS= -x -s '/^calibre/~-src/' -f -SHEBANG_GLOB= *.sh *.py -python_OLD_CMD= "/usr/bin/env python2" /bin/python2 /usr/bin/python2 /usr/local/bin/python2 +SHEBANG_GLOB= *.sh *.py *.recipe +python_OLD_CMD= "/usr/bin/env python2" "/usr/bin/env python2" "/usr/bin/env python" /bin/python2 \ + /usr/bin/python2 /usr/local/bin/python2 WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION} MAKE_ENV+= FC_INC_DIR="${LOCALBASE}/include/fontconfig" \ FC_LIB_DIR="${LOCALBASE}/lib" \ @@ -77,8 +77,12 @@ MAKE_ENV+= FC_INC_DIR="${LOCALBASE}/include/fontconfig SIP_DIR=${PYQT_SIPDIR} post-patch: - @${REINPLACE_CMD} -e "s|#!/usr/bin/env python2|#!${PYTHON_CMD}|" \ - ${WRKSRC}/setup/install.py + @${REINPLACE_CMD} -e "s|#!/usr/bin/env python{py_major_version}|#!${PYTHON_CMD}|" \ + -e "s|#!/usr/bin/env python2|#!${PYTHON_CMD}|" \ + -e "s|#!/usr/bin/env python|#!${PYTHON_CMD}|" \ + ${WRKSRC}/setup/install.py \ + ${WRKSRC}/src/calibre/gui2/dialogs/custom_recipes.py \ + ${WRKSRC}/src/calibre/gui2/preferences/tweaks.py do-build: @${MKDIR} ${WRKDIR}/calibre-config ${WRKDIR}/xdg-config Modified: head/deskutils/calibre/distinfo ============================================================================== --- head/deskutils/calibre/distinfo Mon Apr 22 06:57:54 2019 (r499609) +++ head/deskutils/calibre/distinfo Mon Apr 22 07:41:38 2019 (r499610) @@ -1,3 +1,3 @@ -TIMESTAMP = 1552033862 -SHA256 (calibre-3.40.1.tar.xz) = 78015baefc8498a25d90ec22afe1ff3353abe6211cb7f39e3ab97ad715c233e8 -SIZE (calibre-3.40.1.tar.xz) = 38365300 +TIMESTAMP = 1555764541 +SHA256 (calibre-3.41.3.tar.xz) = 2aa3a819915ea2a4ef032918cf545f2cc21ea3aad84ffc9cb772d6c8c986f098 +SIZE (calibre-3.41.3.tar.xz) = 38508848 Modified: head/deskutils/calibre/pkg-plist ============================================================================== --- head/deskutils/calibre/pkg-plist Mon Apr 22 06:57:54 2019 (r499609) +++ head/deskutils/calibre/pkg-plist Mon Apr 22 07:41:38 2019 (r499610) @@ -18,6 +18,8 @@ bin/lrfviewer bin/lrs2lrf bin/markdown-calibre bin/web2disk +lib/calibre/backports/__init__.py +lib/calibre/backports/functools_lru_cache.py lib/calibre/calibre/__init__.py lib/calibre/calibre/constants.py lib/calibre/calibre/customize/__init__.py @@ -128,7 +130,6 @@ lib/calibre/calibre/devices/kobo/bookmark.py lib/calibre/calibre/devices/kobo/books.py lib/calibre/calibre/devices/kobo/driver.py lib/calibre/calibre/devices/kobo/kobotouch_config.py -lib/calibre/calibre/devices/manager.py lib/calibre/calibre/devices/mime.py lib/calibre/calibre/devices/misc.py lib/calibre/calibre/devices/mtp/__init__.py @@ -172,7 +173,6 @@ lib/calibre/calibre/devices/usbms/cli.py lib/calibre/calibre/devices/usbms/device.py lib/calibre/calibre/devices/usbms/deviceconfig.py lib/calibre/calibre/devices/usbms/driver.py -lib/calibre/calibre/devices/usbobserver/test.py lib/calibre/calibre/devices/user_defined/__init__.py lib/calibre/calibre/devices/user_defined/driver.py lib/calibre/calibre/devices/utils.py @@ -291,7 +291,6 @@ lib/calibre/calibre/ebooks/htmlz/oeb2html.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/lzx.py lib/calibre/calibre/ebooks/lit/maps/__init__.py lib/calibre/calibre/ebooks/lit/maps/html.py @@ -304,7 +303,6 @@ lib/calibre/calibre/ebooks/lrf/fonts.py lib/calibre/calibre/ebooks/lrf/html/__init__.py lib/calibre/calibre/ebooks/lrf/html/color_map.py lib/calibre/calibre/ebooks/lrf/html/convert_from.py -lib/calibre/calibre/ebooks/lrf/html/convert_to.py lib/calibre/calibre/ebooks/lrf/html/table_as_image.py lib/calibre/calibre/ebooks/lrf/html/table.py lib/calibre/calibre/ebooks/lrf/input.py @@ -523,7 +521,6 @@ lib/calibre/calibre/ebooks/pdb/ztxt/__init__.py lib/calibre/calibre/ebooks/pdb/ztxt/reader.py 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/outline_writer.py lib/calibre/calibre/ebooks/pdf/pageoptions.py lib/calibre/calibre/ebooks/pdf/pdftohtml.py @@ -604,7 +601,6 @@ lib/calibre/calibre/ebooks/rtf2xml/styles.py lib/calibre/calibre/ebooks/rtf2xml/table_info.py lib/calibre/calibre/ebooks/rtf2xml/table.py 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/snbfile.py lib/calibre/calibre/ebooks/snb/snbml.py @@ -791,7 +787,6 @@ lib/calibre/calibre/gui2/dialogs/choose_library_ui.py lib/calibre/calibre/gui2/dialogs/choose_library.py lib/calibre/calibre/gui2/dialogs/choose_plugin_toolbars.py lib/calibre/calibre/gui2/dialogs/comicconf_ui.py -lib/calibre/calibre/gui2/dialogs/comicconf.py lib/calibre/calibre/gui2/dialogs/comments_dialog_ui.py lib/calibre/calibre/gui2/dialogs/comments_dialog.py lib/calibre/calibre/gui2/dialogs/confirm_delete_location_ui.py @@ -1230,7 +1225,6 @@ lib/calibre/calibre/translations/__init__.py lib/calibre/calibre/translations/dynamic.py lib/calibre/calibre/translations/msgfmt.py lib/calibre/calibre/utils/__init__.py -lib/calibre/calibre/utils/apsw_shell.py lib/calibre/calibre/utils/bibtex.py lib/calibre/calibre/utils/browser.py lib/calibre/calibre/utils/certgen.py @@ -1284,7 +1278,6 @@ lib/calibre/calibre/utils/ipc/__init__.py lib/calibre/calibre/utils/ipc/job.py lib/calibre/calibre/utils/ipc/launch.py lib/calibre/calibre/utils/ipc/pool.py -lib/calibre/calibre/utils/ipc/proxy.py lib/calibre/calibre/utils/ipc/server.py lib/calibre/calibre/utils/ipc/simple_worker.py lib/calibre/calibre/utils/ipc/worker.py @@ -1296,7 +1289,6 @@ lib/calibre/calibre/utils/localization.py lib/calibre/calibre/utils/localunzip.py lib/calibre/calibre/utils/lock.py lib/calibre/calibre/utils/logging.py -lib/calibre/calibre/utils/lru_cache.py lib/calibre/calibre/utils/magick/__init__.py lib/calibre/calibre/utils/magick/draw.py lib/calibre/calibre/utils/magick/legacy.py @@ -1320,20 +1312,17 @@ lib/calibre/calibre/utils/random_ua.py lib/calibre/calibre/utils/rapydscript.py lib/calibre/calibre/utils/recycle_bin.py lib/calibre/calibre/utils/resources.py -lib/calibre/calibre/utils/rss_gen.py lib/calibre/calibre/utils/run_tests.py lib/calibre/calibre/utils/search_query_parser.py lib/calibre/calibre/utils/search_query_parser_test.py lib/calibre/calibre/utils/serialize.py lib/calibre/calibre/utils/serve_coffee.py -lib/calibre/calibre/utils/sftp.py lib/calibre/calibre/utils/shared_file.py lib/calibre/calibre/utils/short_uuid.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/speedups.py lib/calibre/calibre/utils/spell/__init__.py lib/calibre/calibre/utils/tdir_in_cache.py @@ -1413,8 +1402,19 @@ lib/calibre/odf/thumbnail.py lib/calibre/odf/userfield.py lib/calibre/odf/xforms.py lib/calibre/polyglot/__init__.py +lib/calibre/polyglot/binary.py lib/calibre/polyglot/builtins.py +lib/calibre/polyglot/functools.py +lib/calibre/polyglot/html_entities.py +lib/calibre/polyglot/http_client.py +lib/calibre/polyglot/http_cookie.py lib/calibre/polyglot/http_server.py +lib/calibre/polyglot/io.py +lib/calibre/polyglot/plistlib.py +lib/calibre/polyglot/queue.py +lib/calibre/polyglot/reprlib.py +lib/calibre/polyglot/smtplib.py +lib/calibre/polyglot/socketserver.py lib/calibre/polyglot/urllib.py lib/calibre/templite/__init__.py lib/calibre/tinycss/__init__.py @@ -1445,7 +1445,7 @@ lib/calibre/tinycss/version.py %%DATADIR%%/calibre-portable.sh %%DATADIR%%/catalog/DefaultCover.jpg %%DATADIR%%/catalog/mastheadImage.gif -%%DATADIR%%/catalog/section_list_templates.py +%%DATADIR%%/catalog/section_list_templates.conf %%DATADIR%%/catalog/stylesheet.css %%DATADIR%%/catalog/template.xhtml %%DATADIR%%/coffee-script.js