Mon Sep 25 22:30:43 2017 UTC ()
Don't use bundled six, it conflicts with newer installed versions
required i.e. by py-html5lib.


(joerg)
diff -r1.36 -r1.37 pkgsrc/misc/calibre1/Makefile
diff -r1.1 -r1.2 pkgsrc/misc/calibre1/PLIST
cvs diff -r1.36 -r1.37 pkgsrc/misc/calibre1/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/calibre1/Attic/Makefile 2017/09/25 22:26:51 1.36
+++ pkgsrc/misc/calibre1/Attic/Makefile 2017/09/25 22:30:43 1.37
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.36 2017/09/25 22:26:51 joerg Exp $ 1# $NetBSD: Makefile,v 1.37 2017/09/25 22:30:43 joerg Exp $
2 2
3DISTNAME= calibre-1.48.0 3DISTNAME= calibre-1.48.0
4PKGREVISION= 31 4PKGREVISION= 31
5CATEGORIES= misc 5CATEGORIES= misc
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 8DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.calibre-ebook.com/ 11HOMEPAGE= http://www.calibre-ebook.com/
12COMMENT= E-book library management application 12COMMENT= E-book library management application
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
@@ -84,27 +84,27 @@ REPLACE_PYTHON+= recipes/trouw.recipe @@ -84,27 +84,27 @@ REPLACE_PYTHON+= recipes/trouw.recipe
84REPLACE_PYTHON+= src/calibre/ebooks/markdown/extensions/*.py 84REPLACE_PYTHON+= src/calibre/ebooks/markdown/extensions/*.py
85REPLACE_PYTHON+= src/calibre/ebooks/metadata/odt.py 85REPLACE_PYTHON+= src/calibre/ebooks/metadata/odt.py
86REPLACE_PYTHON+= src/calibre/utils/*.py 86REPLACE_PYTHON+= src/calibre/utils/*.py
87REPLACE_PYTHON+= src/odf/*.py 87REPLACE_PYTHON+= src/odf/*.py
88 88
89MAKE_ENV+= FC_INC_DIR=${BUILDLINK_PREFIX.fontconfig}/include/fontconfig 89MAKE_ENV+= FC_INC_DIR=${BUILDLINK_PREFIX.fontconfig}/include/fontconfig
90MAKE_ENV+= FC_LIB_DIR=${BUILDLINK_PREFIX.fontconfig}/lib 90MAKE_ENV+= FC_LIB_DIR=${BUILDLINK_PREFIX.fontconfig}/lib
91MAKE_ENV+= PODOFO_INC_DIR=${BUILDLINK_PREFIX.podofo}/include/podofo 91MAKE_ENV+= PODOFO_INC_DIR=${BUILDLINK_PREFIX.podofo}/include/podofo
92MAKE_ENV+= PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib 92MAKE_ENV+= PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib
93#MAKE_ENV+= WITH_USB=no 93#MAKE_ENV+= WITH_USB=no
94 94
95# Let's depend on the ones we have in pkgsrc instead of the bundled ones. 95# Let's depend on the ones we have in pkgsrc instead of the bundled ones.
96pre-configure: 96pre-configure:
97 cd ${WRKSRC} && rm -rf src/cherrypy src/html5lib src/chardet 97 cd ${WRKSRC} && rm -rf src/cherrypy src/html5lib src/chardet src/six.py
98 98
99# Turn off x bits on non-executable files. 99# Turn off x bits on non-executable files.
100post-extract: 100post-extract:
101 find ${WRKSRC}/src/calibre/devices ${WRKSRC}/src/calibre/ebooks ${WRKSRC}/src/calibre/web -name '*.py' -exec chmod a-x \{} \; 101 find ${WRKSRC}/src/calibre/devices ${WRKSRC}/src/calibre/ebooks ${WRKSRC}/src/calibre/web -name '*.py' -exec chmod a-x \{} \;
102 find ${WRKSRC}/resources/images/mimetypes -name '*.png' -exec chmod a-x \{} \; 102 find ${WRKSRC}/resources/images/mimetypes -name '*.png' -exec chmod a-x \{} \;
103 chmod a-x ${WRKSRC}/src/calibre/utils/Zeroconf.py 103 chmod a-x ${WRKSRC}/src/calibre/utils/Zeroconf.py
104 chmod a-x ${WRKSRC}/src/calibre/utils/smtplib.py 104 chmod a-x ${WRKSRC}/src/calibre/utils/smtplib.py
105 105
106# Get access to (some of) the Qt4 private header files (for qt_hack). 106# Get access to (some of) the Qt4 private header files (for qt_hack).
107post-wrapper: 107post-wrapper:
108 cd ${WRKDIR}/.buildlink/qt4/include/QtGui && \ 108 cd ${WRKDIR}/.buildlink/qt4/include/QtGui && \
109 ln -s ../../../../${QTNAME}/include/QtGui/private . 109 ln -s ../../../../${QTNAME}/include/QtGui/private .
110 cd ${WRKDIR}/.buildlink/qt4/include/QtCore && \ 110 cd ${WRKDIR}/.buildlink/qt4/include/QtCore && \
cvs diff -r1.1 -r1.2 pkgsrc/misc/calibre1/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/misc/calibre1/Attic/PLIST 2015/02/08 00:32:34 1.1
+++ pkgsrc/misc/calibre1/Attic/PLIST 2017/09/25 22:30:43 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1 2015/02/08 00:32:34 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.2 2017/09/25 22:30:43 joerg Exp $
2bin/calibre 2bin/calibre
3bin/calibre-complete 3bin/calibre-complete
4bin/calibre-customize 4bin/calibre-customize
5bin/calibre-debug 5bin/calibre-debug
6bin/calibre-parallel 6bin/calibre-parallel
7bin/calibre-server 7bin/calibre-server
8bin/calibre-smtp 8bin/calibre-smtp
9bin/calibredb 9bin/calibredb
10bin/ebook-convert 10bin/ebook-convert
11bin/ebook-device 11bin/ebook-device
12bin/ebook-edit 12bin/ebook-edit
13bin/ebook-meta 13bin/ebook-meta
14bin/ebook-polish 14bin/ebook-polish
@@ -1302,27 +1302,26 @@ lib/calibre/odf/text.py @@ -1302,27 +1302,26 @@ lib/calibre/odf/text.py
1302lib/calibre/odf/thumbnail.py 1302lib/calibre/odf/thumbnail.py
1303lib/calibre/odf/userfield.py 1303lib/calibre/odf/userfield.py
1304lib/calibre/odf/xforms.py 1304lib/calibre/odf/xforms.py
1305lib/calibre/qtcurve/test_rendering.py 1305lib/calibre/qtcurve/test_rendering.py
1306lib/calibre/regex/__init__.py 1306lib/calibre/regex/__init__.py
1307lib/calibre/regex/_regex_core.py 1307lib/calibre/regex/_regex_core.py
1308lib/calibre/routes/__init__.py 1308lib/calibre/routes/__init__.py
1309lib/calibre/routes/base.py 1309lib/calibre/routes/base.py
1310lib/calibre/routes/lru.py 1310lib/calibre/routes/lru.py
1311lib/calibre/routes/mapper.py 1311lib/calibre/routes/mapper.py
1312lib/calibre/routes/middleware.py 1312lib/calibre/routes/middleware.py
1313lib/calibre/routes/route.py 1313lib/calibre/routes/route.py
1314lib/calibre/routes/util.py 1314lib/calibre/routes/util.py
1315lib/calibre/six.py 
1316lib/calibre/templite/__init__.py 1315lib/calibre/templite/__init__.py
1317lib/calibre/tinycss/__init__.py 1316lib/calibre/tinycss/__init__.py
1318lib/calibre/tinycss/color3.py 1317lib/calibre/tinycss/color3.py
1319lib/calibre/tinycss/css21.py 1318lib/calibre/tinycss/css21.py
1320lib/calibre/tinycss/decoding.py 1319lib/calibre/tinycss/decoding.py
1321lib/calibre/tinycss/fonts3.py 1320lib/calibre/tinycss/fonts3.py
1322lib/calibre/tinycss/media3.py 1321lib/calibre/tinycss/media3.py
1323lib/calibre/tinycss/page3.py 1322lib/calibre/tinycss/page3.py
1324lib/calibre/tinycss/parsing.py 1323lib/calibre/tinycss/parsing.py
1325lib/calibre/tinycss/tests/__init__.py 1324lib/calibre/tinycss/tests/__init__.py
1326lib/calibre/tinycss/tests/color3.py 1325lib/calibre/tinycss/tests/color3.py
1327lib/calibre/tinycss/tests/css21.py 1326lib/calibre/tinycss/tests/css21.py
1328lib/calibre/tinycss/tests/decoding.py 1327lib/calibre/tinycss/tests/decoding.py