Don't build mpz extension, it's moved to a separate port.

36 files changed, 36 insertions, 120 deletions

diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index b548510597d6..400b87953447 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -17,7 +17,7 @@ MAINTAINER?=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl
+#CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 MAN1=		python.1
@@ -49,12 +49,6 @@ CFLAGS+=	-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 .endif
 
-.if ${OSVERSION} > 500023
-LIB_DEPENDS+=	gmp.3:${PORTSDIR}/math/libgmp
-CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
-.endif
-
 .if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
 CONFIGURE_ARGS+=	--with-libs='-lxpg4'
 .endif
diff --git a/lang/python-devel/files/patch-setup.py b/lang/python-devel/files/patch-setup.py
index fd0d484c38db..f3cef489fa8f 100644
--- a/lang/python-devel/files/patch-setup.py
+++ b/lang/python-devel/files/patch-setup.py
@@ -5,7 +5,7 @@
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ["_tkinter", "gdbm", "pyexpat"]
++disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"]
  
  def find_file(filename, std_dirs, paths):
      """Searches for the directory where a given file is located,
diff --git a/lang/python-devel/pkg-plist b/lang/python-devel/pkg-plist
index fce33946364f..00b364f83709 100644
--- a/lang/python-devel/pkg-plist
+++ b/lang/python-devel/pkg-plist
@@ -872,13 +872,12 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+@comment lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
 lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
-lib/%%PYTHON_VERSION%%/lib-dynload/mpz.so
 lib/%%PYTHON_VERSION%%/lib-dynload/new.so
 lib/%%PYTHON_VERSION%%/lib-dynload/nis.so
 lib/%%PYTHON_VERSION%%/lib-dynload/operator.so
diff --git a/lang/python/Makefile b/lang/python/Makefile
index b548510597d6..400b87953447 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -17,7 +17,7 @@ MAINTAINER?=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl
+#CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 MAN1=		python.1
@@ -49,12 +49,6 @@ CFLAGS+=	-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 .endif
 
-.if ${OSVERSION} > 500023
-LIB_DEPENDS+=	gmp.3:${PORTSDIR}/math/libgmp
-CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
-.endif
-
 .if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
 CONFIGURE_ARGS+=	--with-libs='-lxpg4'
 .endif
diff --git a/lang/python/files/patch-setup.py b/lang/python/files/patch-setup.py
index fd0d484c38db..f3cef489fa8f 100644
--- a/lang/python/files/patch-setup.py
+++ b/lang/python/files/patch-setup.py
@@ -5,7 +5,7 @@
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ["_tkinter", "gdbm", "pyexpat"]
++disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"]
  
  def find_file(filename, std_dirs, paths):
      """Searches for the directory where a given file is located,
diff --git a/lang/python/pkg-plist b/lang/python/pkg-plist
index fce33946364f..00b364f83709 100644
--- a/lang/python/pkg-plist
+++ b/lang/python/pkg-plist
@@ -872,13 +872,12 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+@comment lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
 lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
-lib/%%PYTHON_VERSION%%/lib-dynload/mpz.so
 lib/%%PYTHON_VERSION%%/lib-dynload/new.so
 lib/%%PYTHON_VERSION%%/lib-dynload/nis.so
 lib/%%PYTHON_VERSION%%/lib-dynload/operator.so
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index b548510597d6..400b87953447 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -17,7 +17,7 @@ MAINTAINER?=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl
+#CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 MAN1=		python.1
@@ -49,12 +49,6 @@ CFLAGS+=	-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 .endif
 
-.if ${OSVERSION} > 500023
-LIB_DEPENDS+=	gmp.3:${PORTSDIR}/math/libgmp
-CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
-.endif
-
 .if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
 CONFIGURE_ARGS+=	--with-libs='-lxpg4'
 .endif
