[pkgsrc/trunk]: pkgsrc/misc/calibre1 Don't use bundled six, it conflicts with...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4b3f7c9dbc3a
branches:  trunk
changeset: 368990:4b3f7c9dbc3a
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Sep 25 22:30:43 2017 +0000

description:
Don't use bundled six, it conflicts with newer installed versions
required i.e. by py-html5lib.

diffstat:

 misc/calibre1/Makefile |  4 ++--
 misc/calibre1/PLIST    |  3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 8c10ca7b45ef -r 4b3f7c9dbc3a misc/calibre1/Makefile
--- a/misc/calibre1/Makefile    Mon Sep 25 22:30:06 2017 +0000
+++ b/misc/calibre1/Makefile    Mon Sep 25 22:30:43 2017 +0000
@@ -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 @@
 
 # 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 -r 8c10ca7b45ef -r 4b3f7c9dbc3a misc/calibre1/PLIST
--- a/misc/calibre1/PLIST       Mon Sep 25 22:30:06 2017 +0000
+++ b/misc/calibre1/PLIST       Mon Sep 25 22:30:43 2017 +0000
@@ -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/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