12 files changed, 83 insertions, 31 deletions

diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index a9c98c31e232..f36ec2035a9f 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.4.a1
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -118,10 +119,13 @@ post-extract:
 	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
 		${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py
 
-post-patch:
-	${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \
-		${WRKSRC}/Include/patchlevel.h
-	${REINPLACE_CMD} -e 's,^.*freenet.*$$,,' ${WRKSRC}/Lib/base64.py
+pre-patch:
+	${REINPLACE_CMD} -e \
+		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
+		${WRKSRC}/Lib/pydoc.py
+	${REINPLACE_CMD} -e \
+		's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
+		${WRKSRC}/Lib/site.py
 
 post-configure:
 	@# prepare a subdir for shared build
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 9591ae05d10a..be8add20da11 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.3.4
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -121,6 +122,9 @@ pre-patch:
 	${REINPLACE_CMD} -e \
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
 		${WRKSRC}/Lib/pydoc.py
+	${REINPLACE_CMD} -e \
+		's|^\(prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
+		${WRKSRC}/Lib/site.py
 
 post-configure: ${STACKLESS_POST_CONFIGURE}
 	@# prepare a subdir for shared build
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index ad0785ef6ca3..8ab23120d5dc 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.1.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	lang python
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -28,6 +28,7 @@ USE_PYTHON=	yes
 PYTHON_VERSION=	python2.1
 PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}
+USE_REINPLACE=	yes
 
 #
 # If you don't want to use Python's thread module, you need to set
@@ -72,6 +73,14 @@ post-extract:
 	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
 		${WRKSRC}/Tools/scripts/pydoc > ${WRKDIR}/pydoc2.1
 
+pre-patch:
+	${REINPLACE_CMD} -e \
+		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
+		${WRKSRC}/Lib/pydoc.py
+	${REINPLACE_CMD} -e \
+		's|^\(prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
+		${WRKSRC}/Lib/site.py
+
 pre-su-install:
 .for platform in ${PLATFORMS}
 	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index c8a4818d4722..234cd56eccc3 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.2.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -83,10 +83,13 @@ PLATFORMS=plat-freebsd2 plat-freebsd4 plat-freebsd5
 PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5
 .endif
 
-post-patch:
+pre-patch:
 	${REINPLACE_CMD} -e \
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
 		${WRKSRC}/Lib/pydoc.py
+	${REINPLACE_CMD} -e \
+		's|^\(prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
+		${WRKSRC}/Lib/site.py
 
 pre-su-install:
 .for platform in ${PLATFORMS}
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 9591ae05d10a..be8add20da11 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.3.4
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -121,6 +122,9 @@ pre-patch:
 	${REINPLACE_CMD} -e \
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
 		${WRKSRC}/Lib/pydoc.py
+	${REINPLACE_CMD} -e \
+		's|^\(prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
+		${WRKSRC}/Lib/site.py
 
 post-configure: ${STACKLESS_POST_CONFIGURE}
 	@# prepare a subdir for shared build
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 9591ae05d10a..be8add20da11 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.3.4
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -121,6 +122,9 @@ pre-patch:
 	${REINPLACE_CMD} -e \
 		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
 		${WRKSRC}/Lib/pydoc.py
+	${REINPLACE_CMD} -e \
+		's|^\(prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
+		${WRKSRC}/Lib/site.py
 
 post-configure: ${STACKLESS_POST_CONFIGURE}
 	@# prepare a subdir for shared build
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index a9c98c31e232..f36ec2035a9f 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.4.a1
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -118,10 +119,13 @@ post-extract:
 	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
 		${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py
 
-post-patch:
-	${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \
-		${WRKSRC}/Include/patchlevel.h
-	${REINPLACE_CMD} -e 's,^.*freenet.*$$,,' ${WRKSRC}/Lib/base64.py
+pre-patch:
+	${REINPLACE_CMD} -e \
+		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
+		${WRKSRC}/Lib/pydoc.py
+	${REINPLACE_CMD} -e \
+		's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
+		${WRKSRC}/Lib/site.py
 
 post-configure:
 	@# prepare a subdir for shared build
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index a9c98c31e232..f36ec2035a9f 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.4.a1
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -118,10 +119,13 @@ post-extract:
 	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
 		${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py
 
-post-patch:
-	${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \
-		${WRKSRC}/Include/patchlevel.h
-	${REINPLACE_CMD} -e 's,^.*freenet.*$$,,' ${WRKSRC}/Lib/base64.py
+pre-patch:
+	${REINPLACE_CMD} -e \
+		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
+		${WRKSRC}/Lib/pydoc.py
+	${REINPLACE_CMD} -e \
+		's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
+		${WRKSRC}/Lib/site.py
 
 post-configure:
 	@# prepare a subdir for shared build
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index a9c98c31e232..f36ec2035a9f 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.4.a1
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -118,10 +119,13 @@ post-extract:
 	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
 		${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py
 
-post-patch:
-	${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \
-		${WRKSRC}/Include/patchlevel.h
-	${REINPLACE_CMD} -e 's,^.*freenet.*$$,,' ${WRKSRC}/Lib/base64.py
+pre-patch:
+	${REINPLACE_CMD} -e \
+		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
+		${WRKSRC}/Lib/pydoc.py
+	${REINPLACE_CMD} -e \
+		's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
+		${WRKSRC}/Lib/site.py
 
 post-configure:
 	@# prepare a subdir for shared build
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index a9c98c31e232..f36ec2035a9f 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.4.a1
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -118,10 +119,13 @@ post-extract:
 	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
 		${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py
 
-post-patch:
-	${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \
-		${WRKSRC}/Include/patchlevel.h
-	${REINPLACE_CMD} -e 's,^.*freenet.*$$,,' ${WRKSRC}/Lib/base64.py
+pre-patch:
+	${REINPLACE_CMD} -e \
+		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
+		${WRKSRC}/Lib/pydoc.py
+	${REINPLACE_CMD} -e \
+		's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
+		${WRKSRC}/Lib/site.py
 
 post-configure:
 	@# prepare a subdir for shared build
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index a9c98c31e232..f36ec2035a9f 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.4.a1
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -118,10 +119,13 @@ post-extract:
 	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
 		${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py
 
-post-patch:
-	${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \
-		${WRKSRC}/Include/patchlevel.h
-	${REINPLACE_CMD} -e 's,^.*freenet.*$$,,' ${WRKSRC}/Lib/base64.py
+pre-patch:
+	${REINPLACE_CMD} -e \
+		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
+		${WRKSRC}/Lib/pydoc.py
+	${REINPLACE_CMD} -e \
+		's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
+		${WRKSRC}/Lib/site.py
 
 post-configure:
 	@# prepare a subdir for shared build
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index a9c98c31e232..f36ec2035a9f 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.4.a1
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -118,10 +119,13 @@ post-extract:
 	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
 		${WRKSRC}/Lib/smtpd.py > ${WRKDIR}/smtpd2.4.py
 
-post-patch:
-	${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \
-		${WRKSRC}/Include/patchlevel.h
-	${REINPLACE_CMD} -e 's,^.*freenet.*$$,,' ${WRKSRC}/Lib/base64.py
+pre-patch:
+	${REINPLACE_CMD} -e \
+		's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \
+		${WRKSRC}/Lib/pydoc.py
+	${REINPLACE_CMD} -e \
+		's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \
+		${WRKSRC}/Lib/site.py
 
 post-configure:
 	@# prepare a subdir for shared build