- Update lang/python-devel to Python-2.4 031022 snapshot.

- Correct USE_ZOPE dependency to Python 2.1. [1]
- Fetch from correct MASTER_SITE_SUBDIR when upgrading python
  in same branch. [2]
- Enable installing separated standard modules for python-devel port.

Reported by:	Filippo Natali <pitonat@libero.it> [1],
		Yoshihiko Sarumaru <mistral@imasy.or.jp> [2]

6 files changed, 68 insertions, 35 deletions

diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index ef6e13150801..8fe819da604f 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -5,18 +5,17 @@
 # $FreeBSD$
 
 PORTNAME=	python
-PORTVERSION=	2.4.a0.20030801
-PORTREVISION=	1
+PORTVERSION=	2.4.a0.20031022
 CATEGORIES=	lang python ipv6
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	perky
-DISTNAME=	Python-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${PYTHON_MASTER_SITES}
+MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
+DISTFILES=	${PYTHON_DISTFILE}
 
 MAINTAINER=	perky@FreeBSD.org
 COMMENT?=	An interpreted object-oriented programming language
 
 DIST_SUBDIR=	python
+WRKSRC=		${PYTHON_WRKSRC}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl
 CONFIGURE_ENV=	OPT="${CFLAGS}"
@@ -24,6 +23,7 @@ INSTALL_TARGET=	altinstall
 MAN1=		${PYTHON_VERSION}.1
 
 USE_PYTHON=	yes
