Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 5 Jan 2019 08:25:10 +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: r489307 - head/deskutils/calibre
Message-ID:  <201901050825.x058PAho011098@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Sat Jan  5 08:25:10 2019
New Revision: 489307
URL: https://svnweb.freebsd.org/changeset/ports/489307

Log:
  - Update calibre to 3.37.0
  - Move dependency on py-cssutils to new pt-css-parser fork
  - Reorder variables to silence portlint warning

Modified:
  head/deskutils/calibre/Makefile
  head/deskutils/calibre/distinfo
  head/deskutils/calibre/pkg-plist

Modified: head/deskutils/calibre/Makefile
==============================================================================
--- head/deskutils/calibre/Makefile	Sat Jan  5 08:23:44 2019	(r489306)
+++ head/deskutils/calibre/Makefile	Sat Jan  5 08:25:10 2019	(r489307)
@@ -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:datab
 		${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" \

Modified: head/deskutils/calibre/distinfo
==============================================================================
--- head/deskutils/calibre/distinfo	Sat Jan  5 08:23:44 2019	(r489306)
+++ head/deskutils/calibre/distinfo	Sat Jan  5 08:25:10 2019	(r489307)
@@ -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

Modified: head/deskutils/calibre/pkg-plist
==============================================================================
--- head/deskutils/calibre/pkg-plist	Sat Jan  5 08:23:44 2019	(r489306)
+++ head/deskutils/calibre/pkg-plist	Sat Jan  5 08:25:10 2019	(r489307)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901050825.x058PAho011098>