Date: Wed, 6 Oct 2010 06:36:20 +0800 (CST) From: Li-Lun Wang (Leland Wang) <llwang@infor.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/151234: [maintainer update] Update port: math/py-numpy to 1.5.0 Message-ID: <20101005223620.840B59F341D@infor.ck.tp.edu.tw> Resent-Message-ID: <201010052300.o95N03Fm041868@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 151234 >Category: ports >Synopsis: [maintainer update] Update port: math/py-numpy to 1.5.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Oct 05 23:00:03 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Li-Lun Wang (Leland Wang) >Release: FreeBSD 6.4-RELEASE-p7 i386 >Organization: >Environment: System: FreeBSD Athena.infor.org 6.4-RELEASE-p7 FreeBSD 6.4-RELEASE-p7 #3: Sun Oct 25 21:01:41 CST 2009 root@Athena.infor.org:/usr/obj/usr/src/sys/Athena i386 >Description: * Update to 1.5.0 * Replace numpybook with the new numpy-ref and numpy-user, fixing broken distfile * Avoid the fenv hack on FreeBSD 8 after MFC r203441 * Avoid variable assignment using shell execution (GCCLIBDIR) >How-To-Repeat: >Fix: diff -urN py-numpy.orig/Makefile py-numpy/Makefile --- py-numpy.orig/Makefile 2010-08-01 14:17:51.554138000 -0500 +++ py-numpy/Makefile 2010-10-05 17:12:34.521639676 -0500 @@ -6,14 +6,15 @@ # PORTNAME= numpy -PORTVERSION= 1.4.1 +PORTVERSION= 1.5.0 PORTEPOCH= 1 CATEGORIES= math python -MASTER_SITES= http://numpy.scipy.org/:doc \ +MASTER_SITES= http://docs.scipy.org/doc/${DISTNAME:C/\..$/.x/}/:doc \ SF/${PORTNAME}/NumPy/${PORTVERSION}:source PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTFILES= numpy-${PORTVERSION:S/r/rc/}${EXTRACT_SUFX}:source \ - numpybook.pdf:doc + numpy-ref.pdf:doc \ + numpy-user.pdf:doc EXTRACT_ONLY= numpy-${PORTVERSION:S/r/rc/}${EXTRACT_SUFX} MAINTAINER= llwang@infor.org @@ -33,7 +34,7 @@ .include <bsd.port.pre.mk> -.if ${OSVERSION} <= 900009 && (${ARCH} == "i386" || ${ARCH} == "amd64") +.if ((${OSVERSION} <= 800502) || (${OSVERSION} >= 900000 && ${OSVERSION} <= 900009)) && (${ARCH} == "i386" || ${ARCH} == "amd64") MASTER_SITES+= http://svn.freebsd.org/base/head/lib/msun/:fp .if ${ARCH} == "i386" FP_ARCH= i387 @@ -61,15 +62,16 @@ PYDISTUTILS_BUILDARGS+= --fcompiler=gnu95 post-extract: - @${CP} ${DISTDIR}/numpybook.pdf ${WRKDIR} + @${CP} ${DISTDIR}/numpy-ref.pdf ${WRKDIR} + @${CP} ${DISTDIR}/numpy-user.pdf ${WRKDIR} post-patch: @${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" ${WRKSRC}/numpy/distutils/fcompiler/gnu.py @${CP} ${FILESDIR}/site.cfg ${WRKSRC}/site.cfg -GCCLIBDIR= `${FC} -print-file-name=libgfortran.so|${SED} -e s/libgfortran.so//` +GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so|${SED} -e s/libgfortran.so// pre-configure: -.if ${OSVERSION} <= 900009 && (${ARCH} == "i386" || ${ARCH} == "amd64") +.if ((${OSVERSION} <= 800502) || (${OSVERSION} >= 900000 && ${OSVERSION} <= 900009)) && (${ARCH} == "i386" || ${ARCH} == "amd64") @if [ "`${PKG_VERSION} -t \"\`\\\`${CC} -print-prog-name=as\\\` --version | ${AWK} 'NR==1 {sub(/\(GNU Binutils\)/,""); print $$3}'\`\" 2.18.49`" = ">" ] ; then \ ${CP} ${DISTDIR}/${FP_ARCH}/fenv.c?p=203441 ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.c; \ ${CP} ${DISTDIR}/${FP_ARCH}/fenv.h?p=203441 ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.h; \ @@ -78,20 +80,20 @@ fi .endif .ifdef WITH_ATLAS - @${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+${GCCLIBDIR}+" \ + @${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" \ -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \ -e "s+%%ATLASLIBS%%+alapack_r, f77blas_r, cblas_r, atlas_r+" \ ${WRKSRC}/site.cfg .else - @${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+${GCCLIBDIR}+" \ + @${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" \ -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \ -e "s+%%ATLASLIBS%%+lapack, blas+" \ ${WRKSRC}/site.cfg .endif - @${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+${GCCLIBDIR}+" ${WRKSRC}/numpy/distutils/system_info.py + @${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" ${WRKSRC}/numpy/distutils/system_info.py pre-install: -.if ${OSVERSION} <= 900009 && (${ARCH} == "i386" || ${ARCH} == "amd64") +.if ((${OSVERSION} <= 800502) || (${OSVERSION} >= 900000 && ${OSVERSION} <= 900009)) && (${ARCH} == "i386" || ${ARCH} == "amd64") @if [ "`${PKG_VERSION} -t \"\`\\\`${CC} -print-prog-name=as\\\` --version | ${AWK} 'NR==1 {sub(/\(GNU Binutils\)/,""); print $$3}'\`\" 2.18.49`" = ">" ] ; then \ ${RM} ${WRKSRC}/numpy/core/include/numpy/fenv/fenv.c.bak; \ fi @@ -101,9 +103,10 @@ ${INSTALL_MAN} ${WRKSRC}/numpy/f2py/f2py.1 ${MAN1PREFIX}/man/man1 .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/numpybook.pdf ${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/numpy-ref.pdf ${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/numpy-user.pdf ${DOCSDIR} .endif -.if ${OSVERSION} <= 900009 && (${ARCH} == "i386" || ${ARCH} == "amd64") +.if ((${OSVERSION} <= 800502) || (${OSVERSION} >= 900000 && ${OSVERSION} <= 900009)) && (${ARCH} == "i386" || ${ARCH} == "amd64") @if [ "`${PKG_VERSION} -t \"\`\\\`${CC} -print-prog-name=as\\\` --version | ${AWK} 'NR==1 {sub(/\(GNU Binutils\)/,""); print $$3}'\`\" 2.18.49`" = ">" ] ; then \ ${REINPLACE_CMD} -e "s|%%FENV%%||g" ${TMPPLIST}; \ else \ diff -urN py-numpy.orig/distinfo py-numpy/distinfo --- py-numpy.orig/distinfo 2010-08-01 14:17:51.554138000 -0500 +++ py-numpy/distinfo 2010-10-05 16:00:27.337635322 -0500 @@ -1,9 +1,12 @@ -MD5 (numpy-1.4.1.tar.gz) = 5c7b5349dc3161763f7f366ceb96516b -SHA256 (numpy-1.4.1.tar.gz) = 2e7bb84573e5123e07f3c919fd433bc09b78d606252b6b719e385c2a981d8e06 -SIZE (numpy-1.4.1.tar.gz) = 2201795 -MD5 (numpybook.pdf) = 637180cd704dc8be4036c09412501397 -SHA256 (numpybook.pdf) = 8c9692db7373838c585073e4141ae4bd3b8793dffd59ce3544bf851e71e9b865 -SIZE (numpybook.pdf) = 2148630 +MD5 (numpy-1.5.0.tar.gz) = 3a8bfdc434df782d647161c48943ee09 +SHA256 (numpy-1.5.0.tar.gz) = 06d2181c884c5937c7c475103dd55de4fe4842a9d91bab1ed0965dd973a4661a +SIZE (numpy-1.5.0.tar.gz) = 2276377 +MD5 (numpy-ref.pdf) = b9f4d406e4353514478261ea72c035f5 +SHA256 (numpy-ref.pdf) = 9ec75950b46e9d086cfb170f6978ba2b146ed7b1dc103af51e3c81ed5b8b5406 +SIZE (numpy-ref.pdf) = 7112007 +MD5 (numpy-user.pdf) = a1b1b7ea74225ddb260bbc4cb45e2321 +SHA256 (numpy-user.pdf) = afe77bacce8839460330e0c1c8a01508a03dd4a3010c2b8739ab61956d47f69d +SIZE (numpy-user.pdf) = 562092 MD5 (i387/fenv.c?p=203441) = d371542b4c2d17088d52f73862726496 SHA256 (i387/fenv.c?p=203441) = c7c558ddb6ab6604c83062fe0655d3ce8cf4d60edb4c9c82777962c49d23ca54 SIZE (i387/fenv.c?p=203441) = 4791 diff -urN py-numpy.orig/pkg-plist py-numpy/pkg-plist --- py-numpy.orig/pkg-plist 2010-08-01 14:17:51.594138000 -0500 +++ py-numpy/pkg-plist 2010-10-05 17:00:17.446497257 -0500 @@ -23,6 +23,9 @@ %%PYTHON_SITELIBDIR%%/numpy/compat/_inspect.py %%PYTHON_SITELIBDIR%%/numpy/compat/_inspect.pyc %%PYTHON_SITELIBDIR%%/numpy/compat/_inspect.pyo +%%PYTHON_SITELIBDIR%%/numpy/compat/py3k.py +%%PYTHON_SITELIBDIR%%/numpy/compat/py3k.pyc +%%PYTHON_SITELIBDIR%%/numpy/compat/py3k.pyo %%PYTHON_SITELIBDIR%%/numpy/compat/setup.py %%PYTHON_SITELIBDIR%%/numpy/compat/setup.pyc %%PYTHON_SITELIBDIR%%/numpy/compat/setup.pyo @@ -68,7 +71,9 @@ %%FENV%%%%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/fenv/fenv.h %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/multiarray_api.txt %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/ndarrayobject.h +%%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/ndarraytypes.h %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/noprefix.h +%%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/npy_3kcompat.h %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/npy_common.h %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/npy_cpu.h %%PYTHON_SITELIBDIR%%/numpy/core/include/numpy/npy_endian.h @@ -122,6 +127,7 @@ %%PYTHON_SITELIBDIR%%/numpy/core/shape_base.pyo %%PYTHON_SITELIBDIR%%/numpy/core/tests/data/astype_copy.pkl %%PYTHON_SITELIBDIR%%/numpy/core/tests/data/recarray_from_file.fits +%%PYTHON_SITELIBDIR%%/numpy/core/tests/test_arrayprint.py %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_blasdot.py %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_defchararray.py %%PYTHON_SITELIBDIR%%/numpy/core/tests/test_dtype.py @@ -216,6 +222,9 @@ %%PYTHON_SITELIBDIR%%/numpy/distutils/command/sdist.py %%PYTHON_SITELIBDIR%%/numpy/distutils/command/sdist.pyc %%PYTHON_SITELIBDIR%%/numpy/distutils/command/sdist.pyo +%%PYTHON_SITELIBDIR%%/numpy/distutils/compat.py +%%PYTHON_SITELIBDIR%%/numpy/distutils/compat.pyc +%%PYTHON_SITELIBDIR%%/numpy/distutils/compat.pyo %%PYTHON_SITELIBDIR%%/numpy/distutils/conv_template.py %%PYTHON_SITELIBDIR%%/numpy/distutils/conv_template.pyc %%PYTHON_SITELIBDIR%%/numpy/distutils/conv_template.pyo @@ -514,6 +523,19 @@ %%PYTHON_SITELIBDIR%%/numpy/f2py/setupscons.pyo %%PYTHON_SITELIBDIR%%/numpy/f2py/src/fortranobject.c %%PYTHON_SITELIBDIR%%/numpy/f2py/src/fortranobject.h +%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/array_from_pyobj/wrapmodule.c +%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/mixed/foo.f +%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/mixed/foo_fixed.f90 +%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/mixed/foo_free.f90 +%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_array_from_pyobj.py +%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_callback.py +%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_mixed.py +%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_return_character.py +%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_return_complex.py +%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_return_integer.py +%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_return_logical.py +%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_return_real.py +%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/util.py %%PYTHON_SITELIBDIR%%/numpy/f2py/use_rules.py %%PYTHON_SITELIBDIR%%/numpy/f2py/use_rules.pyc %%PYTHON_SITELIBDIR%%/numpy/f2py/use_rules.pyo @@ -570,9 +592,9 @@ %%PYTHON_SITELIBDIR%%/numpy/lib/info.py %%PYTHON_SITELIBDIR%%/numpy/lib/info.pyc %%PYTHON_SITELIBDIR%%/numpy/lib/info.pyo -%%PYTHON_SITELIBDIR%%/numpy/lib/io.py -%%PYTHON_SITELIBDIR%%/numpy/lib/io.pyc -%%PYTHON_SITELIBDIR%%/numpy/lib/io.pyo +%%PYTHON_SITELIBDIR%%/numpy/lib/npyio.py +%%PYTHON_SITELIBDIR%%/numpy/lib/npyio.pyc +%%PYTHON_SITELIBDIR%%/numpy/lib/npyio.pyo %%PYTHON_SITELIBDIR%%/numpy/lib/polynomial.py %%PYTHON_SITELIBDIR%%/numpy/lib/polynomial.pyc %%PYTHON_SITELIBDIR%%/numpy/lib/polynomial.pyo @@ -726,6 +748,12 @@ %%PYTHON_SITELIBDIR%%/numpy/numarray/image.py %%PYTHON_SITELIBDIR%%/numpy/numarray/image.pyc %%PYTHON_SITELIBDIR%%/numpy/numarray/image.pyo +%%PYTHON_SITELIBDIR%%/numpy/numarray/include/numpy/arraybase.h +%%PYTHON_SITELIBDIR%%/numpy/numarray/include/numpy/cfunc.h +%%PYTHON_SITELIBDIR%%/numpy/numarray/include/numpy/ieeespecial.h +%%PYTHON_SITELIBDIR%%/numpy/numarray/include/numpy/libnumarray.h +%%PYTHON_SITELIBDIR%%/numpy/numarray/include/numpy/numcomplex.h +%%PYTHON_SITELIBDIR%%/numpy/numarray/include/numpy/nummacro.h %%PYTHON_SITELIBDIR%%/numpy/numarray/linear_algebra.py %%PYTHON_SITELIBDIR%%/numpy/numarray/linear_algebra.pyc %%PYTHON_SITELIBDIR%%/numpy/numarray/linear_algebra.pyo @@ -744,12 +772,6 @@ %%PYTHON_SITELIBDIR%%/numpy/numarray/numerictypes.py %%PYTHON_SITELIBDIR%%/numpy/numarray/numerictypes.pyc %%PYTHON_SITELIBDIR%%/numpy/numarray/numerictypes.pyo -%%PYTHON_SITELIBDIR%%/numpy/numarray/numpy/arraybase.h -%%PYTHON_SITELIBDIR%%/numpy/numarray/numpy/cfunc.h -%%PYTHON_SITELIBDIR%%/numpy/numarray/numpy/ieeespecial.h -%%PYTHON_SITELIBDIR%%/numpy/numarray/numpy/libnumarray.h -%%PYTHON_SITELIBDIR%%/numpy/numarray/numpy/numcomplex.h -%%PYTHON_SITELIBDIR%%/numpy/numarray/numpy/nummacro.h %%PYTHON_SITELIBDIR%%/numpy/numarray/random_array.py %%PYTHON_SITELIBDIR%%/numpy/numarray/random_array.pyc %%PYTHON_SITELIBDIR%%/numpy/numarray/random_array.pyo @@ -912,11 +934,15 @@ %%PYTHON_SITELIBDIR%%/numpy/testing/utils.pyc %%PYTHON_SITELIBDIR%%/numpy/testing/utils.pyo %%PYTHON_SITELIBDIR%%/numpy/tests/test_ctypeslib.py +%%PYTHON_SITELIBDIR%%/numpy/tests/test_matlib.py +%%PYTHON_SITELIBDIR%%/numpy/tools/py3tool.py %%PYTHON_SITELIBDIR%%/numpy/version.py %%PYTHON_SITELIBDIR%%/numpy/version.pyc %%PYTHON_SITELIBDIR%%/numpy/version.pyo -%%PORTDOCS%%%%DOCSDIR%%/numpybook.pdf +%%PORTDOCS%%%%DOCSDIR%%/numpy-ref.pdf +%%PORTDOCS%%%%DOCSDIR%%/numpy-user.pdf %%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm %%PYTHON_SITELIBDIR%%/numpy/tools @dirrm %%PYTHON_SITELIBDIR%%/numpy/tests @dirrm %%PYTHON_SITELIBDIR%%/numpy/testing/tests @dirrm %%PYTHON_SITELIBDIR%%/numpy/testing @@ -926,7 +952,8 @@ @dirrm %%PYTHON_SITELIBDIR%%/numpy/polynomial @dirrm %%PYTHON_SITELIBDIR%%/numpy/oldnumeric/tests @dirrm %%PYTHON_SITELIBDIR%%/numpy/oldnumeric -@dirrm %%PYTHON_SITELIBDIR%%/numpy/numarray/numpy +@dirrm %%PYTHON_SITELIBDIR%%/numpy/numarray/include/numpy +@dirrm %%PYTHON_SITELIBDIR%%/numpy/numarray/include @dirrm %%PYTHON_SITELIBDIR%%/numpy/numarray @dirrm %%PYTHON_SITELIBDIR%%/numpy/matrixlib/tests @dirrm %%PYTHON_SITELIBDIR%%/numpy/matrixlib @@ -939,6 +966,10 @@ @dirrm %%PYTHON_SITELIBDIR%%/numpy/lib @dirrm %%PYTHON_SITELIBDIR%%/numpy/fft/tests @dirrm %%PYTHON_SITELIBDIR%%/numpy/fft +@dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/mixed +@dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/array_from_pyobj +@dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src +@dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/tests @dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/src @dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/docs/usersguide @dirrm %%PYTHON_SITELIBDIR%%/numpy/f2py/docs >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20101005223620.840B59F341D>