- Make FPECTL support optional and turn it off by default because

  the feature brings huge overheads for floating point arithmetics
  and integer divisions. [1]
- Fix plist
- Bump PORTREVISION

Requested by:	Ewan Todd <ewan@mathcode.net> [1]

4 files changed, 40 insertions, 4 deletions

diff --git a/lang/python/Makefile b/lang/python/Makefile
index 906d0506b333..28f2516d69e9 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -20,7 +21,6 @@ DIST_SUBDIR=	python
 WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 MAKE_ENV=	VPATH="${WRKSRC}"
 INSTALLS_SHLIB=	yes
@@ -41,7 +41,8 @@ OPTIONS=	THREADS "Enable thread support" on \
 		HUGE_STACK_SIZE "Use a larger thread stack" off \
 		UCS4 "Use UCS4 for unicode support" on \
 		PYMALLOC "Use python's internal malloc" on \
-		IPV6 "Enable IPv6 support" on
+		IPV6 "Enable IPv6 support" on \
+		FPECTL "Enable floating point exception handling" off
 
 .include <bsd.port.pre.mk>
 
@@ -95,6 +96,10 @@ CONFIGURE_ARGS+= --enable-ipv6
 CONFIGURE_ARGS+= --disable-ipv6
 .endif
 
+.if defined(WITH_FPECTL)
+CONFIGURE_ARGS+= --with-fpectl
+.endif
+
 .if ${OSVERSION} >= 600000
 PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5
 .elif ${OSVERSION} >= 500000
@@ -122,6 +127,10 @@ pre-patch:
 		${WRKSRC}/Lib/site.py
 	${MKDIR} ${WRKSRC}/Lib/plat-freebsd6
 	${CP} ${WRKSRC}/Lib/plat-freebsd5/regen ${WRKSRC}/Lib/plat-freebsd6/
+.if defined(WITH_FPECTL)
+	${ECHO} "fpectl fpectlmodule.c" >> ${WRKSRC}/Modules/Setup.dist
+	${REINPLACE_CMD} 's,fpreset,fpset,g' ${WRKSRC}/Modules/fpectlmodule.c
+.endif
 
 post-configure:
 	@# prepare a subdir for shared build
diff --git a/lang/python/pkg-plist b/lang/python/pkg-plist
index 69e408c02a9f..0d8169e96d93 100644
--- a/lang/python/pkg-plist
+++ b/lang/python/pkg-plist
@@ -3216,6 +3216,14 @@ share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/genmodule.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/modulator.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/varsubst.py
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/README.txt
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msi.py
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msilib.py
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msisupport.c
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msisupport.mak
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/schema.py
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/sequence.py
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/uisample.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.py
@@ -3320,6 +3328,7 @@ share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/scripts
 %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche/X
 %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche
+%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/msi
 %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/modulator/Templates
 %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/modulator
 %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/i18n
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 906d0506b333..28f2516d69e9 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	python
 PORTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -20,7 +21,6 @@ DIST_SUBDIR=	python
 WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 MAKE_ENV=	VPATH="${WRKSRC}"
 INSTALLS_SHLIB=	yes
@@ -41,7 +41,8 @@ OPTIONS=	THREADS "Enable thread support" on \
 		HUGE_STACK_SIZE "Use a larger thread stack" off \
 		UCS4 "Use UCS4 for unicode support" on \
 		PYMALLOC "Use python's internal malloc" on \
-		IPV6 "Enable IPv6 support" on
+		IPV6 "Enable IPv6 support" on \
+		FPECTL "Enable floating point exception handling" off
 
 .include <bsd.port.pre.mk>
 
@@ -95,6 +96,10 @@ CONFIGURE_ARGS+= --enable-ipv6
 CONFIGURE_ARGS+= --disable-ipv6
 .endif
 
+.if defined(WITH_FPECTL)
+CONFIGURE_ARGS+= --with-fpectl
+.endif
+
 .if ${OSVERSION} >= 600000
 PLATFORMS=plat-freebsd3 plat-freebsd4 plat-freebsd5
 .elif ${OSVERSION} >= 500000
@@ -122,6 +127,10 @@ pre-patch:
 		${WRKSRC}/Lib/site.py
 	${MKDIR} ${WRKSRC}/Lib/plat-freebsd6
 	${CP} ${WRKSRC}/Lib/plat-freebsd5/regen ${WRKSRC}/Lib/plat-freebsd6/
+.if defined(WITH_FPECTL)
+	${ECHO} "fpectl fpectlmodule.c" >> ${WRKSRC}/Modules/Setup.dist
+	${REINPLACE_CMD} 's,fpreset,fpset,g' ${WRKSRC}/Modules/fpectlmodule.c
+.endif
 
 post-configure:
 	@# prepare a subdir for shared build
diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist
index 69e408c02a9f..0d8169e96d93 100644
--- a/lang/python24/pkg-plist
+++ b/lang/python24/pkg-plist
@@ -3216,6 +3216,14 @@ share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/genmodule.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/modulator.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/modulator/varsubst.py
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/README.txt
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msi.py
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msilib.py
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msisupport.c
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/msisupport.mak
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/schema.py
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/sequence.py
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/msi/uisample.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/ChipViewer.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/ColorDB.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/pynche/DetailsViewer.py
@@ -3320,6 +3328,7 @@ share/emacs/site-lisp/python-mode.el
 %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/scripts
 %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche/X
 %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/pynche
+%%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/msi
 %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/modulator/Templates
 %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/modulator
 %%PORTDOCS%%@dirrm share/%%PYTHON_VERSION%%/Tools/i18n