pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/math/py-Scientific math/py-Scientific: Fix install on ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3469d6c95d11
branches:  trunk
changeset: 331946:3469d6c95d11
user:      bacon <bacon%pkgsrc.org@localhost>
date:      Thu Mar 28 14:10:32 2019 +0000

description:
math/py-Scientific: Fix install on CentOS 7

PLIST was wrong due to build system using python's sys.platorm, which the
package Makefile incorrectly tried to replicate using pkgsrc variables.

Also added LICENSE and fixed one undocumented patch.

diffstat:

 math/py-Scientific/Makefile |  10 +++++++---
 math/py-Scientific/distinfo |   4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diffs (43 lines):

diff -r f916a55dda18 -r 3469d6c95d11 math/py-Scientific/Makefile
--- a/math/py-Scientific/Makefile       Thu Mar 28 06:05:16 2019 +0000
+++ b/math/py-Scientific/Makefile       Thu Mar 28 14:10:32 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2018/12/13 19:52:09 adam Exp $
+# $NetBSD: Makefile,v 1.55 2019/03/28 14:10:32 bacon Exp $
 
 DISTNAME=      ScientificPython-2.8.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/Python//}
@@ -9,13 +9,17 @@
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://dirac.cnrs-orleans.fr/ScientificPython/
 COMMENT=       Python modules for scientific computing
+LICENSE=       cecill-2.1
 
 CONFLICTS+=    py-Scientific-[0-9]*
 
 MAKE_ENV+=     NETCDF_PREFIX=${BUILDLINK_PREFIX.netcdf}
 
-PLIST_SUBST+=  OSNAME=${LOWER_OPSYS:S/solaris/sunos/}
-PLIST_SUBST+=  OSVER=${OS_VERSION:C/^(.).*/\1/}
+.include "../../lang/python/pyversion.mk"
+
+PYPLAT_CMD=    ${PYTHONBIN} -c "import sys; print sys.platform"
+PLIST_SUBST+=  PYPLAT=${PYPLAT_CMD:sh}
+
 PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 37 # not yet ported as of 2.8.1
 
 INSTALLATION_DIRS=     bin
diff -r f916a55dda18 -r 3469d6c95d11 math/py-Scientific/distinfo
--- a/math/py-Scientific/distinfo       Thu Mar 28 06:05:16 2019 +0000
+++ b/math/py-Scientific/distinfo       Thu Mar 28 14:10:32 2019 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 23:33:41 agc Exp $
+$NetBSD: distinfo,v 1.10 2019/03/28 14:10:32 bacon Exp $
 
 SHA1 (ScientificPython-2.8.1.tar.gz) = 40842ffec473371ba3c9710ba609844007616388
 RMD160 (ScientificPython-2.8.1.tar.gz) = 53131b769acafd0ef5e6b3e5f022e40ffa2b4663
 SHA512 (ScientificPython-2.8.1.tar.gz) = ebd083ca3c0f013d8308a717411614b934e7069d81f92a4eb96d4115066fd13a183d71c228343659358e6f21e95e908384ad4dc79349c5c64ebe2816efb6bd19
 Size (ScientificPython-2.8.1.tar.gz) = 559819 bytes
-SHA1 (patch-aa) = c7f353e9264749e3afff633fb28623f053b39f1c
+SHA1 (patch-aa) = 22e5c60651e340a4b5c6c3d24d7aac0b4faaad19
 SHA1 (patch-ab) = 159a6bb2da1f881e755a4c5c2c8c44cef2fb228a



Home | Main Index | Thread Index | Old Index