CVS commit: pkgsrc/net/py-apache-libcloud

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Fri May 10 14:58:37 UTC 2019

Modified Files:
        pkgsrc/net/py-apache-libcloud: Makefile PLIST

Log Message:
Fix make package with '${RM} -f' for following problem
  => Creating installation directories
  /bin/rm /tmp/net/py-apache-libcloud/work/apache-libcloud-2.4.0/libcloud/compute/drivers/azure.py.orig
  rm: /tmp/net/py-apache-libcloud/work/apache-libcloud-2.4.0/libcloud/compute/drivers/azure.py.orig: No such file or directory
  *** Error code 1


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/py-apache-libcloud/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/py-apache-libcloud/PLIST

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

Modified files:

Index: pkgsrc/net/py-apache-libcloud/Makefile
diff -u pkgsrc/net/py-apache-libcloud/Makefile:1.12 pkgsrc/net/py-apache-libcloud/Makefile:1.13
--- pkgsrc/net/py-apache-libcloud/Makefile:1.12 Fri Feb 22 08:59:49 2019
+++ pkgsrc/net/py-apache-libcloud/Makefile      Fri May 10 14:58:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/02/22 08:59:49 adam Exp $
+# $NetBSD: Makefile,v 1.13 2019/05/10 14:58:37 mef Exp $
 
 DISTNAME=      apache-libcloud-2.4.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -18,8 +18,9 @@ TEST_DEPENDS+=        ${PYPKGPREFIX}-requests-m
 TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
 pre-install:
-       ${RM} ${WRKSRC}/libcloud/compute/drivers/azure.py.orig
-       ${RM} ${WRKSRC}/build/lib/libcloud/compute/drivers/azure.py.orig
+       ${RM} -f ${WRKSRC}/libcloud/compute/drivers/azure.py.orig
+       ${RM} -f ${WRKSRC}/build/lib/libcloud/compute/drivers/azure.py.orig
+       ${RM} -f ${WRKSRC}/build/lib/libcloud/compute/drivers/azure.py.rej
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/py-apache-libcloud/PLIST
diff -u pkgsrc/net/py-apache-libcloud/PLIST:1.8 pkgsrc/net/py-apache-libcloud/PLIST:1.9
--- pkgsrc/net/py-apache-libcloud/PLIST:1.8     Fri Feb 22 08:59:49 2019
+++ pkgsrc/net/py-apache-libcloud/PLIST Fri May 10 14:58:37 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2019/02/22 08:59:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2019/05/10 14:58:37 mef Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -183,7 +183,6 @@ ${PYSITELIB}/libcloud/compute/drivers/au
 ${PYSITELIB}/libcloud/compute/drivers/auroracompute.pyc
 ${PYSITELIB}/libcloud/compute/drivers/auroracompute.pyo
 ${PYSITELIB}/libcloud/compute/drivers/azure.py
-${PYSITELIB}/libcloud/compute/drivers/azure.py.rej
 ${PYSITELIB}/libcloud/compute/drivers/azure.pyc
 ${PYSITELIB}/libcloud/compute/drivers/azure.pyo
 ${PYSITELIB}/libcloud/compute/drivers/azure_arm.py