Index: UPDATING
===================================================================
RCS file: /home/ncvs/ports/UPDATING,v
retrieving revision 1.1144
diff -u -r1.1144 UPDATING
--- UPDATING	21 Sep 2011 07:05:46 -0000	1.1144
+++ UPDATING	22 Sep 2011 10:12:20 -0000
@@ -5,6 +5,14 @@
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20110922:
+  AFFECTS: users of lang/python*
+  AUTHOR: lwhsu@FreeBSD.org
+
+ The HUGE_STACK_SIZE option has been removed, now Python will use default
+ thread stack size of the system.  If you want to change it, specify it
+ with -DTHREAD_STACK_SIZE=<size> in CFLAGS.
+
 20110921:
   AFFECTS: users of devel/maven2 and devel/maven3
   AUTHOR: hq@FreeBSD.org
Index: lang/python24/Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/python24/Makefile,v
retrieving revision 1.172
diff -u -r1.172 Makefile
--- lang/python24/Makefile	18 Sep 2011 08:33:14 -0000	1.172
+++ lang/python24/Makefile	22 Sep 2011 10:12:20 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	python24
 PORTVERSION=	2.4.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -43,7 +43,6 @@
 		-e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},'
 
 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 \
@@ -64,11 +63,6 @@
 .if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-threads
 CFLAGS+=		${PTHREAD_CFLAGS}
-.if defined(WITHOUT_HUGE_STACK_SIZE)
-CFLAGS+=		-DTHREAD_STACK_SIZE=0x20000
-.else
-CFLAGS+=		-DTHREAD_STACK_SIZE=0x100000
-.endif # defined(WITHOUT_HUGE_STACK_SIZE)
 CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
 .else
 CONFIGURE_ARGS+=	--without-threads
Index: lang/python25/Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/python25/Makefile,v
retrieving revision 1.163
diff -u -r1.163 Makefile
--- lang/python25/Makefile	18 Sep 2011 08:33:14 -0000	1.163
+++ lang/python25/Makefile	22 Sep 2011 10:12:20 -0000
@@ -6,6 +6,7 @@
 
 PORTNAME=	python25
 PORTVERSION=	2.5.6
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -47,7 +48,6 @@
 		-e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},'
 
 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 \
@@ -68,11 +68,6 @@
 .if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-threads
 CFLAGS+=		${PTHREAD_CFLAGS}
-.if defined(WITHOUT_HUGE_STACK_SIZE)
-CFLAGS+=		-DTHREAD_STACK_SIZE=0x20000
-.else
-CFLAGS+=		-DTHREAD_STACK_SIZE=0x100000
-.endif # defined(WITHOUT_HUGE_STACK_SIZE)
 CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
 .else
 CONFIGURE_ARGS+=	--without-threads
Index: lang/python26/Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/python26/Makefile,v
retrieving revision 1.174
diff -u -r1.174 Makefile
--- lang/python26/Makefile	18 Sep 2011 08:33:14 -0000	1.174
+++ lang/python26/Makefile	22 Sep 2011 10:12:20 -0000
@@ -6,6 +6,7 @@
 
 PORTNAME=	python26
 PORTVERSION=	2.6.7
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -48,7 +49,6 @@
 		-e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},'
 
 OPTIONS=	THREADS "Enable thread support" on \
-		HUGE_STACK_SIZE "Use a larger thread stack" off \
 		SEM "Use POSIX semaphores (experimental)" off \
 		PTH "Use GNU Pth for threading/multiprocessing" off \
 		UCS4 "Use UCS4 for unicode support" on \
@@ -96,11 +96,6 @@
 CFLAGS+=		${PTHREAD_CFLAGS}
 CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
 .endif # defined(WITH_PTH)
-.if defined(WITHOUT_HUGE_STACK_SIZE)
-CFLAGS+=		-DTHREAD_STACK_SIZE=0x20000
-.else
-CFLAGS+=		-DTHREAD_STACK_SIZE=0x100000
-.endif # defined(WITHOUT_HUGE_STACK_SIZE)
 .else # defined(WITHOUT_THREADS)
 PLIST_SUB+=	THREADS="@comment "
 CONFIGURE_ARGS+=	--without-threads
Index: lang/python27/Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/python27/Makefile,v
retrieving revision 1.177
diff -u -r1.177 Makefile
--- lang/python27/Makefile	18 Sep 2011 08:33:14 -0000	1.177
+++ lang/python27/Makefile	22 Sep 2011 10:12:20 -0000
@@ -6,7 +6,7 @@
 
 PORTNAME=	python27
 PORTVERSION=	2.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -49,7 +49,6 @@
 		-e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},'
 
 OPTIONS=	THREADS "Enable thread support" on \
-		HUGE_STACK_SIZE "Use a larger thread stack" off \
 		SEM "Use POSIX semaphores (experimental)" off \
 		PTH "Use GNU Pth for threading/multiprocessing" off \
 		UCS4 "Use UCS4 for unicode support" on \
@@ -98,11 +97,6 @@
 CFLAGS+=		${PTHREAD_CFLAGS}
 CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
 .endif # defined(WITH_PTH)
-.if defined(WITHOUT_HUGE_STACK_SIZE)
-CFLAGS+=		-DTHREAD_STACK_SIZE=0x20000
-.else
-CFLAGS+=		-DTHREAD_STACK_SIZE=0x100000
-.endif # defined(WITHOUT_HUGE_STACK_SIZE)
 .else # defined(WITHOUT_THREADS)
 PLIST_SUB+=	THREADS="@comment "
 CONFIGURE_ARGS+=	--without-threads
Index: lang/python31/Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/python31/Makefile,v
retrieving revision 1.172
diff -u -r1.172 Makefile
--- lang/python31/Makefile	18 Sep 2011 08:33:14 -0000	1.172
+++ lang/python31/Makefile	22 Sep 2011 10:12:20 -0000
@@ -6,6 +6,7 @@
 
 PORTNAME=	python31
 PORTVERSION=	3.1.4
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -48,7 +49,6 @@
 		-e 's,(python-shared|python),\1${PYTHON_VER},'
 
 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 \
@@ -70,11 +70,6 @@
 PLIST_SUB+=	THREADS=""
 CONFIGURE_ARGS+=	--with-threads
 CFLAGS+=		${PTHREAD_CFLAGS}
-.if defined(WITHOUT_HUGE_STACK_SIZE)
-CFLAGS+=		-DTHREAD_STACK_SIZE=0x20000
-.else
-CFLAGS+=		-DTHREAD_STACK_SIZE=0x100000
-.endif # defined(WITHOUT_HUGE_STACK_SIZE)
 CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
 .else # defined(WITHOUT_THREADS)
 PLIST_SUB+=	THREADS="@comment "
Index: lang/python32/Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/python32/Makefile,v
retrieving revision 1.177
diff -u -r1.177 Makefile
--- lang/python32/Makefile	18 Sep 2011 08:33:15 -0000	1.177
+++ lang/python32/Makefile	22 Sep 2011 10:12:20 -0000
@@ -6,6 +6,7 @@
 
 PORTNAME=	python32
 PORTVERSION=	3.2.2
+PORTREVISION=	1
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -49,7 +50,6 @@
 		-e 's,(python-shared|python),\1${PYTHON_VER},'
 
 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 \
@@ -71,11 +71,6 @@
 PLIST_SUB+=	THREADS=""
 CONFIGURE_ARGS+=	--with-threads
 CFLAGS+=		${PTHREAD_CFLAGS}
-.if defined(WITHOUT_HUGE_STACK_SIZE)
-CFLAGS+=		-DTHREAD_STACK_SIZE=0x20000
-.else
-CFLAGS+=		-DTHREAD_STACK_SIZE=0x100000
-.endif # defined(WITHOUT_HUGE_STACK_SIZE)
 CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
 .else # defined(WITHOUT_THREADS)
 PLIST_SUB+=	THREADS="@comment "