Sat Jun 4 12:07:23 2016 UTC ()
Prefer dependency on Pillow. Bump revision.


(joerg)
diff -r1.140 -r1.141 pkgsrc/misc/calibre/Makefile
cvs diff -r1.140 -r1.141 pkgsrc/misc/calibre/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/calibre/Makefile 2016/05/22 18:20:47 1.140
+++ pkgsrc/misc/calibre/Makefile 2016/06/04 12:07:23 1.141
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: Makefile,v 1.140 2016/05/22 18:20:47 wiz Exp $ 1# $NetBSD: Makefile,v 1.141 2016/06/04 12:07:23 joerg Exp $
2 2
3DISTNAME= calibre-2.57.1 3DISTNAME= calibre-2.57.1
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= misc 5CATEGORIES= misc
6#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/} 6#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/}
7MASTER_SITES= http://download.calibre-ebook.com/${PKGVERSION_NOREV}/ 7MASTER_SITES= http://download.calibre-ebook.com/${PKGVERSION_NOREV}/
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 9DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.calibre-ebook.com/ 12HOMEPAGE= http://www.calibre-ebook.com/
13COMMENT= E-book library management application 13COMMENT= E-book library management application
14LICENSE= gnu-gpl-v3 14LICENSE= gnu-gpl-v3
15 15
 16DEPENDS+= ${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow
16#DEPENDS+= help2man>=1.36.4:../../converters/help2man 17#DEPENDS+= help2man>=1.36.4:../../converters/help2man
17DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 18DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
18DEPENDS+= xdg-utils>=1.0.2:../../misc/xdg-utils 19DEPENDS+= xdg-utils>=1.0.2:../../misc/xdg-utils
19#DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils 20#DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils
20DEPENDS+= ${PYPKGPREFIX}-lxml>=3.2.1:../../textproc/py-lxml 21DEPENDS+= ${PYPKGPREFIX}-lxml>=3.2.1:../../textproc/py-lxml
21DEPENDS+= ${PYPKGPREFIX}-beautifulsoup>=3.0.5:../../www/py-beautifulsoup 22DEPENDS+= ${PYPKGPREFIX}-beautifulsoup>=3.0.5:../../www/py-beautifulsoup
22DEPENDS+= ${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize 23DEPENDS+= ${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize
23DEPENDS+= ${PYPKGPREFIX}-cssselect>=0.7.1:../../textproc/py-cssselect 24DEPENDS+= ${PYPKGPREFIX}-cssselect>=0.7.1:../../textproc/py-cssselect
24DEPENDS+= ${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils 25DEPENDS+= ${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils
25DEPENDS+= ${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil 26DEPENDS+= ${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil
26## Let's depend on the ones we have in pkgsrc instead of the bundled ones. 27## Let's depend on the ones we have in pkgsrc instead of the bundled ones.
27#DEPENDS+= ${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf 28#DEPENDS+= ${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf
28DEPENDS+= ${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy 29DEPENDS+= ${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy
@@ -114,28 +115,26 @@ post-install: @@ -114,28 +115,26 @@ post-install:
114 cd ${DESTDIR}${PREFIX} && ${MV} lib/calibre/calibre/plugins/.libs/libheadless.so lib/calibre/calibre/plugins/libheadless.so 115 cd ${DESTDIR}${PREFIX} && ${MV} lib/calibre/calibre/plugins/.libs/libheadless.so lib/calibre/calibre/plugins/libheadless.so
115 ${RM} ${DESTDIR}${PREFIX}/bin/calibre-uninstall 116 ${RM} ${DESTDIR}${PREFIX}/bin/calibre-uninstall
116 117
117.include "../../lang/python/application.mk" 118.include "../../lang/python/application.mk"
118.include "../../lang/python/versioned_dependencies.mk" 119.include "../../lang/python/versioned_dependencies.mk"
119.include "../../databases/sqlite3/buildlink3.mk" 120.include "../../databases/sqlite3/buildlink3.mk"
120BUILDLINK_API_DEPENDS.chmlib+= chmlib>=0.40 121BUILDLINK_API_DEPENDS.chmlib+= chmlib>=0.40
121.include "../../devel/chmlib/buildlink3.mk" 122.include "../../devel/chmlib/buildlink3.mk"
122BUILDLINK_API_DEPENDS.libmtp+= libmtp>=1.1.5 123BUILDLINK_API_DEPENDS.libmtp+= libmtp>=1.1.5
123.include "../../devel/libmtp/buildlink3.mk" 124.include "../../devel/libmtp/buildlink3.mk"
124BUILDLINK_API_DEPENDS.libusb+= libusb>=0.1.12 125BUILDLINK_API_DEPENDS.libusb+= libusb>=0.1.12
125.include "../../devel/libusb/buildlink3.mk" 126.include "../../devel/libusb/buildlink3.mk"
126.include "../../fonts/fontconfig/buildlink3.mk" 127.include "../../fonts/fontconfig/buildlink3.mk"
127BUILDLINK_API_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.6 
128.include "../../graphics/py-imaging/buildlink3.mk" 
129BUILDLINK_API_DEPENDS.libwmf+= libwmf>=0.2.8 128BUILDLINK_API_DEPENDS.libwmf+= libwmf>=0.2.8
130.include "../../graphics/libwmf/buildlink3.mk" 129.include "../../graphics/libwmf/buildlink3.mk"
131.include "../../lang/python/egg.mk" 130.include "../../lang/python/egg.mk"
132_PYSETUPTOOLSINSTALLARGS= # empty 131_PYSETUPTOOLSINSTALLARGS= # empty
133# Get rid of --root=${DESTDIR}, use our own version from above instead. 132# Get rid of --root=${DESTDIR}, use our own version from above instead.
134# because the setup.py is not the standard one and behaves differently. 133# because the setup.py is not the standard one and behaves differently.
135_PYSETUPINSTALLARGS= ${PYSETUPINSTALLARGS} ${PYSETUPOPTARGS} ${_PYSETUPTOOLSINSTALLARGS} 134_PYSETUPINSTALLARGS= ${PYSETUPINSTALLARGS} ${PYSETUPOPTARGS} ${_PYSETUPTOOLSINSTALLARGS}
136#.include "../../lang/python/extension.mk" 135#.include "../../lang/python/extension.mk"
137BUILDLINK_API_DEPENDS.podofo+= podofo>=0.8.2 136BUILDLINK_API_DEPENDS.podofo+= podofo>=0.8.2
138.include "../../print/podofo/buildlink3.mk" 137.include "../../print/podofo/buildlink3.mk"
139BUILDLINK_API_DEPENDS.poppler+= poppler>=0.20.2 138BUILDLINK_API_DEPENDS.poppler+= poppler>=0.20.2
140.include "../../print/poppler-includes/buildlink3.mk" 139.include "../../print/poppler-includes/buildlink3.mk"
141.include "../../print/poppler/buildlink3.mk" 140.include "../../print/poppler/buildlink3.mk"