From 6621179a6cf09a986ed46c904e6b09011be67839 Mon Sep 17 00:00:00 2001 From: Guido Falsi Date: Sat, 5 Jan 2019 08:25:10 +0000 Subject: [PATCH] - Update calibre to 3.37.0 - Move dependency on py-cssutils to new pt-css-parser fork - Reorder variables to silence portlint warning --- deskutils/calibre/Makefile | 15 ++++++++------- deskutils/calibre/distinfo | 6 +++--- deskutils/calibre/pkg-plist | 2 -- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index 5c2a5253363d..c2675dc7cf2d 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= calibre -PORTVERSION= 3.36.0 +PORTVERSION= 3.37.0 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ @@ -23,13 +23,13 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVO ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cssutils>=1.0.1,1:www/py-cssutils@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} RUN_DEPENDS= xdg-open:devel/xdg-utils \ - ${PYTHON_PKGNAMEPREFIX}cssutils>=1.0.1,1:www/py-cssutils@${PY_FLAVOR} \ + ${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} \ @@ -47,17 +47,18 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ ${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \ pdftohtml:graphics/poppler-utils -USES= desktop-file-utils gettext-runtime gnome localbase:ldflags pkgconfig \ +USES= desktop-file-utils gettext-runtime gl gnome localbase:ldflags pkgconfig \ python:2.7 pyqt:5 qt:5 shared-mime-info shebangfix ssl tar:xz USE_RC_SUBR= calibre -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 USE_PYQT= core gui network sip svg webkit widgets webkitwidgets xmlpatterns USE_QT= buildtools_build core dbus gui qmake_build widgets USE_GL= egl gl 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 WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION} MAKE_ENV+= FC_INC_DIR="${LOCALBASE}/include/fontconfig" \ FC_LIB_DIR="${LOCALBASE}/lib" \ diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo index 11a37e329129..e0c72fbc793a 100644 --- a/deskutils/calibre/distinfo +++ b/deskutils/calibre/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1545383499 -SHA256 (calibre-3.36.0.tar.xz) = 68cd787db3eafc2907e2e62b6bf895836c880f6bc91686de1b6ace9dc4226e39 -SIZE (calibre-3.36.0.tar.xz) = 39685880 +TIMESTAMP = 1546591547 +SHA256 (calibre-3.37.0.tar.xz) = 0544fc8c10f7fa29b998ab53b5058a27107b5d26da590011f08dc6f2943c518b +SIZE (calibre-3.37.0.tar.xz) = 38757112 diff --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist index 9182ae8e05d9..8bbfe3a2b649 100644 --- a/deskutils/calibre/pkg-plist +++ b/deskutils/calibre/pkg-plist @@ -1178,7 +1178,6 @@ lib/calibre/calibre/linux.py lib/calibre/calibre/plugins/_patiencediff_c.so lib/calibre/calibre/plugins/bzzdec.so lib/calibre/calibre/plugins/certgen.so -lib/calibre/calibre/plugins/chm_extra.so lib/calibre/calibre/plugins/chmlib.so lib/calibre/calibre/plugins/cPalmdoc.so lib/calibre/calibre/plugins/freetype.so @@ -1265,7 +1264,6 @@ lib/calibre/calibre/utils/browser.py lib/calibre/calibre/utils/certgen.py lib/calibre/calibre/utils/chm/__init__.py lib/calibre/calibre/utils/chm/chm.py -lib/calibre/calibre/utils/chm/chmlib.py lib/calibre/calibre/utils/cleantext.py lib/calibre/calibre/utils/complete.py lib/calibre/calibre/utils/config_base.py