Merged.

(bzr r15369.1.5)

6 files changed, 0 insertions, 257 deletions

diff --git a/packaging/macosx/ports/python/py25-numpy/files/patch-f2py_setup.py.diff b/packaging/macosx/ports/python/py25-numpy/files/patch-f2py_setup.py.diff
deleted file mode 100644
index 5b8f2a28f..000000000
--- a/packaging/macosx/ports/python/py25-numpy/files/patch-f2py_setup.py.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- numpy/f2py/setup.py.orig	2013-02-10 00:51:36.000000000 +0400
-+++ numpy/f2py/setup.py	2013-03-19 15:27:15.000000000 +0400
-@@ -41,7 +41,7 @@
-     config.make_svn_version_py()
- 
-     def generate_f2py_py(build_dir):
--        f2py_exe = 'f2py'+os.path.basename(sys.executable)[6:]
-+        f2py_exe = 'f2py'
-         if f2py_exe[-4:]=='.exe':
-             f2py_exe = f2py_exe[:-4] + '.py'
-         if 'bdist_wininst' in sys.argv and f2py_exe[-3:] != '.py':
-@@ -51,7 +51,7 @@
-             log.info('Creating %s', target)
-             f = open(target,'w')
-             f.write('''\
--#!/usr/bin/env %s
-+#!@@MPORTS_PYTHON@@
- # See http://cens.ioc.ee/projects/f2py2e/
- import os, sys
- for mode in ["g3-numpy", "2e-numeric", "2e-numarray", "2e-numpy"]:
-@@ -75,7 +75,7 @@
-     sys.stderr.write("Unknown mode: " + repr(mode) + "\\n")
-     sys.exit(1)
- main()
--'''%(os.path.basename(sys.executable)))
-+''')
-             f.close()
-         return target
- 
diff --git a/packaging/macosx/ports/python/py25-numpy/files/patch-fcompiler_g95.diff b/packaging/macosx/ports/python/py25-numpy/files/patch-fcompiler_g95.diff
deleted file mode 100644
index 2640a530b..000000000
--- a/packaging/macosx/ports/python/py25-numpy/files/patch-fcompiler_g95.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- numpy/distutils/fcompiler/__init__.py.orig	2013-03-19 13:35:03.000000000 +0400
-+++ numpy/distutils/fcompiler/__init__.py	2013-03-19 13:35:27.000000000 +0400
-@@ -708,7 +708,7 @@
-     ('cygwin.*', ('gnu','intelv','absoft','compaqv','intelev','gnu95','g95')),
-     ('linux.*', ('gnu95','intel','lahey','pg','absoft','nag','vast','compaq',
-                 'intele','intelem','gnu','g95','pathf95')),
--    ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'g95', 'pg')),
-+    ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'pg')),
-     ('sunos.*', ('sun','gnu','gnu95','g95')),
-     ('irix.*', ('mips','gnu','gnu95',)),
-     ('aix.*', ('ibm','gnu','gnu95',)),
diff --git a/packaging/macosx/ports/python/py25-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff b/packaging/macosx/ports/python/py25-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff
deleted file mode 100644
index 4f73dcfc9..000000000
--- a/packaging/macosx/ports/python/py25-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- numpy/distutils/fcompiler/__init__.py.orig	2013-10-31 13:24:12.000000000 +0400
-+++ numpy/distutils/fcompiler/__init__.py	2013-10-31 13:45:03.000000000 +0400
-@@ -815,7 +815,7 @@
-     return compiler_type
- 
- # Flag to avoid rechecking for Fortran compiler every time
--failed_fcompiler = False
-+failed_fcompilers = []
- 
- def new_fcompiler(plat=None,
-                   compiler=None,
-@@ -828,7 +828,8 @@
-     platform/compiler combination.
-     """
-     global failed_fcompiler
--    if failed_fcompiler:
-+    fcompiler_key = (plat, compiler)
-+    if fcompiler_key in failed_fcompilers:
-         return None
- 
-     load_all_fcompiler_classes()
-@@ -848,7 +849,7 @@
-             msg = msg + " Supported compilers are: %s)" \
-                   % (','.join(fcompiler_class.keys()))
-         log.warn(msg)
--        failed_fcompiler = True
-+        failed_fcompilers.append(fcompiler_key)
-         return None
- 
-     compiler = klass(verbose=verbose, dry_run=dry_run, force=force)
diff --git a/packaging/macosx/ports/python/py25-numpy/files/patch-numpy_linalg_setup.py.diff b/packaging/macosx/ports/python/py25-numpy/files/patch-numpy_linalg_setup.py.diff
deleted file mode 100644
index 0b06883a4..000000000
--- a/packaging/macosx/ports/python/py25-numpy/files/patch-numpy_linalg_setup.py.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- numpy/linalg/setup.py.orig	2010-09-14 11:44:21.000000000 -0400
-+++ numpy/linalg/setup.py	2010-09-14 11:45:01.000000000 -0400
-@@ -27,6 +27,7 @@
-                                     'zlapack_lite.c', 'dlapack_lite.c',
-                                     'blas_lite.c', 'dlamch.c',
-                                     'f2c_lite.c','f2c.h'],
-+                         extra_link_args=['-undefined dynamic_lookup -bundle'],
-                          extra_info = lapack_info
-                          )
- 
diff --git a/packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff b/packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff
deleted file mode 100644
index 04e3cdd7a..000000000
--- a/packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- numpy/core/setup.py.orig	2009-04-05 04:09:20.000000000 -0400
-+++ numpy/core/setup.py	2009-04-08 19:53:45.000000000 -0400
-@@ -309,7 +309,14 @@
-                 if isinstance(d,str):
-                     target_f.write('#define %s\n' % (d))
-                 else:
--                    target_f.write('#define %s %s\n' % (d[0],d[1]))
-+                    if d[0]!='SIZEOF_LONG' and d[0]!='SIZEOF_PY_INTPTR_T':
-+                        target_f.write('#define %s %s\n' % (d[0],d[1]))
-+                    else:
-+                        target_f.write('#ifdef __LP64__\n')
-+                        target_f.write('#define %s %s\n' % (d[0],8))
-+                        target_f.write('#else\n')
-+                        target_f.write('#define %s %s\n' % (d[0],4))
-+                        target_f.write('#endif\n')
- 
-             # define inline to our keyword, or nothing
-             target_f.write('#ifndef __cplusplus\n')
-@@ -393,7 +393,14 @@
-                 if isinstance(d,str):
-                     target_f.write('#define %s\n' % (d))
-                 else:
--                    target_f.write('#define %s %s\n' % (d[0],d[1]))
-+                    if d[0]!='NPY_SIZEOF_LONG' and d[0]!='NPY_SIZEOF_PY_INTPTR_T':
-+                        target_f.write('#define %s %s\n' % (d[0],d[1]))
-+                    else:
-+                        target_f.write('#ifdef __LP64__\n')
-+                        target_f.write('#define %s %s\n' % (d[0],8))
-+                        target_f.write('#else\n')
-+                        target_f.write('#define %s %s\n' % (d[0],4))
-+                        target_f.write('#endif\n')
- 
-             # define NPY_INLINE to recognized keyword
-             target_f.write('#define NPY_INLINE %s\n' % inline)
diff --git a/packaging/macosx/ports/python/py25-numpy/files/wrapper-template b/packaging/macosx/ports/python/py25-numpy/files/wrapper-template
deleted file mode 100755
index 48936d107..000000000
--- a/packaging/macosx/ports/python/py25-numpy/files/wrapper-template
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/sh
-COMPILER='@@@'
-SUFFIX='---'
-PREFIX='&&&'
-OUTPUT_O='NO'
-OUTPUT=''
-NAMED_OUTPUT=''
-LASTFILE=''
-INTEL='NO'
-SIZE32='NO'
-SIZE64='NO'
-NEWARGS=''
-
-SKIP='NO'
-
-for arg in $@
-do
-	if [ $SKIP = 'ARCH' ]; then
-		# intercept -arch option and set SIZEXX
-		SKIP='NO'
-		if [ $arg = 'x86_64' ] || [ $arg = 'ppc64' ]; then
-			SIZE64='YES'
-		else
-			SIZE32='YES'
-		fi
-		
-		# which architecture are we compiling for?
-		if [ $arg = 'x86_64' ] || [ $arg = 'i386' ]; then
-			INTEL='YES'
-		fi
-		
-	elif [ $arg = '-arch' ]; then
-		SKIP='ARCH'
-		
-	elif [ $arg = '--version' ]; then
-		${COMPILER} --version
-		exit 0
-		
-	else
-		NEWARGS+="$arg "
-		
-		# if the -c option is given, the output is .o
-		if [ $arg = '-c' ]; then
-			OUTPUT_O='YES'
-		fi
-
-		# if the output file is given by a -o option, record it
-		if [ $SKIP = 'O' ]; then
-			SKIP='NO'
-			NAMED_OUTPUT=$arg
-		fi
-		
-		if [ $arg = '-o' ]; then
-			SKIP='O'
-		fi
-		
-		# Note each file ending by ${SUFFIX} and remember the last one
-		# Transform them in .o 
-		if `echo $arg | grep -q "${SUFFIX}$"`; then
-			LASTFILE=$arg
-			OUTPUT+=`echo $arg | sed "s/${SUFFIX}/\.o/"`
-			OUTPUT+=' '
-		fi
-	fi
-done
-
-# What is the output?
-
-if [ ${NAMED_OUTPUT}"X" != "X" ]; then
-	OUTPUT=$NAMED_OUTPUT
-
-elif [ $OUTPUT_O = 'NO' ]; then
-	# It is an executable whose is name is the LASTFILE without suffix
-	OUTPUT=`echo ${LASTFILE} | sed "s/${SUFFIX}//"`
-fi
-
-# Othewise, the output is just the ${OUTPUT} variable as computed before
-
-# For some reason, -dynamiclib and -lpython2.6 are missing when linking
-# .so files. Add them, except if -bundle is set (incompatible switches)
-if [ `echo $OUTPUT | sed -E 's|.*\.||'` = "so" ] && \
-	! `echo $NEWARGS | grep -q bundle`; then
-	NEWARGS="${NEWARGS} ${PREFIX}/lib/libpython2.6.dylib -dynamiclib"
-fi
-
-# Now, compile
-
-if [ $SIZE32 = 'NO' ] && [ $SIZE64 = 'NO' ]; then
-	# No size indication given, just proceed with default
-	if `${COMPILER} $NEWARGS`; then
-		exit 0
-	else
-		exit 1
-	fi
-
-elif [ $SIZE32 = 'YES' ] && [ $SIZE64 = 'NO' ]; then
-	# 32-bit
-	if `${COMPILER} -m32 $NEWARGS`; then
-		exit 0
-	else
-		exit 1
-	fi
-	
-elif [ $SIZE32 = 'NO' ] && [ $SIZE64 = 'YES' ]; then
-	# 64-bit
-	if `${COMPILER} -m64 $NEWARGS`; then
-		exit 0
-	else
-		exit 1
-	fi
-
-else
-	# Universal case
-	if `${COMPILER} -m32 $NEWARGS`; then
-		for filename in ${OUTPUT}
-		do
-			mv ${filename} ${filename}.32
-		done
-	
-		if `${COMPILER} -m64 $NEWARGS`; then
-			for filename in ${OUTPUT}
-			do
-				mv ${filename} ${filename}.64
-				if [ $INTEL = 'YES' ]; then
-					lipo -create -arch x86_64 ${filename}.64 \
-						 -arch i386 ${filename}.32 \
-			 			 -output ${filename}
-				else
-					lipo -create -arch ppc64 ${filename}.64 \
-						 -arch ppc ${filename}.32 \
-			 			 -output ${filename}
-				fi
-			
-				rm -f ${filename}.32 ${filename}.64
-			done
-		else
-			exit 1
-		fi
-	else
-		exit 1
-	fi
-fi
-exit 0