Mon Mar 16 22:28:38 2015 UTC ()
Get rid of unnecessary calibre-uninstall program, pkg_delete is working fine.
Bump PKGREVISION.
(Gets rid of /usr/bin/python in installed file.)


(wiz)
diff -r1.95 -r1.96 pkgsrc/misc/calibre/Makefile
diff -r1.32 -r1.33 pkgsrc/misc/calibre/PLIST
cvs diff -r1.95 -r1.96 pkgsrc/misc/calibre/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/calibre/Makefile 2015/03/15 21:30:20 1.95
+++ pkgsrc/misc/calibre/Makefile 2015/03/16 22:28:38 1.96
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.95 2015/03/15 21:30:20 wiz Exp $ 1# $NetBSD: Makefile,v 1.96 2015/03/16 22:28:38 wiz Exp $
2 2
3DISTNAME= calibre-2.21.0 3DISTNAME= calibre-2.21.0
 4PKGREVISION= 1
4CATEGORIES= misc 5CATEGORIES= misc
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/}
6EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
7DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 8DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.calibre-ebook.com/ 11HOMEPAGE= http://www.calibre-ebook.com/
11COMMENT= E-book library management application 12COMMENT= E-book library management application
12LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
13 14
14#DEPENDS+= help2man>=1.36.4:../../converters/help2man 15#DEPENDS+= help2man>=1.36.4:../../converters/help2man
15#DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 16#DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
16DEPENDS+= xdg-utils>=1.0.2:../../misc/xdg-utils 17DEPENDS+= xdg-utils>=1.0.2:../../misc/xdg-utils
@@ -100,26 +101,27 @@ post-extract: @@ -100,26 +101,27 @@ post-extract:
100 find ${WRKSRC}/resources/images/mimetypes -name '*.png' -exec chmod a-x \{} \; 101 find ${WRKSRC}/resources/images/mimetypes -name '*.png' -exec chmod a-x \{} \;
101 chmod a-x ${WRKSRC}/src/calibre/utils/Zeroconf.py 102 chmod a-x ${WRKSRC}/src/calibre/utils/Zeroconf.py
102 chmod a-x ${WRKSRC}/src/calibre/utils/smtplib.py 103 chmod a-x ${WRKSRC}/src/calibre/utils/smtplib.py
103 104
104# not sure why libheadless installed into wrong directory 105# not sure why libheadless installed into wrong directory
105# side effect of patch-setup_extensions.py? 106# side effect of patch-setup_extensions.py?
106post-install: 107post-install:
107 cd ${WRKSRC}/recipes && pax -wr -pma *.recipe \ 108 cd ${WRKSRC}/recipes && pax -wr -pma *.recipe \
108 ${DESTDIR}${PREFIX}/share/calibre/recipes 109 ${DESTDIR}${PREFIX}/share/calibre/recipes
109 cd ${WRKSRC} && pax -wr -pma Changelog* README.md \ 110 cd ${WRKSRC} && pax -wr -pma Changelog* README.md \
110 COPYRIGHT INSTALL LICENSE.* \ 111 COPYRIGHT INSTALL LICENSE.* \
111 ${DESTDIR}${PREFIX}/share/doc/calibre 112 ${DESTDIR}${PREFIX}/share/doc/calibre
112 cd ${DESTDIR}${PREFIX} && ${MV} lib/calibre/calibre/plugins/.libs/libheadless.so lib/calibre/calibre/plugins/libheadless.so 113 cd ${DESTDIR}${PREFIX} && ${MV} lib/calibre/calibre/plugins/.libs/libheadless.so lib/calibre/calibre/plugins/libheadless.so
 114 ${RM} ${DESTDIR}${PREFIX}/bin/calibre-uninstall
113 115
114.include "../../lang/python/application.mk" 116.include "../../lang/python/application.mk"
115.include "../../lang/python/versioned_dependencies.mk" 117.include "../../lang/python/versioned_dependencies.mk"
116.include "../../databases/sqlite3/buildlink3.mk" 118.include "../../databases/sqlite3/buildlink3.mk"
117BUILDLINK_API_DEPENDS.chmlib+= chmlib>=0.40 119BUILDLINK_API_DEPENDS.chmlib+= chmlib>=0.40
118.include "../../devel/chmlib/buildlink3.mk" 120.include "../../devel/chmlib/buildlink3.mk"
119BUILDLINK_API_DEPENDS.libmtp+= libmtp>=1.1.5 121BUILDLINK_API_DEPENDS.libmtp+= libmtp>=1.1.5
120.include "../../devel/libmtp/buildlink3.mk" 122.include "../../devel/libmtp/buildlink3.mk"
121BUILDLINK_API_DEPENDS.libusb+= libusb>=0.1.12 123BUILDLINK_API_DEPENDS.libusb+= libusb>=0.1.12
122.include "../../devel/libusb/buildlink3.mk" 124.include "../../devel/libusb/buildlink3.mk"
123.include "../../fonts/fontconfig/buildlink3.mk" 125.include "../../fonts/fontconfig/buildlink3.mk"
124BUILDLINK_API_DEPENDS.ImageMagick+= ImageMagick>=6.5.9 126BUILDLINK_API_DEPENDS.ImageMagick+= ImageMagick>=6.5.9
125.include "../../graphics/ImageMagick/buildlink3.mk" 127.include "../../graphics/ImageMagick/buildlink3.mk"
cvs diff -r1.32 -r1.33 pkgsrc/misc/calibre/PLIST (expand / switch to unified diff)

--- pkgsrc/misc/calibre/PLIST 2015/03/15 21:23:47 1.32
+++ pkgsrc/misc/calibre/PLIST 2015/03/16 22:28:38 1.33
@@ -1,22 +1,21 @@ @@ -1,22 +1,21 @@
1@comment $NetBSD: PLIST,v 1.32 2015/03/15 21:23:47 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.33 2015/03/16 22:28:38 wiz 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/calibre-uninstall 
10bin/calibredb 9bin/calibredb
11bin/ebook-convert 10bin/ebook-convert
12bin/ebook-device 11bin/ebook-device
13bin/ebook-edit 12bin/ebook-edit
14bin/ebook-meta 13bin/ebook-meta
15bin/ebook-polish 14bin/ebook-polish
16bin/ebook-viewer 15bin/ebook-viewer
17bin/fetch-ebook-metadata 16bin/fetch-ebook-metadata
18bin/lrf2lrs 17bin/lrf2lrs
19bin/lrfviewer 18bin/lrfviewer
20bin/lrs2lrf 19bin/lrs2lrf
21bin/markdown-calibre 20bin/markdown-calibre
22bin/web2disk 21bin/web2disk