Enable the gmp module.

Remove the tools flavor in favor of a tools package.
Don't enable Tk flavor by default.

lang/python/Makefile

@@ -1,13 +1,17 @@
-# $OpenBSD: Makefile,v 1.14 2000/04/03 17:11:44 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2000/06/02 17:14:45 jasoni Exp $
 
 DISTNAME=	py152
 PKGNAME=	python-1.5.2
 CATEGORIES=	lang
-NEED_VERSION=	1.251
+NEED_VERSION=	1.270
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 EXTRACT_SUFX=	.tgz
 
+MULTI_PACKAGES=	-tools
+
+HOMEPAGE=	http://www.python.org/
+
 MAINTAINER=	jasoni@openbsd.org
 
 LICENSE_TYPE=		BSD
@@ -16,10 +20,8 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-FLAVORS=tk tools mpz threads
-
-# Support for Tk is compiled in by default.
-FLAVOR?=tk tools threads
+FLAVORS=tk mpz threads
+FLAVOR?=threads mpz
 
 LIB_DEPENDS=
 
@@ -35,7 +37,6 @@ CONFIGURE_ARGS+= --prefix='$${DESTDIR}${PREFIX}'
 CONFIGURE_ARGS+= --with-fpectl 
 MAKE_FLAGS+=	OPT="${CFLAGS}"
 
-
 WRKDIST=	${WRKDIR}/Python-1.5.2
 
 # If libc_r exists, thread support is compiled in by default unless this
@@ -50,14 +51,9 @@ CONFIGURE_ARGS+= --with-thread
 .endif
 .endif
 
-# The mpz module will be built on machines with a full source tree.
+# The mpz module will be built when flavor is specified.
 .if ${FLAVOR:L:Mmpz}
-.  if exists(/usr/src/gnu/lib/libgmp/mpn/generic/gmp-mparam.h)
-BROKEN="Currently disabled"
 SETUP_LOCAL+=	Setup.gmp
-.  else
-BROKEN="Need a full source tree for that module"
-.  endif
 .endif
 
 .if ${MACHINE_ARCH} == "alpha"
@@ -78,12 +74,15 @@ post-configure:
 
 post-install:
 	@strip ${PREFIX}/bin/python
-.if ${FLAVOR:L:Mtools}
 	@cd ${WRKSRC}; tar -cf - Tools | (cd ${PREFIX}/lib/python1.5; tar -xf -)
-.endif
 	
 .include <bsd.port.mk>
 
+# The tools package is not flavor dependent.
+.if defined(SUBPACKAGE) && ${SUBPACKAGE} == "-tools"
+PKGNAME=python-tools-1.5.2
+.endif
+
 .if defined(NO64BIT)
 SED_PLIST+=-e '/%%mm%%/d'
 .else
@@ -102,4 +101,3 @@ finish-setup:
 	@sed -e 's,@NOSHARED@,${NOSHARED},g' \
 		${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local
 .endfor
-

lang/python/patches/patch-ag

@@ -0,0 +1,14 @@
+--- Modules/mpzmodule.c.orig    Sat Feb 26 18:00:40 2000
++++ Modules/mpzmodule.c Sat Feb 26 18:02:31 2000
+@@ -91,8 +91,9 @@
+ ** allocate it himself
+ */
+
+-#include "gmp.h"
+-#include "gmp-mparam.h"
++#include <gmp.h>
++#define BITS_PER_MP_LIMB mp_bits_per_limb
++extern int mp_bits_per_limb;
+
+ #if __GNU_MP__ + 0 == 2                                                        
+ #define GMP2                                                                   

lang/python/pkg/COMMENT-tools

@@ -0,0 +1 @@
+extra tools for python

lang/python/pkg/DESCR-tools

@@ -0,0 +1,18 @@
+Python is an interpreted, interactive, object-oriented
+programming language that combines remarkable power with
+very clear syntax. For an introduction to programming in
+Python you are referred to the Python Tutorial. The Python
+Library Reference documents built-in and standard types,
+constants, functions and modules. Finally, the Python
+Reference Manual describes the syntax and semantics of the
+core language in (perhaps too) much detail.
+
+Python's basic power can be extended with your own modules
+written in C or C++.  On most systems such modules may be
+dynamically loaded. Python is also adaptable as an
+exten-sion language for existing applications. See the
+internal documentation for hints.
+
+This package contains extra tools that python users
+may find useful.
+

lang/python/pkg/PLIST-tools

@@ -1,3 +1,4 @@
+@pkgdep python-1.5.2-*
 lib/python1.5/Tools/README
 lib/python1.5/Tools/audiopy/README
 lib/python1.5/Tools/audiopy/audiopy

lang/python/pkg/PLIST.sed

@@ -60,7 +60,6 @@ include/python1.5/thread.h
 include/python1.5/token.h
 include/python1.5/traceback.h
 include/python1.5/tupleobject.h
-%%tools%%
 lib/python1.5/BaseHTTPServer.py
 lib/python1.5/BaseHTTPServer.pyc
 lib/python1.5/BaseHTTPServer.pyo