haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated sed to got into /boot/system as libtool has issue when sed is in /boot/common, updated python 2.6.5 files, and updated openssh's .opd file

Browse Source
This commit is contained in:
Scott McCreary
2010-03-21 07:01:14 +00:00
parent bf1c68c2a7
commit 828dc5e9dd
5 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dev-lang/python/Python.OptionalPackageDescription
View File

@@ -1,5 +1,5 @@
Package: Python
Version: 2.6.2
Copyright: 1990-2009, Python Software Foundation
Version: 2.6.5
Copyright: 1990-2010, Python Software Foundation
License: Python License.
URL: http://www.python.org/

66
dev-lang/python/patches/python-2.6.5.patch
View File

@@ -1,6 +1,6 @@
diff -urN Python-2.6.5rc2/Lib/plat-haiku1/IN.py Python-2.6.5rc2-haiku/Lib/plat-haiku1/IN.py
--- Python-2.6.5rc2/Lib/plat-haiku1/IN.py 1970-01-01 00:00:00.000000000 +0000
+++ Python-2.6.5rc2-haiku/Lib/plat-haiku1/IN.py 2010-03-11 16:54:31.758644736 +0000
diff -urN Python-2.6.5/Lib/plat-haiku1/IN.py Python-2.6.5-haiku/Lib/plat-haiku1/IN.py
--- Python-2.6.5/Lib/plat-haiku1/IN.py 1970-01-01 00:00:00.000000000 +0000
+++ Python-2.6.5-haiku/Lib/plat-haiku1/IN.py 2010-03-11 16:54:31.758644736 +0000
@@ -0,0 +1,327 @@
+# Generated by h2py from /boot/develop/headers/be/net/netinet/in.h
+
@@ -329,9 +329,9 @@ diff -urN Python-2.6.5rc2/Lib/plat-haiku1/IN.py Python-2.6.5rc2-haiku/Lib/plat-h
+def _FDMSKNO(fd): return ((fd) / NFDBITS)
+
+def _FDBITNO(fd): return ((fd) % NFDBITS)
diff -urN Python-2.6.5rc2/Lib/plat-haiku1/regen Python-2.6.5rc2-haiku/Lib/plat-haiku1/regen
--- Python-2.6.5rc2/Lib/plat-haiku1/regen 1970-01-01 00:00:00.000000000 +0000
+++ Python-2.6.5rc2-haiku/Lib/plat-haiku1/regen 2010-03-11 16:54:31.759693312 +0000
diff -urN Python-2.6.5/Lib/plat-haiku1/regen Python-2.6.5-haiku/Lib/plat-haiku1/regen
--- Python-2.6.5/Lib/plat-haiku1/regen 1970-01-01 00:00:00.000000000 +0000
+++ Python-2.6.5-haiku/Lib/plat-haiku1/regen 2010-03-11 16:54:31.759693312 +0000
@@ -0,0 +1,7 @@
+#! /bin/sh
+
@@ -340,9 +340,9 @@ diff -urN Python-2.6.5rc2/Lib/plat-haiku1/regen Python-2.6.5rc2-haiku/Lib/plat-h
+
+set -v
+python $H2PY -i '(u_long)' $HEADERS/posix/netinet/in.h
diff -urN Python-2.6.5rc2/Modules/resource.c Python-2.6.5rc2-haiku/Modules/resource.c
--- Python-2.6.5rc2/Modules/resource.c 2009-05-08 20:59:57.027000832 +0000
+++ Python-2.6.5rc2-haiku/Modules/resource.c 2010-03-11 16:54:31.767819776 +0000
diff -urN Python-2.6.5/Modules/resource.c Python-2.6.5-haiku/Modules/resource.c
--- Python-2.6.5/Modules/resource.c 2009-05-08 20:59:57.027000832 +0000
+++ Python-2.6.5-haiku/Modules/resource.c 2010-03-11 16:54:31.767819776 +0000
@@ -86,6 +86,7 @@
PyFloat_FromDouble(doubletime(ru.ru_utime)));
PyStructSequence_SET_ITEM(result, 1,
@@ -359,9 +359,9 @@ diff -urN Python-2.6.5rc2/Modules/resource.c Python-2.6.5rc2-haiku/Modules/resou
if (PyErr_Occurred()) {
Py_DECREF(result);
diff -urN Python-2.6.5rc2/Modules/socketmodule.c Python-2.6.5rc2-haiku/Modules/socketmodule.c
--- Python-2.6.5rc2/Modules/socketmodule.c 2010-02-04 20:26:34.027787264 +0000
+++ Python-2.6.5rc2-haiku/Modules/socketmodule.c 2010-03-11 16:54:31.778043392 +0000
diff -urN Python-2.6.5/Modules/socketmodule.c Python-2.6.5-haiku/Modules/socketmodule.c
--- Python-2.6.5/Modules/socketmodule.c 2010-02-04 20:26:34.027787264 +0000
+++ Python-2.6.5-haiku/Modules/socketmodule.c 2010-03-11 16:54:31.778043392 +0000
@@ -4647,7 +4647,9 @@
#ifndef __BEOS__
/* We have incomplete socket support. */
@@ -372,9 +372,9 @@ diff -urN Python-2.6.5rc2/Modules/socketmodule.c Python-2.6.5rc2-haiku/Modules/s
#if defined(SOCK_RDM)
PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM);
#endif
diff -urN Python-2.6.5rc2/Modules/socketmodule.h Python-2.6.5rc2-haiku/Modules/socketmodule.h
--- Python-2.6.5rc2/Modules/socketmodule.h 2008-06-14 08:36:07.027000832 +0000
+++ Python-2.6.5rc2-haiku/Modules/socketmodule.h 2010-03-11 16:54:31.793247744 +0000
diff -urN Python-2.6.5/Modules/socketmodule.h Python-2.6.5-haiku/Modules/socketmodule.h
--- Python-2.6.5/Modules/socketmodule.h 2008-06-14 08:36:07.027000832 +0000
+++ Python-2.6.5-haiku/Modules/socketmodule.h 2010-03-11 16:54:31.793247744 +0000
@@ -47,6 +47,10 @@
# undef AF_NETLINK
#endif
@@ -386,9 +386,9 @@ diff -urN Python-2.6.5rc2/Modules/socketmodule.h Python-2.6.5rc2-haiku/Modules/s
#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
#include <bluetooth/bluetooth.h>
#include <bluetooth/rfcomm.h>
diff -urN Python-2.6.5rc2/Modules/spwdmodule.c Python-2.6.5rc2-haiku/Modules/spwdmodule.c
--- Python-2.6.5rc2/Modules/spwdmodule.c 2008-06-09 04:58:54.003932160 +0000
+++ Python-2.6.5rc2-haiku/Modules/spwdmodule.c 2010-03-11 16:54:31.794820608 +0000
diff -urN Python-2.6.5/Modules/spwdmodule.c Python-2.6.5-haiku/Modules/spwdmodule.c
--- Python-2.6.5/Modules/spwdmodule.c 2008-06-09 04:58:54.003932160 +0000
+++ Python-2.6.5-haiku/Modules/spwdmodule.c 2010-03-11 16:54:31.794820608 +0000
@@ -79,7 +79,9 @@
SETS(setIndex++, p->sp_namp);
@@ -399,9 +399,9 @@ diff -urN Python-2.6.5rc2/Modules/spwdmodule.c Python-2.6.5rc2-haiku/Modules/spw
SETI(setIndex++, p->sp_min);
SETI(setIndex++, p->sp_max);
SETI(setIndex++, p->sp_warn);
diff -urN Python-2.6.5rc2/Modules/timemodule.c Python-2.6.5rc2-haiku/Modules/timemodule.c
--- Python-2.6.5rc2/Modules/timemodule.c 2008-07-05 19:19:50.055836672 +0000
+++ Python-2.6.5rc2-haiku/Modules/timemodule.c 2010-03-11 16:54:31.796655616 +0000
diff -urN Python-2.6.5/Modules/timemodule.c Python-2.6.5-haiku/Modules/timemodule.c
--- Python-2.6.5/Modules/timemodule.c 2008-07-05 19:19:50.055836672 +0000
+++ Python-2.6.5-haiku/Modules/timemodule.c 2010-03-11 16:54:31.796655616 +0000
@@ -968,11 +968,11 @@
return -1;
}
@@ -416,18 +416,18 @@ diff -urN Python-2.6.5rc2/Modules/timemodule.c Python-2.6.5rc2-haiku/Modules/tim
}
Py_BEGIN_ALLOW_THREADS
diff -urN Python-2.6.5rc2/Parser/asdl_c.py Python-2.6.5rc2-haiku/Parser/asdl_c.py
--- Python-2.6.5rc2/Parser/asdl_c.py 2009-12-13 00:59:01.033030144 +0000
+++ Python-2.6.5rc2-haiku/Parser/asdl_c.py 2010-03-11 16:54:31.798228480 +0000
diff -urN Python-2.6.5/Parser/asdl_c.py Python-2.6.5-haiku/Parser/asdl_c.py
--- Python-2.6.5/Parser/asdl_c.py 2009-12-13 00:59:01.033030144 +0000
+++ Python-2.6.5-haiku/Parser/asdl_c.py 2010-03-11 16:54:31.798228480 +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.5rc2/Tools/scripts/h2py.py Python-2.6.5rc2-haiku/Tools/scripts/h2py.py
--- Python-2.6.5rc2/Tools/scripts/h2py.py 2004-08-09 17:27:55.039059456 +0000
+++ Python-2.6.5rc2-haiku/Tools/scripts/h2py.py 2010-03-11 16:54:31.805830656 +0000
diff -urN Python-2.6.5/Tools/scripts/h2py.py Python-2.6.5-haiku/Tools/scripts/h2py.py
--- Python-2.6.5/Tools/scripts/h2py.py 2004-08-09 17:27:55.039059456 +0000
+++ Python-2.6.5-haiku/Tools/scripts/h2py.py 2010-03-11 16:54:31.805830656 +0000
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /bin/env python
@@ -443,9 +443,9 @@ diff -urN Python-2.6.5rc2/Tools/scripts/h2py.py Python-2.6.5rc2-haiku/Tools/scri
searchdirs=os.environ['BEINCLUDES'].split(';')
elif sys.platform.startswith("atheos"):
searchdirs=os.environ['C_INCLUDE_PATH'].split(':')
diff -urN Python-2.6.5rc2/configure.in Python-2.6.5rc2-haiku/configure.in
--- Python-2.6.5rc2/configure.in 2010-03-09 21:47:28.038273024 +0000
+++ Python-2.6.5rc2-haiku/configure.in 2010-03-11 16:54:31.812908544 +0000
diff -urN Python-2.6.5/configure.in Python-2.6.5-haiku/configure.in
--- Python-2.6.5/configure.in 2010-03-09 21:47:28.038273024 +0000
+++ Python-2.6.5-haiku/configure.in 2010-03-11 16:54:31.812908544 +0000
@@ -747,7 +747,7 @@
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
INSTSONAME="$LDLIBRARY".$SOVERSION
@@ -510,9 +510,9 @@ diff -urN Python-2.6.5rc2/configure.in Python-2.6.5rc2-haiku/configure.in
*) LIBM=-lm
esac
AC_MSG_CHECKING(for --with-libm=STRING)
diff -urN Python-2.6.5rc2/setup.py Python-2.6.5rc2-haiku/setup.py
--- Python-2.6.5rc2/setup.py 2010-03-08 07:08:25.030146560 +0000
+++ Python-2.6.5rc2-haiku/setup.py 2010-03-11 16:55:47.940834816 +0000
diff -urN Python-2.6.5/setup.py Python-2.6.5-haiku/setup.py
--- Python-2.6.5/setup.py 2010-03-08 07:08:25.030146560 +0000
+++ Python-2.6.5-haiku/setup.py 2010-03-11 16:55:47.940834816 +0000
@@ -382,6 +382,10 @@
inc_dirs += ['/system/include', '/atheos/autolnk/include']
inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)

8
dev-lang/python/python-2.6.5.bep
View File

@@ -1,12 +1,12 @@
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.5rc2.tgz"
CHECKSUM_MD5="fbb10a1610fc1bdea7df2e63c18f177d"
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.5rc2/Modules/_ctypes/libffi
cd Python-2.6.5/Modules/_ctypes/libffi
libtoolize --force --copy --install
cd ../../..
echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in
@@ -18,6 +18,6 @@ BUILD {
}
INSTALL {
cd Python-2.6.5rc2
cd Python-2.6.5
make install
}

4
net-misc/openssh/openssh.OptionalPackageDescription
View File

@@ -1,5 +1,5 @@
Package: OpenSSH
Version: 5.3p1
Copyright: 2005-2009 Tatu Ylonen et al.
Version: 5.4p1
Copyright: 2005-2010 Tatu Ylonen et al.
License: OpenSSH
URL: http://www.openssh.com

2
sys-apps/sed/sed-4.2.1.bep
View File

@@ -8,7 +8,7 @@ DEPEND=""
BUILD {
cd sed-4.2.1
autoconf
./configure --prefix=/boot/common
./configure --prefix=/boot/system
make
}