+USE_REINPLACE=	yes
 PYTHON_VERSION=	python2.4
 PYTHON_NO_DEPENDS=	yes
 LATEST_LINK=	${PYTHON_VERSION:S/.//}
@@ -35,6 +35,11 @@ LATEST_LINK=	${PYTHON_VERSION:S/.//}
 .if !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-threads
 CFLAGS+=		${PTHREAD_CFLAGS}
+.if !defined(WANT_HUGE_STACK_SIZE)
+CFLAGS+=		-DTHREAD_STACK_SIZE=0x20000
+.else
+CFLAGS+=		-DTHREAD_STACK_SIZE=0x100000
+.endif # !defined(WANT_HUGE_STACK_SIZE)
 CONFIGURE_ENV+=		LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
 .else
 CONFIGURE_ARGS+=	--without-threads
@@ -47,6 +52,10 @@ CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=	--enable-unicode=ucs4
 .endif
 
+.if defined(WITHOUT_PYMALLOC)
+CONFIGURE_ARGS+=        --without-pymalloc
+.endif
+
 .if defined(BUILD_SHARED)
 CONFIGURE_ARGS+=	--enable-shared
 INSTALLS_SHLIB=		yes
@@ -57,7 +66,6 @@ PLIST_SUB+=		SHARED_ONLY="@comment "
 
 DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
 TOOLSDIR=	${PREFIX}/share/${PYTHON_VERSION}
-CFLAGS+=	-D__BSD_VISIBLE # see python/configure.in rev 1.409
 
 .include <bsd.port.pre.mk>
 
@@ -66,6 +74,14 @@ PLIST_SUB+=	X86_ONLY=""
 .else
 PLIST_SUB+=	X86_ONLY="@comment "
 .endif
+.if ${ARCH} == amd64
+CFLAGS+=        -fPIC
+.endif
+.if ${ARCH} == amd64 || ${ARCH} == ia64 || ${ARCH} == sparc64 || ${ARCH} == alpha
+PLIST_SUB+=     32BIT_ONLY="@comment "
+.else
+PLIST_SUB+=     32BIT_ONLY=""
+.endif
 
 .if ${OSVERSION} < 400000
 LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
@@ -102,6 +118,10 @@ post-extract:
 	${SED} -e '1s,^.*$$,#!${PREFIX}/bin/${PYTHON_VERSION},' \
 		${WRKSRC}/Tools/scripts/idle > ${WRKDIR}/idle2.4
 
+post-patch:
+	${REINPLACE_CMD} -e 's,\(PY_VERSION.*\)2\.4a0,\1${PORTVERSION},g' \
+		${WRKSRC}/Include/patchlevel.h
+
 pre-install:
 .for platform in ${PLATFORMS}
 	${MKDIR} ${PYTHONPREFIX_LIBDIR}/${platform}
diff --git a/lang/python31/distinfo b/lang/python31/distinfo
index 583d7ca077de..d6c272147706 100644
--- a/lang/python31/distinfo
+++ b/lang/python31/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.4a0-20030801.tgz) = 7bb219e81cd565ed1c360108d9e8ba16
+MD5 (python/Python-2.4.a0.20031022.tgz) = 79581105c218886dd9dc382a84c64043
diff --git a/lang/python31/files/patch-Modules-Setup.dist b/lang/python31/files/patch-Modules-Setup.dist
deleted file mode 100644
index 74b1ef29f224..000000000000
--- a/lang/python31/files/patch-Modules-Setup.dist
+++ /dev/null
@@ -1,12 +0,0 @@
---- Modules/Setup.dist	Thu Aug  8 15:52:42 2002
-+++ Modules/Setup.dist.new	Thu Nov 21 10:40:05 2002
-@@ -356,8 +356,7 @@
- # it is a highly experimental and dangerous device for calling
- # *arbitrary* C functions in *arbitrary* shared libraries:
- 
--#dl dlmodule.c
--
-+dl dlmodule.c
- 
- # Modules that provide persistent dictionary-like semantics.  You will
- # probably want to arrange for at least one of them to be available on
diff --git a/lang/python31/files/patch-configure b/lang/python31/files/patch-configure
index c17e753795a5..6ee47894e12f 100644
--- a/lang/python31/files/patch-configure
+++ b/lang/python31/files/patch-configure
@@ -1,15 +1,24 @@
---- configure.orig	Sun Jul 13 18:46:13 2003
-+++ configure	Sat Jul 19 15:21:09 2003
-@@ -3288,6 +3288,12 @@
- 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
- 	  INSTSONAME="$LDLIBRARY".$SOVERSION
- 	  ;;
+--- configure.orig	Sat Oct  4 13:27:50 2003
++++ configure	Sat Oct  4 13:29:05 2003
+@@ -1321,7 +1321,7 @@
+ VERSION=2.3
+ 
+ 
+-SOVERSION=1.0
++SOVERSION=1
+ 
+ # The later defininition of _XOPEN_SOURCE disables certain features
+ # on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone).
+@@ -3594,6 +3594,12 @@
+ 	  LDLIBRARY='libpython$(VERSION).so'
+ 	  BLDLIBRARY='-L. -lpython$(VERSION)'
+ 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
++	  INSTSONAME="$LDLIBRARY".$SOVERSION
++	  ;;
 +    FreeBSD*)
 +	  LDLIBRARY='libpython$(VERSION).so'
 +	  BLDLIBRARY='-L. -lpython$(VERSION)'
 +	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH
-+	  INSTSONAME="$LDLIBRARY"
-+	  ;;
+ 	  INSTSONAME="$LDLIBRARY".$SOVERSION
+ 	  ;;
      hp*|HP*)
- 	  LDLIBRARY='libpython$(VERSION).sl'
- 	  BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(VERSION)'
diff --git a/lang/python31/files/patch-setup.py b/lang/python31/files/patch-setup.py
index 63779f7d0fe0..d83025329ce0 100644
--- a/lang/python31/files/patch-setup.py
+++ b/lang/python31/files/patch-setup.py
@@ -1,5 +1,5 @@
---- setup.py.orig	Thu Jul 10 21:48:39 2003
-+++ setup.py	Sat Jul 19 16:27:04 2003
+--- setup.py.orig	Wed Oct 22 00:41:15 2003
++++ setup.py	Thu Oct 30 06:21:21 2003
 @@ -15,7 +15,7 @@
  from distutils.command.install_lib import install_lib
  
@@ -9,7 +9,16 @@
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -1128,7 +1128,7 @@
+@@ -770,7 +770,7 @@
+             # Linux-specific modules
+             exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
+ 
+-        if platform in ('linux2', 'freebsd4'):
++        if platform in ('linux2', 'freebsd4', 'freebsd5'):
+             exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
+ 
+         if platform == 'sunos5':
+@@ -1140,7 +1140,7 @@
            ext_modules=[Extension('struct', ['structmodule.c'])],
  
            # Scripts to install
diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist
index e80918c71206..6d00ab24f61c 100644
--- a/lang/python31/pkg-plist
+++ b/lang/python31/pkg-plist
@@ -73,6 +73,7 @@ include/%%PYTHON_VERSION%%/ucnhash.h
 include/%%PYTHON_VERSION%%/unicodeobject.h
 include/%%PYTHON_VERSION%%/weakrefobject.h
 %%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so
+%%SHARED_ONLY%%lib/lib%%PYTHON_VERSION%%.so.1
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.py
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyc
 lib/%%PYTHON_VERSION%%/BaseHTTPServer.pyo
@@ -628,6 +629,9 @@ lib/%%PYTHON_VERSION%%/encodings/ascii.pyo
 lib/%%PYTHON_VERSION%%/encodings/base64_codec.py
 lib/%%PYTHON_VERSION%%/encodings/base64_codec.pyc
 lib/%%PYTHON_VERSION%%/encodings/base64_codec.pyo
+lib/%%PYTHON_VERSION%%/encodings/bz2_codec.py
+lib/%%PYTHON_VERSION%%/encodings/bz2_codec.pyc
+lib/%%PYTHON_VERSION%%/encodings/bz2_codec.pyo
 lib/%%PYTHON_VERSION%%/encodings/charmap.py
 lib/%%PYTHON_VERSION%%/encodings/charmap.pyc
 lib/%%PYTHON_VERSION%%/encodings/charmap.pyo
@@ -1070,7 +1074,6 @@ lib/%%PYTHON_VERSION%%/idlelib/dynOptionMenuWidget.pyc
 lib/%%PYTHON_VERSION%%/idlelib/dynOptionMenuWidget.pyo
 lib/%%PYTHON_VERSION%%/idlelib/extend.txt
 lib/%%PYTHON_VERSION%%/idlelib/help.txt
-lib/%%PYTHON_VERSION%%/idlelib/idle
 lib/%%PYTHON_VERSION%%/idlelib/idle.bat
 lib/%%PYTHON_VERSION%%/idlelib/idle.py
 lib/%%PYTHON_VERSION%%/idlelib/idle.pyc
@@ -1136,6 +1139,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so
 lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/datetime.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
+%%32BIT_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/dl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
 lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
 %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
@@ -1152,6 +1156,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/readline.so
 lib/%%PYTHON_VERSION%%/lib-dynload/regex.so
 lib/%%PYTHON_VERSION%%/lib-dynload/resource.so
 %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so
 lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so
 lib/%%PYTHON_VERSION%%/lib-dynload/select.so
 lib/%%PYTHON_VERSION%%/lib-dynload/sha.so
@@ -1583,7 +1588,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_grammar
 lib/%%PYTHON_VERSION%%/test/output/test_httplib
 lib/%%PYTHON_VERSION%%/test/output/test_linuxaudiodev
 lib/%%PYTHON_VERSION%%/test/output/test_logging
-lib/%%PYTHON_VERSION%%/test/output/test_longexp
 lib/%%PYTHON_VERSION%%/test/output/test_math
 lib/%%PYTHON_VERSION%%/test/output/test_md5
 lib/%%PYTHON_VERSION%%/test/output/test_mmap
@@ -1656,6 +1660,9 @@ lib/%%PYTHON_VERSION%%/test/test___all__.pyo
 lib/%%PYTHON_VERSION%%/test/test___future__.py
 lib/%%PYTHON_VERSION%%/test/test___future__.pyc
 lib/%%PYTHON_VERSION%%/test/test___future__.pyo
+lib/%%PYTHON_VERSION%%/test/test__locale.py
+lib/%%PYTHON_VERSION%%/test/test__locale.pyc
+lib/%%PYTHON_VERSION%%/test/test__locale.pyo
 lib/%%PYTHON_VERSION%%/test/test_aepack.py
 lib/%%PYTHON_VERSION%%/test/test_aepack.pyc
 lib/%%PYTHON_VERSION%%/test/test_aepack.pyo