From ebd4836132ddff6ade16f6e8f3a0ffc46d06b598 Mon Sep 17 00:00:00 2001 From: Hye-Shik Chang Date: Fri, 27 Feb 2004 13:00:06 +0000 Subject: - Update stackless_python to 2.3.3 as of 040225 and unmark BROKEN. - Set mutually exclusive confliction for {,stackless_}python. --- lang/python/Makefile | 3 ++- lang/python23/Makefile | 3 ++- lang/python24/Makefile | 3 ++- lang/stackless_python/Makefile | 27 ++++++++++++++++----------- lang/stackless_python/distinfo | 6 ++++-- 5 files changed, 26 insertions(+), 16 deletions(-) (limited to 'lang') diff --git a/lang/python/Makefile b/lang/python/Makefile index 516eac521283..6916723136ba 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -16,6 +16,7 @@ DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language +CONFLICTS= stackless_python-* DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes @@ -123,7 +124,7 @@ post-extract: ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.3 -post-patch: +pre-patch: ${REINPLACE_CMD} -e \ 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${WRKSRC}/Lib/pydoc.py diff --git a/lang/python23/Makefile b/lang/python23/Makefile index 516eac521283..6916723136ba 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -16,6 +16,7 @@ DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language +CONFLICTS= stackless_python-* DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes @@ -123,7 +124,7 @@ post-extract: ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.3 -post-patch: +pre-patch: ${REINPLACE_CMD} -e \ 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${WRKSRC}/Lib/pydoc.py diff --git a/lang/python24/Makefile b/lang/python24/Makefile index 516eac521283..6916723136ba 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -16,6 +16,7 @@ DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= perky@FreeBSD.org COMMENT?= An interpreted object-oriented programming language +CONFLICTS= stackless_python-* DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes @@ -123,7 +124,7 @@ post-extract: ${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \ ${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.3 -post-patch: +pre-patch: ${REINPLACE_CMD} -e \ 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${WRKSRC}/Lib/pydoc.py diff --git a/lang/stackless_python/Makefile b/lang/stackless_python/Makefile index 1da2729b8956..3fa0a9bbebab 100644 --- a/lang/stackless_python/Makefile +++ b/lang/stackless_python/Makefile @@ -6,7 +6,7 @@ # PORTNAME= python -PORTVERSION= 2.2.3 +PORTVERSION= 2.3.3 PORTREVISION= ${CVSDATE}0 CATEGORIES= lang python MASTER_SITES= # @@ -21,22 +21,27 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= perky@FreeBSD.org COMMENT= Python implementation that does not use the C stack +CONFLICTS= python-2.3.* ONLY_FOR_ARCHS= i386 powerpc -CVSDATE= 021026 +CVSDATE= 040225 MASTERDIR= ${.CURDIR}/../../lang/python DESCR= ${.CURDIR}/pkg-descr MD5_FILE= ${.CURDIR}/distinfo PLIST= ${WRKDIR}/pkg-plist -BROKEN= "not ported to Python-2.2.3 yet" -DEPRECATED= ${BROKEN} -EXPIRATION_DATE=2004-04-07 -#post-patch: -# @${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} -f {} \; -# @${RM} -rf ${WRKSRC}/Lib/test/output/test_atexit \ -# ${WRKSRC}/Lib/test/output/test_minidom -# @${ECHO} "lib/%%PYTHON_VERSION%%/lib-dynload/stackless.so" >${PLIST} -# @${CAT} ${MASTERDIR}/pkg-plist >>${PLIST} +post-patch: + @${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} -f {} \; +.for hf in atomicobject.h cframeobject.h channelobject.h cstackobject.h \ + flextype.h nonrecursive.h prickelpit.h schedulerobject.h \ + slp_platformselect.h stackless.h stackless_api.h \ + stackless_ceval.h stackless_frame.h stackless_impl.h \ + stackless_structs.h stackless_tstate.h stackless_version.h \ + stacklesseval.h stacklessversion.h switch_ppc_macosx.h \ + switch_ppc_unix.h switch_s390_unix.h switch_sparc_sun_gcc.h \ + switch_x86_msvc.h switch_x86_unix.h taskletobject.h + @${ECHO} "include/%%PYTHON_VERSION%%/${hf}" >>${PLIST} +.endfor + @${CAT} ${MASTERDIR}/pkg-plist >>${PLIST} .include "${MASTERDIR}/Makefile" diff --git a/lang/stackless_python/distinfo b/lang/stackless_python/distinfo index 3be1987e36dc..189ede477ebb 100644 --- a/lang/stackless_python/distinfo +++ b/lang/stackless_python/distinfo @@ -1,2 +1,4 @@ -MD5 (python/Python-2.2.3.tgz) = 169f89f318e252dac0c54dd1b165d229 -MD5 (python/stackless-021026.diff.bz2) = 72249d4d0422150ca9c8a6ff5f28fd63 +MD5 (python/Python-2.3.3.tgz) = 4d16732b1cfccc0ed250956d41463c61 +SIZE (python/Python-2.3.3.tgz) = 8491380 +MD5 (python/stackless-040225.diff.bz2) = 94c041d48294ee57bc9b83cf83fedffd +SIZE (python/stackless-040225.diff.bz2) = 82214 -- cgit v1.2.3