From 66fe9ee3b01de6d3db6a3d42b67aa2a6ec9a8007 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Tue, 16 Nov 2004 02:10:56 +0000
Subject: [PATCH] Fix tk dependency

---
 lang/python/2.1/Makefile | 4 ++--
 lang/python/2.2/Makefile | 4 ++--
 lang/python/2.3/Makefile | 4 ++--
 lang/python/Makefile.inc | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lang/python/2.1/Makefile b/lang/python/2.1/Makefile
index 42a09f9dffa..203995fe6f0 100644
--- a/lang/python/2.1/Makefile
+++ b/lang/python/2.1/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2004/02/29 16:39:39 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2004/11/16 02:10:56 espie Exp $
 
 VERSION=	2.1
 PATCHLEVEL=	.3
-PKG_PATCHLEVEL=	p2
+PKG_PATCHLEVEL=	p3
 
 .include <bsd.port.mk>
 
diff --git a/lang/python/2.2/Makefile b/lang/python/2.2/Makefile
index fe8c2797949..29bcf2e6f4f 100644
--- a/lang/python/2.2/Makefile
+++ b/lang/python/2.2/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.8 2004/04/06 02:39:23 brad Exp $
+# $OpenBSD: Makefile,v 1.9 2004/11/16 02:10:56 espie Exp $
 
 VERSION=	2.2
 PATCHLEVEL=	.3
-PKG_PATCHLEVEL=	p0
+PKG_PATCHLEVEL=	p1
 
 .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "sparc64"
 PATCH_LIST=	patch-* sup64-*
diff --git a/lang/python/2.3/Makefile b/lang/python/2.3/Makefile
index 63460c2e010..e010b2167d6 100644
--- a/lang/python/2.3/Makefile
+++ b/lang/python/2.3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2004/11/14 11:48:19 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2004/11/16 02:10:56 espie 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=		.4
-PKG_PATCHLEVEL=		p0
+PKG_PATCHLEVEL=		p1
 
 COMMENT-bsddb=		"Berkeley db module for Python"
 
diff --git a/lang/python/Makefile.inc b/lang/python/Makefile.inc
index 882b8aa81f2..a8d41da4f28 100644
--- a/lang/python/Makefile.inc
+++ b/lang/python/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.24 2004/11/04 22:16:07 alek Exp $
+# $OpenBSD: Makefile.inc,v 1.25 2004/11/16 02:10:56 espie 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
@@ -97,14 +97,14 @@ PKG_ARGS+=-Dtkinter=1
 .  if !defined(NO_SHARED_LIBS) || ${NO_SHARED_LIBS:U} != YES
 MULTI_PACKAGES+=	-tkinter
 .  else
-LIB_DEPENDS+=		tk84::x11/tk/8.4
+LIB_DEPENDS+=		tk84:tk-8.4.*:x11/tk/8.4
 .  endif
 .else
 PKG_ARGS+=-Dtkinter=0
 .endif
 
 .if defined(PACKAGING) && ${SUBPACKAGE} == "-tkinter"
-LIB_DEPENDS+=		tk84::x11/tk/8.4
+LIB_DEPENDS+=		tk84:tk-8.4.*:x11/tk/8.4
 .endif
 
 .if empty(FLAVOR:L:Mno_mpz)