14 files changed, 140 insertions, 84 deletions

diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index 954c1d45a6ea..0f0bdbf9b49d 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl --with-libs='-lxpg4'
+CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 PLIST=		${WRKDIR}/PLIST
@@ -30,11 +30,8 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# If you want to use Python's thread module, you need to set WITH_THREADS
-# to 'yes', and you must have the FreeBSD threading c library (libc_r)
-# installed. See 'man 3 pthread' for details on libc_r.
-#
-# This option is enabled by default.
+# If you don't want to use Python's thread module, you need to set
+# WITHOUT_THREADS. libc_r should be installed on current systems.
 #
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
@@ -72,6 +69,13 @@ post-configure:
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+.if ${OSVERSION} < 400020
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+
 .if ${OSVERSION} >= 500000
 PLATFORMS=plat-freebsd2 plat-freebsd3 plat-freebsd4
 .elif ${OSVERSION} >= 400000
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 954c1d45a6ea..0f0bdbf9b49d 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl --with-libs='-lxpg4'
+CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 PLIST=		${WRKDIR}/PLIST
@@ -30,11 +30,8 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# If you want to use Python's thread module, you need to set WITH_THREADS
-# to 'yes', and you must have the FreeBSD threading c library (libc_r)
-# installed. See 'man 3 pthread' for details on libc_r.
-#
-# This option is enabled by default.
+# If you don't want to use Python's thread module, you need to set
+# WITHOUT_THREADS. libc_r should be installed on current systems.
 #
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
@@ -72,6 +69,13 @@ post-configure:
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+.if ${OSVERSION} < 400020
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+
 .if ${OSVERSION} >= 500000
 PLATFORMS=plat-freebsd2 plat-freebsd3 plat-freebsd4
 .elif ${OSVERSION} >= 400000
diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index 954c1d45a6ea..0f0bdbf9b49d 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl --with-libs='-lxpg4'
+CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 PLIST=		${WRKDIR}/PLIST
@@ -30,11 +30,8 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# If you want to use Python's thread module, you need to set WITH_THREADS
-# to 'yes', and you must have the FreeBSD threading c library (libc_r)
-# installed. See 'man 3 pthread' for details on libc_r.
-#
-# This option is enabled by default.
+# If you don't want to use Python's thread module, you need to set
+# WITHOUT_THREADS. libc_r should be installed on current systems.
 #
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
@@ -72,6 +69,13 @@ post-configure:
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+.if ${OSVERSION} < 400020
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+
 .if ${OSVERSION} >= 500000
 PLATFORMS=plat-freebsd2 plat-freebsd3 plat-freebsd4
 .elif ${OSVERSION} >= 400000
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index 954c1d45a6ea..0f0bdbf9b49d 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl --with-libs='-lxpg4'
+CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 PLIST=		${WRKDIR}/PLIST
@@ -30,11 +30,8 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# If you want to use Python's thread module, you need to set WITH_THREADS
-# to 'yes', and you must have the FreeBSD threading c library (libc_r)
-# installed. See 'man 3 pthread' for details on libc_r.
-#
-# This option is enabled by default.
+# If you don't want to use Python's thread module, you need to set
+# WITHOUT_THREADS. libc_r should be installed on current systems.
 #
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
@@ -72,6 +69,13 @@ post-configure:
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+.if ${OSVERSION} < 400020
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+
 .if ${OSVERSION} >= 500000
 PLATFORMS=plat-freebsd2 plat-freebsd3 plat-freebsd4
 .elif ${OSVERSION} >= 400000
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 954c1d45a6ea..0f0bdbf9b49d 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl --with-libs='-lxpg4'
+CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 PLIST=		${WRKDIR}/PLIST
@@ -30,11 +30,8 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# If you want to use Python's thread module, you need to set WITH_THREADS
-# to 'yes', and you must have the FreeBSD threading c library (libc_r)
-# installed. See 'man 3 pthread' for details on libc_r.
-#
-# This option is enabled by default.
+# If you don't want to use Python's thread module, you need to set
+# WITHOUT_THREADS. libc_r should be installed on current systems.
 #
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
@@ -72,6 +69,13 @@ post-configure:
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+.if ${OSVERSION} < 400020
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+
 .if ${OSVERSION} >= 500000
 PLATFORMS=plat-freebsd2 plat-freebsd3 plat-freebsd4
 .elif ${OSVERSION} >= 400000
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index 954c1d45a6ea..0f0bdbf9b49d 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl --with-libs='-lxpg4'
+CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 PLIST=		${WRKDIR}/PLIST
@@ -30,11 +30,8 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# If you want to use Python's thread module, you need to set WITH_THREADS
-# to 'yes', and you must have the FreeBSD threading c library (libc_r)
-# installed. See 'man 3 pthread' for details on libc_r.
-#
-# This option is enabled by default.
+# If you don't want to use Python's thread module, you need to set
+# WITHOUT_THREADS. libc_r should be installed on current systems.
 #
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
@@ -72,6 +69,13 @@ post-configure:
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+.if ${OSVERSION} < 400020
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+
 .if ${OSVERSION} >= 500000
 PLATFORMS=plat-freebsd2 plat-freebsd3 plat-freebsd4
 .elif ${OSVERSION} >= 400000
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 954c1d45a6ea..0f0bdbf9b49d 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl --with-libs='-lxpg4'
+CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 PLIST=		${WRKDIR}/PLIST
@@ -30,11 +30,8 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# If you want to use Python's thread module, you need to set WITH_THREADS
-# to 'yes', and you must have the FreeBSD threading c library (libc_r)
-# installed. See 'man 3 pthread' for details on libc_r.
-#
-# This option is enabled by default.
+# If you don't want to use Python's thread module, you need to set
+# WITHOUT_THREADS. libc_r should be installed on current systems.
 #
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
@@ -72,6 +69,13 @@ post-configure:
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+.if ${OSVERSION} < 400020
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+
 .if ${OSVERSION} >= 500000
 PLATFORMS=plat-freebsd2 plat-freebsd3 plat-freebsd4
 .elif ${OSVERSION} >= 400000
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 954c1d45a6ea..0f0bdbf9b49d 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl --with-libs='-lxpg4'
+CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 PLIST=		${WRKDIR}/PLIST
@@ -30,11 +30,8 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# If you want to use Python's thread module, you need to set WITH_THREADS
-# to 'yes', and you must have the FreeBSD threading c library (libc_r)
-# installed. See 'man 3 pthread' for details on libc_r.
-#
-# This option is enabled by default.
+# If you don't want to use Python's thread module, you need to set
+# WITHOUT_THREADS. libc_r should be installed on current systems.
 #
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
@@ -72,6 +69,13 @@ post-configure:
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+.if ${OSVERSION} < 400020
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+
 .if ${OSVERSION} >= 500000
 PLATFORMS=plat-freebsd2 plat-freebsd3 plat-freebsd4
 .elif ${OSVERSION} >= 400000
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 954c1d45a6ea..0f0bdbf9b49d 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl --with-libs='-lxpg4'
+CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 PLIST=		${WRKDIR}/PLIST
@@ -30,11 +30,8 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# If you want to use Python's thread module, you need to set WITH_THREADS
-# to 'yes', and you must have the FreeBSD threading c library (libc_r)
-# installed. See 'man 3 pthread' for details on libc_r.
-#
-# This option is enabled by default.
+# If you don't want to use Python's thread module, you need to set
+# WITHOUT_THREADS. libc_r should be installed on current systems.
 #
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
@@ -72,6 +69,13 @@ post-configure:
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+.if ${OSVERSION} < 400020
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+
 .if ${OSVERSION} >= 500000
 PLATFORMS=plat-freebsd2 plat-freebsd3 plat-freebsd4
 .elif ${OSVERSION} >= 400000
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 954c1d45a6ea..0f0bdbf9b49d 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl --with-libs='-lxpg4'
+CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 PLIST=		${WRKDIR}/PLIST
@@ -30,11 +30,8 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# If you want to use Python's thread module, you need to set WITH_THREADS
-# to 'yes', and you must have the FreeBSD threading c library (libc_r)
-# installed. See 'man 3 pthread' for details on libc_r.
-#
-# This option is enabled by default.
+# If you don't want to use Python's thread module, you need to set
+# WITHOUT_THREADS. libc_r should be installed on current systems.
 #
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
@@ -72,6 +69,13 @@ post-configure:
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+.if ${OSVERSION} < 400020
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+
 .if ${OSVERSION} >= 500000
 PLATFORMS=plat-freebsd2 plat-freebsd3 plat-freebsd4
 .elif ${OSVERSION} >= 400000
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 954c1d45a6ea..0f0bdbf9b49d 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl --with-libs='-lxpg4'
+CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 PLIST=		${WRKDIR}/PLIST
@@ -30,11 +30,8 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# If you want to use Python's thread module, you need to set WITH_THREADS
-# to 'yes', and you must have the FreeBSD threading c library (libc_r)
-# installed. See 'man 3 pthread' for details on libc_r.
-#
-# This option is enabled by default.
+# If you don't want to use Python's thread module, you need to set
+# WITHOUT_THREADS. libc_r should be installed on current systems.
 #
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
@@ -72,6 +69,13 @@ post-configure:
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+.if ${OSVERSION} < 400020
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+
 .if ${OSVERSION} >= 500000
 PLATFORMS=plat-freebsd2 plat-freebsd3 plat-freebsd4
 .elif ${OSVERSION} >= 400000
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index 954c1d45a6ea..0f0bdbf9b49d 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl --with-libs='-lxpg4'
+CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 PLIST=		${WRKDIR}/PLIST
@@ -30,11 +30,8 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# If you want to use Python's thread module, you need to set WITH_THREADS
-# to 'yes', and you must have the FreeBSD threading c library (libc_r)
-# installed. See 'man 3 pthread' for details on libc_r.
-#
-# This option is enabled by default.
+# If you don't want to use Python's thread module, you need to set
+# WITHOUT_THREADS. libc_r should be installed on current systems.
 #
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
@@ -72,6 +69,13 @@ post-configure:
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+.if ${OSVERSION} < 400020
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+
 .if ${OSVERSION} >= 500000
 PLATFORMS=plat-freebsd2 plat-freebsd3 plat-freebsd4
 .elif ${OSVERSION} >= 400000
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 954c1d45a6ea..0f0bdbf9b49d 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl --with-libs='-lxpg4'
+CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 PLIST=		${WRKDIR}/PLIST
@@ -30,11 +30,8 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# If you want to use Python's thread module, you need to set WITH_THREADS
-# to 'yes', and you must have the FreeBSD threading c library (libc_r)
-# installed. See 'man 3 pthread' for details on libc_r.
-#
-# This option is enabled by default.
+# If you don't want to use Python's thread module, you need to set
+# WITHOUT_THREADS. libc_r should be installed on current systems.
 #
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
@@ -72,6 +69,13 @@ post-configure:
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+.if ${OSVERSION} < 400020
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+
 .if ${OSVERSION} >= 500000
 PLATFORMS=plat-freebsd2 plat-freebsd3 plat-freebsd4
 .elif ${OSVERSION} >= 400000
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 954c1d45a6ea..0f0bdbf9b49d 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl --with-libs='-lxpg4'
+CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 PLIST=		${WRKDIR}/PLIST
@@ -30,11 +30,8 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# If you want to use Python's thread module, you need to set WITH_THREADS
-# to 'yes', and you must have the FreeBSD threading c library (libc_r)
-# installed. See 'man 3 pthread' for details on libc_r.
-#
-# This option is enabled by default.
+# If you don't want to use Python's thread module, you need to set
+# WITHOUT_THREADS. libc_r should be installed on current systems.
 #
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
 .if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
@@ -72,6 +69,13 @@ post-configure:
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+.if ${OSVERSION} < 400020
+CONFIGURE_ARGS+= --with-libs='-lxpg4'
+.endif
+
 .if ${OSVERSION} >= 500000
 PLATFORMS=plat-freebsd2 plat-freebsd3 plat-freebsd4
 .elif ${OSVERSION} >= 400000