diff --git a/lang/python21/files/patch-setup.py b/lang/python21/files/patch-setup.py
index fd0d484c38db..f3cef489fa8f 100644
--- a/lang/python21/files/patch-setup.py
+++ b/lang/python21/files/patch-setup.py
@@ -5,7 +5,7 @@
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ["_tkinter", "gdbm", "pyexpat"]
++disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"]
  
  def find_file(filename, std_dirs, paths):
      """Searches for the directory where a given file is located,
diff --git a/lang/python21/pkg-plist b/lang/python21/pkg-plist
index fce33946364f..00b364f83709 100644
--- a/lang/python21/pkg-plist
+++ b/lang/python21/pkg-plist
@@ -872,13 +872,12 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+@comment lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
 lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
-lib/%%PYTHON_VERSION%%/lib-dynload/mpz.so
 lib/%%PYTHON_VERSION%%/lib-dynload/new.so
 lib/%%PYTHON_VERSION%%/lib-dynload/nis.so
 lib/%%PYTHON_VERSION%%/lib-dynload/operator.so
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index b548510597d6..400b87953447 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -17,7 +17,7 @@ MAINTAINER?=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl
+#CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 MAN1=		python.1
@@ -49,12 +49,6 @@ CFLAGS+=	-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 .endif
 
-.if ${OSVERSION} > 500023
-LIB_DEPENDS+=	gmp.3:${PORTSDIR}/math/libgmp
-CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
-.endif
-
 .if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
 CONFIGURE_ARGS+=	--with-libs='-lxpg4'
 .endif
diff --git a/lang/python22/files/patch-setup.py b/lang/python22/files/patch-setup.py
index fd0d484c38db..f3cef489fa8f 100644
--- a/lang/python22/files/patch-setup.py
+++ b/lang/python22/files/patch-setup.py
@@ -5,7 +5,7 @@
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ["_tkinter", "gdbm", "pyexpat"]
++disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"]
  
  def find_file(filename, std_dirs, paths):
      """Searches for the directory where a given file is located,
diff --git a/lang/python22/pkg-plist b/lang/python22/pkg-plist
index fce33946364f..00b364f83709 100644
--- a/lang/python22/pkg-plist
+++ b/lang/python22/pkg-plist
@@ -872,13 +872,12 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+@comment lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
 lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
-lib/%%PYTHON_VERSION%%/lib-dynload/mpz.so
 lib/%%PYTHON_VERSION%%/lib-dynload/new.so
 lib/%%PYTHON_VERSION%%/lib-dynload/nis.so
 lib/%%PYTHON_VERSION%%/lib-dynload/operator.so
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index b548510597d6..400b87953447 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -17,7 +17,7 @@ MAINTAINER?=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl
+#CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 MAN1=		python.1
@@ -49,12 +49,6 @@ CFLAGS+=	-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 .endif
 
-.if ${OSVERSION} > 500023
-LIB_DEPENDS+=	gmp.3:${PORTSDIR}/math/libgmp
-CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
-.endif
-
 .if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
 CONFIGURE_ARGS+=	--with-libs='-lxpg4'
 .endif
diff --git a/lang/python23/files/patch-setup.py b/lang/python23/files/patch-setup.py
index fd0d484c38db..f3cef489fa8f 100644
--- a/lang/python23/files/patch-setup.py
+++ b/lang/python23/files/patch-setup.py
@@ -5,7 +5,7 @@
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ["_tkinter", "gdbm", "pyexpat"]
++disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"]
  
  def find_file(filename, std_dirs, paths):
      """Searches for the directory where a given file is located,
diff --git a/lang/python23/pkg-plist b/lang/python23/pkg-plist
index fce33946364f..00b364f83709 100644
--- a/lang/python23/pkg-plist
+++ b/lang/python23/pkg-plist
@@ -872,13 +872,12 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+@comment lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
 lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
-lib/%%PYTHON_VERSION%%/lib-dynload/mpz.so
 lib/%%PYTHON_VERSION%%/lib-dynload/new.so
 lib/%%PYTHON_VERSION%%/lib-dynload/nis.so
 lib/%%PYTHON_VERSION%%/lib-dynload/operator.so
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index b548510597d6..400b87953447 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -17,7 +17,7 @@ MAINTAINER?=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl
+#CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 MAN1=		python.1
@@ -49,12 +49,6 @@ CFLAGS+=	-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 .endif
 
-.if ${OSVERSION} > 500023
-LIB_DEPENDS+=	gmp.3:${PORTSDIR}/math/libgmp
-CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
-.endif
-
 .if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
 CONFIGURE_ARGS+=	--with-libs='-lxpg4'
 .endif
diff --git a/lang/python24/files/patch-setup.py b/lang/python24/files/patch-setup.py
index fd0d484c38db..f3cef489fa8f 100644
--- a/lang/python24/files/patch-setup.py
+++ b/lang/python24/files/patch-setup.py
@@ -5,7 +5,7 @@
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ["_tkinter", "gdbm", "pyexpat"]
++disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"]
  
  def find_file(filename, std_dirs, paths):
      """Searches for the directory where a given file is located,
diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist
index fce33946364f..00b364f83709 100644
--- a/lang/python24/pkg-plist
+++ b/lang/python24/pkg-plist
@@ -872,13 +872,12 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+@comment lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
 lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
