CVS commit: pkgsrc/math/py-numpy

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jan 29 07:46:10 UTC 2022

Modified Files:
        pkgsrc/math/py-numpy: ALTERNATIVES Makefile PLIST

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

use ALTERNATIVES framework to provide it

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/py-numpy/ALTERNATIVES
cvs rdiff -u -r1.89 -r1.90 pkgsrc/math/py-numpy/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/math/py-numpy/PLIST

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

Modified files:

Index: pkgsrc/math/py-numpy/ALTERNATIVES
diff -u pkgsrc/math/py-numpy/ALTERNATIVES:1.2 pkgsrc/math/py-numpy/ALTERNATIVES:1.3
--- pkgsrc/math/py-numpy/ALTERNATIVES:1.2       Mon Aug 27 06:04:35 2018
+++ pkgsrc/math/py-numpy/ALTERNATIVES   Sat Jan 29 07:46:10 2022
@@ -1 +1,2 @@
 bin/f2py @PREFIX@/bin/f2py@PYVERSSUFFIX@
+bin/f2py3 @PREFIX@/bin/f2py@PYVERSSUFFIX@

Index: pkgsrc/math/py-numpy/Makefile
diff -u pkgsrc/math/py-numpy/Makefile:1.89 pkgsrc/math/py-numpy/Makefile:1.90
--- pkgsrc/math/py-numpy/Makefile:1.89  Wed Jan  5 15:41:14 2022
+++ pkgsrc/math/py-numpy/Makefile       Sat Jan 29 07:46:10 2022
@@ -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 @@ MAKE_ENV.DragonFly+=  LDVER=ld.bfd
 
 post-install:
        cd ${DESTDIR}${PREFIX}/bin && ${RM} f2py || ${TRUE}
+       cd ${DESTDIR}${PREFIX}/bin && ${RM} f2py3 || ${TRUE}
 
 do-test:
        cd ${WRKDIR} && \

Index: pkgsrc/math/py-numpy/PLIST
diff -u pkgsrc/math/py-numpy/PLIST:1.33 pkgsrc/math/py-numpy/PLIST:1.34
--- pkgsrc/math/py-numpy/PLIST:1.33     Tue Nov  2 18:48:28 2021
+++ pkgsrc/math/py-numpy/PLIST  Sat Jan 29 07:46:10 2022
@@ -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