- Document flavors.

- Allow to co-exist with Python 2.0

lang/python/pkg/DESCR

@@ -13,4 +13,9 @@ dynamically loaded. Python is also adaptable as an
 extension language for existing applications. See the
 internal documentation for hints.
 
+Flavors:
+	tk       - builds tkinter module, depends on Tk
+	threads  - build with thread support
+	no_tools - do not build tools package
+
 WWW: ${HOMEPAGE}

lang/python/pkg/PLIST

@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.7 2000/11/20 22:15:30 jasoni Exp $
+@comment $OpenBSD: PLIST,v 1.8 2000/11/24 20:13:38 jasoni Exp $
+@option no-default-conflict
+@pkgcfl python-1.6.*
 bin/python
 bin/python1.6
 include/python1.6/Python.h

lang/python/pkg/PLIST-tools

@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST-tools,v 1.5 2000/11/20 22:15:31 jasoni Exp $
+@comment $OpenBSD: PLIST-tools,v 1.6 2000/11/24 20:13:39 jasoni Exp $
+@option no-default-conflict
 @pkgdep python-1.6-*
+@pkgcfl python-tools-1.6
 lib/python1.6/Tools/README
 lib/python1.6/Tools/audiopy/README
 lib/python1.6/Tools/audiopy/audiopy