Index: head/lang/python/Makefile =================================================================== --- head/lang/python/Makefile (revision 100479) +++ head/lang/python/Makefile (revision 100480) @@ -1,156 +1,157 @@ # New ports collection makefile for: python # Date created: 08 August 1995 # Whom: jkh # # $FreeBSD$ # PORTNAME= python PORTVERSION= 2.3.3 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" MAKE_ENV= VPATH="${WRKSRC}" INSTALL_TARGET= install MAN1= python.1 USE_PYTHON= yes PYTHON_VERSION= python2.3 PYTHON_NO_DEPENDS= yes USE_REINPLACE= yes # # If you don't want to use Python's thread module, you need to set # WITHOUT_THREADS. # .if !defined(WITHOUT_THREADS) CONFIGURE_ARGS+= --with-threads CFLAGS+= ${PTHREAD_CFLAGS} .if !defined(WANT_HUGE_STACK_SIZE) CFLAGS+= -DTHREAD_STACK_SIZE=0x20000 .else CFLAGS+= -DTHREAD_STACK_SIZE=0x100000 .endif # !defined(WANT_HUGE_STACK_SIZE) CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}" .else CONFIGURE_ARGS+= --without-threads .if defined(LDFLAGS) CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" .endif # defined(LDFLAGS) .endif # !defined(WITHOUT_THREADS) .if !defined(WITH_UCS2) CONFIGURE_ARGS+= --enable-unicode=ucs4 .endif .if defined(WITHOUT_PYMALLOC) CONFIGURE_ARGS+= --without-pymalloc .endif .if defined(BUILD_SHARED) CONFIGURE_ARGS+= --enable-shared INSTALLS_SHLIB= yes PLIST_SUB+= SHARED_ONLY="" .else PLIST_SUB+= SHARED_ONLY="@comment " .endif DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} .include .if ${ARCH} == i386 PLIST_SUB+= X86_ONLY="" .else PLIST_SUB+= X86_ONLY="@comment " .endif .if ${ARCH} == amd64 CFLAGS+= -fPIC .endif .if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha PLIST_SUB+= 32BIT_ONLY="@comment " .else PLIST_SUB+= 32BIT_ONLY="" .endif .if ${ARCH} == sparc64 CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900 .endif .if ${OSVERSION} < 400000 LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" .endif .if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005 CONFIGURE_ARGS+= --with-libs='-lxpg4' .endif .if ${OSVERSION} < 400020 CONFIGURE_ARGS+= --with-libs='-lxpg4' .endif .if ${OSVERSION} >= 400014 CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 .endif .if ${OSVERSION} >= 500000 PLATFORMS=plat-freebsd2 plat-freebsd3 plat-freebsd4 .elif ${OSVERSION} >= 400000 PLATFORMS=plat-freebsd2 plat-freebsd3 plat-freebsd5 .elif ${OSVERSION} >= 300000 PLATFORMS=plat-freebsd2 plat-freebsd4 plat-freebsd5 .else PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 .endif post-extract: ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.3 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.3 post-patch: ${REINPLACE_CMD} -e \ 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${WRKSRC}/Lib/pydoc.py pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} .for file in IN.py regen ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \ ${PYTHONPREFIX_LIBDIR}/${platform}/ .endfor .endfor post-install: ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \ ${PREFIX}/share/emacs/site-lisp ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \ ${PREFIX}/bin .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ (cd ${TOOLSDIR}; tar xf -) @${MKDIR} ${DEMODIR} @cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \ (cd ${DEMODIR}; tar xf -) .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/lang/python/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.117 \ No newline at end of property +1.118 \ No newline at end of property Index: head/lang/python/distinfo =================================================================== --- head/lang/python/distinfo (revision 100479) +++ head/lang/python/distinfo (revision 100480) @@ -1,18 +1,19 @@ MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92 MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 MD5 (python/Python-2.0.1.tgz) = 8aa10dcf062723001b852d96e905af79 MD5 (python/Python-2.1.tgz) = 2ba2baeccd6100a4be80e6368a975054 MD5 (python/Python-2.1.1.tgz) = eb34371c49b271abc74b42572883e1b4 MD5 (python/Python-2.1.2.tgz) = 4af22bded23a55f907365ed7610de8c9 MD5 (python/Python-2.1.3.tgz) = a8b04cdc822a6fc833ed9b99c7fba589 MD5 (python/Python-2.2.tgz) = 87febf0780c8e18454022d34b2ca70a0 MD5 (python/Python-2.2.1.tgz) = e7012d611602b62e36073c2fd02396a3 MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c MD5 (python/Python-2.2.3.tgz) = 169f89f318e252dac0c54dd1b165d229 MD5 (python/Python-2.3.tgz) = 595620a4769073a812e353597585c4e8 MD5 (python/Python-2.3.1.tgz) = a3dcbe1c7f173c8e3c7cce28495016ae MD5 (python/Python-2.3.2.tgz) = f54d7a529d444994b4b33429bbb45479 MD5 (python/Python-2.3.3.tgz) = 4d16732b1cfccc0ed250956d41463c61 +SIZE (python/Python-2.3.3.tgz) = 8491380 MD5 (python/Python-2.4.a0.20031022.tgz) = 79581105c218886dd9dc382a84c64043 MD5 (python/Python-2.4.a0.20040106.tgz) = cde5962028bcfdb473455c57bbb24c18 Property changes on: head/lang/python/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.40 \ No newline at end of property +1.41 \ No newline at end of property Index: head/lang/python/files/patch-Objects::intobject.c =================================================================== --- head/lang/python/files/patch-Objects::intobject.c (nonexistent) +++ head/lang/python/files/patch-Objects::intobject.c (revision 100480) @@ -0,0 +1,12 @@ +diff -u python/dist/src/Objects/intobject.c:2.105 python/dist/src/Objects/intobject.c:2.105.8.1 +--- Objects/intobject.c:2.105 Sat Jun 28 13:04:24 2003 ++++ Objects/intobject.c Sun Feb 8 10:56:07 2004 +@@ -1080,7 +1080,7 @@ + int ival; + #if NSMALLNEGINTS + NSMALLPOSINTS > 0 + for (ival = -NSMALLNEGINTS; ival < NSMALLPOSINTS; ival++) { +- if ((free_list = fill_free_list()) == NULL) ++ if (!free_list && (free_list = fill_free_list()) == NULL) + return 0; + /* PyObject_New is inlined */ + v = free_list; Property changes on: head/lang/python/files/patch-Objects::intobject.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/lang/python/files/patch-Objects::weakrefobject.c =================================================================== --- head/lang/python/files/patch-Objects::weakrefobject.c (nonexistent) +++ head/lang/python/files/patch-Objects::weakrefobject.c (revision 100480) @@ -0,0 +1,65 @@ +diff -u python/dist/src/Objects/weakrefobject.c:1.13.6.1 python/dist/src/Objects/weakrefobject.c:1.13.6.3 +--- Objects/weakrefobject.c:1.13.6.1 Thu Nov 20 14:13:51 2003 ++++ Objects/weakrefobject.c Wed Feb 4 15:13:43 2004 +@@ -624,20 +624,29 @@ + } + list = GET_WEAKREFS_LISTPTR(ob); + get_basic_refs(*list, &ref, &proxy); +- if (callback == NULL || callback == Py_None) ++ if (callback == Py_None) ++ callback = NULL; ++ if (callback == NULL) + /* return existing weak reference if it exists */ + result = ref; + if (result != NULL) +- Py_XINCREF(result); ++ Py_INCREF(result); + else { ++ /* Note: new_weakref() can trigger cyclic GC, so the weakref ++ list on ob can be mutated. This means that the ref and ++ proxy pointers we got back earlier may have been collected, ++ so we need to compute these values again before we use ++ them. */ + result = new_weakref(ob, callback); + if (result != NULL) { + if (callback == NULL) { + insert_head(result, list); + } + else { +- PyWeakReference *prev = (proxy == NULL) ? ref : proxy; ++ PyWeakReference *prev; + ++ get_basic_refs(*list, &ref, &proxy); ++ prev = (proxy == NULL) ? ref : proxy; + if (prev == NULL) + insert_head(result, list); + else +@@ -664,12 +673,19 @@ + } + list = GET_WEAKREFS_LISTPTR(ob); + get_basic_refs(*list, &ref, &proxy); ++ if (callback == Py_None) ++ callback = NULL; + if (callback == NULL) + /* attempt to return an existing weak reference if it exists */ + result = proxy; + if (result != NULL) +- Py_XINCREF(result); ++ Py_INCREF(result); + else { ++ /* Note: new_weakref() can trigger cyclic GC, so the weakref ++ list on ob can be mutated. This means that the ref and ++ proxy pointers we got back earlier may have been collected, ++ so we need to compute these values again before we use ++ them. */ + result = new_weakref(ob, callback); + if (result != NULL) { + PyWeakReference *prev; +@@ -678,6 +694,7 @@ + result->ob_type = &_PyWeakref_CallableProxyType; + else + result->ob_type = &_PyWeakref_ProxyType; ++ get_basic_refs(*list, &ref, &proxy); + if (callback == NULL) + prev = ref; + else Property changes on: head/lang/python/files/patch-Objects::weakrefobject.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.3 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/lang/python/files/patch-configure =================================================================== --- head/lang/python/files/patch-configure (revision 100479) +++ head/lang/python/files/patch-configure (revision 100480) @@ -1,24 +1,33 @@ ---- configure.orig Sat Oct 4 13:27:50 2003 -+++ configure Sat Oct 4 13:29:05 2003 +--- configure.orig Wed Nov 19 04:59:36 2003 ++++ configure Mon Feb 9 17:39:34 2004 @@ -1321,7 +1321,7 @@ VERSION=2.3 -SOVERSION=1.0 +SOVERSION=1 # The later defininition of _XOPEN_SOURCE disables certain features # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). -@@ -3594,6 +3594,12 @@ - LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-L. -lpython$(VERSION)' +@@ -3608,6 +3608,12 @@ RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -+ INSTSONAME="$LDLIBRARY".$SOVERSION -+ ;; + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; + FreeBSD*) + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; ++ INSTSONAME="$LDLIBRARY".$SOVERSION ++ ;; hp*|HP*) + LDLIBRARY='libpython$(VERSION).sl' + BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)' +@@ -12272,7 +12278,7 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_pthread_system_supported=yes ++ ac_cv_pthread_system_supported="ignored by port" + else + echo "$as_me: program exited with status $ac_status" >&5 + echo "$as_me: failed program was:" >&5 Property changes on: head/lang/python/files/patch-configure ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/lang/python23/Makefile =================================================================== --- head/lang/python23/Makefile (revision 100479) +++ head/lang/python23/Makefile (revision 100480) @@ -1,156 +1,157 @@ # New ports collection makefile for: python # Date created: 08 August 1995 # Whom: jkh # # $FreeBSD$ # PORTNAME= python PORTVERSION= 2.3.3 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" MAKE_ENV= VPATH="${WRKSRC}" INSTALL_TARGET= install MAN1= python.1 USE_PYTHON= yes PYTHON_VERSION= python2.3 PYTHON_NO_DEPENDS= yes USE_REINPLACE= yes # # If you don't want to use Python's thread module, you need to set # WITHOUT_THREADS. # .if !defined(WITHOUT_THREADS) CONFIGURE_ARGS+= --with-threads CFLAGS+= ${PTHREAD_CFLAGS} .if !defined(WANT_HUGE_STACK_SIZE) CFLAGS+= -DTHREAD_STACK_SIZE=0x20000 .else CFLAGS+= -DTHREAD_STACK_SIZE=0x100000 .endif # !defined(WANT_HUGE_STACK_SIZE) CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}" .else CONFIGURE_ARGS+= --without-threads .if defined(LDFLAGS) CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" .endif # defined(LDFLAGS) .endif # !defined(WITHOUT_THREADS) .if !defined(WITH_UCS2) CONFIGURE_ARGS+= --enable-unicode=ucs4 .endif .if defined(WITHOUT_PYMALLOC) CONFIGURE_ARGS+= --without-pymalloc .endif .if defined(BUILD_SHARED) CONFIGURE_ARGS+= --enable-shared INSTALLS_SHLIB= yes PLIST_SUB+= SHARED_ONLY="" .else PLIST_SUB+= SHARED_ONLY="@comment " .endif DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} .include .if ${ARCH} == i386 PLIST_SUB+= X86_ONLY="" .else PLIST_SUB+= X86_ONLY="@comment " .endif .if ${ARCH} == amd64 CFLAGS+= -fPIC .endif .if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha PLIST_SUB+= 32BIT_ONLY="@comment " .else PLIST_SUB+= 32BIT_ONLY="" .endif .if ${ARCH} == sparc64 CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900 .endif .if ${OSVERSION} < 400000 LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" .endif .if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005 CONFIGURE_ARGS+= --with-libs='-lxpg4' .endif .if ${OSVERSION} < 400020 CONFIGURE_ARGS+= --with-libs='-lxpg4' .endif .if ${OSVERSION} >= 400014 CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 .endif .if ${OSVERSION} >= 500000 PLATFORMS=plat-freebsd2 plat-freebsd3 plat-freebsd4 .elif ${OSVERSION} >= 400000 PLATFORMS=plat-freebsd2 plat-freebsd3 plat-freebsd5 .elif ${OSVERSION} >= 300000 PLATFORMS=plat-freebsd2 plat-freebsd4 plat-freebsd5 .else PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 .endif post-extract: ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.3 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.3 post-patch: ${REINPLACE_CMD} -e \ 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${WRKSRC}/Lib/pydoc.py pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} .for file in IN.py regen ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \ ${PYTHONPREFIX_LIBDIR}/${platform}/ .endfor .endfor post-install: ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \ ${PREFIX}/share/emacs/site-lisp ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \ ${PREFIX}/bin .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ (cd ${TOOLSDIR}; tar xf -) @${MKDIR} ${DEMODIR} @cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \ (cd ${DEMODIR}; tar xf -) .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/lang/python23/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.117 \ No newline at end of property +1.118 \ No newline at end of property Index: head/lang/python23/distinfo =================================================================== --- head/lang/python23/distinfo (revision 100479) +++ head/lang/python23/distinfo (revision 100480) @@ -1,18 +1,19 @@ MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92 MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 MD5 (python/Python-2.0.1.tgz) = 8aa10dcf062723001b852d96e905af79 MD5 (python/Python-2.1.tgz) = 2ba2baeccd6100a4be80e6368a975054 MD5 (python/Python-2.1.1.tgz) = eb34371c49b271abc74b42572883e1b4 MD5 (python/Python-2.1.2.tgz) = 4af22bded23a55f907365ed7610de8c9 MD5 (python/Python-2.1.3.tgz) = a8b04cdc822a6fc833ed9b99c7fba589 MD5 (python/Python-2.2.tgz) = 87febf0780c8e18454022d34b2ca70a0 MD5 (python/Python-2.2.1.tgz) = e7012d611602b62e36073c2fd02396a3 MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c MD5 (python/Python-2.2.3.tgz) = 169f89f318e252dac0c54dd1b165d229 MD5 (python/Python-2.3.tgz) = 595620a4769073a812e353597585c4e8 MD5 (python/Python-2.3.1.tgz) = a3dcbe1c7f173c8e3c7cce28495016ae MD5 (python/Python-2.3.2.tgz) = f54d7a529d444994b4b33429bbb45479 MD5 (python/Python-2.3.3.tgz) = 4d16732b1cfccc0ed250956d41463c61 +SIZE (python/Python-2.3.3.tgz) = 8491380 MD5 (python/Python-2.4.a0.20031022.tgz) = 79581105c218886dd9dc382a84c64043 MD5 (python/Python-2.4.a0.20040106.tgz) = cde5962028bcfdb473455c57bbb24c18 Property changes on: head/lang/python23/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.40 \ No newline at end of property +1.41 \ No newline at end of property Index: head/lang/python23/files/patch-Objects::intobject.c =================================================================== --- head/lang/python23/files/patch-Objects::intobject.c (nonexistent) +++ head/lang/python23/files/patch-Objects::intobject.c (revision 100480) @@ -0,0 +1,12 @@ +diff -u python/dist/src/Objects/intobject.c:2.105 python/dist/src/Objects/intobject.c:2.105.8.1 +--- Objects/intobject.c:2.105 Sat Jun 28 13:04:24 2003 ++++ Objects/intobject.c Sun Feb 8 10:56:07 2004 +@@ -1080,7 +1080,7 @@ + int ival; + #if NSMALLNEGINTS + NSMALLPOSINTS > 0 + for (ival = -NSMALLNEGINTS; ival < NSMALLPOSINTS; ival++) { +- if ((free_list = fill_free_list()) == NULL) ++ if (!free_list && (free_list = fill_free_list()) == NULL) + return 0; + /* PyObject_New is inlined */ + v = free_list; Property changes on: head/lang/python23/files/patch-Objects::intobject.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/lang/python23/files/patch-Objects::weakrefobject.c =================================================================== --- head/lang/python23/files/patch-Objects::weakrefobject.c (nonexistent) +++ head/lang/python23/files/patch-Objects::weakrefobject.c (revision 100480) @@ -0,0 +1,65 @@ +diff -u python/dist/src/Objects/weakrefobject.c:1.13.6.1 python/dist/src/Objects/weakrefobject.c:1.13.6.3 +--- Objects/weakrefobject.c:1.13.6.1 Thu Nov 20 14:13:51 2003 ++++ Objects/weakrefobject.c Wed Feb 4 15:13:43 2004 +@@ -624,20 +624,29 @@ + } + list = GET_WEAKREFS_LISTPTR(ob); + get_basic_refs(*list, &ref, &proxy); +- if (callback == NULL || callback == Py_None) ++ if (callback == Py_None) ++ callback = NULL; ++ if (callback == NULL) + /* return existing weak reference if it exists */ + result = ref; + if (result != NULL) +- Py_XINCREF(result); ++ Py_INCREF(result); + else { ++ /* Note: new_weakref() can trigger cyclic GC, so the weakref ++ list on ob can be mutated. This means that the ref and ++ proxy pointers we got back earlier may have been collected, ++ so we need to compute these values again before we use ++ them. */ + result = new_weakref(ob, callback); + if (result != NULL) { + if (callback == NULL) { + insert_head(result, list); + } + else { +- PyWeakReference *prev = (proxy == NULL) ? ref : proxy; ++ PyWeakReference *prev; + ++ get_basic_refs(*list, &ref, &proxy); ++ prev = (proxy == NULL) ? ref : proxy; + if (prev == NULL) + insert_head(result, list); + else +@@ -664,12 +673,19 @@ + } + list = GET_WEAKREFS_LISTPTR(ob); + get_basic_refs(*list, &ref, &proxy); ++ if (callback == Py_None) ++ callback = NULL; + if (callback == NULL) + /* attempt to return an existing weak reference if it exists */ + result = proxy; + if (result != NULL) +- Py_XINCREF(result); ++ Py_INCREF(result); + else { ++ /* Note: new_weakref() can trigger cyclic GC, so the weakref ++ list on ob can be mutated. This means that the ref and ++ proxy pointers we got back earlier may have been collected, ++ so we need to compute these values again before we use ++ them. */ + result = new_weakref(ob, callback); + if (result != NULL) { + PyWeakReference *prev; +@@ -678,6 +694,7 @@ + result->ob_type = &_PyWeakref_CallableProxyType; + else + result->ob_type = &_PyWeakref_ProxyType; ++ get_basic_refs(*list, &ref, &proxy); + if (callback == NULL) + prev = ref; + else Property changes on: head/lang/python23/files/patch-Objects::weakrefobject.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.3 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/lang/python23/files/patch-configure =================================================================== --- head/lang/python23/files/patch-configure (revision 100479) +++ head/lang/python23/files/patch-configure (revision 100480) @@ -1,24 +1,33 @@ ---- configure.orig Sat Oct 4 13:27:50 2003 -+++ configure Sat Oct 4 13:29:05 2003 +--- configure.orig Wed Nov 19 04:59:36 2003 ++++ configure Mon Feb 9 17:39:34 2004 @@ -1321,7 +1321,7 @@ VERSION=2.3 -SOVERSION=1.0 +SOVERSION=1 # The later defininition of _XOPEN_SOURCE disables certain features # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). -@@ -3594,6 +3594,12 @@ - LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-L. -lpython$(VERSION)' +@@ -3608,6 +3608,12 @@ RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -+ INSTSONAME="$LDLIBRARY".$SOVERSION -+ ;; + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; + FreeBSD*) + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; ++ INSTSONAME="$LDLIBRARY".$SOVERSION ++ ;; hp*|HP*) + LDLIBRARY='libpython$(VERSION).sl' + BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)' +@@ -12272,7 +12278,7 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_pthread_system_supported=yes ++ ac_cv_pthread_system_supported="ignored by port" + else + echo "$as_me: program exited with status $ac_status" >&5 + echo "$as_me: failed program was:" >&5 Property changes on: head/lang/python23/files/patch-configure ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/lang/python24/Makefile =================================================================== --- head/lang/python24/Makefile (revision 100479) +++ head/lang/python24/Makefile (revision 100480) @@ -1,156 +1,157 @@ # New ports collection makefile for: python # Date created: 08 August 1995 # Whom: jkh # # $FreeBSD$ # PORTNAME= python PORTVERSION= 2.3.3 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" MAKE_ENV= VPATH="${WRKSRC}" INSTALL_TARGET= install MAN1= python.1 USE_PYTHON= yes PYTHON_VERSION= python2.3 PYTHON_NO_DEPENDS= yes USE_REINPLACE= yes # # If you don't want to use Python's thread module, you need to set # WITHOUT_THREADS. # .if !defined(WITHOUT_THREADS) CONFIGURE_ARGS+= --with-threads CFLAGS+= ${PTHREAD_CFLAGS} .if !defined(WANT_HUGE_STACK_SIZE) CFLAGS+= -DTHREAD_STACK_SIZE=0x20000 .else CFLAGS+= -DTHREAD_STACK_SIZE=0x100000 .endif # !defined(WANT_HUGE_STACK_SIZE) CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}" .else CONFIGURE_ARGS+= --without-threads .if defined(LDFLAGS) CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" .endif # defined(LDFLAGS) .endif # !defined(WITHOUT_THREADS) .if !defined(WITH_UCS2) CONFIGURE_ARGS+= --enable-unicode=ucs4 .endif .if defined(WITHOUT_PYMALLOC) CONFIGURE_ARGS+= --without-pymalloc .endif .if defined(BUILD_SHARED) CONFIGURE_ARGS+= --enable-shared INSTALLS_SHLIB= yes PLIST_SUB+= SHARED_ONLY="" .else PLIST_SUB+= SHARED_ONLY="@comment " .endif DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} .include .if ${ARCH} == i386 PLIST_SUB+= X86_ONLY="" .else PLIST_SUB+= X86_ONLY="@comment " .endif .if ${ARCH} == amd64 CFLAGS+= -fPIC .endif .if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha PLIST_SUB+= 32BIT_ONLY="@comment " .else PLIST_SUB+= 32BIT_ONLY="" .endif .if ${ARCH} == sparc64 CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900 .endif .if ${OSVERSION} < 400000 LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" .endif .if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005 CONFIGURE_ARGS+= --with-libs='-lxpg4' .endif .if ${OSVERSION} < 400020 CONFIGURE_ARGS+= --with-libs='-lxpg4' .endif .if ${OSVERSION} >= 400014 CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 .endif .if ${OSVERSION} >= 500000 PLATFORMS=plat-freebsd2 plat-freebsd3 plat-freebsd4 .elif ${OSVERSION} >= 400000 PLATFORMS=plat-freebsd2 plat-freebsd3 plat-freebsd5 .elif ${OSVERSION} >= 300000 PLATFORMS=plat-freebsd2 plat-freebsd4 plat-freebsd5 .else PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5 .endif post-extract: ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.3 ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.3 post-patch: ${REINPLACE_CMD} -e \ 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${WRKSRC}/Lib/pydoc.py pre-install: .for platform in ${PLATFORMS} ${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform} .for file in IN.py regen ${INSTALL_DATA} ${WRKSRC}/Lib/${platform}/${file} \ ${PYTHONPREFIX_LIBDIR}/${platform}/ .endfor .endfor post-install: ${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el \ ${PREFIX}/share/emacs/site-lisp ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \ ${PREFIX}/bin .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ (cd ${TOOLSDIR}; tar xf -) @${MKDIR} ${DEMODIR} @cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \ (cd ${DEMODIR}; tar xf -) .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/lang/python24/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.117 \ No newline at end of property +1.118 \ No newline at end of property Index: head/lang/python24/distinfo =================================================================== --- head/lang/python24/distinfo (revision 100479) +++ head/lang/python24/distinfo (revision 100480) @@ -1,18 +1,19 @@ MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92 MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 MD5 (python/Python-2.0.1.tgz) = 8aa10dcf062723001b852d96e905af79 MD5 (python/Python-2.1.tgz) = 2ba2baeccd6100a4be80e6368a975054 MD5 (python/Python-2.1.1.tgz) = eb34371c49b271abc74b42572883e1b4 MD5 (python/Python-2.1.2.tgz) = 4af22bded23a55f907365ed7610de8c9 MD5 (python/Python-2.1.3.tgz) = a8b04cdc822a6fc833ed9b99c7fba589 MD5 (python/Python-2.2.tgz) = 87febf0780c8e18454022d34b2ca70a0 MD5 (python/Python-2.2.1.tgz) = e7012d611602b62e36073c2fd02396a3 MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c MD5 (python/Python-2.2.3.tgz) = 169f89f318e252dac0c54dd1b165d229 MD5 (python/Python-2.3.tgz) = 595620a4769073a812e353597585c4e8 MD5 (python/Python-2.3.1.tgz) = a3dcbe1c7f173c8e3c7cce28495016ae MD5 (python/Python-2.3.2.tgz) = f54d7a529d444994b4b33429bbb45479 MD5 (python/Python-2.3.3.tgz) = 4d16732b1cfccc0ed250956d41463c61 +SIZE (python/Python-2.3.3.tgz) = 8491380 MD5 (python/Python-2.4.a0.20031022.tgz) = 79581105c218886dd9dc382a84c64043 MD5 (python/Python-2.4.a0.20040106.tgz) = cde5962028bcfdb473455c57bbb24c18 Property changes on: head/lang/python24/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.40 \ No newline at end of property +1.41 \ No newline at end of property Index: head/lang/python24/files/patch-Objects::intobject.c =================================================================== --- head/lang/python24/files/patch-Objects::intobject.c (nonexistent) +++ head/lang/python24/files/patch-Objects::intobject.c (revision 100480) @@ -0,0 +1,12 @@ +diff -u python/dist/src/Objects/intobject.c:2.105 python/dist/src/Objects/intobject.c:2.105.8.1 +--- Objects/intobject.c:2.105 Sat Jun 28 13:04:24 2003 ++++ Objects/intobject.c Sun Feb 8 10:56:07 2004 +@@ -1080,7 +1080,7 @@ + int ival; + #if NSMALLNEGINTS + NSMALLPOSINTS > 0 + for (ival = -NSMALLNEGINTS; ival < NSMALLPOSINTS; ival++) { +- if ((free_list = fill_free_list()) == NULL) ++ if (!free_list && (free_list = fill_free_list()) == NULL) + return 0; + /* PyObject_New is inlined */ + v = free_list; Property changes on: head/lang/python24/files/patch-Objects::intobject.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/lang/python24/files/patch-Objects::weakrefobject.c =================================================================== --- head/lang/python24/files/patch-Objects::weakrefobject.c (nonexistent) +++ head/lang/python24/files/patch-Objects::weakrefobject.c (revision 100480) @@ -0,0 +1,65 @@ +diff -u python/dist/src/Objects/weakrefobject.c:1.13.6.1 python/dist/src/Objects/weakrefobject.c:1.13.6.3 +--- Objects/weakrefobject.c:1.13.6.1 Thu Nov 20 14:13:51 2003 ++++ Objects/weakrefobject.c Wed Feb 4 15:13:43 2004 +@@ -624,20 +624,29 @@ + } + list = GET_WEAKREFS_LISTPTR(ob); + get_basic_refs(*list, &ref, &proxy); +- if (callback == NULL || callback == Py_None) ++ if (callback == Py_None) ++ callback = NULL; ++ if (callback == NULL) + /* return existing weak reference if it exists */ + result = ref; + if (result != NULL) +- Py_XINCREF(result); ++ Py_INCREF(result); + else { ++ /* Note: new_weakref() can trigger cyclic GC, so the weakref ++ list on ob can be mutated. This means that the ref and ++ proxy pointers we got back earlier may have been collected, ++ so we need to compute these values again before we use ++ them. */ + result = new_weakref(ob, callback); + if (result != NULL) { + if (callback == NULL) { + insert_head(result, list); + } + else { +- PyWeakReference *prev = (proxy == NULL) ? ref : proxy; ++ PyWeakReference *prev; + ++ get_basic_refs(*list, &ref, &proxy); ++ prev = (proxy == NULL) ? ref : proxy; + if (prev == NULL) + insert_head(result, list); + else +@@ -664,12 +673,19 @@ + } + list = GET_WEAKREFS_LISTPTR(ob); + get_basic_refs(*list, &ref, &proxy); ++ if (callback == Py_None) ++ callback = NULL; + if (callback == NULL) + /* attempt to return an existing weak reference if it exists */ + result = proxy; + if (result != NULL) +- Py_XINCREF(result); ++ Py_INCREF(result); + else { ++ /* Note: new_weakref() can trigger cyclic GC, so the weakref ++ list on ob can be mutated. This means that the ref and ++ proxy pointers we got back earlier may have been collected, ++ so we need to compute these values again before we use ++ them. */ + result = new_weakref(ob, callback); + if (result != NULL) { + PyWeakReference *prev; +@@ -678,6 +694,7 @@ + result->ob_type = &_PyWeakref_CallableProxyType; + else + result->ob_type = &_PyWeakref_ProxyType; ++ get_basic_refs(*list, &ref, &proxy); + if (callback == NULL) + prev = ref; + else Property changes on: head/lang/python24/files/patch-Objects::weakrefobject.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.3 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/lang/python24/files/patch-configure =================================================================== --- head/lang/python24/files/patch-configure (revision 100479) +++ head/lang/python24/files/patch-configure (revision 100480) @@ -1,24 +1,33 @@ ---- configure.orig Sat Oct 4 13:27:50 2003 -+++ configure Sat Oct 4 13:29:05 2003 +--- configure.orig Wed Nov 19 04:59:36 2003 ++++ configure Mon Feb 9 17:39:34 2004 @@ -1321,7 +1321,7 @@ VERSION=2.3 -SOVERSION=1.0 +SOVERSION=1 # The later defininition of _XOPEN_SOURCE disables certain features # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone). -@@ -3594,6 +3594,12 @@ - LDLIBRARY='libpython$(VERSION).so' - BLDLIBRARY='-L. -lpython$(VERSION)' +@@ -3608,6 +3608,12 @@ RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -+ INSTSONAME="$LDLIBRARY".$SOVERSION -+ ;; + INSTSONAME="$LDLIBRARY".$SOVERSION + ;; + FreeBSD*) + LDLIBRARY='libpython$(VERSION).so' + BLDLIBRARY='-L. -lpython$(VERSION)' + RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH - INSTSONAME="$LDLIBRARY".$SOVERSION - ;; ++ INSTSONAME="$LDLIBRARY".$SOVERSION ++ ;; hp*|HP*) + LDLIBRARY='libpython$(VERSION).sl' + BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)' +@@ -12272,7 +12278,7 @@ + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_pthread_system_supported=yes ++ ac_cv_pthread_system_supported="ignored by port" + else + echo "$as_me: program exited with status $ac_status" >&5 + echo "$as_me: failed program was:" >&5 Property changes on: head/lang/python24/files/patch-configure ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property