From b3fa38f6efd0b03edcc89480741d0e5bf76911fd Mon Sep 17 00:00:00 2001
From: shell <shell@openbsd.org>
Date: Tue, 21 Aug 2001 13:18:38 +0000
Subject: [PATCH] No python1 flavor

---
 databases/py-mysql/Makefile  | 14 ++------------
 databases/py-mysql/pkg/PLIST |  2 +-
 textproc/Makefile            |  3 +--
 textproc/py-Chart/Makefile   | 14 ++------------
 textproc/py-xml/Makefile     | 14 ++------------
 5 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/databases/py-mysql/Makefile b/databases/py-mysql/Makefile
index ad2bfadfb98..75c5b850cb9 100644
--- a/databases/py-mysql/Makefile
+++ b/databases/py-mysql/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/08/12 19:02:07 shell Exp $
+# $OpenBSD: Makefile,v 1.5 2001/08/21 13:18:38 shell Exp $
 
 COMMENT=		"python interface to MySQL"
 
@@ -6,7 +6,7 @@ VERSION=		0.9.0
 DISTNAME=		MySQL-python-${VERSION}
 PKGNAME=		py-mysql-${VERSION}
 CATEGORIES=		databases
-NEED_VERSION=		1.435
+NEED_VERSION=		1.440
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mysql-python
@@ -22,17 +22,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 
 LIB_DEPENDS=		mysqlclient.10:mysql-client-3.23.*:databases/mysql
 
-FLAVORS=		python1
-FLAVOR?=
-
-.if ${FLAVOR:L:Mpython1}
-PYTHON_VER=	1.5
-PYTHON_EXT=	15
-PYTHON_PATH=	${LOCALBASE}/lib/python${PYTHON_VER}
-RUN_DEPENDS=	${PYTHON_PATH}/site-packages/distutils::devel/py-Distutils
-.else
 PYTHON_VER=	2.1
-.endif
 
 RUN_DEPENDS+=	python${PYTHON_VER}::lang/python${PYTHON_EXT}
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/databases/py-mysql/pkg/PLIST b/databases/py-mysql/pkg/PLIST
index ec54daa1b54..9377ddc6de2 100644
--- a/databases/py-mysql/pkg/PLIST
+++ b/databases/py-mysql/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2001/08/12 19:02:07 shell Exp $
+@comment $OpenBSD: PLIST,v 1.4 2001/08/21 13:18:38 shell Exp $
 lib/python${PYTHON_VER}/site-packages/CompatMysqldb.py
 lib/python${PYTHON_VER}/site-packages/CompatMysqldb.pyc
 lib/python${PYTHON_VER}/site-packages/MySQLdb/__init__.py
diff --git a/textproc/Makefile b/textproc/Makefile
index 26f6399cdc8..856f6a88216 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.65 2001/08/11 23:36:44 avsm Exp $
+# $OpenBSD: Makefile,v 1.66 2001/08/21 13:20:34 shell Exp $
 # $FreeBSD: Makefile,v 1.15 1997/11/22 00:31:24 jseger Exp $
 #
 
@@ -52,7 +52,6 @@
      SUBDIR += pilot_makedoc
      SUBDIR += pspell
      SUBDIR += py-Chart
-     SUBDIR += py-Chart,python1
      SUBDIR += py-xml
      SUBDIR += rman
      SUBDIR += rxp
diff --git a/textproc/py-Chart/Makefile b/textproc/py-Chart/Makefile
index 785c0079dc8..5bbaf8b4541 100644
--- a/textproc/py-Chart/Makefile
+++ b/textproc/py-Chart/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2001/08/08 10:03:42 shell Exp $
+# $OpenBSD: Makefile,v 1.3 2001/08/21 13:20:05 shell Exp $
 
 
 COMMENT=		"python library for creating postscript or PDF charts"
@@ -7,7 +7,7 @@ VERSION=		1.10
 DISTNAME=		PyChart-${VERSION}
 PKGNAME=		py-Chart-${VERSION}
 CATEGORIES=     	textproc devel
-NEED_VERSION=		1.434
+NEED_VERSION=		1.440
 
 HOMEPAGE=		http://www.cs.washington.edu/homes/yasushi/pychart/
 
@@ -20,17 +20,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${HOMEPAGE}
 
-FLAVORS=		python1
-FLAVOR?=
-
-.if ${FLAVOR:L:Mpython1}
-PYTHON_VER=	1.5
-PYTHON_EXT=	15
-PYTHON_PATH=	${LOCALBASE}/lib/python${PYTHON_VER}
-RUN_DEPENDS=	${PYTHON_PATH}/site-packages/distutils::devel/py-Distutils
-.else
 PYTHON_VER=	2.1
-.endif
 
 RUN_DEPENDS+=	python${PYTHON_VER}::lang/python${PYTHON_EXT}
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
index be3629dc196..dffd05aec03 100644
--- a/textproc/py-xml/Makefile
+++ b/textproc/py-xml/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2001/08/08 10:02:50 shell Exp $
+# $OpenBSD: Makefile,v 1.4 2001/08/21 13:19:31 shell Exp $
 
 COMMENT=		"python module for writing basic XML applications"
 
@@ -6,7 +6,7 @@ VERSION=		0.6.6
 DISTNAME=		PyXML-${VERSION}
 PKGNAME=		py-xml-${VERSION}
 CATEGORIES=		textproc devel
-NEED_VERSION=		1.434
+NEED_VERSION=		1.440
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pyxml
@@ -20,17 +20,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 
-FLAVORS=                python1
-FLAVOR?=
-
-.if ${FLAVOR:L:Mpython1}
-PYTHON_VER=     1.5
-PYTHON_EXT=     15
-PYTHON_PATH=    ${LOCALBASE}/lib/python${PYTHON_VER}
-RUN_DEPENDS=    ${PYTHON_PATH}/site-packages/distutils::devel/py-Distutils
-.else
 PYTHON_VER=     2.1
-.endif
 
 RUN_DEPENDS+=   python${PYTHON_VER}::lang/python${PYTHON_EXT}
 BUILD_DEPENDS=  ${RUN_DEPENDS}