From d0646ffd3dd4d7847a64143140c4fdae36a4c822 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Mon, 7 May 2007 15:43:33 +0000
Subject: [PATCH] fix WANTLIB/LIB_DEPENDS

ok alek@ mbalmer@
---
 lang/python/2.3/Makefile | 4 ++--
 lang/python/2.4/Makefile | 4 ++--
 lang/python/2.5/Makefile | 4 ++--
 lang/python/Makefile.inc | 7 ++++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lang/python/2.3/Makefile b/lang/python/2.3/Makefile
index eda921051bc..d5a7b6a12cb 100644
--- a/lang/python/2.3/Makefile
+++ b/lang/python/2.3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2007/04/28 10:06:24 bernd Exp $
+# $OpenBSD: Makefile,v 1.26 2007/05/07 15:43:33 jasper Exp $
 
 .if ${MACHINE_ARCH} == "hppa"
 BROKEN=			"compiler hangs on py-Checker for example"
@@ -6,7 +6,7 @@ BROKEN=			"compiler hangs on py-Checker for example"
 
 VERSION=		2.3
 PATCHLEVEL=		.6
-PKG_PATCHLEVEL=		p1
+PKG_PATCHLEVEL=		p2
 SHARED_LIBS=		python2.3 0.0
 
 # needed for www/zope
diff --git a/lang/python/2.4/Makefile b/lang/python/2.4/Makefile
index d298a802d3a..83ab23fb9bc 100644
--- a/lang/python/2.4/Makefile
+++ b/lang/python/2.4/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.12 2007/04/28 10:06:25 bernd Exp $
+# $OpenBSD: Makefile,v 1.13 2007/05/07 15:43:33 jasper Exp $
 
 VERSION=		2.4
 PATCHLEVEL=		.4
-PKG_PATCHLEVEL=		p2
+PKG_PATCHLEVEL=		p3
 SHARED_LIBS=		python2.4 0.0
 
 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "sparc64"
diff --git a/lang/python/2.5/Makefile b/lang/python/2.5/Makefile
index 7ed3a9b9718..de93c513aca 100644
--- a/lang/python/2.5/Makefile
+++ b/lang/python/2.5/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2007/04/28 10:06:25 bernd Exp $
+# $OpenBSD: Makefile,v 1.8 2007/05/07 15:43:33 jasper Exp $
 
 VERSION=		2.5
 PATCHLEVEL=		.1
-PKG_PATCHLEVEL=		p0
+PKG_PATCHLEVEL=		p1
 SHARED_LIBS=		python2.5 0.0
 
 # PSUBDIR=		python/${VERSION}
diff --git a/lang/python/Makefile.inc b/lang/python/Makefile.inc
index 4db1e0a2e75..7451c15dd18 100644
--- a/lang/python/Makefile.inc
+++ b/lang/python/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.46 2007/04/28 10:06:24 bernd Exp $
+# $OpenBSD: Makefile.inc,v 1.47 2007/05/07 15:43:33 jasper Exp $
 
 # IMPORTANT!  If you make any changes to the Python ports, be sure
 # to also update files/CHANGES.OpenBSD for your change.  This is a
@@ -57,8 +57,9 @@ LIB_DEPENDS-gdbm=	gdbm.>=3::databases/gdbm
 LIB_DEPENDS-bz2=	bz2::archivers/bzip2
 RUN_DEPENDS-idle=	${RUN_DEPENDS} \
 			::lang/python/${VERSION},-tkinter
-LIB_DEPENDS-tkinter=	tk84:tk-8.4.*:x11/tk/8.4
-WANTLIB-tkinter=	tcl84 X11
+LIB_DEPENDS-tkinter=	tcl84:tcl-8.4.*:lang/tcl/8.4 \
+			tk84:tk-8.4.*:x11/tk/8.4
+WANTLIB-tkinter=	X11
 LIB_DEPENDS-mpz=	gmp::devel/gmp
 WANTLIB-expat=		expat
 LIB_DEPENDS-sqlite=	sqlite3.>=8.7::databases/sqlite3