Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/pkgsrc/misc/calibre/Makefile,v rcsdiff: /ftp/cvs/cvsroot/pkgsrc/misc/calibre/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.169 retrieving revision 1.170 diff -u -p -r1.169 -r1.170 --- pkgsrc/misc/calibre/Makefile 2017/01/27 10:24:56 1.169 +++ pkgsrc/misc/calibre/Makefile 2017/02/05 18:34:09 1.170 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.169 2017/01/27 10:24:56 kleink Exp $ +# $NetBSD: Makefile,v 1.170 2017/02/05 18:34:09 wiz Exp $ -DISTNAME= calibre-2.77.0 -PKGREVISION= 1 +DISTNAME= calibre-2.78.0 CATEGORIES= misc #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/} MASTER_SITES= http://download.calibre-ebook.com/${PKGVERSION_NOREV}/ @@ -25,10 +24,12 @@ DEPENDS+= ${PYPKGPREFIX}-mechanize>=0.1. DEPENDS+= ${PYPKGPREFIX}-cssselect>=0.7.1:../../textproc/py-cssselect DEPENDS+= ${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils DEPENDS+= ${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil -## Let's depend on the ones we have in pkgsrc instead of the bundled ones. +# Let's depend on the ones we have in pkgsrc instead of the bundled ones. DEPENDS+= ${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy -DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib +# not sure if pkgsrc version would be ok or not #DEPENDS+= ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet +# includes own, modified copy of html5lib +#DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib DEPENDS+= ${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces DEPENDS+= ${PYPKGPREFIX}-apsw>=3.7.17:../../databases/py-apsw @@ -93,7 +94,7 @@ MAKE_ENV+= SIP_BIN=${BUILDLINK_PREFIX.p # Let's depend on the ones we have in pkgsrc instead of the bundled ones. pre-configure: - cd ${WRKSRC} && rm -rf src/cherrypy src/html5lib src/chardet + cd ${WRKSRC} && rm -rf src/cherrypy # Turn off x bits on non-executable files. post-extract: