CVS commit: pkgsrc/misc

["Klaus Klein" <kleink%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kleink
Date:           Fri Jan 27 10:24:56 UTC 2017

Modified Files:
        pkgsrc/misc/calibre: Makefile
        pkgsrc/misc/calibre1: Makefile

Log Message:
pyPdf hasn't been used by calibre since 2012, neither in bundled (removed)
nor in dependency form.

Noted by Eli Schwartz.


To generate a diff of this commit:
cvs rdiff -u -r1.168 -r1.169 pkgsrc/misc/calibre/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/misc/calibre1/Makefile

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

Modified files:

Index: pkgsrc/misc/calibre/Makefile
diff -u pkgsrc/misc/calibre/Makefile:1.168 pkgsrc/misc/calibre/Makefile:1.169
--- pkgsrc/misc/calibre/Makefile:1.168  Wed Jan 25 14:36:37 2017
+++ pkgsrc/misc/calibre/Makefile        Fri Jan 27 10:24:56 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.168 2017/01/25 14:36:37 wiz Exp $
+# $NetBSD: Makefile,v 1.169 2017/01/27 10:24:56 kleink Exp $
 
 DISTNAME=      calibre-2.77.0
 PKGREVISION=   1
@@ -26,7 +26,6 @@ DEPENDS+=     ${PYPKGPREFIX}-cssselect>=0.7.
 DEPENDS+=      ${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils
 DEPENDS+=      ${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil
 ## Let's depend on the ones we have in pkgsrc instead of the bundled ones.
-#DEPENDS+=     ${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf
 DEPENDS+=      ${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy
 DEPENDS+=      ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
 #DEPENDS+=     ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
@@ -94,7 +93,7 @@ MAKE_ENV+=            SIP_BIN=${BUILDLINK_PREFIX.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/pyPdf src/html5lib src/chardet
+       cd ${WRKSRC} && rm -rf src/cherrypy src/html5lib src/chardet
 
 # Turn off x bits on non-executable files.
 post-extract:

Index: pkgsrc/misc/calibre1/Makefile
diff -u pkgsrc/misc/calibre1/Makefile:1.24 pkgsrc/misc/calibre1/Makefile:1.25
--- pkgsrc/misc/calibre1/Makefile:1.24  Wed Jan 25 14:36:38 2017
+++ pkgsrc/misc/calibre1/Makefile       Fri Jan 27 10:24:56 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2017/01/25 14:36:38 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2017/01/27 10:24:56 kleink Exp $
 
 DISTNAME=      calibre-1.48.0
 PKGREVISION=   23
@@ -23,7 +23,6 @@ DEPENDS+=     ${PYPKGPREFIX}-mechanize>=0.1.
 DEPENDS+=      ${PYPKGPREFIX}-cssselect>=0.7.1:../../textproc/py-cssselect
 DEPENDS+=      ${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils
 # Let's depend on the ones we have in pkgsrc instead of the bundled ones.
-DEPENDS+=      ${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf
 DEPENDS+=      ${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy
 DEPENDS+=      ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
 DEPENDS+=      ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
@@ -96,7 +95,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/pyPdf src/html5lib src/chardet
+       cd ${WRKSRC} && rm -rf src/cherrypy src/html5lib src/chardet
 
 # Turn off x bits on non-executable files.
 post-extract: