Wed Jul 26 15:15:46 2017 UTC ()
Remove py-imaging comment, it now uses py-Pillow.

Noted by adam@


(wiz)
diff -r1.183 -r1.184 pkgsrc/misc/calibre/Makefile
diff -r1.30 -r1.31 pkgsrc/misc/calibre1/Makefile
cvs diff -r1.183 -r1.184 pkgsrc/misc/calibre/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/calibre/Makefile 2017/07/26 14:28:07 1.183
+++ pkgsrc/misc/calibre/Makefile 2017/07/26 15:15:46 1.184
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.183 2017/07/26 14:28:07 wiz Exp $ 1# $NetBSD: Makefile,v 1.184 2017/07/26 15:15:46 wiz Exp $
2 2
3DISTNAME= calibre-2.85.1 3DISTNAME= calibre-2.85.1
4CATEGORIES= misc 4CATEGORIES= misc
5#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/} 5#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/}
6MASTER_SITES= http://download.calibre-ebook.com/${PKGVERSION_NOREV}/ 6MASTER_SITES= http://download.calibre-ebook.com/${PKGVERSION_NOREV}/
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
@@ -30,27 +30,27 @@ DEPENDS+= ${PYPKGPREFIX}-cherrypy-[0-9]* @@ -30,27 +30,27 @@ DEPENDS+= ${PYPKGPREFIX}-cherrypy-[0-9]*
30# not sure if pkgsrc version would be ok or not 30# not sure if pkgsrc version would be ok or not
31#DEPENDS+= ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet 31#DEPENDS+= ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
32# includes own, modified copy of html5lib 32# includes own, modified copy of html5lib
33#DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib 33#DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
34DEPENDS+= ${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces 34DEPENDS+= ${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces
35DEPENDS+= ${PYPKGPREFIX}-apsw>=3.7.17:../../databases/py-apsw 35DEPENDS+= ${PYPKGPREFIX}-apsw>=3.7.17:../../databases/py-apsw
36 36
37EXTRACT_USING= bsdtar 37EXTRACT_USING= bsdtar
38 38
39USE_LANGUAGES= c c++ 39USE_LANGUAGES= c c++
40USE_LIBTOOL= yes 40USE_LIBTOOL= yes
41USE_TOOLS+= pkg-config pax 41USE_TOOLS+= pkg-config pax
42PYTHON_VERSIONS_ACCEPTED= 27 42PYTHON_VERSIONS_ACCEPTED= 27
43PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not ported as of 2.1.0; also: py-mechanize, py-beautifulsoup, py-imaging 43PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not ported as of 2.1.0; also: py-mechanize, py-beautifulsoup
44PYDISTUTILSPKG= yes 44PYDISTUTILSPKG= yes
45PYSETUPOPTARGS= # empty 45PYSETUPOPTARGS= # empty
46PYSETUPINSTALLARGS= --prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX} 46PYSETUPINSTALLARGS= --prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX}
47 47
48INSTALLATION_DIRS= share/applications 48INSTALLATION_DIRS= share/applications
49INSTALLATION_DIRS= share/icons 49INSTALLATION_DIRS= share/icons
50INSTALLATION_DIRS= share/calibre/recipes 50INSTALLATION_DIRS= share/calibre/recipes
51 51
52FIX_PYTHON_FILES+= *.py 52FIX_PYTHON_FILES+= *.py
53FIX_PYTHON_FILES+= recipes/*.recipe 53FIX_PYTHON_FILES+= recipes/*.recipe
54FIX_PYTHON_FILES+= */*.py 54FIX_PYTHON_FILES+= */*.py
55FIX_PYTHON_FILES+= */*/*.py 55FIX_PYTHON_FILES+= */*/*.py
56FIX_PYTHON_FILES+= */*/*/*.py 56FIX_PYTHON_FILES+= */*/*/*.py
cvs diff -r1.30 -r1.31 pkgsrc/misc/calibre1/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/calibre1/Attic/Makefile 2017/07/26 14:28:07 1.30
+++ pkgsrc/misc/calibre1/Attic/Makefile 2017/07/26 15:15:46 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.30 2017/07/26 14:28:07 wiz Exp $ 1# $NetBSD: Makefile,v 1.31 2017/07/26 15:15:46 wiz Exp $
2 2
3DISTNAME= calibre-1.48.0 3DISTNAME= calibre-1.48.0
4PKGREVISION= 26 4PKGREVISION= 26
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
@@ -33,27 +33,27 @@ DEPENDS+= ${PYPKGPREFIX}-apsw-[0-9]*:../ @@ -33,27 +33,27 @@ DEPENDS+= ${PYPKGPREFIX}-apsw-[0-9]*:../
33# We also need the distfile for qt4-libs to extract some private header files 33# We also need the distfile for qt4-libs to extract some private header files
34# If QTVERSION changes, the distinfo file needs to be updated too. 34# If QTVERSION changes, the distinfo file needs to be updated too.
35QTVERSION= 4.8.5 # from ../../x11/qt4/Makefile.common 35QTVERSION= 4.8.5 # from ../../x11/qt4/Makefile.common
36# Including that file to avoid hardcoding the version number won't work, 36# Including that file to avoid hardcoding the version number won't work,
37# since it will occur in the distinfo anyway. 37# since it will occur in the distinfo anyway.
38QTNAME= qt-everywhere-opensource-src-${QTVERSION} 38QTNAME= qt-everywhere-opensource-src-${QTVERSION}
39DISTFILES+= ${QTNAME}.tar.gz 39DISTFILES+= ${QTNAME}.tar.gz
40MASTER_SITES+= http://releases.qt-project.org/qt4/source/ 40MASTER_SITES+= http://releases.qt-project.org/qt4/source/
41EXTRACT_USING= bsdtar 41EXTRACT_USING= bsdtar
42 42
43USE_LANGUAGES= c c++ 43USE_LANGUAGES= c c++
44USE_TOOLS+= pkg-config pax 44USE_TOOLS+= pkg-config pax
45PYTHON_VERSIONS_ACCEPTED= 27 45PYTHON_VERSIONS_ACCEPTED= 27
46PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-mechanize, py-beautifulsoup, py-imaging 46PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-mechanize, py-beautifulsoup
47PYDISTUTILSPKG= yes 47PYDISTUTILSPKG= yes
48PYSETUPOPTARGS= # empty 48PYSETUPOPTARGS= # empty
49PYSETUPINSTALLARGS= --prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX} 49PYSETUPINSTALLARGS= --prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX}
50WRKSRC= ${WRKDIR}/calibre 50WRKSRC= ${WRKDIR}/calibre
51 51
52INSTALLATION_DIRS= share/applications 52INSTALLATION_DIRS= share/applications
53INSTALLATION_DIRS= share/icons 53INSTALLATION_DIRS= share/icons
54INSTALLATION_DIRS= share/calibre/recipes 54INSTALLATION_DIRS= share/calibre/recipes
55 55
56FIX_PYTHON_PATHS+= *.py 56FIX_PYTHON_PATHS+= *.py
57FIX_PYTHON_PATHS+= recipes/*.recipe 57FIX_PYTHON_PATHS+= recipes/*.recipe
58FIX_PYTHON_PATHS+= */*.py 58FIX_PYTHON_PATHS+= */*.py
59FIX_PYTHON_PATHS+= */*/*.py 59FIX_PYTHON_PATHS+= */*/*.py