-lib/%%PYTHON_VERSION%%/lib-dynload/mpz.so
 lib/%%PYTHON_VERSION%%/lib-dynload/new.so
 lib/%%PYTHON_VERSION%%/lib-dynload/nis.so
 lib/%%PYTHON_VERSION%%/lib-dynload/operator.so
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index b548510597d6..400b87953447 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -17,7 +17,7 @@ MAINTAINER?=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl
+#CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 MAN1=		python.1
@@ -49,12 +49,6 @@ CFLAGS+=	-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 .endif
 
-.if ${OSVERSION} > 500023
-LIB_DEPENDS+=	gmp.3:${PORTSDIR}/math/libgmp
-CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
-.endif
-
 .if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
 CONFIGURE_ARGS+=	--with-libs='-lxpg4'
 .endif
diff --git a/lang/python25/files/patch-setup.py b/lang/python25/files/patch-setup.py
index fd0d484c38db..f3cef489fa8f 100644
--- a/lang/python25/files/patch-setup.py
+++ b/lang/python25/files/patch-setup.py
@@ -5,7 +5,7 @@
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ["_tkinter", "gdbm", "pyexpat"]
++disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"]
  
  def find_file(filename, std_dirs, paths):
      """Searches for the directory where a given file is located,
diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist
index fce33946364f..00b364f83709 100644
--- a/lang/python25/pkg-plist
+++ b/lang/python25/pkg-plist
@@ -872,13 +872,12 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+@comment lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
 lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
-lib/%%PYTHON_VERSION%%/lib-dynload/mpz.so
 lib/%%PYTHON_VERSION%%/lib-dynload/new.so
 lib/%%PYTHON_VERSION%%/lib-dynload/nis.so
 lib/%%PYTHON_VERSION%%/lib-dynload/operator.so
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index b548510597d6..400b87953447 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -17,7 +17,7 @@ MAINTAINER?=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl
+#CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 MAN1=		python.1
@@ -49,12 +49,6 @@ CFLAGS+=	-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 .endif
 
-.if ${OSVERSION} > 500023
-LIB_DEPENDS+=	gmp.3:${PORTSDIR}/math/libgmp
-CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
-.endif
-
 .if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
 CONFIGURE_ARGS+=	--with-libs='-lxpg4'
 .endif
diff --git a/lang/python26/files/patch-setup.py b/lang/python26/files/patch-setup.py
index fd0d484c38db..f3cef489fa8f 100644
--- a/lang/python26/files/patch-setup.py
+++ b/lang/python26/files/patch-setup.py
@@ -5,7 +5,7 @@
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ["_tkinter", "gdbm", "pyexpat"]
++disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"]
  
  def find_file(filename, std_dirs, paths):
      """Searches for the directory where a given file is located,
diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist
index fce33946364f..00b364f83709 100644
--- a/lang/python26/pkg-plist
+++ b/lang/python26/pkg-plist
@@ -872,13 +872,12 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+@comment lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
 lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
-lib/%%PYTHON_VERSION%%/lib-dynload/mpz.so
 lib/%%PYTHON_VERSION%%/lib-dynload/new.so
 lib/%%PYTHON_VERSION%%/lib-dynload/nis.so
 lib/%%PYTHON_VERSION%%/lib-dynload/operator.so
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index b548510597d6..400b87953447 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -17,7 +17,7 @@ MAINTAINER?=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl
+#CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 MAN1=		python.1
@@ -49,12 +49,6 @@ CFLAGS+=	-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 .endif
 
-.if ${OSVERSION} > 500023
-LIB_DEPENDS+=	gmp.3:${PORTSDIR}/math/libgmp
-CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
-.endif
-
 .if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
 CONFIGURE_ARGS+=	--with-libs='-lxpg4'
 .endif
diff --git a/lang/python27/files/patch-setup.py b/lang/python27/files/patch-setup.py
index fd0d484c38db..f3cef489fa8f 100644
--- a/lang/python27/files/patch-setup.py
+++ b/lang/python27/files/patch-setup.py
@@ -5,7 +5,7 @@
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ["_tkinter", "gdbm", "pyexpat"]
++disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"]
  
  def find_file(filename, std_dirs, paths):
      """Searches for the directory where a given file is located,
diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist
index fce33946364f..00b364f83709 100644
--- a/lang/python27/pkg-plist
+++ b/lang/python27/pkg-plist
@@ -872,13 +872,12 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+@comment lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
 lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
-lib/%%PYTHON_VERSION%%/lib-dynload/mpz.so
 lib/%%PYTHON_VERSION%%/lib-dynload/new.so
 lib/%%PYTHON_VERSION%%/lib-dynload/nis.so
 lib/%%PYTHON_VERSION%%/lib-dynload/operator.so
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index b548510597d6..400b87953447 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -17,7 +17,7 @@ MAINTAINER?=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl
+#CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 MAN1=		python.1
@@ -49,12 +49,6 @@ CFLAGS+=	-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 .endif
 
-.if ${OSVERSION} > 500023
-LIB_DEPENDS+=	gmp.3:${PORTSDIR}/math/libgmp
-CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
-.endif
-
 .if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
 CONFIGURE_ARGS+=	--with-libs='-lxpg4'
 .endif
diff --git a/lang/python30/files/patch-setup.py b/lang/python30/files/patch-setup.py
index fd0d484c38db..f3cef489fa8f 100644
--- a/lang/python30/files/patch-setup.py
+++ b/lang/python30/files/patch-setup.py
@@ -5,7 +5,7 @@
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ["_tkinter", "gdbm", "pyexpat"]
++disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"]
  
  def find_file(filename, std_dirs, paths):
      """Searches for the directory where a given file is located,
diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist
index fce33946364f..00b364f83709 100644
--- a/lang/python30/pkg-plist
+++ b/lang/python30/pkg-plist
@@ -872,13 +872,12 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+@comment lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
 lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
-lib/%%PYTHON_VERSION%%/lib-dynload/mpz.so
 lib/%%PYTHON_VERSION%%/lib-dynload/new.so
 lib/%%PYTHON_VERSION%%/lib-dynload/nis.so
 lib/%%PYTHON_VERSION%%/lib-dynload/operator.so
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index b548510597d6..400b87953447 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -17,7 +17,7 @@ MAINTAINER?=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl
+#CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 MAN1=		python.1
@@ -49,12 +49,6 @@ CFLAGS+=	-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 .endif
 
-.if ${OSVERSION} > 500023
-LIB_DEPENDS+=	gmp.3:${PORTSDIR}/math/libgmp
-CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
-.endif
-
 .if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
 CONFIGURE_ARGS+=	--with-libs='-lxpg4'
 .endif
diff --git a/lang/python31/files/patch-setup.py b/lang/python31/files/patch-setup.py
index fd0d484c38db..f3cef489fa8f 100644
--- a/lang/python31/files/patch-setup.py
+++ b/lang/python31/files/patch-setup.py
@@ -5,7 +5,7 @@
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ["_tkinter", "gdbm", "pyexpat"]
++disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"]
  
  def find_file(filename, std_dirs, paths):
      """Searches for the directory where a given file is located,
diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist
index fce33946364f..00b364f83709 100644
--- a/lang/python31/pkg-plist
+++ b/lang/python31/pkg-plist
@@ -872,13 +872,12 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+@comment lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
 lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
-lib/%%PYTHON_VERSION%%/lib-dynload/mpz.so
 lib/%%PYTHON_VERSION%%/lib-dynload/new.so
 lib/%%PYTHON_VERSION%%/lib-dynload/nis.so
 lib/%%PYTHON_VERSION%%/lib-dynload/operator.so
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index b548510597d6..400b87953447 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -17,7 +17,7 @@ MAINTAINER?=	tg@FreeBSD.org
 DIST_SUBDIR=	python
 WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-fpectl
+#CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
 INSTALL_TARGET=	install
 MAN1=		python.1
@@ -49,12 +49,6 @@ CFLAGS+=	-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 .endif
 
-.if ${OSVERSION} > 500023
-LIB_DEPENDS+=	gmp.3:${PORTSDIR}/math/libgmp
-CFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
-.endif
-
 .if ${OSVERSION} >= 500000 && ${OSVERSION} < 500005
 CONFIGURE_ARGS+=	--with-libs='-lxpg4'
 .endif
diff --git a/lang/python32/files/patch-setup.py b/lang/python32/files/patch-setup.py
index fd0d484c38db..f3cef489fa8f 100644
--- a/lang/python32/files/patch-setup.py
+++ b/lang/python32/files/patch-setup.py
@@ -5,7 +5,7 @@
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ["_tkinter", "gdbm", "pyexpat"]
++disabled_module_list = ["_tkinter", "gdbm", "mpz", "pyexpat"]
  
  def find_file(filename, std_dirs, paths):
      """Searches for the directory where a given file is located,
diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist
index fce33946364f..00b364f83709 100644
--- a/lang/python32/pkg-plist
+++ b/lang/python32/pkg-plist
@@ -872,13 +872,12 @@ lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
 lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
+@comment lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
 lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
 lib/%%PYTHON_VERSION%%/lib-dynload/math.so
 lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
-lib/%%PYTHON_VERSION%%/lib-dynload/mpz.so
 lib/%%PYTHON_VERSION%%/lib-dynload/new.so
 lib/%%PYTHON_VERSION%%/lib-dynload/nis.so
 lib/%%PYTHON_VERSION%%/lib-dynload/operator.so