Update to Python trunk snapshot as of 2006-03-26.

svn path=/head/; revision=158131
2024-11-20 00:21:35 +00:00 · 2006-03-26 07:58:41 +00:00 · 2006-03-26 07:58:41 +00:00 · b243082281 · 2021-03-31 03:12:20 +00:00
commit b243082281
parent 989fbabdf9
29 changed files with 9262 additions and 20791 deletions
--- a/Mk/bsd.python.mk
+++ b/Mk/bsd.python.mk
@ -298,7 +298,7 @@ PYTHON_PORTVERSION=	${_PYTHON_PORTVERSION}

 # Python-2.5
 .if ${PYTHON_VERSION} == "python2.5"
-PYTHON_PORTVERSION?=2.5.a0.20050728
+PYTHON_PORTVERSION?=2.5.a0.20060326
 PYTHON_PORTSDIR=	${PORTSDIR}/lang/python-devel
 PYTHON_REL=			250
 PYTHON_SUFFIX=		25
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@ -5,7 +5,7 @@
 # $FreeBSD$

 PORTNAME=	python
-PORTVERSION=	2.5.a0.20050728
+PORTVERSION=	2.5.a0.20060326
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@ -15,11 +15,13 @@ MAINTAINER=	perky@FreeBSD.org
 COMMENT?=	An interpreted object-oriented programming language

 DIST_SUBDIR=	python
-WRKSRC=		${PYTHON_WRKSRC}
+WRKSRC=		${PYTHON_WRKSRC}/portbld.static
+PATCH_WRKSRC=	${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	OPT="${CFLAGS}"
-MAKE_ENV=	VPATH="${WRKSRC}"
+CONFIGURE_SCRIPT=	../configure # must be relative
+CONFIGURE_ENV=	OPT="${CFLAGS}" SVNVERSION="echo freebsd"
+MAKE_ENV=	VPATH="${PYTHON_WRKSRC}"
 INSTALLS_SHLIB=	yes
 INSTALL_TARGET=	altinstall
 MAN1=		${PYTHON_VERSION}.1
@ -30,11 +32,14 @@ PYTHON_VERSION=	python2.5
 PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}

-SHARED_WRKSRC=	${WRKSRC}/build.shared
+SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//}
 DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
 TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}

+PLIST=		${WRKDIR}/PLIST
+PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
+
 OPTIONS=	THREADS "Enable thread support" on \
 		HUGE_STACK_SIZE "Use a larger thread stack" off \
 		UCS4 "Use UCS4 for unicode support" on \
@ -44,6 +49,9 @@ OPTIONS=	THREADS "Enable thread support" on \

 .include <bsd.port.pre.mk>

+# workaround for a bug in base curses.h.
+CFLAGS+=	-D__wchar_t=wchar_t
+
 .if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-threads
 CFLAGS+=		${PTHREAD_CFLAGS}
@ -108,27 +116,24 @@ PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7
 PLATFORMS=plat-freebsd5 plat-freebsd6 plat-freebsd7
 .endif

-post-extract:
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.5
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.5
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.5.py
-
 pre-patch:
+	${MKDIR} ${WRKSRC} ${SHARED_WRKSRC}/Modules
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${PATCH_WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.5
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${PATCH_WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.5
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${PATCH_WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.5.py
 	${REINPLACE_CMD} -e \
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
-		${WRKSRC}/Lib/pydoc.py
+		${PATCH_WRKSRC}/Lib/pydoc.py
 	${REINPLACE_CMD} -e \
 		's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
-		${WRKSRC}/Lib/site.py
+		${PATCH_WRKSRC}/Lib/site.py

 post-configure:
-	@# prepare a subdir for shared build
-.for subdir in Modules Parser Python Objects
-	${MKDIR} ${SHARED_WRKSRC}/${subdir}
-.endfor
+	${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${SHARED_WRKSRC} -xf -
+	${LN} -sf ${PYTHON_WRKSRC}/Lib ${WRKSRC}/Lib
 	${SED} -e 's,^\(LDLIBRARY=\).*$$,\1libpython$$(VERSION).so,' \
 		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(VERSION),' \
 		-e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \
@ -136,16 +141,8 @@ post-configure:
 		-e 's,^\(.(BUILDPYTHON)\: .*\).(LIBRARY),\1,' \
 		-e 's,^\(.(BUILDPYTHON):.*\).(LIBRARY),\1,' \
 		${WRKSRC}/Makefile > ${SHARED_WRKSRC}/Makefile
-	${LN} -sf ${WRKSRC}/pyconfig.h ${WRKSRC}/Include ${WRKSRC}/Grammar \
-		${SHARED_WRKSRC}/
-	${LN} -sf ${WRKSRC}/Python/getplatform.c ${WRKSRC}/Python/importdl.c \
-		${WRKSRC}/Python/importdl.h \
-		${SHARED_WRKSRC}/Python/
-	${LN} -sf ${WRKSRC}/Modules/makesetup ${WRKSRC}/Modules/Setup* \
-		${WRKSRC}/Modules/*.c ${WRKSRC}/Modules/*.h \
-		${SHARED_WRKSRC}/Modules/

-post-build:
+pre-build:
 	cd ${SHARED_WRKSRC}; \
 	${SETENV} ${MAKE_ENV} ${MAKE} lib${PYTHON_VERSION}.so python; \
 	${LN} -f lib${PYTHON_VERSION}.so lib${PYTHON_VERSION}.so.1; \
@ -160,6 +157,11 @@ pre-su-install:
 .endfor
 .endfor

+pre-install:
+	${AWK} '{ print $$0; }						\
+	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	\
+	${PLIST_TEMPLATE} > ${PLIST}
+
 post-install:
 	@# shared version of executable and library
 	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \
@ -175,16 +177,16 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.5 ${WRKDIR}/idle2.5 \
 		${WRKDIR}/smtpd2.5.py ${PREFIX}/bin
 	@${MKDIR} ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/Misc/python.man \
+	${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
 		${MANPREFIX}/man/man1/${PYTHON_VERSION}.1

 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${TOOLSDIR}
-	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
-		(cd ${TOOLSDIR}; tar xf -)
+	@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
+		(cd ${TOOLSDIR}; ${TAR} -xf -)
 	@${MKDIR} ${DEMODIR}
-	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \
-		(cd ${DEMODIR}; tar xf -)
+	@cd ${PYTHON_WRKSRC}/Demo; ${TAR} -cf - * | \
+		(cd ${DEMODIR}; ${TAR} -xf -)
 .endif

 .include <bsd.port.post.mk>
--- a/lang/python-devel/distinfo
+++ b/lang/python-devel/distinfo
@ -1,3 +1,3 @@
-MD5 (python/Python-2.5.a0.20050728.tgz) = 423c9ac2dbe3a754195e26652495aac3
-SHA256 (python/Python-2.5.a0.20050728.tgz) = 176d76f6933879cac8ead7f50b847e53c894501ad491fab3ff1fcc3ca18e0056
-SIZE (python/Python-2.5.a0.20050728.tgz) = 9280478
+MD5 (python/Python-2.5.a0.20060326.tgz) = 8a292f1df443e1cd3d88b091da34a5a3
+SHA256 (python/Python-2.5.a0.20060326.tgz) = 0acd60c0c81dd69813928a710640105d96667d60a0df7f05e2ed86c5bd09397e
+SIZE (python/Python-2.5.a0.20060326.tgz) = 10450951
--- a/lang/python-devel/files/patch-Modules-_ctypes-libffi-configure
+++ b/lang/python-devel/files/patch-Modules-_ctypes-libffi-configure
@ -0,0 +1,11 @@
+--- Modules/_ctypes/libffi/configure.orig	Sun Mar 26 13:22:58 2006
+++ Modules/_ctypes/libffi/configure	Sun Mar 26 13:23:07 2006
+@@ -3520,7 +3520,7 @@
+ cris-*-*) TARGET=LIBFFI_CRIS; TARGETDIR=cris;;
+ s390-*-linux-*) TARGET=S390; TARGETDIR=s390;;
+ s390x-*-linux-*) TARGET=S390; TARGETDIR=s390;;
+-x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
+amd64-*-freebsd* | x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
+ sh-*-linux* | sh[34]*-*-linux*) TARGET=SH; TARGETDIR=sh;;
+ sh-*-rtems*) TARGET=SH; TARGETDIR=sh;;
+ sh64-*-linux* | sh5*-*-linux*) TARGET=SH64; TARGETDIR=sh64;;
--- a/lang/python-devel/pkg-plist
+++ b/lang/python-devel/pkg-plist
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@ -5,7 +5,7 @@
 # $FreeBSD$

 PORTNAME=	python
-PORTVERSION=	2.5.a0.20050728
+PORTVERSION=	2.5.a0.20060326
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@ -15,11 +15,13 @@ MAINTAINER=	perky@FreeBSD.org
 COMMENT?=	An interpreted object-oriented programming language

 DIST_SUBDIR=	python
-WRKSRC=		${PYTHON_WRKSRC}
+WRKSRC=		${PYTHON_WRKSRC}/portbld.static
+PATCH_WRKSRC=	${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	OPT="${CFLAGS}"
-MAKE_ENV=	VPATH="${WRKSRC}"
+CONFIGURE_SCRIPT=	../configure # must be relative
+CONFIGURE_ENV=	OPT="${CFLAGS}" SVNVERSION="echo freebsd"
+MAKE_ENV=	VPATH="${PYTHON_WRKSRC}"
 INSTALLS_SHLIB=	yes
 INSTALL_TARGET=	altinstall
 MAN1=		${PYTHON_VERSION}.1
@ -30,11 +32,14 @@ PYTHON_VERSION=	python2.5
 PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}

-SHARED_WRKSRC=	${WRKSRC}/build.shared
+SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//}
 DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
 TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}

+PLIST=		${WRKDIR}/PLIST
+PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
+
 OPTIONS=	THREADS "Enable thread support" on \
 		HUGE_STACK_SIZE "Use a larger thread stack" off \
 		UCS4 "Use UCS4 for unicode support" on \
@ -44,6 +49,9 @@ OPTIONS=	THREADS "Enable thread support" on \

 .include <bsd.port.pre.mk>

+# workaround for a bug in base curses.h.
+CFLAGS+=	-D__wchar_t=wchar_t
+
 .if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-threads
 CFLAGS+=		${PTHREAD_CFLAGS}
@ -108,27 +116,24 @@ PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7
 PLATFORMS=plat-freebsd5 plat-freebsd6 plat-freebsd7
 .endif

-post-extract:
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.5
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.5
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.5.py
-
 pre-patch:
+	${MKDIR} ${WRKSRC} ${SHARED_WRKSRC}/Modules
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${PATCH_WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.5
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${PATCH_WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.5
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${PATCH_WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.5.py
 	${REINPLACE_CMD} -e \
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
-		${WRKSRC}/Lib/pydoc.py
+		${PATCH_WRKSRC}/Lib/pydoc.py
 	${REINPLACE_CMD} -e \
 		's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
-		${WRKSRC}/Lib/site.py
+		${PATCH_WRKSRC}/Lib/site.py

 post-configure:
-	@# prepare a subdir for shared build
-.for subdir in Modules Parser Python Objects
-	${MKDIR} ${SHARED_WRKSRC}/${subdir}
-.endfor
+	${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${SHARED_WRKSRC} -xf -
+	${LN} -sf ${PYTHON_WRKSRC}/Lib ${WRKSRC}/Lib
 	${SED} -e 's,^\(LDLIBRARY=\).*$$,\1libpython$$(VERSION).so,' \
 		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(VERSION),' \
 		-e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \
@ -136,16 +141,8 @@ post-configure:
 		-e 's,^\(.(BUILDPYTHON)\: .*\).(LIBRARY),\1,' \
 		-e 's,^\(.(BUILDPYTHON):.*\).(LIBRARY),\1,' \
 		${WRKSRC}/Makefile > ${SHARED_WRKSRC}/Makefile
-	${LN} -sf ${WRKSRC}/pyconfig.h ${WRKSRC}/Include ${WRKSRC}/Grammar \
-		${SHARED_WRKSRC}/
-	${LN} -sf ${WRKSRC}/Python/getplatform.c ${WRKSRC}/Python/importdl.c \
-		${WRKSRC}/Python/importdl.h \
-		${SHARED_WRKSRC}/Python/
-	${LN} -sf ${WRKSRC}/Modules/makesetup ${WRKSRC}/Modules/Setup* \
-		${WRKSRC}/Modules/*.c ${WRKSRC}/Modules/*.h \
-		${SHARED_WRKSRC}/Modules/

-post-build:
+pre-build:
 	cd ${SHARED_WRKSRC}; \
 	${SETENV} ${MAKE_ENV} ${MAKE} lib${PYTHON_VERSION}.so python; \
 	${LN} -f lib${PYTHON_VERSION}.so lib${PYTHON_VERSION}.so.1; \
@ -160,6 +157,11 @@ pre-su-install:
 .endfor
 .endfor

+pre-install:
+	${AWK} '{ print $$0; }						\
+	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	\
+	${PLIST_TEMPLATE} > ${PLIST}
+
 post-install:
 	@# shared version of executable and library
 	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \
@ -175,16 +177,16 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.5 ${WRKDIR}/idle2.5 \
 		${WRKDIR}/smtpd2.5.py ${PREFIX}/bin
 	@${MKDIR} ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/Misc/python.man \
+	${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
 		${MANPREFIX}/man/man1/${PYTHON_VERSION}.1

 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${TOOLSDIR}
-	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
-		(cd ${TOOLSDIR}; tar xf -)
+	@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
+		(cd ${TOOLSDIR}; ${TAR} -xf -)
 	@${MKDIR} ${DEMODIR}
-	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \
-		(cd ${DEMODIR}; tar xf -)
+	@cd ${PYTHON_WRKSRC}/Demo; ${TAR} -cf - * | \
+		(cd ${DEMODIR}; ${TAR} -xf -)
 .endif

 .include <bsd.port.post.mk>
--- a/lang/python25/distinfo
+++ b/lang/python25/distinfo
@ -1,3 +1,3 @@
-MD5 (python/Python-2.5.a0.20050728.tgz) = 423c9ac2dbe3a754195e26652495aac3
-SHA256 (python/Python-2.5.a0.20050728.tgz) = 176d76f6933879cac8ead7f50b847e53c894501ad491fab3ff1fcc3ca18e0056
-SIZE (python/Python-2.5.a0.20050728.tgz) = 9280478
+MD5 (python/Python-2.5.a0.20060326.tgz) = 8a292f1df443e1cd3d88b091da34a5a3
+SHA256 (python/Python-2.5.a0.20060326.tgz) = 0acd60c0c81dd69813928a710640105d96667d60a0df7f05e2ed86c5bd09397e
+SIZE (python/Python-2.5.a0.20060326.tgz) = 10450951
--- a/lang/python25/files/patch-Modules-_ctypes-libffi-configure
+++ b/lang/python25/files/patch-Modules-_ctypes-libffi-configure
@ -0,0 +1,11 @@
+--- Modules/_ctypes/libffi/configure.orig	Sun Mar 26 13:22:58 2006
+++ Modules/_ctypes/libffi/configure	Sun Mar 26 13:23:07 2006
+@@ -3520,7 +3520,7 @@
+ cris-*-*) TARGET=LIBFFI_CRIS; TARGETDIR=cris;;
+ s390-*-linux-*) TARGET=S390; TARGETDIR=s390;;
+ s390x-*-linux-*) TARGET=S390; TARGETDIR=s390;;
+-x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
+amd64-*-freebsd* | x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
+ sh-*-linux* | sh[34]*-*-linux*) TARGET=SH; TARGETDIR=sh;;
+ sh-*-rtems*) TARGET=SH; TARGETDIR=sh;;
+ sh64-*-linux* | sh5*-*-linux*) TARGET=SH64; TARGETDIR=sh64;;
--- a/lang/python25/pkg-plist
+++ b/lang/python25/pkg-plist
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@ -5,7 +5,7 @@
 # $FreeBSD$

 PORTNAME=	python
-PORTVERSION=	2.5.a0.20050728
+PORTVERSION=	2.5.a0.20060326
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@ -15,11 +15,13 @@ MAINTAINER=	perky@FreeBSD.org
 COMMENT?=	An interpreted object-oriented programming language

 DIST_SUBDIR=	python
-WRKSRC=		${PYTHON_WRKSRC}
+WRKSRC=		${PYTHON_WRKSRC}/portbld.static
+PATCH_WRKSRC=	${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	OPT="${CFLAGS}"
-MAKE_ENV=	VPATH="${WRKSRC}"
+CONFIGURE_SCRIPT=	../configure # must be relative
+CONFIGURE_ENV=	OPT="${CFLAGS}" SVNVERSION="echo freebsd"
+MAKE_ENV=	VPATH="${PYTHON_WRKSRC}"
 INSTALLS_SHLIB=	yes
 INSTALL_TARGET=	altinstall
 MAN1=		${PYTHON_VERSION}.1
@ -30,11 +32,14 @@ PYTHON_VERSION=	python2.5
 PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}

-SHARED_WRKSRC=	${WRKSRC}/build.shared
+SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//}
 DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
 TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}

+PLIST=		${WRKDIR}/PLIST
+PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
+
 OPTIONS=	THREADS "Enable thread support" on \
 		HUGE_STACK_SIZE "Use a larger thread stack" off \
 		UCS4 "Use UCS4 for unicode support" on \
@ -44,6 +49,9 @@ OPTIONS=	THREADS "Enable thread support" on \

 .include <bsd.port.pre.mk>

+# workaround for a bug in base curses.h.
+CFLAGS+=	-D__wchar_t=wchar_t
+
 .if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-threads
 CFLAGS+=		${PTHREAD_CFLAGS}
@ -108,27 +116,24 @@ PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7
 PLATFORMS=plat-freebsd5 plat-freebsd6 plat-freebsd7
 .endif

-post-extract:
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.5
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.5
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.5.py
-
 pre-patch:
+	${MKDIR} ${WRKSRC} ${SHARED_WRKSRC}/Modules
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${PATCH_WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.5
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${PATCH_WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.5
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${PATCH_WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.5.py
 	${REINPLACE_CMD} -e \
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
-		${WRKSRC}/Lib/pydoc.py
+		${PATCH_WRKSRC}/Lib/pydoc.py
 	${REINPLACE_CMD} -e \
 		's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
-		${WRKSRC}/Lib/site.py
+		${PATCH_WRKSRC}/Lib/site.py

 post-configure:
-	@# prepare a subdir for shared build
-.for subdir in Modules Parser Python Objects
-	${MKDIR} ${SHARED_WRKSRC}/${subdir}
-.endfor
+	${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${SHARED_WRKSRC} -xf -
+	${LN} -sf ${PYTHON_WRKSRC}/Lib ${WRKSRC}/Lib
 	${SED} -e 's,^\(LDLIBRARY=\).*$$,\1libpython$$(VERSION).so,' \
 		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(VERSION),' \
 		-e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \
@ -136,16 +141,8 @@ post-configure:
 		-e 's,^\(.(BUILDPYTHON)\: .*\).(LIBRARY),\1,' \
 		-e 's,^\(.(BUILDPYTHON):.*\).(LIBRARY),\1,' \
 		${WRKSRC}/Makefile > ${SHARED_WRKSRC}/Makefile
-	${LN} -sf ${WRKSRC}/pyconfig.h ${WRKSRC}/Include ${WRKSRC}/Grammar \
-		${SHARED_WRKSRC}/
-	${LN} -sf ${WRKSRC}/Python/getplatform.c ${WRKSRC}/Python/importdl.c \
-		${WRKSRC}/Python/importdl.h \
-		${SHARED_WRKSRC}/Python/
-	${LN} -sf ${WRKSRC}/Modules/makesetup ${WRKSRC}/Modules/Setup* \
-		${WRKSRC}/Modules/*.c ${WRKSRC}/Modules/*.h \
-		${SHARED_WRKSRC}/Modules/

-post-build:
+pre-build:
 	cd ${SHARED_WRKSRC}; \
 	${SETENV} ${MAKE_ENV} ${MAKE} lib${PYTHON_VERSION}.so python; \
 	${LN} -f lib${PYTHON_VERSION}.so lib${PYTHON_VERSION}.so.1; \
@ -160,6 +157,11 @@ pre-su-install:
 .endfor
 .endfor

+pre-install:
+	${AWK} '{ print $$0; }						\
+	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	\
+	${PLIST_TEMPLATE} > ${PLIST}
+
 post-install:
 	@# shared version of executable and library
 	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \
@ -175,16 +177,16 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.5 ${WRKDIR}/idle2.5 \
 		${WRKDIR}/smtpd2.5.py ${PREFIX}/bin
 	@${MKDIR} ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/Misc/python.man \
+	${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
 		${MANPREFIX}/man/man1/${PYTHON_VERSION}.1

 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${TOOLSDIR}
-	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
-		(cd ${TOOLSDIR}; tar xf -)
+	@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
+		(cd ${TOOLSDIR}; ${TAR} -xf -)
 	@${MKDIR} ${DEMODIR}
-	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \
-		(cd ${DEMODIR}; tar xf -)
+	@cd ${PYTHON_WRKSRC}/Demo; ${TAR} -cf - * | \
+		(cd ${DEMODIR}; ${TAR} -xf -)
 .endif

 .include <bsd.port.post.mk>
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@ -1,3 +1,3 @@
-MD5 (python/Python-2.5.a0.20050728.tgz) = 423c9ac2dbe3a754195e26652495aac3
-SHA256 (python/Python-2.5.a0.20050728.tgz) = 176d76f6933879cac8ead7f50b847e53c894501ad491fab3ff1fcc3ca18e0056
-SIZE (python/Python-2.5.a0.20050728.tgz) = 9280478
+MD5 (python/Python-2.5.a0.20060326.tgz) = 8a292f1df443e1cd3d88b091da34a5a3
+SHA256 (python/Python-2.5.a0.20060326.tgz) = 0acd60c0c81dd69813928a710640105d96667d60a0df7f05e2ed86c5bd09397e
+SIZE (python/Python-2.5.a0.20060326.tgz) = 10450951
--- a/lang/python26/files/patch-Modules-_ctypes-libffi-configure
+++ b/lang/python26/files/patch-Modules-_ctypes-libffi-configure
@ -0,0 +1,11 @@
+--- Modules/_ctypes/libffi/configure.orig	Sun Mar 26 13:22:58 2006
+++ Modules/_ctypes/libffi/configure	Sun Mar 26 13:23:07 2006
+@@ -3520,7 +3520,7 @@
+ cris-*-*) TARGET=LIBFFI_CRIS; TARGETDIR=cris;;
+ s390-*-linux-*) TARGET=S390; TARGETDIR=s390;;
+ s390x-*-linux-*) TARGET=S390; TARGETDIR=s390;;
+-x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
+amd64-*-freebsd* | x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
+ sh-*-linux* | sh[34]*-*-linux*) TARGET=SH; TARGETDIR=sh;;
+ sh-*-rtems*) TARGET=SH; TARGETDIR=sh;;
+ sh64-*-linux* | sh5*-*-linux*) TARGET=SH64; TARGETDIR=sh64;;
--- a/lang/python26/pkg-plist
+++ b/lang/python26/pkg-plist
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@ -5,7 +5,7 @@
 # $FreeBSD$

 PORTNAME=	python
-PORTVERSION=	2.5.a0.20050728
+PORTVERSION=	2.5.a0.20060326
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@ -15,11 +15,13 @@ MAINTAINER=	perky@FreeBSD.org
 COMMENT?=	An interpreted object-oriented programming language

 DIST_SUBDIR=	python
-WRKSRC=		${PYTHON_WRKSRC}
+WRKSRC=		${PYTHON_WRKSRC}/portbld.static
+PATCH_WRKSRC=	${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	OPT="${CFLAGS}"
-MAKE_ENV=	VPATH="${WRKSRC}"
+CONFIGURE_SCRIPT=	../configure # must be relative
+CONFIGURE_ENV=	OPT="${CFLAGS}" SVNVERSION="echo freebsd"
+MAKE_ENV=	VPATH="${PYTHON_WRKSRC}"
 INSTALLS_SHLIB=	yes
 INSTALL_TARGET=	altinstall
 MAN1=		${PYTHON_VERSION}.1
@ -30,11 +32,14 @@ PYTHON_VERSION=	python2.5
 PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}

-SHARED_WRKSRC=	${WRKSRC}/build.shared
+SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//}
 DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
 TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}

+PLIST=		${WRKDIR}/PLIST
+PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
+
 OPTIONS=	THREADS "Enable thread support" on \
 		HUGE_STACK_SIZE "Use a larger thread stack" off \
 		UCS4 "Use UCS4 for unicode support" on \
@ -44,6 +49,9 @@ OPTIONS=	THREADS "Enable thread support" on \

 .include <bsd.port.pre.mk>

+# workaround for a bug in base curses.h.
+CFLAGS+=	-D__wchar_t=wchar_t
+
 .if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-threads
 CFLAGS+=		${PTHREAD_CFLAGS}
@ -108,27 +116,24 @@ PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7
 PLATFORMS=plat-freebsd5 plat-freebsd6 plat-freebsd7
 .endif

-post-extract:
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.5
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.5
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.5.py
-
 pre-patch:
+	${MKDIR} ${WRKSRC} ${SHARED_WRKSRC}/Modules
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${PATCH_WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.5
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${PATCH_WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.5
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${PATCH_WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.5.py
 	${REINPLACE_CMD} -e \
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
-		${WRKSRC}/Lib/pydoc.py
+		${PATCH_WRKSRC}/Lib/pydoc.py
 	${REINPLACE_CMD} -e \
 		's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
-		${WRKSRC}/Lib/site.py
+		${PATCH_WRKSRC}/Lib/site.py

 post-configure:
-	@# prepare a subdir for shared build
-.for subdir in Modules Parser Python Objects
-	${MKDIR} ${SHARED_WRKSRC}/${subdir}
-.endfor
+	${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${SHARED_WRKSRC} -xf -
+	${LN} -sf ${PYTHON_WRKSRC}/Lib ${WRKSRC}/Lib
 	${SED} -e 's,^\(LDLIBRARY=\).*$$,\1libpython$$(VERSION).so,' \
 		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(VERSION),' \
 		-e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \
@ -136,16 +141,8 @@ post-configure:
 		-e 's,^\(.(BUILDPYTHON)\: .*\).(LIBRARY),\1,' \
 		-e 's,^\(.(BUILDPYTHON):.*\).(LIBRARY),\1,' \
 		${WRKSRC}/Makefile > ${SHARED_WRKSRC}/Makefile
-	${LN} -sf ${WRKSRC}/pyconfig.h ${WRKSRC}/Include ${WRKSRC}/Grammar \
-		${SHARED_WRKSRC}/
-	${LN} -sf ${WRKSRC}/Python/getplatform.c ${WRKSRC}/Python/importdl.c \
-		${WRKSRC}/Python/importdl.h \
-		${SHARED_WRKSRC}/Python/
-	${LN} -sf ${WRKSRC}/Modules/makesetup ${WRKSRC}/Modules/Setup* \
-		${WRKSRC}/Modules/*.c ${WRKSRC}/Modules/*.h \
-		${SHARED_WRKSRC}/Modules/

-post-build:
+pre-build:
 	cd ${SHARED_WRKSRC}; \
 	${SETENV} ${MAKE_ENV} ${MAKE} lib${PYTHON_VERSION}.so python; \
 	${LN} -f lib${PYTHON_VERSION}.so lib${PYTHON_VERSION}.so.1; \
@ -160,6 +157,11 @@ pre-su-install:
 .endfor
 .endfor

+pre-install:
+	${AWK} '{ print $$0; }						\
+	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	\
+	${PLIST_TEMPLATE} > ${PLIST}
+
 post-install:
 	@# shared version of executable and library
 	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \
@ -175,16 +177,16 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.5 ${WRKDIR}/idle2.5 \
 		${WRKDIR}/smtpd2.5.py ${PREFIX}/bin
 	@${MKDIR} ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/Misc/python.man \
+	${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
 		${MANPREFIX}/man/man1/${PYTHON_VERSION}.1

 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${TOOLSDIR}
-	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
-		(cd ${TOOLSDIR}; tar xf -)
+	@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
+		(cd ${TOOLSDIR}; ${TAR} -xf -)
 	@${MKDIR} ${DEMODIR}
-	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \
-		(cd ${DEMODIR}; tar xf -)
+	@cd ${PYTHON_WRKSRC}/Demo; ${TAR} -cf - * | \
+		(cd ${DEMODIR}; ${TAR} -xf -)
 .endif

 .include <bsd.port.post.mk>
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@ -1,3 +1,3 @@
-MD5 (python/Python-2.5.a0.20050728.tgz) = 423c9ac2dbe3a754195e26652495aac3
-SHA256 (python/Python-2.5.a0.20050728.tgz) = 176d76f6933879cac8ead7f50b847e53c894501ad491fab3ff1fcc3ca18e0056
-SIZE (python/Python-2.5.a0.20050728.tgz) = 9280478
+MD5 (python/Python-2.5.a0.20060326.tgz) = 8a292f1df443e1cd3d88b091da34a5a3
+SHA256 (python/Python-2.5.a0.20060326.tgz) = 0acd60c0c81dd69813928a710640105d96667d60a0df7f05e2ed86c5bd09397e
+SIZE (python/Python-2.5.a0.20060326.tgz) = 10450951
--- a/lang/python27/files/patch-Modules-_ctypes-libffi-configure
+++ b/lang/python27/files/patch-Modules-_ctypes-libffi-configure
@ -0,0 +1,11 @@
+--- Modules/_ctypes/libffi/configure.orig	Sun Mar 26 13:22:58 2006
+++ Modules/_ctypes/libffi/configure	Sun Mar 26 13:23:07 2006
+@@ -3520,7 +3520,7 @@
+ cris-*-*) TARGET=LIBFFI_CRIS; TARGETDIR=cris;;
+ s390-*-linux-*) TARGET=S390; TARGETDIR=s390;;
+ s390x-*-linux-*) TARGET=S390; TARGETDIR=s390;;
+-x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
+amd64-*-freebsd* | x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
+ sh-*-linux* | sh[34]*-*-linux*) TARGET=SH; TARGETDIR=sh;;
+ sh-*-rtems*) TARGET=SH; TARGETDIR=sh;;
+ sh64-*-linux* | sh5*-*-linux*) TARGET=SH64; TARGETDIR=sh64;;
--- a/lang/python27/pkg-plist
+++ b/lang/python27/pkg-plist
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@ -5,7 +5,7 @@
 # $FreeBSD$

 PORTNAME=	python
-PORTVERSION=	2.5.a0.20050728
+PORTVERSION=	2.5.a0.20060326
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@ -15,11 +15,13 @@ MAINTAINER=	perky@FreeBSD.org
 COMMENT?=	An interpreted object-oriented programming language

 DIST_SUBDIR=	python
-WRKSRC=		${PYTHON_WRKSRC}
+WRKSRC=		${PYTHON_WRKSRC}/portbld.static
+PATCH_WRKSRC=	${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	OPT="${CFLAGS}"
-MAKE_ENV=	VPATH="${WRKSRC}"
+CONFIGURE_SCRIPT=	../configure # must be relative
+CONFIGURE_ENV=	OPT="${CFLAGS}" SVNVERSION="echo freebsd"
+MAKE_ENV=	VPATH="${PYTHON_WRKSRC}"
 INSTALLS_SHLIB=	yes
 INSTALL_TARGET=	altinstall
 MAN1=		${PYTHON_VERSION}.1
@ -30,11 +32,14 @@ PYTHON_VERSION=	python2.5
 PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}

-SHARED_WRKSRC=	${WRKSRC}/build.shared
+SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//}
 DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
 TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}

+PLIST=		${WRKDIR}/PLIST
+PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
+
 OPTIONS=	THREADS "Enable thread support" on \
 		HUGE_STACK_SIZE "Use a larger thread stack" off \
 		UCS4 "Use UCS4 for unicode support" on \
@ -44,6 +49,9 @@ OPTIONS=	THREADS "Enable thread support" on \

 .include <bsd.port.pre.mk>

+# workaround for a bug in base curses.h.
+CFLAGS+=	-D__wchar_t=wchar_t
+
 .if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-threads
 CFLAGS+=		${PTHREAD_CFLAGS}
@ -108,27 +116,24 @@ PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7
 PLATFORMS=plat-freebsd5 plat-freebsd6 plat-freebsd7
 .endif

-post-extract:
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.5
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.5
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.5.py
-
 pre-patch:
+	${MKDIR} ${WRKSRC} ${SHARED_WRKSRC}/Modules
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${PATCH_WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.5
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${PATCH_WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.5
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${PATCH_WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.5.py
 	${REINPLACE_CMD} -e \
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
-		${WRKSRC}/Lib/pydoc.py
+		${PATCH_WRKSRC}/Lib/pydoc.py
 	${REINPLACE_CMD} -e \
 		's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
-		${WRKSRC}/Lib/site.py
+		${PATCH_WRKSRC}/Lib/site.py

 post-configure:
-	@# prepare a subdir for shared build
-.for subdir in Modules Parser Python Objects
-	${MKDIR} ${SHARED_WRKSRC}/${subdir}
-.endfor
+	${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${SHARED_WRKSRC} -xf -
+	${LN} -sf ${PYTHON_WRKSRC}/Lib ${WRKSRC}/Lib
 	${SED} -e 's,^\(LDLIBRARY=\).*$$,\1libpython$$(VERSION).so,' \
 		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(VERSION),' \
 		-e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \
@ -136,16 +141,8 @@ post-configure:
 		-e 's,^\(.(BUILDPYTHON)\: .*\).(LIBRARY),\1,' \
 		-e 's,^\(.(BUILDPYTHON):.*\).(LIBRARY),\1,' \
 		${WRKSRC}/Makefile > ${SHARED_WRKSRC}/Makefile
-	${LN} -sf ${WRKSRC}/pyconfig.h ${WRKSRC}/Include ${WRKSRC}/Grammar \
-		${SHARED_WRKSRC}/
-	${LN} -sf ${WRKSRC}/Python/getplatform.c ${WRKSRC}/Python/importdl.c \
-		${WRKSRC}/Python/importdl.h \
-		${SHARED_WRKSRC}/Python/
-	${LN} -sf ${WRKSRC}/Modules/makesetup ${WRKSRC}/Modules/Setup* \
-		${WRKSRC}/Modules/*.c ${WRKSRC}/Modules/*.h \
-		${SHARED_WRKSRC}/Modules/

-post-build:
+pre-build:
 	cd ${SHARED_WRKSRC}; \
 	${SETENV} ${MAKE_ENV} ${MAKE} lib${PYTHON_VERSION}.so python; \
 	${LN} -f lib${PYTHON_VERSION}.so lib${PYTHON_VERSION}.so.1; \
@ -160,6 +157,11 @@ pre-su-install:
 .endfor
 .endfor

+pre-install:
+	${AWK} '{ print $$0; }						\
+	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	\
+	${PLIST_TEMPLATE} > ${PLIST}
+
 post-install:
 	@# shared version of executable and library
 	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \
@ -175,16 +177,16 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.5 ${WRKDIR}/idle2.5 \
 		${WRKDIR}/smtpd2.5.py ${PREFIX}/bin
 	@${MKDIR} ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/Misc/python.man \
+	${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
 		${MANPREFIX}/man/man1/${PYTHON_VERSION}.1

 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${TOOLSDIR}
-	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
-		(cd ${TOOLSDIR}; tar xf -)
+	@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
+		(cd ${TOOLSDIR}; ${TAR} -xf -)
 	@${MKDIR} ${DEMODIR}
-	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \
-		(cd ${DEMODIR}; tar xf -)
+	@cd ${PYTHON_WRKSRC}/Demo; ${TAR} -cf - * | \
+		(cd ${DEMODIR}; ${TAR} -xf -)
 .endif

 .include <bsd.port.post.mk>
--- a/lang/python30/distinfo
+++ b/lang/python30/distinfo
@ -1,3 +1,3 @@
-MD5 (python/Python-2.5.a0.20050728.tgz) = 423c9ac2dbe3a754195e26652495aac3
-SHA256 (python/Python-2.5.a0.20050728.tgz) = 176d76f6933879cac8ead7f50b847e53c894501ad491fab3ff1fcc3ca18e0056
-SIZE (python/Python-2.5.a0.20050728.tgz) = 9280478
+MD5 (python/Python-2.5.a0.20060326.tgz) = 8a292f1df443e1cd3d88b091da34a5a3
+SHA256 (python/Python-2.5.a0.20060326.tgz) = 0acd60c0c81dd69813928a710640105d96667d60a0df7f05e2ed86c5bd09397e
+SIZE (python/Python-2.5.a0.20060326.tgz) = 10450951
--- a/lang/python30/files/patch-Modules-_ctypes-libffi-configure
+++ b/lang/python30/files/patch-Modules-_ctypes-libffi-configure
@ -0,0 +1,11 @@
+--- Modules/_ctypes/libffi/configure.orig	Sun Mar 26 13:22:58 2006
+++ Modules/_ctypes/libffi/configure	Sun Mar 26 13:23:07 2006
+@@ -3520,7 +3520,7 @@
+ cris-*-*) TARGET=LIBFFI_CRIS; TARGETDIR=cris;;
+ s390-*-linux-*) TARGET=S390; TARGETDIR=s390;;
+ s390x-*-linux-*) TARGET=S390; TARGETDIR=s390;;
+-x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
+amd64-*-freebsd* | x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
+ sh-*-linux* | sh[34]*-*-linux*) TARGET=SH; TARGETDIR=sh;;
+ sh-*-rtems*) TARGET=SH; TARGETDIR=sh;;
+ sh64-*-linux* | sh5*-*-linux*) TARGET=SH64; TARGETDIR=sh64;;
--- a/lang/python30/pkg-plist
+++ b/lang/python30/pkg-plist
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@ -5,7 +5,7 @@
 # $FreeBSD$

 PORTNAME=	python
-PORTVERSION=	2.5.a0.20050728
+PORTVERSION=	2.5.a0.20060326
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@ -15,11 +15,13 @@ MAINTAINER=	perky@FreeBSD.org
 COMMENT?=	An interpreted object-oriented programming language

 DIST_SUBDIR=	python
-WRKSRC=		${PYTHON_WRKSRC}
+WRKSRC=		${PYTHON_WRKSRC}/portbld.static
+PATCH_WRKSRC=	${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	OPT="${CFLAGS}"
-MAKE_ENV=	VPATH="${WRKSRC}"
+CONFIGURE_SCRIPT=	../configure # must be relative
+CONFIGURE_ENV=	OPT="${CFLAGS}" SVNVERSION="echo freebsd"
+MAKE_ENV=	VPATH="${PYTHON_WRKSRC}"
 INSTALLS_SHLIB=	yes
 INSTALL_TARGET=	altinstall
 MAN1=		${PYTHON_VERSION}.1
@ -30,11 +32,14 @@ PYTHON_VERSION=	python2.5
 PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}

-SHARED_WRKSRC=	${WRKSRC}/build.shared
+SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//}
 DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
 TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}

+PLIST=		${WRKDIR}/PLIST
+PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
+
 OPTIONS=	THREADS "Enable thread support" on \
 		HUGE_STACK_SIZE "Use a larger thread stack" off \
 		UCS4 "Use UCS4 for unicode support" on \
@ -44,6 +49,9 @@ OPTIONS=	THREADS "Enable thread support" on \

 .include <bsd.port.pre.mk>

+# workaround for a bug in base curses.h.
+CFLAGS+=	-D__wchar_t=wchar_t
+
 .if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-threads
 CFLAGS+=		${PTHREAD_CFLAGS}
@ -108,27 +116,24 @@ PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7
 PLATFORMS=plat-freebsd5 plat-freebsd6 plat-freebsd7
 .endif

-post-extract:
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.5
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.5
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.5.py
-
 pre-patch:
+	${MKDIR} ${WRKSRC} ${SHARED_WRKSRC}/Modules
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${PATCH_WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.5
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${PATCH_WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.5
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${PATCH_WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.5.py
 	${REINPLACE_CMD} -e \
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
-		${WRKSRC}/Lib/pydoc.py
+		${PATCH_WRKSRC}/Lib/pydoc.py
 	${REINPLACE_CMD} -e \
 		's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
-		${WRKSRC}/Lib/site.py
+		${PATCH_WRKSRC}/Lib/site.py

 post-configure:
-	@# prepare a subdir for shared build
-.for subdir in Modules Parser Python Objects
-	${MKDIR} ${SHARED_WRKSRC}/${subdir}
-.endfor
+	${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${SHARED_WRKSRC} -xf -
+	${LN} -sf ${PYTHON_WRKSRC}/Lib ${WRKSRC}/Lib
 	${SED} -e 's,^\(LDLIBRARY=\).*$$,\1libpython$$(VERSION).so,' \
 		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(VERSION),' \
 		-e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \
@ -136,16 +141,8 @@ post-configure:
 		-e 's,^\(.(BUILDPYTHON)\: .*\).(LIBRARY),\1,' \
 		-e 's,^\(.(BUILDPYTHON):.*\).(LIBRARY),\1,' \
 		${WRKSRC}/Makefile > ${SHARED_WRKSRC}/Makefile
-	${LN} -sf ${WRKSRC}/pyconfig.h ${WRKSRC}/Include ${WRKSRC}/Grammar \
-		${SHARED_WRKSRC}/
-	${LN} -sf ${WRKSRC}/Python/getplatform.c ${WRKSRC}/Python/importdl.c \
-		${WRKSRC}/Python/importdl.h \
-		${SHARED_WRKSRC}/Python/
-	${LN} -sf ${WRKSRC}/Modules/makesetup ${WRKSRC}/Modules/Setup* \
-		${WRKSRC}/Modules/*.c ${WRKSRC}/Modules/*.h \
-		${SHARED_WRKSRC}/Modules/

-post-build:
+pre-build:
 	cd ${SHARED_WRKSRC}; \
 	${SETENV} ${MAKE_ENV} ${MAKE} lib${PYTHON_VERSION}.so python; \
 	${LN} -f lib${PYTHON_VERSION}.so lib${PYTHON_VERSION}.so.1; \
@ -160,6 +157,11 @@ pre-su-install:
 .endfor
 .endfor

+pre-install:
+	${AWK} '{ print $$0; }						\
+	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	\
+	${PLIST_TEMPLATE} > ${PLIST}
+
 post-install:
 	@# shared version of executable and library
 	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \
@ -175,16 +177,16 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.5 ${WRKDIR}/idle2.5 \
 		${WRKDIR}/smtpd2.5.py ${PREFIX}/bin
 	@${MKDIR} ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/Misc/python.man \
+	${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
 		${MANPREFIX}/man/man1/${PYTHON_VERSION}.1

 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${TOOLSDIR}
-	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
-		(cd ${TOOLSDIR}; tar xf -)
+	@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
+		(cd ${TOOLSDIR}; ${TAR} -xf -)
 	@${MKDIR} ${DEMODIR}
-	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \
-		(cd ${DEMODIR}; tar xf -)
+	@cd ${PYTHON_WRKSRC}/Demo; ${TAR} -cf - * | \
+		(cd ${DEMODIR}; ${TAR} -xf -)
 .endif

 .include <bsd.port.post.mk>
--- a/lang/python31/distinfo
+++ b/lang/python31/distinfo
@ -1,3 +1,3 @@
-MD5 (python/Python-2.5.a0.20050728.tgz) = 423c9ac2dbe3a754195e26652495aac3
-SHA256 (python/Python-2.5.a0.20050728.tgz) = 176d76f6933879cac8ead7f50b847e53c894501ad491fab3ff1fcc3ca18e0056
-SIZE (python/Python-2.5.a0.20050728.tgz) = 9280478
+MD5 (python/Python-2.5.a0.20060326.tgz) = 8a292f1df443e1cd3d88b091da34a5a3
+SHA256 (python/Python-2.5.a0.20060326.tgz) = 0acd60c0c81dd69813928a710640105d96667d60a0df7f05e2ed86c5bd09397e
+SIZE (python/Python-2.5.a0.20060326.tgz) = 10450951
--- a/lang/python31/files/patch-Modules-_ctypes-libffi-configure
+++ b/lang/python31/files/patch-Modules-_ctypes-libffi-configure
@ -0,0 +1,11 @@
+--- Modules/_ctypes/libffi/configure.orig	Sun Mar 26 13:22:58 2006
+++ Modules/_ctypes/libffi/configure	Sun Mar 26 13:23:07 2006
+@@ -3520,7 +3520,7 @@
+ cris-*-*) TARGET=LIBFFI_CRIS; TARGETDIR=cris;;
+ s390-*-linux-*) TARGET=S390; TARGETDIR=s390;;
+ s390x-*-linux-*) TARGET=S390; TARGETDIR=s390;;
+-x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
+amd64-*-freebsd* | x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
+ sh-*-linux* | sh[34]*-*-linux*) TARGET=SH; TARGETDIR=sh;;
+ sh-*-rtems*) TARGET=SH; TARGETDIR=sh;;
+ sh64-*-linux* | sh5*-*-linux*) TARGET=SH64; TARGETDIR=sh64;;
--- a/lang/python31/pkg-plist
+++ b/lang/python31/pkg-plist
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@ -5,7 +5,7 @@
 # $FreeBSD$

 PORTNAME=	python
-PORTVERSION=	2.5.a0.20050728
+PORTVERSION=	2.5.a0.20060326
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@ -15,11 +15,13 @@ MAINTAINER=	perky@FreeBSD.org
 COMMENT?=	An interpreted object-oriented programming language

 DIST_SUBDIR=	python
-WRKSRC=		${PYTHON_WRKSRC}
+WRKSRC=		${PYTHON_WRKSRC}/portbld.static
+PATCH_WRKSRC=	${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	OPT="${CFLAGS}"
-MAKE_ENV=	VPATH="${WRKSRC}"
+CONFIGURE_SCRIPT=	../configure # must be relative
+CONFIGURE_ENV=	OPT="${CFLAGS}" SVNVERSION="echo freebsd"
+MAKE_ENV=	VPATH="${PYTHON_WRKSRC}"
 INSTALLS_SHLIB=	yes
 INSTALL_TARGET=	altinstall
 MAN1=		${PYTHON_VERSION}.1
@ -30,11 +32,14 @@ PYTHON_VERSION=	python2.5
 PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}

-SHARED_WRKSRC=	${WRKSRC}/build.shared
+SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//}
 DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
 TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}

+PLIST=		${WRKDIR}/PLIST
+PLIST_TEMPLATE=	${PKGDIR}/pkg-plist
+
 OPTIONS=	THREADS "Enable thread support" on \
 		HUGE_STACK_SIZE "Use a larger thread stack" off \
 		UCS4 "Use UCS4 for unicode support" on \
@ -44,6 +49,9 @@ OPTIONS=	THREADS "Enable thread support" on \

 .include <bsd.port.pre.mk>

+# workaround for a bug in base curses.h.
+CFLAGS+=	-D__wchar_t=wchar_t
+
 .if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-threads
 CFLAGS+=		${PTHREAD_CFLAGS}
@ -108,27 +116,24 @@ PLATFORMS=plat-freebsd4 plat-freebsd6 plat-freebsd7
 PLATFORMS=plat-freebsd5 plat-freebsd6 plat-freebsd7
 .endif

-post-extract:
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.5
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.5
-	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
-		${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.5.py
-
 pre-patch:
+	${MKDIR} ${WRKSRC} ${SHARED_WRKSRC}/Modules
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${PATCH_WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.5
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${PATCH_WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.5
+	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
+		${PATCH_WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.5.py
 	${REINPLACE_CMD} -e \
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
-		${WRKSRC}/Lib/pydoc.py
+		${PATCH_WRKSRC}/Lib/pydoc.py
 	${REINPLACE_CMD} -e \
 		's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
-		${WRKSRC}/Lib/site.py
+		${PATCH_WRKSRC}/Lib/site.py

 post-configure:
-	@# prepare a subdir for shared build
-.for subdir in Modules Parser Python Objects
-	${MKDIR} ${SHARED_WRKSRC}/${subdir}
-.endfor
+	${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${SHARED_WRKSRC} -xf -
+	${LN} -sf ${PYTHON_WRKSRC}/Lib ${WRKSRC}/Lib
 	${SED} -e 's,^\(LDLIBRARY=\).*$$,\1libpython$$(VERSION).so,' \
 		-e 's,^\(BLDLIBRARY=\).*$$,\1-L. -lpython$$(VERSION),' \
 		-e 's,^\(CFLAGSFORSHARED=\).*$$,\1$$(CCSHARED),' \
@ -136,16 +141,8 @@ post-configure:
 		-e 's,^\(.(BUILDPYTHON)\: .*\).(LIBRARY),\1,' \
 		-e 's,^\(.(BUILDPYTHON):.*\).(LIBRARY),\1,' \
 		${WRKSRC}/Makefile > ${SHARED_WRKSRC}/Makefile
-	${LN} -sf ${WRKSRC}/pyconfig.h ${WRKSRC}/Include ${WRKSRC}/Grammar \
-		${SHARED_WRKSRC}/
-	${LN} -sf ${WRKSRC}/Python/getplatform.c ${WRKSRC}/Python/importdl.c \
-		${WRKSRC}/Python/importdl.h \
-		${SHARED_WRKSRC}/Python/
-	${LN} -sf ${WRKSRC}/Modules/makesetup ${WRKSRC}/Modules/Setup* \
-		${WRKSRC}/Modules/*.c ${WRKSRC}/Modules/*.h \
-		${SHARED_WRKSRC}/Modules/

-post-build:
+pre-build:
 	cd ${SHARED_WRKSRC}; \
 	${SETENV} ${MAKE_ENV} ${MAKE} lib${PYTHON_VERSION}.so python; \
 	${LN} -f lib${PYTHON_VERSION}.so lib${PYTHON_VERSION}.so.1; \
@ -160,6 +157,11 @@ pre-su-install:
 .endfor
 .endfor

+pre-install:
+	${AWK} '{ print $$0; }						\
+	/LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }'	\
+	${PLIST_TEMPLATE} > ${PLIST}
+
 post-install:
 	@# shared version of executable and library
 	${INSTALL_PROGRAM} ${SHARED_WRKSRC}/lib${PYTHON_VERSION}.so.1 \
@ -175,16 +177,16 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.5 ${WRKDIR}/idle2.5 \
 		${WRKDIR}/smtpd2.5.py ${PREFIX}/bin
 	@${MKDIR} ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/Misc/python.man \
+	${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \
 		${MANPREFIX}/man/man1/${PYTHON_VERSION}.1

 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${TOOLSDIR}
-	@cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \
-		(cd ${TOOLSDIR}; tar xf -)
+	@cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \
+		(cd ${TOOLSDIR}; ${TAR} -xf -)
 	@${MKDIR} ${DEMODIR}
-	@cd ${WRKSRC}/Demo; tar -c --exclude='*CVS*' -f - * | \
-		(cd ${DEMODIR}; tar xf -)
+	@cd ${PYTHON_WRKSRC}/Demo; ${TAR} -cf - * | \
+		(cd ${DEMODIR}; ${TAR} -xf -)
 .endif

 .include <bsd.port.post.mk>
--- a/lang/python32/distinfo
+++ b/lang/python32/distinfo
@ -1,3 +1,3 @@
-MD5 (python/Python-2.5.a0.20050728.tgz) = 423c9ac2dbe3a754195e26652495aac3
-SHA256 (python/Python-2.5.a0.20050728.tgz) = 176d76f6933879cac8ead7f50b847e53c894501ad491fab3ff1fcc3ca18e0056
-SIZE (python/Python-2.5.a0.20050728.tgz) = 9280478
+MD5 (python/Python-2.5.a0.20060326.tgz) = 8a292f1df443e1cd3d88b091da34a5a3
+SHA256 (python/Python-2.5.a0.20060326.tgz) = 0acd60c0c81dd69813928a710640105d96667d60a0df7f05e2ed86c5bd09397e
+SIZE (python/Python-2.5.a0.20060326.tgz) = 10450951
--- a/lang/python32/files/patch-Modules-_ctypes-libffi-configure
+++ b/lang/python32/files/patch-Modules-_ctypes-libffi-configure
@ -0,0 +1,11 @@
+--- Modules/_ctypes/libffi/configure.orig	Sun Mar 26 13:22:58 2006
+++ Modules/_ctypes/libffi/configure	Sun Mar 26 13:23:07 2006
+@@ -3520,7 +3520,7 @@
+ cris-*-*) TARGET=LIBFFI_CRIS; TARGETDIR=cris;;
+ s390-*-linux-*) TARGET=S390; TARGETDIR=s390;;
+ s390x-*-linux-*) TARGET=S390; TARGETDIR=s390;;
+-x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
+amd64-*-freebsd* | x86_64-*-linux* | x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) TARGET=X86_64; TARGETDIR=x86;;
+ sh-*-linux* | sh[34]*-*-linux*) TARGET=SH; TARGETDIR=sh;;
+ sh-*-rtems*) TARGET=SH; TARGETDIR=sh;;
+ sh64-*-linux* | sh5*-*-linux*) TARGET=SH64; TARGETDIR=sh64;;
--- a/lang/python32/pkg-plist
+++ b/lang/python32/pkg-plist