Attachment 113198 Details for Bug 154742 – file.diff

[patch] file.diff

file.diff (text/plain), 4.12 KB, created by Brendan Fabeny on 2011-02-13 17:00:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brendan Fabeny

Created: 2011-02-13 17:00:19 UTC

Size: 4.12 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/math/py-numpy/Makefile,v
>retrieving revision 1.32
>diff -u -r1.32 Makefile
>--- Makefile	1 Dec 2010 06:07:59 -0000	1.32
>+++ Makefile	13 Feb 2011 15:11:30 -0000
>@@ -31,10 +31,18 @@
> 
> LATEST_LINK=	py-${PORTNAME}
> WRKSRC=	${WRKDIR}/${DISTNAME:S/r/rc/}
>+MAKE_ENV+=	LDSHARED="${CC} -shared"
> 
> .include <bsd.port.pre.mk>
> 
>-.if ((${OSVERSION} <= 800502) || (${OSVERSION} >= 900000 && ${OSVERSION} <= 900009)) && (${ARCH} == "i386" || ${ARCH} == "amd64")
>+.if ( ${OSVERSION} <= 703100 || \
>+( ${OSVERSION} >= 800000 && ${OSVERSION} <= 800502 ) || \
>+( ${OSVERSION} >= 900000 && ${OSVERSION} <= 900009 )) && \
>+( ${ARCH} == "i386" || ${ARCH} == "amd64" )
>+FIX_FENV=	yes
>+.endif
>+
>+.if defined(FIX_FENV)
> MASTER_SITES+=	http://svn.freebsd.org/base/head/lib/msun/:fp
> .if ${ARCH} == "i386"
> FP_ARCH=	i387
>@@ -71,7 +79,7 @@
> 
> GCCLIBDIR_CMDS=	${FC} -print-file-name=libgfortran.so|${SED} -e s/libgfortran.so//
> pre-configure:
>-.if ((${OSVERSION} <= 800502) || (${OSVERSION} >= 900000 && ${OSVERSION} <= 900009)) && (${ARCH} == "i386" || ${ARCH} == "amd64")
>+.if defined(FIX_FENV)
> 	@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; \
>@@ -93,7 +101,7 @@
> 	@${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" ${WRKSRC}/numpy/distutils/system_info.py
> 
> pre-install:
>-.if ((${OSVERSION} <= 800502) || (${OSVERSION} >= 900000 && ${OSVERSION} <= 900009)) && (${ARCH} == "i386" || ${ARCH} == "amd64")
>+.if defined(FIX_FENV)
> 	@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
>@@ -106,7 +114,7 @@
> 	${INSTALL_DATA} ${WRKDIR}/numpy-ref.pdf ${DOCSDIR}
> 	${INSTALL_DATA} ${WRKDIR}/numpy-user.pdf ${DOCSDIR}
> .endif
>-.if ((${OSVERSION} <= 800502) || (${OSVERSION} >= 900000 && ${OSVERSION} <= 900009)) && (${ARCH} == "i386" || ${ARCH} == "amd64")
>+.if defined(FIX_FENV)
> 	@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 \
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/math/py-numpy/distinfo,v
>retrieving revision 1.17
>diff -u -r1.17 distinfo
>--- distinfo	1 Dec 2010 06:07:59 -0000	1.17
>+++ distinfo	13 Feb 2011 15:15:37 -0000
>@@ -1,21 +1,14 @@
>-MD5 (numpy-1.5.1.tar.gz) = 376ef150df41b5353944ab742145352d
> SHA256 (numpy-1.5.1.tar.gz) = c36789ec381fec09f519249744ea36a77e5534b69446a59ee73b06cac29542eb
> SIZE (numpy-1.5.1.tar.gz) = 2280220
>-MD5 (numpy-ref.pdf) = 05b9cef44d4e2c22e4c7963cecb988e4
> SHA256 (numpy-ref.pdf) = 4ae481be313756dac9db43ca7cb6ea05eafc43262f8f6a1e2fde5397a69634a0
> SIZE (numpy-ref.pdf) = 5865550
>-MD5 (numpy-user.pdf) = 3a6ba806e2833d1acb6385f8e6a1cd86
> SHA256 (numpy-user.pdf) = 4c0774547ed30323cb8c53718fb9be778f8ab9d49829772bf25f35cb482e90ab
> SIZE (numpy-user.pdf) = 470154
>-MD5 (i387/fenv.c?p=203441) = d371542b4c2d17088d52f73862726496
> SHA256 (i387/fenv.c?p=203441) = c7c558ddb6ab6604c83062fe0655d3ce8cf4d60edb4c9c82777962c49d23ca54
> SIZE (i387/fenv.c?p=203441) = 4791
>-MD5 (i387/fenv.h?p=203441) = d7c13d3c58b762a7a8814e7d6c585689
> SHA256 (i387/fenv.h?p=203441) = 40c72f3cdd6990076394056e06461e1daeb6087b6a32f1962d3c33b0a00c0e0d
> SIZE (i387/fenv.h?p=203441) = 6774
>-MD5 (amd64/fenv.c?p=203441) = be35d718bd9113d9efa6fc777298d12d
> SHA256 (amd64/fenv.c?p=203441) = 9741a9ad3f8406f8292a268b0bc288dc7cb042e3e102440696d48c9a8b7955f0
> SIZE (amd64/fenv.c?p=203441) = 3601
>-MD5 (amd64/fenv.h?p=203441) = 564a4e973990e4f66a5b3ab0e5ded5e1
> SHA256 (amd64/fenv.h?p=203441) = 2daf607fea1bf7e8de5e174599d963fc3bbbe48e293cf2ff08e221351472c9d6
> SIZE (amd64/fenv.h?p=203441) = 5810

Actions: View | Diff

Attachments on bug 154742: 113198 | 113199