CVS commit: pkgsrc/misc/calibre1

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Mon Sep 25 22:30:43 UTC 2017

Modified Files:
        pkgsrc/misc/calibre1: Makefile PLIST

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


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/misc/calibre1/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/calibre1/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/calibre1/Makefile
diff -u pkgsrc/misc/calibre1/Makefile:1.36 pkgsrc/misc/calibre1/Makefile:1.37
--- pkgsrc/misc/calibre1/Makefile:1.36  Mon Sep 25 22:26:51 2017
+++ pkgsrc/misc/calibre1/Makefile       Mon Sep 25 22:30:43 2017
@@ -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_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 src/html5lib src/chardet src/six.py
 
 # Turn off x bits on non-executable files.
 post-extract:

Index: pkgsrc/misc/calibre1/PLIST
diff -u pkgsrc/misc/calibre1/PLIST:1.1 pkgsrc/misc/calibre1/PLIST:1.2
--- pkgsrc/misc/calibre1/PLIST:1.1      Sun Feb  8 00:32:34 2015
+++ pkgsrc/misc/calibre1/PLIST  Mon Sep 25 22:30:43 2017
@@ -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