Hello Please look enclosed diff, test and commit, because i not have python@ commit bit.
- Update to 1.8.1, announce message is here: http://sourceforge.net/projects/numpy/files/NumPy/1.8.1/ - Add IGNORE --> is this good - Break lines around 80 characters - Change REINPLACE, cosmetical changes - Strip libraries - Change patch f2py/f2py2e.py --> db_(Dianora) -- Best regards, Rusmir Dusko
Index: Makefile =================================================================== --- Makefile (revision 350423) +++ Makefile (working copy) @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= numpy -PORTVERSION= 1.8.0 -PORTREVISION= 1 +PORTVERSION= 1.8.1 PORTEPOCH= 1 CATEGORIES= math python -MASTER_SITES= http://docs.scipy.org/doc/${DISTNAME:C/\..$/.0/}/:doc \ - SF/${PORTNAME}/NumPy/${PORTVERSION}:source +MASTER_SITES= SF/${PORTNAME}/NumPy/${PORTVERSION}:source \ + http://docs.scipy.org/doc/${DISTNAME:C/\..$/.1/}/:doc PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTFILES= numpy-${PORTVERSION:S/r/rc/}${EXTRACT_SUFX}:source \ numpy-ref-${PORTVERSION}.pdf:doc \ @@ -40,6 +39,9 @@ .if ${PORT_OPTIONS:MATLAS} LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas +. if !exists(${LOCALBASE}/lib/libalapack.a) +IGNORE= ATLAS needs to be built with STATIC for NumPy to function properly +. endif .else LIB_DEPENDS+= liblapack.so:${PORTSDIR}/math/lapack \ libblas.so:${PORTSDIR}/math/blas @@ -54,10 +56,12 @@ @${CP} ${DISTDIR}/numpy-user-${PORTVERSION}.pdf ${WRKDIR} post-patch: - @${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" ${WRKSRC}/numpy/distutils/fcompiler/gnu.py + @${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" \ + ${WRKSRC}/numpy/distutils/fcompiler/gnu.py @${CP} ${FILESDIR}/site.cfg ${WRKSRC}/site.cfg # ignore LDFLAGS from env, as it overrides internal flags (e.g. -shared) for some reason - @${REINPLACE_CMD} -e "s|'LDFLAGS'|None|" ${WRKSRC}/numpy/distutils/fcompiler/__init__.py + @${REINPLACE_CMD} -e "s|'LDFLAGS'|None|" \ + ${WRKSRC}/numpy/distutils/fcompiler/__init__.py GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so|${SED} -e s/libgfortran.so// @@ -71,11 +75,19 @@ @${REINPLACE_CMD} -e "s+:%%LOCALBASE%%/include/suitesparse++" ${WRKSRC}/site.cfg .endif @${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" \ - -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \ + -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \ ${WRKSRC}/site.cfg - @${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" ${WRKSRC}/numpy/distutils/system_info.py + @${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" \ + ${WRKSRC}/numpy/distutils/system_info.py post-install: +.for l in core/operand_flag_tests core/struct_ufunc_test core/umath core/multiarray \ + core/multiarray_tests core/_dummy core/umath_tests core/scalarmath \ + core/test_rational core/_dotblas lib/_compiled_base numarray/_capi \ + linalg/lapack_lite linalg/_umath_linalg random/mtrand fft/fftpack_lite + ${STRIP_CMD} ${STAGEDIR}${PYTHON}${PYTHON_SITELIBDIR}/numpy/${l}.so +.endfor + ${INSTALL_MAN} ${WRKSRC}/numpy/f2py/f2py.1 ${STAGEDIR}${MANPREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/numpy-ref-${PORTVERSION}.pdf ${STAGEDIR}${DOCSDIR} Index: distinfo =================================================================== --- distinfo (revision 350423) +++ distinfo (working copy) @@ -1,6 +1,6 @@ -SHA256 (numpy-1.8.0.tar.gz) = 2764d0819acc77e9ff81b060fe7f69530b0d85c26ac9d162639b787cb227d253 -SIZE (numpy-1.8.0.tar.gz) = 3779617 -SHA256 (numpy-ref-1.8.0.pdf) = 49ecb1d768eb48598439cc63058f830ca3522fe1cfeba1a321086e9820ae8911 -SIZE (numpy-ref-1.8.0.pdf) = 5324229 -SHA256 (numpy-user-1.8.0.pdf) = a8c30360f9e46c63cfdf48fa594971d94d68ce59ece08c13d4acde8b14032cfe -SIZE (numpy-user-1.8.0.pdf) = 408447 +SHA256 (numpy-1.8.1.tar.gz) = 3d722fc3ac922a34c50183683e828052cd9bb7e9134a95098441297d7ea1c7a9 +SIZE (numpy-1.8.1.tar.gz) = 3794076 +SHA256 (numpy-ref-1.8.1.pdf) = 973851e66d0d5ab095f444f8aeb966fefe2dd544226395abbb110fc1b60f351d +SIZE (numpy-ref-1.8.1.pdf) = 5348248 +SHA256 (numpy-user-1.8.1.pdf) = be827f2d92ef86c3af7f59c623017e7bc23ee95c64f88e8c9871f3ad1f99b262 +SIZE (numpy-user-1.8.1.pdf) = 408305 Index: files/patch-numpy-f2py-f2py2e.py =================================================================== --- files/patch-numpy-f2py-f2py2e.py (revision 350423) +++ files/patch-numpy-f2py-f2py2e.py (working copy) @@ -1,10 +1,10 @@ ---- numpy/f2py/f2py2e.py.orig 2012-01-25 06:59:14.651304791 -0600 -+++ numpy/f2py/f2py2e.py 2012-01-25 07:00:58.475075133 -0600 +--- ./numpy/f2py/f2py2e.py.orig 2014-03-25 20:43:24.000000000 +0100 ++++ ./numpy/f2py/f2py2e.py 2014-04-09 17:57:26.264759349 +0200 @@ -520,6 +520,7 @@ include_dirs, sources = filter_files('-I', '', sources, remove_prefix=1) library_dirs, sources = filter_files('-L', '', sources, remove_prefix=1) libraries, sources = filter_files('-l', '', sources, remove_prefix=1) -+ extra_link_args, sources = filter_files('-Wl,','',sources,remove_prefix=0) ++ extra_link_args, sources = filter_files('-Wl,|-B','',sources,remove_prefix=0) undef_macros, sources = filter_files('-U', '', sources, remove_prefix=1) define_macros, sources = filter_files('-D', '', sources, remove_prefix=1) using_numarray = 0
signature.asc
Description: PGP signature
