pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math/py-numpy py-numpy: do not install f2py3 to avoid ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7c242f76106e
branches:  trunk
changeset: 372701:7c242f76106e
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Jan 29 07:46:10 2022 +0000

description:
py-numpy: do not install f2py3 to avoid conflict with other versions of this package

use ALTERNATIVES framework to provide it

Bump PKGREVISION.

diffstat:

 math/py-numpy/ALTERNATIVES |  1 +
 math/py-numpy/Makefile     |  5 +++--
 math/py-numpy/PLIST        |  4 +---
 3 files changed, 5 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r 563ef26892cc -r 7c242f76106e math/py-numpy/ALTERNATIVES
--- a/math/py-numpy/ALTERNATIVES        Sat Jan 29 07:36:08 2022 +0000
+++ b/math/py-numpy/ALTERNATIVES        Sat Jan 29 07:46:10 2022 +0000
@@ -1,1 +1,2 @@
 bin/f2py @PREFIX@/bin/f2py@PYVERSSUFFIX@
+bin/f2py3 @PREFIX@/bin/f2py@PYVERSSUFFIX@
diff -r 563ef26892cc -r 7c242f76106e math/py-numpy/Makefile
--- a/math/py-numpy/Makefile    Sat Jan 29 07:36:08 2022 +0000
+++ b/math/py-numpy/Makefile    Sat Jan 29 07:46:10 2022 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.89 2022/01/05 15:41:14 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2022/01/29 07:46:10 wiz Exp $
 
 DISTNAME=      numpy-1.21.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   2
+PKGREVISION=   4
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/numpy/}
 EXTRACT_SUFX=  .zip
@@ -55,6 +55,7 @@
 
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && ${RM} f2py || ${TRUE}
+       cd ${DESTDIR}${PREFIX}/bin && ${RM} f2py3 || ${TRUE}
 
 do-test:
        cd ${WRKDIR} && \
diff -r 563ef26892cc -r 7c242f76106e math/py-numpy/PLIST
--- a/math/py-numpy/PLIST       Sat Jan 29 07:36:08 2022 +0000
+++ b/math/py-numpy/PLIST       Sat Jan 29 07:46:10 2022 +0000
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.33 2021/11/02 18:48:28 adam Exp $
+@comment $NetBSD: PLIST,v 1.34 2022/01/29 07:46:10 wiz Exp $
 bin/f2py${PYVERSSUFFIX}
-${PLIST.py2x}bin/f2py2
-${PLIST.py3x}bin/f2py3
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt



Home | Main Index | Thread Index | Old Index