From 02658ea7b340f31a47803585c36bab72e3444752 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Thu, 6 Sep 2001 11:10:13 +0000
Subject: [PATCH] cooledit's python flavor now refers to python2; kill python15
 dependency

---
 editors/Makefile           |  3 +--
 editors/cooledit/Makefile  | 10 ++--------
 editors/cooledit/pkg/DESCR |  2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/editors/Makefile b/editors/Makefile
index 149437ab924..c9600e33548 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2001/07/15 09:26:17 kevlo Exp $
+# $OpenBSD: Makefile,v 1.34 2001/09/06 11:10:13 naddy Exp $
 # $FreeBSD: Makefile,v 1.44 1997/09/13 20:19:28 chuckr Exp $
 #
 
@@ -10,7 +10,6 @@
      SUBDIR += bvi
      SUBDIR += cooledit
      SUBDIR += cooledit,python
-     SUBDIR += cooledit,python2
 #    SUBDIR += e93
      SUBDIR += emacs
      SUBDIR += emacs,no_X11
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 8c99f011bc1..24bcee6a6c8 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2001/08/09 21:05:28 naddy Exp $
+# $OpenBSD: Makefile,v 1.8 2001/09/06 11:10:13 naddy Exp $
 
 COMMENT=	"easy to use, graphical editor"
 
@@ -10,16 +10,10 @@ NEED_VERSION=	1.402
 
 MAINTAINER=	Marc Espie <espie@openbsd.org>
 
-FLAVORS=	python	python2
+FLAVORS=	python
 FLAVOR?=
 
-.if ${FLAVOR:L:Mpython} && ${FLAVOR:L:Mpython2}
-ERRORS+=	"Fatal: flavors 'python' and 'python2' conflict."
-.endif
 .if ${FLAVOR:L:Mpython}
-BUILD_DEPENDS+=	python1.5:python-1.5.2-!threads:lang/python15,
-RUN_DEPENDS+=	python1.5:python-1.5.2-!threads:lang/python15,
-.elif ${FLAVOR:L:Mpython2}
 BUILD_DEPENDS+=	python2.1:python-2.1-!threads:lang/python,
 RUN_DEPENDS+=	python2.1:python-2.1-!threads:lang/python,
 .else
diff --git a/editors/cooledit/pkg/DESCR b/editors/cooledit/pkg/DESCR
index af56200e2b2..18476c5e36d 100644
--- a/editors/cooledit/pkg/DESCR
+++ b/editors/cooledit/pkg/DESCR
@@ -10,6 +10,6 @@ Cooledit is a suite of programs consisting of the following:
 	under any window manager
 
 FLAVOR=python  
-	turns it into a programmable editor, must have python 1.5
+	turns it into a programmable editor, must have python 2.
 
 WWW: ${HOMEPAGE}