diff options
| author | joerg <joerg@pkgsrc.org> | 2017-09-25 22:30:43 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2017-09-25 22:30:43 +0000 |
| commit | 0646e4ffd855dfdd7da1924144ba069ee6809f00 (patch) | |
| tree | 59d66e19caea6f5e7a759bf934da72ff2836121d | |
| parent | 4bc50990862e3ed3218de5de6ec19cefecac4a3c (diff) | |
| download | pkgsrc-0646e4ffd855dfdd7da1924144ba069ee6809f00.tar.gz | |
Don't use bundled six, it conflicts with newer installed versions
required i.e. by py-html5lib.
| -rw-r--r-- | misc/calibre1/Makefile | 4 | ||||
| -rw-r--r-- | misc/calibre1/PLIST | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/misc/calibre1/Makefile b/misc/calibre1/Makefile index b4fa6d02475..50b6585a50b 100644 --- a/misc/calibre1/Makefile +++ b/misc/calibre1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2017/09/25 22:26:51 joerg Exp $ +# $NetBSD: Makefile,v 1.37 2017/09/25 22:30:43 joerg Exp $ DISTNAME= calibre-1.48.0 PKGREVISION= 31 @@ -94,7 +94,7 @@ MAKE_ENV+= PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib # 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 src/html5lib src/chardet src/six.py # Turn off x bits on non-executable files. post-extract: diff --git a/misc/calibre1/PLIST b/misc/calibre1/PLIST index dc7c21e5684..f9cbeae0ad5 100644 --- a/misc/calibre1/PLIST +++ b/misc/calibre1/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2015/02/08 00:32:34 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2017/09/25 22:30:43 joerg Exp $ bin/calibre bin/calibre-complete bin/calibre-customize @@ -1312,7 +1312,6 @@ lib/calibre/routes/mapper.py lib/calibre/routes/middleware.py lib/calibre/routes/route.py lib/calibre/routes/util.py -lib/calibre/six.py lib/calibre/templite/__init__.py lib/calibre/tinycss/__init__.py lib/calibre/tinycss/color3.py |