From 387dff0977f39e2949c068c51f5132b962ec45c5 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sat, 4 May 2013 01:01:44 +0200 Subject: [PATCH] Remove old python non-recipes and patches --- dev-lang/python/fix-haiku.sh | 2 - dev-lang/python/patches/python-2.5.4.patch | 203 -------- dev-lang/python/patches/python-2.6.4.patch | 544 -------------------- dev-lang/python/patches/python-2.6.5.patch | 556 -------------------- dev-lang/python/patches/python-2.6.6.patch | 558 -------------------- dev-lang/python/patches/python-2.6.7.patch | 568 --------------------- dev-lang/python/python-2.5.4.recipe | 28 - dev-lang/python/python-2.6.4.recipe | 27 - dev-lang/python/python-2.6.5.recipe | 27 - dev-lang/python/python-2.6.6.recipe | 41 -- dev-lang/python/python-2.6.7.recipe | 41 -- 11 files changed, 2595 deletions(-) delete mode 100644 dev-lang/python/fix-haiku.sh delete mode 100644 dev-lang/python/patches/python-2.5.4.patch delete mode 100644 dev-lang/python/patches/python-2.6.4.patch delete mode 100644 dev-lang/python/patches/python-2.6.5.patch delete mode 100644 dev-lang/python/patches/python-2.6.6.patch delete mode 100644 dev-lang/python/patches/python-2.6.7.patch delete mode 100644 dev-lang/python/python-2.5.4.recipe delete mode 100644 dev-lang/python/python-2.6.4.recipe delete mode 100644 dev-lang/python/python-2.6.5.recipe delete mode 100644 dev-lang/python/python-2.6.6.recipe delete mode 100644 dev-lang/python/python-2.6.7.recipe diff --git a/dev-lang/python/fix-haiku.sh b/dev-lang/python/fix-haiku.sh deleted file mode 100644 index c13f7ddea..000000000 --- a/dev-lang/python/fix-haiku.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -find . -name '*.py' -exec sed -i -e 's|/usr/bin/env|/bin/env|g' {} \; diff --git a/dev-lang/python/patches/python-2.5.4.patch b/dev-lang/python/patches/python-2.5.4.patch deleted file mode 100644 index 9bb9f3ae5..000000000 --- a/dev-lang/python/patches/python-2.5.4.patch +++ /dev/null @@ -1,203 +0,0 @@ -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/Modules/_ctypes/libffi/configure.ac ./Python-2.5.4/Modules/_ctypes/libffi/configure.ac ---- ./Python-2.5.4.orig/Modules/_ctypes/libffi/configure.ac 2007-09-05 01:47:16.942407680 +0200 -+++ ./Python-2.5.4/Modules/_ctypes/libffi/configure.ac 2010-06-07 16:42:39.216006656 +0200 -@@ -8,16 +8,16 @@ - AC_CANONICAL_SYSTEM - target_alias=${target_alias-$host_alias} - --m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) -+#m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) - m4_define([_AC_ARG_VAR_PRECIOUS],[]) - AC_PROG_CC --m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) -+#m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) - - AC_SUBST(CFLAGS) - - AC_CHECK_HEADERS(sys/mman.h) - AC_CHECK_FUNCS(mmap) --AC_FUNC_MMAP_BLACKLIST -+#AC_FUNC_MMAP_BLACKLIST - - TARGETDIR="unknown" - case "$host" in -@@ -34,6 +34,7 @@ - i*86-*-solaris2.1[[0-9]]*) TARGET=X86_64; TARGETDIR=x86;; - i*86-*-solaris*) TARGET=X86; TARGETDIR=x86;; - i*86-*-beos*) TARGET=X86; TARGETDIR=x86;; -+i*86-*-haiku*) TARGET=X86; TARGETDIR=x86;; - i*86-*-freebsd* | i*86-*-kfreebsd*-gnu) TARGET=X86; TARGETDIR=x86;; - i*86-*-netbsdelf* | i*86-*-knetbsd*-gnu) TARGET=X86; TARGETDIR=x86;; - i*86-*-openbsd*) TARGET=X86; TARGETDIR=x86;; -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/Modules/resource.c ./Python-2.5.4/Modules/resource.c ---- ./Python-2.5.4.orig/Modules/resource.c 2006-05-29 23:04:52.942407680 +0200 -+++ ./Python-2.5.4/Modules/resource.c 2010-06-03 18:12:58.990380032 +0200 -@@ -86,6 +86,7 @@ - PyFloat_FromDouble(doubletime(ru.ru_utime))); - PyStructSequence_SET_ITEM(result, 1, - PyFloat_FromDouble(doubletime(ru.ru_stime))); -+#ifndef __HAIKU__ - PyStructSequence_SET_ITEM(result, 2, PyInt_FromLong(ru.ru_maxrss)); - PyStructSequence_SET_ITEM(result, 3, PyInt_FromLong(ru.ru_ixrss)); - PyStructSequence_SET_ITEM(result, 4, PyInt_FromLong(ru.ru_idrss)); -@@ -100,6 +101,7 @@ - PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(ru.ru_nsignals)); - PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(ru.ru_nvcsw)); - PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(ru.ru_nivcsw)); -+#endif - - if (PyErr_Occurred()) { - Py_DECREF(result); -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/Modules/socketmodule.h ./Python-2.5.4/Modules/socketmodule.h ---- ./Python-2.5.4.orig/Modules/socketmodule.h 2006-12-03 12:24:00.942407680 +0100 -+++ ./Python-2.5.4/Modules/socketmodule.h 2010-06-03 18:12:58.991952896 +0200 -@@ -41,6 +41,10 @@ - # undef AF_NETLINK - #endif - -+#if defined(__HAIKU__) -+#undef HAVE_BLUETOOTH_BLUETOOTH_H -+#endif -+ - #ifdef HAVE_BLUETOOTH_BLUETOOTH_H - #include - #include -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/Modules/spwdmodule.c ./Python-2.5.4/Modules/spwdmodule.c ---- ./Python-2.5.4.orig/Modules/spwdmodule.c 2006-08-02 08:15:10.942407680 +0200 -+++ ./Python-2.5.4/Modules/spwdmodule.c 2010-06-03 18:12:58.994312192 +0200 -@@ -79,7 +79,9 @@ - - SETS(setIndex++, p->sp_namp); - SETS(setIndex++, p->sp_pwdp); -+#ifndef __HAIKU__ - SETI(setIndex++, p->sp_lstchg); -+#endif - SETI(setIndex++, p->sp_min); - SETI(setIndex++, p->sp_max); - SETI(setIndex++, p->sp_warn); -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/Modules/timemodule.c ./Python-2.5.4/Modules/timemodule.c ---- ./Python-2.5.4.orig/Modules/timemodule.c 2007-12-24 21:00:42.942407680 +0100 -+++ ./Python-2.5.4/Modules/timemodule.c 2010-06-03 18:12:59.021757952 +0200 -@@ -968,11 +968,11 @@ - return -1; - } - Py_END_ALLOW_THREADS --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - /* This sleep *CAN BE* interrupted. */ - { - if( secs <= 0.0 ) { -- return; -+ return 0; - } - - Py_BEGIN_ALLOW_THREADS -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/Tools/scripts/h2py.py ./Python-2.5.4/Tools/scripts/h2py.py ---- ./Python-2.5.4.orig/Tools/scripts/h2py.py 2004-08-09 19:27:55.942407680 +0200 -+++ ./Python-2.5.4/Tools/scripts/h2py.py 2010-06-06 11:00:49.436731904 +0200 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - - # Read #define's and translate to Python code. - # Handle #include statements. -@@ -50,7 +50,7 @@ - searchdirs=os.environ['INCLUDE'].split(';') - except KeyError: - try: -- if sys.platform.find("beos") == 0: -+ if sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0: - searchdirs=os.environ['BEINCLUDES'].split(';') - elif sys.platform.startswith("atheos"): - searchdirs=os.environ['C_INCLUDE_PATH'].split(':') -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/configure.in ./Python-2.5.4/configure.in ---- ./Python-2.5.4.orig/configure.in 2008-12-13 15:13:52.942407680 +0100 -+++ ./Python-2.5.4/configure.in 2010-06-07 16:53:42.874250240 +0200 -@@ -7,6 +7,7 @@ - AC_PREREQ(2.59) - AC_INIT(python, PYTHON_VERSION, http://www.python.org/python-bugs) - AC_CONFIG_SRCDIR([Include/object.h]) -+AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_HEADER(pyconfig.h) - - dnl This is for stuff that absolutely must end up in pyconfig.h. -@@ -627,6 +628,11 @@ - BeOS*) - LDLIBRARY='libpython$(VERSION).so' - ;; -+ Haiku*) -+ LDLIBRARY='libpython$(VERSION).so' -+ BLDLIBRARY='-L. -lpython$(VERSION)' -+ RUNSHARED=LIBRARY_PATH=`pwd`:${LIBRARY_PATH} -+ ;; - CYGWIN*) - LDLIBRARY='libpython$(VERSION).dll.a' - DLLLIBRARY='libpython$(VERSION).dll' -@@ -709,7 +715,7 @@ - AC_SUBST(LN) - if test -z "$LN" ; then - case $ac_sys_system in -- BeOS*) LN="ln -s";; -+ BeOS*|Haiku*) LN="ln -s";; - CYGWIN*) LN="ln -s";; - atheos*) LN="ln -s";; - *) LN=ln;; -@@ -1445,6 +1451,10 @@ - BLDSHARED="\$(srcdir)/Modules/ld_so_beos $LDLIBRARY" - LDSHARED="\$(BINLIBDEST)/config/ld_so_beos \$(LIBDIR)/$LDLIBRARY" - ;; -+ Haiku*) -+ LDFLAGS="-L." # help ld find libpythonX.Y.so in root directory -+ LDSHARED="gcc -shared" -+ ;; - IRIX/5*) LDSHARED="ld -shared";; - IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";; - SunOS/5*) -@@ -1585,6 +1595,7 @@ - *) CCSHARED="";; - esac;; - atheos*) CCSHARED="-fPIC";; -+ Haiku*) CCSHARED="-fPIC";; - esac - fi - AC_MSG_RESULT($CCSHARED) -@@ -1710,6 +1721,9 @@ - BeOS*) - AC_CHECK_LIB(net, socket, [LIBS="-lnet $LIBS"], [], $LIBS) # BeOS - ;; -+Haiku*) -+AC_CHECK_LIB(network, socket, [LIBS="-lnetwork $LIBS"], [], $LIBS) # Haiku -+;; - esac - - AC_MSG_CHECKING(for --with-libs) -@@ -2879,7 +2893,7 @@ - AC_SUBST(LIBM) - case $ac_sys_system in - Darwin) ;; --BeOS) ;; -+BeOS|Haiku) ;; - *) LIBM=-lm - esac - AC_MSG_CHECKING(for --with-libm=STRING) -diff -X excludes-for-diff -Naur ./Python-2.5.4.orig/setup.py ./Python-2.5.4/setup.py ---- ./Python-2.5.4.orig/setup.py 2008-10-16 20:58:19.942407680 +0200 -+++ ./Python-2.5.4/setup.py 2010-06-03 18:12:59.056885248 +0200 -@@ -338,7 +338,7 @@ - - # Check for MacOS X, which doesn't need libm.a at all - math_libs = ['m'] -- if platform in ['darwin', 'beos', 'mac']: -+ if platform in ['darwin', 'beos', 'haiku1', 'mac']: - math_libs = [] - - # XXX Omitted modules: gl, pure, dl, SGI-specific modules -@@ -912,7 +912,7 @@ - exts.append( Extension('resource', ['resource.c']) ) - - # Sun yellow pages. Some systems have the functions in libc. -- if platform not in ['cygwin', 'atheos']: -+ if platform not in ['cygwin', 'atheos', 'haiku1']: - if (self.compiler.find_library_file(lib_dirs, 'nsl')): - libs = ['nsl'] - else: diff --git a/dev-lang/python/patches/python-2.6.4.patch b/dev-lang/python/patches/python-2.6.4.patch deleted file mode 100644 index 2fa785ec5..000000000 --- a/dev-lang/python/patches/python-2.6.4.patch +++ /dev/null @@ -1,544 +0,0 @@ -diff -ruN Python-2.6.4/Lib/plat-haiku1/IN.py Python-2.6.4-haiku/Lib/plat-haiku1/IN.py ---- Python-2.6.4/Lib/plat-haiku1/IN.py 1969-12-31 17:00:00.000000000 -0700 -+++ Python-2.6.4-haiku/Lib/plat-haiku1/IN.py 2009-10-27 13:31:08.000000000 -0600 -@@ -0,0 +1,327 @@ -+# Generated by h2py from /boot/develop/headers/be/net/netinet/in.h -+ -+# Included from socket.h -+ -+# Included from BeBuild.h -+B_BEOS_VERSION_4 = 0x0400 -+B_BEOS_VERSION_4_5 = 0x0450 -+B_BEOS_VERSION_5 = 0x0500 -+B_BEOS_VERSION = B_BEOS_VERSION_5 -+B_BEOS_VERSION_MAUI = B_BEOS_VERSION_5 -+_PR2_COMPATIBLE_ = 1 -+_PR3_COMPATIBLE_ = 1 -+_R4_COMPATIBLE_ = 1 -+_R4_5_COMPATIBLE_ = 1 -+_PR2_COMPATIBLE_ = 0 -+_PR3_COMPATIBLE_ = 0 -+_R4_COMPATIBLE_ = 1 -+_R4_5_COMPATIBLE_ = 1 -+def _UNUSED(x): return x -+ -+ -+# Included from sys/types.h -+ -+# Included from time.h -+ -+# Included from be_setup.h -+def __std(ref): return ref -+ -+__be_os = 2 -+__dest_os = __be_os -+__MSL__ = 0x4011 -+__GLIBC__ = -2 -+__GLIBC_MINOR__ = 1 -+ -+# Included from null.h -+NULL = (0) -+NULL = 0L -+ -+# Included from size_t.h -+ -+# Included from stddef.h -+ -+# Included from wchar_t.h -+CLOCKS_PER_SEC = 1000 -+CLK_TCK = CLOCKS_PER_SEC -+MAX_TIMESTR = 70 -+ -+# Included from sys/time.h -+ -+# Included from ByteOrder.h -+ -+# Included from endian.h -+__LITTLE_ENDIAN = 1234 -+LITTLE_ENDIAN = __LITTLE_ENDIAN -+__BYTE_ORDER = __LITTLE_ENDIAN -+BYTE_ORDER = __BYTE_ORDER -+__BIG_ENDIAN = 0 -+BIG_ENDIAN = 0 -+__BIG_ENDIAN = 4321 -+BIG_ENDIAN = __BIG_ENDIAN -+__BYTE_ORDER = __BIG_ENDIAN -+BYTE_ORDER = __BYTE_ORDER -+__LITTLE_ENDIAN = 0 -+LITTLE_ENDIAN = 0 -+__PDP_ENDIAN = 3412 -+PDP_ENDIAN = __PDP_ENDIAN -+ -+# Included from SupportDefs.h -+ -+# Included from Errors.h -+ -+# Included from limits.h -+ -+# Included from float.h -+FLT_ROUNDS = 1 -+FLT_RADIX = 2 -+FLT_MANT_DIG = 24 -+FLT_DIG = 6 -+FLT_MIN_EXP = (-125) -+FLT_MIN_10_EXP = (-37) -+FLT_MAX_EXP = 128 -+FLT_MAX_10_EXP = 38 -+DBL_MANT_DIG = 53 -+DBL_DIG = 15 -+DBL_MIN_EXP = (-1021) -+DBL_MIN_10_EXP = (-308) -+DBL_MAX_EXP = 1024 -+DBL_MAX_10_EXP = 308 -+LDBL_MANT_DIG = DBL_MANT_DIG -+LDBL_DIG = DBL_DIG -+LDBL_MIN_EXP = DBL_MIN_EXP -+LDBL_MIN_10_EXP = DBL_MIN_10_EXP -+LDBL_MAX_EXP = DBL_MAX_EXP -+LDBL_MAX_10_EXP = DBL_MAX_10_EXP -+CHAR_BIT = (8) -+SCHAR_MIN = (-127-1) -+SCHAR_MAX = (127) -+CHAR_MIN = SCHAR_MIN -+CHAR_MAX = SCHAR_MAX -+MB_LEN_MAX = (1) -+SHRT_MIN = (-32767-1) -+SHRT_MAX = (32767) -+LONG_MIN = (-2147483647L-1) -+LONG_MAX = (2147483647L) -+INT_MIN = LONG_MIN -+INT_MAX = LONG_MAX -+ARG_MAX = (32768) -+ATEXIT_MAX = (32) -+CHILD_MAX = (1024) -+IOV_MAX = (256) -+FILESIZEBITS = (64) -+LINK_MAX = (1) -+LOGIN_NAME_MAX = (32) -+MAX_CANON = (255) -+MAX_INPUT = (255) -+NAME_MAX = (256) -+NGROUPS_MAX = (32) -+OPEN_MAX = (128) -+PATH_MAX = (1024) -+PIPE_MAX = (512) -+SSIZE_MAX = (2147483647L) -+TTY_NAME_MAX = (256) -+TZNAME_MAX = (32) -+SYMLINKS_MAX = (16) -+_POSIX_ARG_MAX = (32768) -+_POSIX_CHILD_MAX = (1024) -+_POSIX_LINK_MAX = (1) -+_POSIX_LOGIN_NAME_MAX = (9) -+_POSIX_MAX_CANON = (255) -+_POSIX_MAX_INPUT = (255) -+_POSIX_NAME_MAX = (255) -+_POSIX_NGROUPS_MAX = (0) -+_POSIX_OPEN_MAX = (128) -+_POSIX_PATH_MAX = (1024) -+_POSIX_PIPE_BUF = (512) -+_POSIX_SSIZE_MAX = (2147483647L) -+_POSIX_STREAM_MAX = (8) -+_POSIX_TTY_NAME_MAX = (256) -+_POSIX_TZNAME_MAX = (3) -+B_GENERAL_ERROR_BASE = LONG_MIN -+B_OS_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x1000 -+B_APP_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x2000 -+B_INTERFACE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x3000 -+B_MEDIA_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4000 -+B_TRANSLATION_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4800 -+B_MIDI_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x5000 -+B_STORAGE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x6000 -+B_POSIX_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x7000 -+B_MAIL_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x8000 -+B_PRINT_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x9000 -+B_DEVICE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0xa000 -+B_ERRORS_END = (B_GENERAL_ERROR_BASE + 0xffff) -+E2BIG = (B_POSIX_ERROR_BASE + 1) -+ECHILD = (B_POSIX_ERROR_BASE + 2) -+EDEADLK = (B_POSIX_ERROR_BASE + 3) -+EFBIG = (B_POSIX_ERROR_BASE + 4) -+EMLINK = (B_POSIX_ERROR_BASE + 5) -+ENFILE = (B_POSIX_ERROR_BASE + 6) -+ENODEV = (B_POSIX_ERROR_BASE + 7) -+ENOLCK = (B_POSIX_ERROR_BASE + 8) -+ENOSYS = (B_POSIX_ERROR_BASE + 9) -+ENOTTY = (B_POSIX_ERROR_BASE + 10) -+ENXIO = (B_POSIX_ERROR_BASE + 11) -+ESPIPE = (B_POSIX_ERROR_BASE + 12) -+ESRCH = (B_POSIX_ERROR_BASE + 13) -+EFPOS = (B_POSIX_ERROR_BASE + 14) -+ESIGPARM = (B_POSIX_ERROR_BASE + 15) -+EDOM = (B_POSIX_ERROR_BASE + 16) -+ERANGE = (B_POSIX_ERROR_BASE + 17) -+EPROTOTYPE = (B_POSIX_ERROR_BASE + 18) -+EPROTONOSUPPORT = (B_POSIX_ERROR_BASE + 19) -+EPFNOSUPPORT = (B_POSIX_ERROR_BASE + 20) -+EAFNOSUPPORT = (B_POSIX_ERROR_BASE + 21) -+EADDRINUSE = (B_POSIX_ERROR_BASE + 22) -+EADDRNOTAVAIL = (B_POSIX_ERROR_BASE + 23) -+ENETDOWN = (B_POSIX_ERROR_BASE + 24) -+ENETUNREACH = (B_POSIX_ERROR_BASE + 25) -+ENETRESET = (B_POSIX_ERROR_BASE + 26) -+ECONNABORTED = (B_POSIX_ERROR_BASE + 27) -+ECONNRESET = (B_POSIX_ERROR_BASE + 28) -+EISCONN = (B_POSIX_ERROR_BASE + 29) -+ENOTCONN = (B_POSIX_ERROR_BASE + 30) -+ESHUTDOWN = (B_POSIX_ERROR_BASE + 31) -+ECONNREFUSED = (B_POSIX_ERROR_BASE + 32) -+EHOSTUNREACH = (B_POSIX_ERROR_BASE + 33) -+ENOPROTOOPT = (B_POSIX_ERROR_BASE + 34) -+ENOBUFS = (B_POSIX_ERROR_BASE + 35) -+EINPROGRESS = (B_POSIX_ERROR_BASE + 36) -+EALREADY = (B_POSIX_ERROR_BASE + 37) -+EILSEQ = (B_POSIX_ERROR_BASE + 38) -+ENOMSG = (B_POSIX_ERROR_BASE + 39) -+ESTALE = (B_POSIX_ERROR_BASE + 40) -+EOVERFLOW = (B_POSIX_ERROR_BASE + 41) -+EMSGSIZE = (B_POSIX_ERROR_BASE + 42) -+EOPNOTSUPP = (B_POSIX_ERROR_BASE + 43) -+ENOTSOCK = (B_POSIX_ERROR_BASE + 44) -+false = 0 -+true = 1 -+NULL = (0) -+FALSE = 0 -+TRUE = 1 -+ -+# Included from TypeConstants.h -+B_HOST_IS_LENDIAN = 1 -+B_HOST_IS_BENDIAN = 0 -+def B_HOST_TO_LENDIAN_DOUBLE(arg): return (double)(arg) -+ -+def B_HOST_TO_LENDIAN_FLOAT(arg): return (float)(arg) -+ -+def B_HOST_TO_LENDIAN_INT64(arg): return (uint64)(arg) -+ -+def B_HOST_TO_LENDIAN_INT32(arg): return (uint32)(arg) -+ -+def B_HOST_TO_LENDIAN_INT16(arg): return (uint16)(arg) -+ -+def B_HOST_TO_BENDIAN_DOUBLE(arg): return __swap_double(arg) -+ -+def B_HOST_TO_BENDIAN_FLOAT(arg): return __swap_float(arg) -+ -+def B_HOST_TO_BENDIAN_INT64(arg): return __swap_int64(arg) -+ -+def B_HOST_TO_BENDIAN_INT32(arg): return __swap_int32(arg) -+ -+def B_HOST_TO_BENDIAN_INT16(arg): return __swap_int16(arg) -+ -+def B_LENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg) -+ -+def B_LENDIAN_TO_HOST_FLOAT(arg): return (float)(arg) -+ -+def B_LENDIAN_TO_HOST_INT64(arg): return (uint64)(arg) -+ -+def B_LENDIAN_TO_HOST_INT32(arg): return (uint32)(arg) -+ -+def B_LENDIAN_TO_HOST_INT16(arg): return (uint16)(arg) -+ -+def B_BENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg) -+ -+def B_BENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg) -+ -+def B_BENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg) -+ -+def B_BENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg) -+ -+def B_BENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg) -+ -+B_HOST_IS_LENDIAN = 0 -+B_HOST_IS_BENDIAN = 1 -+def B_HOST_TO_LENDIAN_DOUBLE(arg): return __swap_double(arg) -+ -+def B_HOST_TO_LENDIAN_FLOAT(arg): return __swap_float(arg) -+ -+def B_HOST_TO_LENDIAN_INT64(arg): return __swap_int64(arg) -+ -+def B_HOST_TO_LENDIAN_INT32(arg): return __swap_int32(arg) -+ -+def B_HOST_TO_LENDIAN_INT16(arg): return __swap_int16(arg) -+ -+def B_HOST_TO_BENDIAN_DOUBLE(arg): return (double)(arg) -+ -+def B_HOST_TO_BENDIAN_FLOAT(arg): return (float)(arg) -+ -+def B_HOST_TO_BENDIAN_INT64(arg): return (uint64)(arg) -+ -+def B_HOST_TO_BENDIAN_INT32(arg): return (uint32)(arg) -+ -+def B_HOST_TO_BENDIAN_INT16(arg): return (uint16)(arg) -+ -+def B_LENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg) -+ -+def B_LENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg) -+ -+def B_LENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg) -+ -+def B_LENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg) -+ -+def B_LENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg) -+ -+def B_BENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg) -+ -+def B_BENDIAN_TO_HOST_FLOAT(arg): return (float)(arg) -+ -+def B_BENDIAN_TO_HOST_INT64(arg): return (uint64)(arg) -+ -+def B_BENDIAN_TO_HOST_INT32(arg): return (uint32)(arg) -+ -+def B_BENDIAN_TO_HOST_INT16(arg): return (uint16)(arg) -+ -+def B_SWAP_DOUBLE(arg): return __swap_double(arg) -+ -+def B_SWAP_FLOAT(arg): return __swap_float(arg) -+ -+def B_SWAP_INT64(arg): return __swap_int64(arg) -+ -+def B_SWAP_INT32(arg): return __swap_int32(arg) -+ -+def B_SWAP_INT16(arg): return __swap_int16(arg) -+ -+def htonl(x): return B_HOST_TO_BENDIAN_INT32(x) -+ -+def ntohl(x): return B_BENDIAN_TO_HOST_INT32(x) -+ -+def htons(x): return B_HOST_TO_BENDIAN_INT16(x) -+ -+def ntohs(x): return B_BENDIAN_TO_HOST_INT16(x) -+ -+AF_INET = 1 -+INADDR_ANY = 0x00000000 -+INADDR_BROADCAST = 0xffffffff -+INADDR_LOOPBACK = 0x7f000001 -+SOL_SOCKET = 1 -+SO_DEBUG = 1 -+SO_REUSEADDR = 2 -+SO_NONBLOCK = 3 -+SO_REUSEPORT = 4 -+MSG_OOB = 0x1 -+SOCK_DGRAM = 1 -+SOCK_STREAM = 2 -+IPPROTO_UDP = 1 -+IPPROTO_TCP = 2 -+IPPROTO_ICMP = 3 -+B_UDP_MAX_SIZE = (65536 - 1024) -+FD_SETSIZE = 256 -+FDSETSIZE = FD_SETSIZE -+NFDBITS = 32 -+def _FDMSKNO(fd): return ((fd) / NFDBITS) -+ -+def _FDBITNO(fd): return ((fd) % NFDBITS) -diff -ruN Python-2.6.4/Lib/plat-haiku1/regen Python-2.6.4-haiku/Lib/plat-haiku1/regen ---- Python-2.6.4/Lib/plat-haiku1/regen 1969-12-31 17:00:00.000000000 -0700 -+++ Python-2.6.4-haiku/Lib/plat-haiku1/regen 2009-10-27 13:31:08.000000000 -0600 -@@ -0,0 +1,7 @@ -+#! /bin/sh -+ -+H2PY=../../Tools/scripts/h2py.py -+HEADERS=/boot/develop/headers -+ -+set -v -+python $H2PY -i '(u_long)' $HEADERS/posix/netinet/in.h -diff -ruN Python-2.6.4/Modules/resource.c Python-2.6.4-haiku/Modules/resource.c ---- Python-2.6.4/Modules/resource.c 2009-05-08 14:59:57.000000000 -0600 -+++ Python-2.6.4-haiku/Modules/resource.c 2009-10-27 13:31:08.000000000 -0600 -@@ -86,6 +86,7 @@ - PyFloat_FromDouble(doubletime(ru.ru_utime))); - PyStructSequence_SET_ITEM(result, 1, - PyFloat_FromDouble(doubletime(ru.ru_stime))); -+#ifndef __HAIKU__ - PyStructSequence_SET_ITEM(result, 2, PyInt_FromLong(ru.ru_maxrss)); - PyStructSequence_SET_ITEM(result, 3, PyInt_FromLong(ru.ru_ixrss)); - PyStructSequence_SET_ITEM(result, 4, PyInt_FromLong(ru.ru_idrss)); -@@ -100,6 +101,7 @@ - PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(ru.ru_nsignals)); - PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(ru.ru_nvcsw)); - PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(ru.ru_nivcsw)); -+#endif - - if (PyErr_Occurred()) { - Py_DECREF(result); -diff -ruN Python-2.6.4/Modules/socketmodule.c Python-2.6.4-haiku/Modules/socketmodule.c ---- Python-2.6.4/Modules/socketmodule.c 2009-09-19 01:46:24.000000000 -0600 -+++ Python-2.6.4-haiku/Modules/socketmodule.c 2009-10-27 13:31:08.000000000 -0600 -@@ -4640,7 +4640,9 @@ - #ifndef __BEOS__ - /* We have incomplete socket support. */ - PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW); -+#ifndef __HAIKU__ - PyModule_AddIntConstant(m, "SOCK_SEQPACKET", SOCK_SEQPACKET); -+#endif - #if defined(SOCK_RDM) - PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM); - #endif -diff -ruN Python-2.6.4/Modules/socketmodule.h Python-2.6.4-haiku/Modules/socketmodule.h ---- Python-2.6.4/Modules/socketmodule.h 2008-06-14 02:36:07.000000000 -0600 -+++ Python-2.6.4-haiku/Modules/socketmodule.h 2009-10-27 13:31:08.000000000 -0600 -@@ -47,6 +47,10 @@ - # undef AF_NETLINK - #endif - -+#if defined(__HAIKU__) -+#undef HAVE_BLUETOOTH_BLUETOOTH_H -+#endif -+ - #ifdef HAVE_BLUETOOTH_BLUETOOTH_H - #include - #include -diff -ruN Python-2.6.4/Modules/spwdmodule.c Python-2.6.4-haiku/Modules/spwdmodule.c ---- Python-2.6.4/Modules/spwdmodule.c 2008-06-08 22:58:54.000000000 -0600 -+++ Python-2.6.4-haiku/Modules/spwdmodule.c 2009-10-27 13:31:08.000000000 -0600 -@@ -79,7 +79,9 @@ - - SETS(setIndex++, p->sp_namp); - SETS(setIndex++, p->sp_pwdp); -+#ifndef __HAIKU__ - SETI(setIndex++, p->sp_lstchg); -+#endif - SETI(setIndex++, p->sp_min); - SETI(setIndex++, p->sp_max); - SETI(setIndex++, p->sp_warn); -diff -ruN Python-2.6.4/Modules/timemodule.c Python-2.6.4-haiku/Modules/timemodule.c ---- Python-2.6.4/Modules/timemodule.c 2008-07-05 13:19:50.000000000 -0600 -+++ Python-2.6.4-haiku/Modules/timemodule.c 2009-10-27 13:31:08.000000000 -0600 -@@ -968,11 +968,11 @@ - return -1; - } - Py_END_ALLOW_THREADS --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - /* This sleep *CAN BE* interrupted. */ - { - if( secs <= 0.0 ) { -- return; -+ return 0; - } - - Py_BEGIN_ALLOW_THREADS -diff -ruN Python-2.6.4/Parser/asdl_c.py Python-2.6.4-haiku/Parser/asdl_c.py ---- Python-2.6.4/Parser/asdl_c.py 2008-11-07 01:56:27.000000000 -0700 -+++ Python-2.6.4-haiku/Parser/asdl_c.py 2009-10-27 13:31:08.000000000 -0600 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - """Generate C code from an ASDL description.""" - - # TO DO -diff -ruN Python-2.6.4/Tools/scripts/h2py.py Python-2.6.4-haiku/Tools/scripts/h2py.py ---- Python-2.6.4/Tools/scripts/h2py.py 2004-08-09 11:27:55.000000000 -0600 -+++ Python-2.6.4-haiku/Tools/scripts/h2py.py 2009-10-27 13:31:08.000000000 -0600 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - - # Read #define's and translate to Python code. - # Handle #include statements. -@@ -50,7 +50,7 @@ - searchdirs=os.environ['INCLUDE'].split(';') - except KeyError: - try: -- if sys.platform.find("beos") == 0: -+ if sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0: - searchdirs=os.environ['BEINCLUDES'].split(';') - elif sys.platform.startswith("atheos"): - searchdirs=os.environ['C_INCLUDE_PATH'].split(':') -diff -ruN Python-2.6.4/configure.in Python-2.6.4-haiku/configure.in ---- Python-2.6.4/configure.in 2009-09-29 07:01:59.000000000 -0600 -+++ Python-2.6.4-haiku/configure.in 2009-10-27 13:31:08.000000000 -0600 -@@ -715,7 +715,7 @@ - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; -- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) -+ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|Haiku*) - LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -@@ -793,7 +793,7 @@ - AC_SUBST(LN) - if test -z "$LN" ; then - case $ac_sys_system in -- BeOS*) LN="ln -s";; -+ BeOS*|Haiku*) LN="ln -s";; - CYGWIN*) LN="ln -s";; - atheos*) LN="ln -s";; - *) LN=ln;; -@@ -1766,7 +1766,7 @@ - fi - fi - ;; -- Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';; -+ Linux*|GNU*|QNX*|Haiku*) LDSHARED='$(CC) -shared';; - BSD/OS*/4*) LDSHARED="gcc -shared";; - FreeBSD*) - if [[ "`$CC -dM -E - - #include -diff -up Python-2.6.5/Modules/spwdmodule.c.orig Python-2.6.5/Modules/spwdmodule.c ---- Python-2.6.5/Modules/spwdmodule.c.orig 2008-06-08 22:58:54.041418752 -0600 -+++ Python-2.6.5/Modules/spwdmodule.c 2010-04-26 15:46:55.977534976 -0600 -@@ -79,7 +79,9 @@ static PyObject *mkspent(struct spwd *p) - - SETS(setIndex++, p->sp_namp); - SETS(setIndex++, p->sp_pwdp); -+#ifndef __HAIKU__ - SETI(setIndex++, p->sp_lstchg); -+#endif - SETI(setIndex++, p->sp_min); - SETI(setIndex++, p->sp_max); - SETI(setIndex++, p->sp_warn); -diff -up Python-2.6.5/Modules/timemodule.c.orig Python-2.6.5/Modules/timemodule.c ---- Python-2.6.5/Modules/timemodule.c.orig 2008-07-05 13:19:50.026214400 -0600 -+++ Python-2.6.5/Modules/timemodule.c 2010-04-26 15:46:56.001048576 -0600 -@@ -968,11 +968,11 @@ floatsleep(double secs) - return -1; - } - Py_END_ALLOW_THREADS --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - /* This sleep *CAN BE* interrupted. */ - { - if( secs <= 0.0 ) { -- return; -+ return 0; - } - - Py_BEGIN_ALLOW_THREADS -diff -up Python-2.6.5/Parser/asdl_c.py.orig Python-2.6.5/Parser/asdl_c.py ---- Python-2.6.5/Parser/asdl_c.py.orig 2009-12-12 17:59:01.002621440 -0700 -+++ Python-2.6.5/Parser/asdl_c.py 2010-04-26 15:46:56.004456448 -0600 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - """Generate C code from an ASDL description.""" - - # TO DO -diff -up Python-2.6.5/Python/bltinmodule.c.orig Python-2.6.5/Python/bltinmodule.c ---- Python-2.6.5/Python/bltinmodule.c.orig 2010-04-26 15:47:08.138936320 -0600 -+++ Python-2.6.5/Python/bltinmodule.c 2010-04-26 15:47:23.016777216 -0600 -@@ -18,7 +18,7 @@ - */ - #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T) - const char *Py_FileSystemDefaultEncoding = "mbcs"; --#elif defined(__APPLE__) -+#elif defined(__APPLE__) || defined(__HAIKU__) - const char *Py_FileSystemDefaultEncoding = "utf-8"; - #else - const char *Py_FileSystemDefaultEncoding = NULL; /* use default */ -diff -up Python-2.6.5/Tools/scripts/h2py.py.orig Python-2.6.5/Tools/scripts/h2py.py ---- Python-2.6.5/Tools/scripts/h2py.py.orig 2004-08-09 11:27:55.006815744 -0600 -+++ Python-2.6.5/Tools/scripts/h2py.py 2010-04-26 15:46:56.047710208 -0600 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - - # Read #define's and translate to Python code. - # Handle #include statements. -@@ -50,7 +50,7 @@ except KeyError: - searchdirs=os.environ['INCLUDE'].split(';') - except KeyError: - try: -- if sys.platform.find("beos") == 0: -+ if sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0: - searchdirs=os.environ['BEINCLUDES'].split(';') - elif sys.platform.startswith("atheos"): - searchdirs=os.environ['C_INCLUDE_PATH'].split(':') diff --git a/dev-lang/python/patches/python-2.6.6.patch b/dev-lang/python/patches/python-2.6.6.patch deleted file mode 100644 index b2b70cafd..000000000 --- a/dev-lang/python/patches/python-2.6.6.patch +++ /dev/null @@ -1,558 +0,0 @@ -diff -urN Python-2.6.6/Lib/plat-haiku1/IN.py Python-2.6.6-haiku/Lib/plat-haiku1/IN.py ---- Python-2.6.6/Lib/plat-haiku1/IN.py 1970-01-01 00:00:00.000000000 +0000 -+++ Python-2.6.6-haiku/Lib/plat-haiku1/IN.py 2010-08-30 04:52:27.223346688 +0000 -@@ -0,0 +1,327 @@ -+# Generated by h2py from /boot/develop/headers/be/net/netinet/in.h -+ -+# Included from socket.h -+ -+# Included from BeBuild.h -+B_BEOS_VERSION_4 = 0x0400 -+B_BEOS_VERSION_4_5 = 0x0450 -+B_BEOS_VERSION_5 = 0x0500 -+B_BEOS_VERSION = B_BEOS_VERSION_5 -+B_BEOS_VERSION_MAUI = B_BEOS_VERSION_5 -+_PR2_COMPATIBLE_ = 1 -+_PR3_COMPATIBLE_ = 1 -+_R4_COMPATIBLE_ = 1 -+_R4_5_COMPATIBLE_ = 1 -+_PR2_COMPATIBLE_ = 0 -+_PR3_COMPATIBLE_ = 0 -+_R4_COMPATIBLE_ = 1 -+_R4_5_COMPATIBLE_ = 1 -+def _UNUSED(x): return x -+ -+ -+# Included from sys/types.h -+ -+# Included from time.h -+ -+# Included from be_setup.h -+def __std(ref): return ref -+ -+__be_os = 2 -+__dest_os = __be_os -+__MSL__ = 0x4011 -+__GLIBC__ = -2 -+__GLIBC_MINOR__ = 1 -+ -+# Included from null.h -+NULL = (0) -+NULL = 0L -+ -+# Included from size_t.h -+ -+# Included from stddef.h -+ -+# Included from wchar_t.h -+CLOCKS_PER_SEC = 1000 -+CLK_TCK = CLOCKS_PER_SEC -+MAX_TIMESTR = 70 -+ -+# Included from sys/time.h -+ -+# Included from ByteOrder.h -+ -+# Included from endian.h -+__LITTLE_ENDIAN = 1234 -+LITTLE_ENDIAN = __LITTLE_ENDIAN -+__BYTE_ORDER = __LITTLE_ENDIAN -+BYTE_ORDER = __BYTE_ORDER -+__BIG_ENDIAN = 0 -+BIG_ENDIAN = 0 -+__BIG_ENDIAN = 4321 -+BIG_ENDIAN = __BIG_ENDIAN -+__BYTE_ORDER = __BIG_ENDIAN -+BYTE_ORDER = __BYTE_ORDER -+__LITTLE_ENDIAN = 0 -+LITTLE_ENDIAN = 0 -+__PDP_ENDIAN = 3412 -+PDP_ENDIAN = __PDP_ENDIAN -+ -+# Included from SupportDefs.h -+ -+# Included from Errors.h -+ -+# Included from limits.h -+ -+# Included from float.h -+FLT_ROUNDS = 1 -+FLT_RADIX = 2 -+FLT_MANT_DIG = 24 -+FLT_DIG = 6 -+FLT_MIN_EXP = (-125) -+FLT_MIN_10_EXP = (-37) -+FLT_MAX_EXP = 128 -+FLT_MAX_10_EXP = 38 -+DBL_MANT_DIG = 53 -+DBL_DIG = 15 -+DBL_MIN_EXP = (-1021) -+DBL_MIN_10_EXP = (-308) -+DBL_MAX_EXP = 1024 -+DBL_MAX_10_EXP = 308 -+LDBL_MANT_DIG = DBL_MANT_DIG -+LDBL_DIG = DBL_DIG -+LDBL_MIN_EXP = DBL_MIN_EXP -+LDBL_MIN_10_EXP = DBL_MIN_10_EXP -+LDBL_MAX_EXP = DBL_MAX_EXP -+LDBL_MAX_10_EXP = DBL_MAX_10_EXP -+CHAR_BIT = (8) -+SCHAR_MIN = (-127-1) -+SCHAR_MAX = (127) -+CHAR_MIN = SCHAR_MIN -+CHAR_MAX = SCHAR_MAX -+MB_LEN_MAX = (1) -+SHRT_MIN = (-32767-1) -+SHRT_MAX = (32767) -+LONG_MIN = (-2147483647L-1) -+LONG_MAX = (2147483647L) -+INT_MIN = LONG_MIN -+INT_MAX = LONG_MAX -+ARG_MAX = (32768) -+ATEXIT_MAX = (32) -+CHILD_MAX = (1024) -+IOV_MAX = (256) -+FILESIZEBITS = (64) -+LINK_MAX = (1) -+LOGIN_NAME_MAX = (32) -+MAX_CANON = (255) -+MAX_INPUT = (255) -+NAME_MAX = (256) -+NGROUPS_MAX = (32) -+OPEN_MAX = (128) -+PATH_MAX = (1024) -+PIPE_MAX = (512) -+SSIZE_MAX = (2147483647L) -+TTY_NAME_MAX = (256) -+TZNAME_MAX = (32) -+SYMLINKS_MAX = (16) -+_POSIX_ARG_MAX = (32768) -+_POSIX_CHILD_MAX = (1024) -+_POSIX_LINK_MAX = (1) -+_POSIX_LOGIN_NAME_MAX = (9) -+_POSIX_MAX_CANON = (255) -+_POSIX_MAX_INPUT = (255) -+_POSIX_NAME_MAX = (255) -+_POSIX_NGROUPS_MAX = (0) -+_POSIX_OPEN_MAX = (128) -+_POSIX_PATH_MAX = (1024) -+_POSIX_PIPE_BUF = (512) -+_POSIX_SSIZE_MAX = (2147483647L) -+_POSIX_STREAM_MAX = (8) -+_POSIX_TTY_NAME_MAX = (256) -+_POSIX_TZNAME_MAX = (3) -+B_GENERAL_ERROR_BASE = LONG_MIN -+B_OS_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x1000 -+B_APP_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x2000 -+B_INTERFACE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x3000 -+B_MEDIA_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4000 -+B_TRANSLATION_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x4800 -+B_MIDI_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x5000 -+B_STORAGE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x6000 -+B_POSIX_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x7000 -+B_MAIL_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x8000 -+B_PRINT_ERROR_BASE = B_GENERAL_ERROR_BASE + 0x9000 -+B_DEVICE_ERROR_BASE = B_GENERAL_ERROR_BASE + 0xa000 -+B_ERRORS_END = (B_GENERAL_ERROR_BASE + 0xffff) -+E2BIG = (B_POSIX_ERROR_BASE + 1) -+ECHILD = (B_POSIX_ERROR_BASE + 2) -+EDEADLK = (B_POSIX_ERROR_BASE + 3) -+EFBIG = (B_POSIX_ERROR_BASE + 4) -+EMLINK = (B_POSIX_ERROR_BASE + 5) -+ENFILE = (B_POSIX_ERROR_BASE + 6) -+ENODEV = (B_POSIX_ERROR_BASE + 7) -+ENOLCK = (B_POSIX_ERROR_BASE + 8) -+ENOSYS = (B_POSIX_ERROR_BASE + 9) -+ENOTTY = (B_POSIX_ERROR_BASE + 10) -+ENXIO = (B_POSIX_ERROR_BASE + 11) -+ESPIPE = (B_POSIX_ERROR_BASE + 12) -+ESRCH = (B_POSIX_ERROR_BASE + 13) -+EFPOS = (B_POSIX_ERROR_BASE + 14) -+ESIGPARM = (B_POSIX_ERROR_BASE + 15) -+EDOM = (B_POSIX_ERROR_BASE + 16) -+ERANGE = (B_POSIX_ERROR_BASE + 17) -+EPROTOTYPE = (B_POSIX_ERROR_BASE + 18) -+EPROTONOSUPPORT = (B_POSIX_ERROR_BASE + 19) -+EPFNOSUPPORT = (B_POSIX_ERROR_BASE + 20) -+EAFNOSUPPORT = (B_POSIX_ERROR_BASE + 21) -+EADDRINUSE = (B_POSIX_ERROR_BASE + 22) -+EADDRNOTAVAIL = (B_POSIX_ERROR_BASE + 23) -+ENETDOWN = (B_POSIX_ERROR_BASE + 24) -+ENETUNREACH = (B_POSIX_ERROR_BASE + 25) -+ENETRESET = (B_POSIX_ERROR_BASE + 26) -+ECONNABORTED = (B_POSIX_ERROR_BASE + 27) -+ECONNRESET = (B_POSIX_ERROR_BASE + 28) -+EISCONN = (B_POSIX_ERROR_BASE + 29) -+ENOTCONN = (B_POSIX_ERROR_BASE + 30) -+ESHUTDOWN = (B_POSIX_ERROR_BASE + 31) -+ECONNREFUSED = (B_POSIX_ERROR_BASE + 32) -+EHOSTUNREACH = (B_POSIX_ERROR_BASE + 33) -+ENOPROTOOPT = (B_POSIX_ERROR_BASE + 34) -+ENOBUFS = (B_POSIX_ERROR_BASE + 35) -+EINPROGRESS = (B_POSIX_ERROR_BASE + 36) -+EALREADY = (B_POSIX_ERROR_BASE + 37) -+EILSEQ = (B_POSIX_ERROR_BASE + 38) -+ENOMSG = (B_POSIX_ERROR_BASE + 39) -+ESTALE = (B_POSIX_ERROR_BASE + 40) -+EOVERFLOW = (B_POSIX_ERROR_BASE + 41) -+EMSGSIZE = (B_POSIX_ERROR_BASE + 42) -+EOPNOTSUPP = (B_POSIX_ERROR_BASE + 43) -+ENOTSOCK = (B_POSIX_ERROR_BASE + 44) -+false = 0 -+true = 1 -+NULL = (0) -+FALSE = 0 -+TRUE = 1 -+ -+# Included from TypeConstants.h -+B_HOST_IS_LENDIAN = 1 -+B_HOST_IS_BENDIAN = 0 -+def B_HOST_TO_LENDIAN_DOUBLE(arg): return (double)(arg) -+ -+def B_HOST_TO_LENDIAN_FLOAT(arg): return (float)(arg) -+ -+def B_HOST_TO_LENDIAN_INT64(arg): return (uint64)(arg) -+ -+def B_HOST_TO_LENDIAN_INT32(arg): return (uint32)(arg) -+ -+def B_HOST_TO_LENDIAN_INT16(arg): return (uint16)(arg) -+ -+def B_HOST_TO_BENDIAN_DOUBLE(arg): return __swap_double(arg) -+ -+def B_HOST_TO_BENDIAN_FLOAT(arg): return __swap_float(arg) -+ -+def B_HOST_TO_BENDIAN_INT64(arg): return __swap_int64(arg) -+ -+def B_HOST_TO_BENDIAN_INT32(arg): return __swap_int32(arg) -+ -+def B_HOST_TO_BENDIAN_INT16(arg): return __swap_int16(arg) -+ -+def B_LENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg) -+ -+def B_LENDIAN_TO_HOST_FLOAT(arg): return (float)(arg) -+ -+def B_LENDIAN_TO_HOST_INT64(arg): return (uint64)(arg) -+ -+def B_LENDIAN_TO_HOST_INT32(arg): return (uint32)(arg) -+ -+def B_LENDIAN_TO_HOST_INT16(arg): return (uint16)(arg) -+ -+def B_BENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg) -+ -+def B_BENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg) -+ -+def B_BENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg) -+ -+def B_BENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg) -+ -+def B_BENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg) -+ -+B_HOST_IS_LENDIAN = 0 -+B_HOST_IS_BENDIAN = 1 -+def B_HOST_TO_LENDIAN_DOUBLE(arg): return __swap_double(arg) -+ -+def B_HOST_TO_LENDIAN_FLOAT(arg): return __swap_float(arg) -+ -+def B_HOST_TO_LENDIAN_INT64(arg): return __swap_int64(arg) -+ -+def B_HOST_TO_LENDIAN_INT32(arg): return __swap_int32(arg) -+ -+def B_HOST_TO_LENDIAN_INT16(arg): return __swap_int16(arg) -+ -+def B_HOST_TO_BENDIAN_DOUBLE(arg): return (double)(arg) -+ -+def B_HOST_TO_BENDIAN_FLOAT(arg): return (float)(arg) -+ -+def B_HOST_TO_BENDIAN_INT64(arg): return (uint64)(arg) -+ -+def B_HOST_TO_BENDIAN_INT32(arg): return (uint32)(arg) -+ -+def B_HOST_TO_BENDIAN_INT16(arg): return (uint16)(arg) -+ -+def B_LENDIAN_TO_HOST_DOUBLE(arg): return __swap_double(arg) -+ -+def B_LENDIAN_TO_HOST_FLOAT(arg): return __swap_float(arg) -+ -+def B_LENDIAN_TO_HOST_INT64(arg): return __swap_int64(arg) -+ -+def B_LENDIAN_TO_HOST_INT32(arg): return __swap_int32(arg) -+ -+def B_LENDIAN_TO_HOST_INT16(arg): return __swap_int16(arg) -+ -+def B_BENDIAN_TO_HOST_DOUBLE(arg): return (double)(arg) -+ -+def B_BENDIAN_TO_HOST_FLOAT(arg): return (float)(arg) -+ -+def B_BENDIAN_TO_HOST_INT64(arg): return (uint64)(arg) -+ -+def B_BENDIAN_TO_HOST_INT32(arg): return (uint32)(arg) -+ -+def B_BENDIAN_TO_HOST_INT16(arg): return (uint16)(arg) -+ -+def B_SWAP_DOUBLE(arg): return __swap_double(arg) -+ -+def B_SWAP_FLOAT(arg): return __swap_float(arg) -+ -+def B_SWAP_INT64(arg): return __swap_int64(arg) -+ -+def B_SWAP_INT32(arg): return __swap_int32(arg) -+ -+def B_SWAP_INT16(arg): return __swap_int16(arg) -+ -+def htonl(x): return B_HOST_TO_BENDIAN_INT32(x) -+ -+def ntohl(x): return B_BENDIAN_TO_HOST_INT32(x) -+ -+def htons(x): return B_HOST_TO_BENDIAN_INT16(x) -+ -+def ntohs(x): return B_BENDIAN_TO_HOST_INT16(x) -+ -+AF_INET = 1 -+INADDR_ANY = 0x00000000 -+INADDR_BROADCAST = 0xffffffff -+INADDR_LOOPBACK = 0x7f000001 -+SOL_SOCKET = 1 -+SO_DEBUG = 1 -+SO_REUSEADDR = 2 -+SO_NONBLOCK = 3 -+SO_REUSEPORT = 4 -+MSG_OOB = 0x1 -+SOCK_DGRAM = 1 -+SOCK_STREAM = 2 -+IPPROTO_UDP = 1 -+IPPROTO_TCP = 2 -+IPPROTO_ICMP = 3 -+B_UDP_MAX_SIZE = (65536 - 1024) -+FD_SETSIZE = 256 -+FDSETSIZE = FD_SETSIZE -+NFDBITS = 32 -+def _FDMSKNO(fd): return ((fd) / NFDBITS) -+ -+def _FDBITNO(fd): return ((fd) % NFDBITS) -diff -urN Python-2.6.6/Lib/plat-haiku1/regen Python-2.6.6-haiku/Lib/plat-haiku1/regen ---- Python-2.6.6/Lib/plat-haiku1/regen 1970-01-01 00:00:00.000000000 +0000 -+++ Python-2.6.6-haiku/Lib/plat-haiku1/regen 2010-08-30 04:52:27.237502464 +0000 -@@ -0,0 +1,7 @@ -+#! /bin/sh -+ -+H2PY=../../Tools/scripts/h2py.py -+HEADERS=/boot/develop/headers -+ -+set -v -+python $H2PY -i '(u_long)' $HEADERS/posix/netinet/in.h -diff -urN Python-2.6.6/Modules/resource.c Python-2.6.6-haiku/Modules/resource.c ---- Python-2.6.6/Modules/resource.c 2010-05-09 15:15:40.053739520 +0000 -+++ Python-2.6.6-haiku/Modules/resource.c 2010-08-30 04:52:24.666370048 +0000 -@@ -86,6 +86,7 @@ - PyFloat_FromDouble(doubletime(ru.ru_utime))); - PyStructSequence_SET_ITEM(result, 1, - PyFloat_FromDouble(doubletime(ru.ru_stime))); -+#ifndef __HAIKU__ - PyStructSequence_SET_ITEM(result, 2, PyInt_FromLong(ru.ru_maxrss)); - PyStructSequence_SET_ITEM(result, 3, PyInt_FromLong(ru.ru_ixrss)); - PyStructSequence_SET_ITEM(result, 4, PyInt_FromLong(ru.ru_idrss)); -@@ -100,7 +101,7 @@ - PyStructSequence_SET_ITEM(result, 13, PyInt_FromLong(ru.ru_nsignals)); - PyStructSequence_SET_ITEM(result, 14, PyInt_FromLong(ru.ru_nvcsw)); - PyStructSequence_SET_ITEM(result, 15, PyInt_FromLong(ru.ru_nivcsw)); -- -+#endif - if (PyErr_Occurred()) { - Py_DECREF(result); - return NULL; -diff -urN Python-2.6.6/Modules/socketmodule.c Python-2.6.6-haiku/Modules/socketmodule.c ---- Python-2.6.6/Modules/socketmodule.c 2010-05-23 15:22:08.054525952 +0000 -+++ Python-2.6.6-haiku/Modules/socketmodule.c 2010-08-30 04:53:35.429916160 +0000 -@@ -4661,7 +4661,9 @@ - #ifndef __BEOS__ - /* We have incomplete socket support. */ - PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW); -- PyModule_AddIntConstant(m, "SOCK_SEQPACKET", SOCK_SEQPACKET); -+#ifndef __HAIKU__ -+ PyModule_AddIntConstant(m, "SOCK_SEQPACKET", SOCK_SEQPACKET); -+#endif - #if defined(SOCK_RDM) - PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM); - #endif -diff -urN Python-2.6.6/Modules/socketmodule.h Python-2.6.6-haiku/Modules/socketmodule.h ---- Python-2.6.6/Modules/socketmodule.h 2010-05-09 15:15:40.053739520 +0000 -+++ Python-2.6.6-haiku/Modules/socketmodule.h 2010-08-30 04:52:24.667942912 +0000 -@@ -47,6 +47,10 @@ - # undef AF_NETLINK - #endif - -+#if defined(__HAIKU__) -+#undef HAVE_BLUETOOTH_BLUETOOTH_H -+#endif -+ - #ifdef HAVE_BLUETOOTH_BLUETOOTH_H - #include - #include -diff -urN Python-2.6.6/Modules/spwdmodule.c Python-2.6.6-haiku/Modules/spwdmodule.c ---- Python-2.6.6/Modules/spwdmodule.c 2010-05-09 15:15:40.030408704 +0000 -+++ Python-2.6.6-haiku/Modules/spwdmodule.c 2010-08-30 04:52:24.709623808 +0000 -@@ -79,7 +79,9 @@ - - SETS(setIndex++, p->sp_namp); - SETS(setIndex++, p->sp_pwdp); -+#ifndef __HAIKU__ - SETI(setIndex++, p->sp_lstchg); -+#endif - SETI(setIndex++, p->sp_min); - SETI(setIndex++, p->sp_max); - SETI(setIndex++, p->sp_warn); -diff -urN Python-2.6.6/Modules/timemodule.c Python-2.6.6-haiku/Modules/timemodule.c ---- Python-2.6.6/Modules/timemodule.c 2010-05-09 15:15:40.015204352 +0000 -+++ Python-2.6.6-haiku/Modules/timemodule.c 2010-08-30 04:52:24.721944576 +0000 -@@ -968,11 +968,11 @@ - return -1; - } - Py_END_ALLOW_THREADS --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - /* This sleep *CAN BE* interrupted. */ - { - if( secs <= 0.0 ) { -- return; -+ return 0; - } - - Py_BEGIN_ALLOW_THREADS -diff -urN Python-2.6.6/Parser/asdl_c.py Python-2.6.6-haiku/Parser/asdl_c.py ---- Python-2.6.6/Parser/asdl_c.py 2009-12-13 00:59:01.059768832 +0000 -+++ Python-2.6.6-haiku/Parser/asdl_c.py 2010-08-30 04:52:27.169607168 +0000 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - """Generate C code from an ASDL description.""" - - # TO DO -diff -urN Python-2.6.6/Python/bltinmodule.c Python-2.6.6-haiku/Python/bltinmodule.c ---- Python-2.6.6/Python/bltinmodule.c 2010-05-09 15:15:40.065011712 +0000 -+++ Python-2.6.6-haiku/Python/bltinmodule.c 2010-08-30 04:52:27.186646528 +0000 -@@ -18,7 +18,7 @@ - */ - #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T) - const char *Py_FileSystemDefaultEncoding = "mbcs"; --#elif defined(__APPLE__) -+#elif defined(__APPLE__) || defined(__HAIKU__) - const char *Py_FileSystemDefaultEncoding = "utf-8"; - #else - const char *Py_FileSystemDefaultEncoding = NULL; /* use default */ -diff -urN Python-2.6.6/Tools/scripts/h2py.py Python-2.6.6-haiku/Tools/scripts/h2py.py ---- Python-2.6.6/Tools/scripts/h2py.py 2004-08-09 17:27:55.066584576 +0000 -+++ Python-2.6.6-haiku/Tools/scripts/h2py.py 2010-08-30 04:52:27.188219392 +0000 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - - # Read #define's and translate to Python code. - # Handle #include statements. -@@ -50,7 +50,7 @@ - searchdirs=os.environ['INCLUDE'].split(';') - except KeyError: - try: -- if sys.platform.find("beos") == 0: -+ if sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0: - searchdirs=os.environ['BEINCLUDES'].split(';') - elif sys.platform.startswith("atheos"): - searchdirs=os.environ['C_INCLUDE_PATH'].split(':') -diff -urN Python-2.6.6/configure.in Python-2.6.6-haiku/configure.in ---- Python-2.6.6/configure.in 2010-05-25 02:27:03.064225280 +0000 -+++ Python-2.6.6-haiku/configure.in 2010-08-30 04:52:27.207880192 +0000 -@@ -745,7 +745,7 @@ - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; -- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) -+ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|Haiku*) - LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -@@ -823,7 +823,7 @@ - AC_SUBST(LN) - if test -z "$LN" ; then - case $ac_sys_system in -- BeOS*) LN="ln -s";; -+ BeOS*|Haiku*) LN="ln -s";; - CYGWIN*) LN="ln -s";; - atheos*) LN="ln -s";; - *) LN=ln;; -@@ -1829,7 +1829,7 @@ - fi - fi - ;; -- Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';; -+ Linux*|GNU*|QNX*|Haiku*) LDSHARED='$(CC) -shared';; - BSD/OS*/4*) LDSHARED="gcc -shared";; - FreeBSD*) - if [[ "`$CC -dM -E - - #include -diff -urN Python-2.6.7/Modules/spwdmodule.c Python-2.6.7-haiku/Modules/spwdmodule.c ---- Python-2.6.7/Modules/spwdmodule.c 2010-05-09 15:15:40.030408704 +0000 -+++ Python-2.6.7-haiku/Modules/spwdmodule.c 2010-08-30 04:52:24.709623808 +0000 -@@ -79,7 +79,9 @@ - - SETS(setIndex++, p->sp_namp); - SETS(setIndex++, p->sp_pwdp); -+#ifndef __HAIKU__ - SETI(setIndex++, p->sp_lstchg); -+#endif - SETI(setIndex++, p->sp_min); - SETI(setIndex++, p->sp_max); - SETI(setIndex++, p->sp_warn); -diff -urN Python-2.6.7/Modules/timemodule.c Python-2.6.7-haiku/Modules/timemodule.c ---- Python-2.6.7/Modules/timemodule.c 2010-05-09 15:15:40.015204352 +0000 -+++ Python-2.6.7-haiku/Modules/timemodule.c 2010-08-30 04:52:24.721944576 +0000 -@@ -972,11 +972,11 @@ - return -1; - } - Py_END_ALLOW_THREADS --#elif defined(__BEOS__) -+#elif defined(__BEOS__) || defined(__HAIKU__) - /* This sleep *CAN BE* interrupted. */ - { - if( secs <= 0.0 ) { -- return; -+ return 0; - } - - Py_BEGIN_ALLOW_THREADS -diff -urN Python-2.6.7/Parser/asdl_c.py Python-2.6.7-haiku/Parser/asdl_c.py ---- Python-2.6.7/Parser/asdl_c.py 2009-12-13 00:59:01.059768832 +0000 -+++ Python-2.6.7-haiku/Parser/asdl_c.py 2010-08-30 04:52:27.169607168 +0000 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - """Generate C code from an ASDL description.""" - - # TO DO -diff -urN Python-2.6.7/Python/bltinmodule.c Python-2.6.7-haiku/Python/bltinmodule.c ---- Python-2.6.7/Python/bltinmodule.c 2010-05-09 15:15:40.065011712 +0000 -+++ Python-2.6.7-haiku/Python/bltinmodule.c 2010-08-30 04:52:27.186646528 +0000 -@@ -18,7 +18,7 @@ - */ - #if defined(MS_WINDOWS) && defined(HAVE_USABLE_WCHAR_T) - const char *Py_FileSystemDefaultEncoding = "mbcs"; --#elif defined(__APPLE__) -+#elif defined(__APPLE__) || defined(__HAIKU__) - const char *Py_FileSystemDefaultEncoding = "utf-8"; - #else - const char *Py_FileSystemDefaultEncoding = NULL; /* use default */ -diff -urN Python-2.6.7/Tools/scripts/h2py.py Python-2.6.7-haiku/Tools/scripts/h2py.py ---- Python-2.6.7/Tools/scripts/h2py.py 2004-08-09 17:27:55.066584576 +0000 -+++ Python-2.6.7-haiku/Tools/scripts/h2py.py 2010-08-30 04:52:27.188219392 +0000 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /bin/env python - - # Read #define's and translate to Python code. - # Handle #include statements. -@@ -50,7 +50,7 @@ - searchdirs=os.environ['INCLUDE'].split(';') - except KeyError: - try: -- if sys.platform.find("beos") == 0: -+ if sys.platform.find("beos") == 0 or sys.platform.find("haiku1") == 0: - searchdirs=os.environ['BEINCLUDES'].split(';') - elif sys.platform.startswith("atheos"): - searchdirs=os.environ['C_INCLUDE_PATH'].split(':') -diff -urN Python-2.6.7/configure.in Python-2.6.7-haiku/configure.in ---- Python-2.6.7/configure.in 2010-05-25 02:27:03.064225280 +0000 -+++ Python-2.6.7-haiku/configure.in 2010-08-30 04:52:27.207880192 +0000 -@@ -745,7 +745,7 @@ - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; -- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*) -+ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|Haiku*) - LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-L. -lpython$(VERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -@@ -823,7 +823,7 @@ - AC_SUBST(LN) - if test -z "$LN" ; then - case $ac_sys_system in -- BeOS*) LN="ln -s";; -+ BeOS*|Haiku*) LN="ln -s";; - CYGWIN*) LN="ln -s";; - atheos*) LN="ln -s";; - *) LN=ln;; -@@ -1829,7 +1829,7 @@ - fi - fi - ;; -- Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';; -+ Linux*|GNU*|QNX*|Haiku*) LDSHARED='$(CC) -shared';; - BSD/OS*/4*) LDSHARED="gcc -shared";; - FreeBSD*) - if [[ "`$CC -dM -E - > configure.in - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared CFLAGS=-I/boot/develop/headers/3rdparty - make -} - -INSTALL() -{ - cd Python-2.6.4 - make install -} -LICENSE="Python" -COPYRIGHT="1990-2010, Python Software Foundation" diff --git a/dev-lang/python/python-2.6.5.recipe b/dev-lang/python/python-2.6.5.recipe deleted file mode 100644 index ee375a445..000000000 --- a/dev-lang/python/python-2.6.5.recipe +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION="python - An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org" -SRC_URI="http://www.python.org/ftp/python/2.6.5/Python-2.6.5.tgz" -CHECKSUM_MD5="cd04b5b9383b6c1fccdaa991af762cf4" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd Python-2.6.5/Modules/_ctypes/libffi - libtoolize --force --copy --install - cd ../../.. - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-shared LDFLAGS=-L/boot/common/lib CFLAGS=-I/boot/develop/headers/3rdparty - make -} - -INSTALL() -{ - cd Python-2.6.5 - make install -} -LICENSE="Python" -COPYRIGHT="1990-2010, Python Software Foundation" diff --git a/dev-lang/python/python-2.6.6.recipe b/dev-lang/python/python-2.6.6.recipe deleted file mode 100644 index cdc28008f..000000000 --- a/dev-lang/python/python-2.6.6.recipe +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION="python - An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org" -SRC_URI="http://www.python.org/ftp/python/2.6.6/Python-2.6.6.tar.bz2" -CHECKSUM_MD5="cf4e6881bb84a7ce6089e4a307f71f14" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/readline >= 6.0" -BUILD() -{ - cd Python-2.6.6/Modules/_ctypes/libffi - libtoolize --force --copy --install - cd ../../.. - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-shared LDFLAGS=-L/boot/common/lib \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - CFLAGS=-I/boot/develop/headers/3rdparty - make -} - -INSTALL() -{ - cd Python-2.6.6 - make install -} - -TEST() -{ - cd Python-2.6.6 - cd Lib/test - rm test_asynchat.py # this one stalls, so skip it for now - rm test_multiprocessing.py # this one stalls, so skip it for now - - python regrtest.py -} - -LICENSE="Python" -COPYRIGHT="1990-2010, Python Software Foundation" diff --git a/dev-lang/python/python-2.6.7.recipe b/dev-lang/python/python-2.6.7.recipe deleted file mode 100644 index af4de579a..000000000 --- a/dev-lang/python/python-2.6.7.recipe +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION="python - An interpreted, interactive, object-oriented programming language" -HOMEPAGE="http://www.python.org" -SRC_URI="http://www.python.org/ftp/python/2.6.7/Python-2.6.7.tar.bz2" -CHECKSUM_MD5="d40ef58ed88438a870bbeb0ac5d4217b" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="sys-libs/readline >= 6.0" -BUILD() -{ - cd Python-2.6.7/Modules/_ctypes/libffi - libtoolize --force --copy --install - cd ../../.. - echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in - libtoolize --force --copy --install - aclocal - autoconf - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --enable-shared LDFLAGS=-L/boot/common/lib \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - CFLAGS=-I/boot/develop/headers/3rdparty - make -} - -INSTALL() -{ - cd Python-2.6.7 - make install -} - -TEST() -{ - cd Python-2.6.7 - cd Lib/test - rm test_asynchat.py # this one stalls, so skip it for now - rm test_multiprocessing.py # this one stalls, so skip it for now - - python regrtest.py -} - -LICENSE="Python" -COPYRIGHT="1990-2011, Python Software Foundation"