CVS commit: pkgsrc/math/py-numpy

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Aug  2 10:14:46 UTC 2016

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

Log Message:
Fix build, this package now needs py-cython and egg.mk


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/math/py-numpy/Makefile
cvs rdiff -u -r1.14 -r1.15 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/Makefile
diff -u pkgsrc/math/py-numpy/Makefile:1.29 pkgsrc/math/py-numpy/Makefile:1.30
--- pkgsrc/math/py-numpy/Makefile:1.29  Sun Jul 24 15:25:22 2016
+++ pkgsrc/math/py-numpy/Makefile       Tue Aug  2 10:14:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2016/07/24 15:25:22 kamil Exp $
+# $NetBSD: Makefile,v 1.30 2016/08/02 10:14:46 jperkin Exp $
 
 DISTNAME=      numpy-1.11.1
 GITHUB_PROJECT=        numpy
@@ -39,8 +39,9 @@ LDFLAGS+=             ${_COMPILER_ABI_FLAG.${ABI}}
 do-test:
        ${RUN} PYTHONPATH=${DESTDIR}${PREFIX}/${PYSITELIB} ${PYTHONBIN} -c "import numpy; numpy.test()"
 
+.include "../../devel/py-cython/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .if ${OPSYS} != "Darwin"
 # blas and lapack are not needed; numpy will use Accelerate.framework
 .include "../../math/blas/buildlink3.mk"

Index: pkgsrc/math/py-numpy/PLIST
diff -u pkgsrc/math/py-numpy/PLIST:1.14 pkgsrc/math/py-numpy/PLIST:1.15
--- pkgsrc/math/py-numpy/PLIST:1.14     Sun Jul 24 15:25:22 2016
+++ pkgsrc/math/py-numpy/PLIST  Tue Aug  2 10:14:46 2016
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.14 2016/07/24 15:25:22 kamil Exp $
+@comment $NetBSD: PLIST,v 1.15 2016/08/02 10:14:46 jperkin Exp $
 bin/f2py${PYVERSSUFFIX}
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/numpy/__config__.py
 ${PYSITELIB}/numpy/__config__.pyc
 ${PYSITELIB}/numpy/__config__.pyo