Hi
The following diff updates lang/python/2.3 to new version -- 2.3.6.
It also fixes py-wxWidgets problem spotted by John Danks
<[EMAIL PROTECTED]>. The problem was that python is built with
CC and doesn't work with extensions that use CXX.
OK?
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/python/Makefile.inc,v
retrieving revision 1.44
diff -u -r1.44 Makefile.inc
--- Makefile.inc 24 Nov 2006 20:48:23 -0000 1.44
+++ Makefile.inc 19 Dec 2006 11:37:35 -0000
@@ -50,7 +50,7 @@
LIB_DEPENDS=
RUN_DEPENDS-main=
-WANTLIB-main= ssl panel m crypto c util z readline pthread ncurses
+WANTLIB-main= ssl panel m crypto c util z readline pthread ncurses stdc++
LIB_DEPENDS-bsddb= lib/db4/db.=4:db-4.*:databases/db/v4
LIB_DEPENDS-gdbm= gdbm.>=3::databases/gdbm
Index: 2.3/Makefile
===================================================================
RCS file: /cvs/ports/lang/python/2.3/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- 2.3/Makefile 24 Nov 2006 20:48:23 -0000 1.22
+++ 2.3/Makefile 19 Dec 2006 11:37:35 -0000
@@ -5,8 +5,8 @@
.endif
VERSION= 2.3
-PATCHLEVEL= .5
-PKG_PATCHLEVEL= p6
+PATCHLEVEL= .6
+PKG_PATCHLEVEL=
SHARED_LIBS= python2.3 0.0
# needed for www/zope
Index: 2.3/distinfo
===================================================================
RCS file: /cvs/ports/lang/python/2.3/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- 2.3/distinfo 3 Mar 2005 22:29:49 -0000 1.4
+++ 2.3/distinfo 19 Dec 2006 11:37:35 -0000
@@ -1,4 +1,4 @@
-MD5 (Python-2.3.5.tgz) = 7a1ecc1196c5c0e9d4eef90ba684c4e9
-RMD160 (Python-2.3.5.tgz) = 2104a393ca7c91b72b990ced53a0da752ccf42ef
-SHA1 (Python-2.3.5.tgz) = 2729d068f5d1abe7b743f32012d4f7c4b0508a3c
-SIZE (Python-2.3.5.tgz) = 8535749
+MD5 (Python-2.3.6.tgz) = 357c79f9c914b671c9401f70853ebf3b
+RMD160 (Python-2.3.6.tgz) = ee8a9f46137aba8972d22d5dc7cf0f601ad75c7b
+SHA1 (Python-2.3.6.tgz) = 20e180cfa1aa678728ac9bd54f73e0660acbbf9f
+SIZE (Python-2.3.6.tgz) = 8610359
Index: 2.3/patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/lang/python/2.3/patches/patch-configure_in,v
retrieving revision 1.10
diff -u -r1.10 patch-configure_in
--- 2.3/patches/patch-configure_in 1 Nov 2006 20:02:06 -0000 1.10
+++ 2.3/patches/patch-configure_in 19 Dec 2006 11:37:35 -0000
@@ -10,16 +10,7 @@
define_xopen_source=no;;
# On Solaris 2.6, sys/wait.h is inconsistent in the usage
# of union __?sigval. Reported by Stuart Bishop.
-@@ -479,6 +479,8 @@ then
- LINKCC="LD_RUN_PATH=$libdir $LINKCC";;
- Monterey64*)
- LINKCC="$LINKCC -L/usr/lib/ia64l64";;
-+ OpenBSD*)
-+ LINKCC="\$(PURIFY) \$(CC)";;
- esac
- fi
- AC_MSG_RESULT($LINKCC)
-@@ -1321,14 +1323,28 @@ then
+@@ -1321,14 +1321,17 @@ then
Linux*|GNU*) LDSHARED='$(CC) -shared';;
dgux*) LDSHARED="ld -G";;
BSD/OS*/4*) LDSHARED="gcc -shared";;
@@ -33,24 +24,13 @@
fi;;
- NetBSD*) LDSHARED="cc -shared ${LDFLAGS}";;
+ OpenBSD*)
-+ if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
-+ then
-+ LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
-+ else
-+ case `uname -r` in
-+ [[01]].* | 2.[[0-7]] | 2.[[0-7]].*)
-+ LDSHARED="ld -Bshareable ${LDFLAGS}"
-+ ;;
-+ *)
-+ LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
-+ ;;
-+ esac
-+ fi;;
++ LDSHARED='$(CC) -shared $(CCSHARED) ${LDFLAGS}'
++ ;;
+ NetBSD*) LDSHARED="${CC} -shared ${LDFLAGS}";;
OpenUNIX*|UnixWare*)
if test "$GCC" = "yes"
then LDSHARED='$(CC) -shared'
-@@ -1465,9 +1481,10 @@ AC_CHECK_LIB(dld, shl_load) # Dynamic li
+@@ -1465,9 +1468,10 @@ AC_CHECK_LIB(dld, shl_load) # Dynamic li
# only check for sem_ini if thread support is requested
if test "$with_threads" = "yes" -o -z "$with_threads"; then
Index: 2.4/Makefile
===================================================================
RCS file: /cvs/ports/lang/python/2.4/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- 2.4/Makefile 24 Nov 2006 20:48:23 -0000 1.10
+++ 2.4/Makefile 19 Dec 2006 11:37:35 -0000
@@ -2,7 +2,7 @@
VERSION= 2.4
PATCHLEVEL= .4
-PKG_PATCHLEVEL= p0
+PKG_PATCHLEVEL= p1
SHARED_LIBS= python2.4 0.0
.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" ||
${MACHINE_ARCH} == "sparc64"
Index: 2.4/patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/lang/python/2.4/patches/patch-configure_in,v
retrieving revision 1.6
diff -u -r1.6 patch-configure_in
--- 2.4/patches/patch-configure_in 1 Nov 2006 20:38:37 -0000 1.6
+++ 2.4/patches/patch-configure_in 19 Dec 2006 11:37:35 -0000
@@ -10,15 +10,6 @@
define_xopen_source=no;;
# On Solaris 2.6, sys/wait.h is inconsistent in the usage
# of union __?sigval. Reported by Stuart Bishop.
-@@ -565,6 +565,8 @@ then
- LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp $exp_extra
\$(LIBRARY); $LINKCC";;
- Monterey64*)
- LINKCC="$LINKCC -L/usr/lib/ia64l64";;
-+ OpenBSD*)
-+ LINKCC="\$(PURIFY) \$(CC)";;
- esac
- fi
- AC_MSG_RESULT($LINKCC)
@@ -1616,9 +1618,10 @@ AC_CHECK_LIB(dld, shl_load) # Dynamic li
# only check for sem_ini if thread support is requested
Index: 2.5/Makefile
===================================================================
RCS file: /cvs/ports/lang/python/2.5/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- 2.5/Makefile 24 Nov 2006 20:48:23 -0000 1.3
+++ 2.5/Makefile 19 Dec 2006 11:37:35 -0000
@@ -2,7 +2,7 @@
VERSION= 2.5
PATCHLEVEL=
-PKG_PATCHLEVEL= p1
+PKG_PATCHLEVEL= p2
SHARED_LIBS= python2.5 0.0
# PSUBDIR= python/${VERSION}
@@ -11,5 +11,7 @@
.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" ||
${MACHINE_ARCH} == "sparc64"
PATCH_LIST= patch-* sup64-*
.endif
+
+CONFIGURE_ARGS+= --with-cxx_main
.include <bsd.port.mk>
