cooledit's python flavor now refers to python2; kill python15 dependency

This commit is contained in:
naddy 2001-09-06 11:10:13 +00:00
parent 5904212e68
commit 02658ea7b3
3 changed files with 4 additions and 11 deletions

View File

@ -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 $ # $FreeBSD: Makefile,v 1.44 1997/09/13 20:19:28 chuckr Exp $
# #
@ -10,7 +10,6 @@
SUBDIR += bvi SUBDIR += bvi
SUBDIR += cooledit SUBDIR += cooledit
SUBDIR += cooledit,python SUBDIR += cooledit,python
SUBDIR += cooledit,python2
# SUBDIR += e93 # SUBDIR += e93
SUBDIR += emacs SUBDIR += emacs
SUBDIR += emacs,no_X11 SUBDIR += emacs,no_X11

View File

@ -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" COMMENT= "easy to use, graphical editor"
@ -10,16 +10,10 @@ NEED_VERSION= 1.402
MAINTAINER= Marc Espie <espie@openbsd.org> MAINTAINER= Marc Espie <espie@openbsd.org>
FLAVORS= python python2 FLAVORS= python
FLAVOR?= FLAVOR?=
.if ${FLAVOR:L:Mpython} && ${FLAVOR:L:Mpython2}
ERRORS+= "Fatal: flavors 'python' and 'python2' conflict."
.endif
.if ${FLAVOR:L:Mpython} .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, BUILD_DEPENDS+= python2.1:python-2.1-!threads:lang/python,
RUN_DEPENDS+= python2.1:python-2.1-!threads:lang/python, RUN_DEPENDS+= python2.1:python-2.1-!threads:lang/python,
.else .else

View File

@ -10,6 +10,6 @@ Cooledit is a suite of programs consisting of the following:
under any window manager under any window manager
FLAVOR=python 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} WWW: ${HOMEPAGE}