From 040fb32f4271f0bdbf6fe04257da61a5b28fa608 Mon Sep 17 00:00:00 2001
From: jasoni <jasoni@openbsd.org>
Date: Fri, 24 Nov 2000 20:13:38 +0000
Subject: [PATCH] - Document flavors. - Allow to co-exist with Python 2.0

---
 lang/python/pkg/DESCR       | 5 +++++
 lang/python/pkg/PLIST       | 4 +++-
 lang/python/pkg/PLIST-tools | 4 +++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lang/python/pkg/DESCR b/lang/python/pkg/DESCR
index 357c033dd4e..99b2f401cb2 100644
--- a/lang/python/pkg/DESCR
+++ b/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}
diff --git a/lang/python/pkg/PLIST b/lang/python/pkg/PLIST
index 903e79d29ca..150a37ab632 100644
--- a/lang/python/pkg/PLIST
+++ b/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
diff --git a/lang/python/pkg/PLIST-tools b/lang/python/pkg/PLIST-tools
index 84d17aa8be6..65fe0cd7d3f 100644
--- a/lang/python/pkg/PLIST-tools
+++ b/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