Separate the Python Tk module from the main port. I've been

wanting do to this for a long time now. Now we got rid of the stupid
dependency on Tcl/Tk and save some checks in python's makefile.

Update the dependent ports accordingly.

27 files changed, 118 insertions, 226 deletions

diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index cb8a38cf5b6b..e3a19da10002 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -15,9 +15,9 @@ MASTER_SITES=	http://www.pythonware.com/downloads/ \
 
 MAINTAINER=	tg@FreeBSD.org
 
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
+BUILD_DEPENDS=	${PREFIX}/lib/python1.5/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python
+RUN_DEPENDS=	${PREFIX}/lib/python1.5/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/${DISTNAME}/libImaging
diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile
index 98eeb599ce45..7bbdfd49d134 100644
--- a/graphics/skencil/Makefile
+++ b/graphics/skencil/Makefile
@@ -12,10 +12,10 @@ MASTER_SITES=	http://download.sourceforge.net/sketch/
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/include/python1.5/Imaging.h:${PORTSDIR}/graphics/py-imaging
-RUN_DEPENDS=	${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \
-		${LOCALBASE}/lib/python1.5/site-packages/_imaging.so:${PORTSDIR}/graphics/py-imaging \
-		${LOCALBASE}/lib/python1.5/site-packages/xml/__init__.py:${PORTSDIR}/textproc/py-xml
+BUILD_DEPENDS=	${PREFIX}/include/python1.5/Imaging.h:${PORTSDIR}/graphics/py-imaging
+RUN_DEPENDS=	${PREFIX}/lib/python1.5/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+		${PREFIX}/lib/python1.5/site-packages/_imaging.so:${PORTSDIR}/graphics/py-imaging \
+		${PREFIX}/lib/python1.5/site-packages/xml/__init__.py:${PORTSDIR}/textproc/py-xml
 
 SKETCHDIR=	${PREFIX}/share/sketch
 SKETCHDOCDIR=	${PREFIX}/share/doc/sketch
diff --git a/graphics/sketch/Makefile b/graphics/sketch/Makefile
index 98eeb599ce45..7bbdfd49d134 100644
--- a/graphics/sketch/Makefile
+++ b/graphics/sketch/Makefile
@@ -12,10 +12,10 @@ MASTER_SITES=	http://download.sourceforge.net/sketch/
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/include/python1.5/Imaging.h:${PORTSDIR}/graphics/py-imaging
-RUN_DEPENDS=	${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \
-		${LOCALBASE}/lib/python1.5/site-packages/_imaging.so:${PORTSDIR}/graphics/py-imaging \
-		${LOCALBASE}/lib/python1.5/site-packages/xml/__init__.py:${PORTSDIR}/textproc/py-xml
+BUILD_DEPENDS=	${PREFIX}/include/python1.5/Imaging.h:${PORTSDIR}/graphics/py-imaging
+RUN_DEPENDS=	${PREFIX}/lib/python1.5/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
+		${PREFIX}/lib/python1.5/site-packages/_imaging.so:${PORTSDIR}/graphics/py-imaging \
+		${PREFIX}/lib/python1.5/site-packages/xml/__init__.py:${PORTSDIR}/textproc/py-xml
 
 SKETCHDIR=	${PREFIX}/share/sketch
 SKETCHDOCDIR=	${PREFIX}/share/doc/sketch
diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index 7e3a0663fe2e..fc091f0a9713 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -8,15 +8,13 @@
 
 DISTNAME=       py152
 PKGNAME=        python-1.5.2
-CATEGORIES=	lang python tk82
+CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
 
-LIB_DEPENDS=	${TK_DEPENDS}
-
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
@@ -32,18 +30,6 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default only if X11 is installed.
-#
-.if exists(${X11BASE})
-WITH_TK?=	yes
-.endif
-.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-SETUP_LOCAL=	Setup.tk
-PLIST_TK=	${PKGDIR}/PLIST.tk
-.endif
-
-#
 # If you want to use Python's thread module, you need to set WITH_THREADS
 # to 'yes', and you must have the FreeBSD threading c library (libc_r)
 # installed. See 'man 3 pthread' for details on libc_r.
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 7e3a0663fe2e..fc091f0a9713 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -8,15 +8,13 @@
 
 DISTNAME=       py152
 PKGNAME=        python-1.5.2
-CATEGORIES=	lang python tk82
+CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
 
-LIB_DEPENDS=	${TK_DEPENDS}
-
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
@@ -32,18 +30,6 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default only if X11 is installed.
-#
-.if exists(${X11BASE})
-WITH_TK?=	yes
-.endif
-.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-SETUP_LOCAL=	Setup.tk
-PLIST_TK=	${PKGDIR}/PLIST.tk
-.endif
-
-#
 # If you want to use Python's thread module, you need to set WITH_THREADS
 # to 'yes', and you must have the FreeBSD threading c library (libc_r)
 # installed. See 'man 3 pthread' for details on libc_r.
diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index 7e3a0663fe2e..fc091f0a9713 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -8,15 +8,13 @@
 
 DISTNAME=       py152
 PKGNAME=        python-1.5.2
-CATEGORIES=	lang python tk82
+CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
 
-LIB_DEPENDS=	${TK_DEPENDS}
-
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
@@ -32,18 +30,6 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default only if X11 is installed.
-#
-.if exists(${X11BASE})
-WITH_TK?=	yes
-.endif
-.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-SETUP_LOCAL=	Setup.tk
-PLIST_TK=	${PKGDIR}/PLIST.tk
-.endif
-
-#
 # If you want to use Python's thread module, you need to set WITH_THREADS
 # to 'yes', and you must have the FreeBSD threading c library (libc_r)
 # installed. See 'man 3 pthread' for details on libc_r.
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index 7e3a0663fe2e..fc091f0a9713 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -8,15 +8,13 @@
 
 DISTNAME=       py152
 PKGNAME=        python-1.5.2
-CATEGORIES=	lang python tk82
+CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
 
-LIB_DEPENDS=	${TK_DEPENDS}
-
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
@@ -32,18 +30,6 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default only if X11 is installed.
-#
-.if exists(${X11BASE})
-WITH_TK?=	yes
-.endif
-.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-SETUP_LOCAL=	Setup.tk
-PLIST_TK=	${PKGDIR}/PLIST.tk
-.endif
-
-#
 # If you want to use Python's thread module, you need to set WITH_THREADS
 # to 'yes', and you must have the FreeBSD threading c library (libc_r)
 # installed. See 'man 3 pthread' for details on libc_r.
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 7e3a0663fe2e..fc091f0a9713 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -8,15 +8,13 @@
 
 DISTNAME=       py152
 PKGNAME=        python-1.5.2
-CATEGORIES=	lang python tk82
+CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
 
-LIB_DEPENDS=	${TK_DEPENDS}
-
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
@@ -32,18 +30,6 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default only if X11 is installed.
-#
-.if exists(${X11BASE})
-WITH_TK?=	yes
-.endif
-.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-SETUP_LOCAL=	Setup.tk
-PLIST_TK=	${PKGDIR}/PLIST.tk
-.endif
-
-#
 # If you want to use Python's thread module, you need to set WITH_THREADS
 # to 'yes', and you must have the FreeBSD threading c library (libc_r)
 # installed. See 'man 3 pthread' for details on libc_r.
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index 7e3a0663fe2e..fc091f0a9713 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -8,15 +8,13 @@
 
 DISTNAME=       py152
 PKGNAME=        python-1.5.2
-CATEGORIES=	lang python tk82
+CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
 
-LIB_DEPENDS=	${TK_DEPENDS}
-
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
@@ -32,18 +30,6 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default only if X11 is installed.
-#
-.if exists(${X11BASE})
-WITH_TK?=	yes
-.endif
-.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-SETUP_LOCAL=	Setup.tk
-PLIST_TK=	${PKGDIR}/PLIST.tk
-.endif
-
-#
 # If you want to use Python's thread module, you need to set WITH_THREADS
 # to 'yes', and you must have the FreeBSD threading c library (libc_r)
 # installed. See 'man 3 pthread' for details on libc_r.
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 7e3a0663fe2e..fc091f0a9713 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -8,15 +8,13 @@
 
 DISTNAME=       py152
 PKGNAME=        python-1.5.2
-CATEGORIES=	lang python tk82
+CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
 
-LIB_DEPENDS=	${TK_DEPENDS}
-
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
@@ -32,18 +30,6 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default only if X11 is installed.
-#
-.if exists(${X11BASE})
-WITH_TK?=	yes
-.endif
-.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-SETUP_LOCAL=	Setup.tk
-PLIST_TK=	${PKGDIR}/PLIST.tk
-.endif
-
-#
 # If you want to use Python's thread module, you need to set WITH_THREADS
 # to 'yes', and you must have the FreeBSD threading c library (libc_r)
 # installed. See 'man 3 pthread' for details on libc_r.
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 7e3a0663fe2e..fc091f0a9713 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -8,15 +8,13 @@
 
 DISTNAME=       py152
 PKGNAME=        python-1.5.2
-CATEGORIES=	lang python tk82
+CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
 
-LIB_DEPENDS=	${TK_DEPENDS}
-
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
@@ -32,18 +30,6 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default only if X11 is installed.
-#
-.if exists(${X11BASE})
-WITH_TK?=	yes
-.endif
-.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-SETUP_LOCAL=	Setup.tk
-PLIST_TK=	${PKGDIR}/PLIST.tk
-.endif
-
-#
 # If you want to use Python's thread module, you need to set WITH_THREADS
 # to 'yes', and you must have the FreeBSD threading c library (libc_r)
 # installed. See 'man 3 pthread' for details on libc_r.
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 7e3a0663fe2e..fc091f0a9713 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -8,15 +8,13 @@
 
 DISTNAME=       py152
 PKGNAME=        python-1.5.2
-CATEGORIES=	lang python tk82
+CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
 
-LIB_DEPENDS=	${TK_DEPENDS}
-
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
@@ -32,18 +30,6 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default only if X11 is installed.
-#
-.if exists(${X11BASE})
-WITH_TK?=	yes
-.endif
-.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-SETUP_LOCAL=	Setup.tk
-PLIST_TK=	${PKGDIR}/PLIST.tk
-.endif
-
-#
 # If you want to use Python's thread module, you need to set WITH_THREADS
 # to 'yes', and you must have the FreeBSD threading c library (libc_r)
 # installed. See 'man 3 pthread' for details on libc_r.
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 7e3a0663fe2e..fc091f0a9713 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -8,15 +8,13 @@
 
 DISTNAME=       py152
 PKGNAME=        python-1.5.2
-CATEGORIES=	lang python tk82
+CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
 
-LIB_DEPENDS=	${TK_DEPENDS}
-
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
@@ -32,18 +30,6 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default only if X11 is installed.
-#
-.if exists(${X11BASE})
-WITH_TK?=	yes
-.endif
-.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-SETUP_LOCAL=	Setup.tk
-PLIST_TK=	${PKGDIR}/PLIST.tk
-.endif
-
-#
 # If you want to use Python's thread module, you need to set WITH_THREADS
 # to 'yes', and you must have the FreeBSD threading c library (libc_r)
 # installed. See 'man 3 pthread' for details on libc_r.
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 7e3a0663fe2e..fc091f0a9713 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -8,15 +8,13 @@
 
 DISTNAME=       py152
 PKGNAME=        python-1.5.2
-CATEGORIES=	lang python tk82
+CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
 
-LIB_DEPENDS=	${TK_DEPENDS}
-
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
@@ -32,18 +30,6 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default only if X11 is installed.
-#
-.if exists(${X11BASE})
-WITH_TK?=	yes
-.endif
-.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-SETUP_LOCAL=	Setup.tk
-PLIST_TK=	${PKGDIR}/PLIST.tk
-.endif
-
-#
 # If you want to use Python's thread module, you need to set WITH_THREADS
 # to 'yes', and you must have the FreeBSD threading c library (libc_r)
 # installed. See 'man 3 pthread' for details on libc_r.
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index 7e3a0663fe2e..fc091f0a9713 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -8,15 +8,13 @@
 
 DISTNAME=       py152
 PKGNAME=        python-1.5.2
-CATEGORIES=	lang python tk82
+CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
 
-LIB_DEPENDS=	${TK_DEPENDS}
-
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
@@ -32,18 +30,6 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default only if X11 is installed.
-#
-.if exists(${X11BASE})
-WITH_TK?=	yes
-.endif
-.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-SETUP_LOCAL=	Setup.tk
-PLIST_TK=	${PKGDIR}/PLIST.tk
-.endif
-
-#
 # If you want to use Python's thread module, you need to set WITH_THREADS
 # to 'yes', and you must have the FreeBSD threading c library (libc_r)
 # installed. See 'man 3 pthread' for details on libc_r.
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 7e3a0663fe2e..fc091f0a9713 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -8,15 +8,13 @@
 
 DISTNAME=       py152
 PKGNAME=        python-1.5.2
-CATEGORIES=	lang python tk82
+CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
 
-LIB_DEPENDS=	${TK_DEPENDS}
-
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
@@ -32,18 +30,6 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default only if X11 is installed.
-#
-.if exists(${X11BASE})
-WITH_TK?=	yes
-.endif
-.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-SETUP_LOCAL=	Setup.tk
-PLIST_TK=	${PKGDIR}/PLIST.tk
-.endif
-
-#
 # If you want to use Python's thread module, you need to set WITH_THREADS
 # to 'yes', and you must have the FreeBSD threading c library (libc_r)
 # installed. See 'man 3 pthread' for details on libc_r.
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 7e3a0663fe2e..fc091f0a9713 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -8,15 +8,13 @@
 
 DISTNAME=       py152
 PKGNAME=        python-1.5.2
-CATEGORIES=	lang python tk82
+CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
 
-LIB_DEPENDS=	${TK_DEPENDS}
-
 DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
@@ -32,18 +30,6 @@ MAN1=		python.1
 SETUP_FILE=	Setup
 
 #
-# Support for Tk is compiled in by default only if X11 is installed.
-#
-.if exists(${X11BASE})
-WITH_TK?=	yes
-.endif
-.if defined(WITH_TK) && $(WITH_TK) == yes
-TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-SETUP_LOCAL=	Setup.tk
-PLIST_TK=	${PKGDIR}/PLIST.tk
-.endif
-
-#
 # If you want to use Python's thread module, you need to set WITH_THREADS
 # to 'yes', and you must have the FreeBSD threading c library (libc_r)
 # installed. See 'man 3 pthread' for details on libc_r.
diff --git a/www/grail/Makefile b/www/grail/Makefile
index ec25eb799795..5604c573dde4 100644
--- a/www/grail/Makefile
+++ b/www/grail/Makefile
@@ -15,8 +15,7 @@ EXTRACT_SUFX=		.tgz
 MAINTAINER=		nectar@freebsd.org
 
 BUILD_DEPENDS=		python:${PORTSDIR}/lang/python
-RUN_DEPENDS=		python:${PORTSDIR}/lang/python
-LIB_DEPENDS=		tk82.1:${PORTSDIR}/x11-toolkits/tk82
+RUN_DEPENDS=		${PREFIX}/lib/python1.5/site-packages/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
 WRKSRC=			${WRKDIR}/${PKGNAME}
 
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 107f7fec102d..6b6954ceebe0 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -29,6 +29,7 @@
     SUBDIR += pmw
     SUBDIR += py-gnome
     SUBDIR += py-gtk
+    SUBDIR += py-tkinter
     SUBDIR += py-wxPython
     SUBDIR += qt-i18n
     SUBDIR += qt145
diff --git a/x11-toolkits/pmw/Makefile b/x11-toolkits/pmw/Makefile
index e62156061f28..2c3bc10277ec 100644
--- a/x11-toolkits/pmw/Makefile
+++ b/x11-toolkits/pmw/Makefile
@@ -12,8 +12,7 @@ MASTER_SITES=	ftp://ftp.dscpl.com.au/pub/pmw/
 
 MAINTAINER=	tg@FreeBSD.org
 
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python
+RUN_DEPENDS=	${SITEPYDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
 PLIST_SUB=	PMWVERSION="${PMWVERSION}"
 
diff --git a/x11-toolkits/py-Pmw/Makefile b/x11-toolkits/py-Pmw/Makefile
index e62156061f28..2c3bc10277ec 100644
--- a/x11-toolkits/py-Pmw/Makefile
+++ b/x11-toolkits/py-Pmw/Makefile
@@ -12,8 +12,7 @@ MASTER_SITES=	ftp://ftp.dscpl.com.au/pub/pmw/
 
 MAINTAINER=	tg@FreeBSD.org
 
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python
+RUN_DEPENDS=	${SITEPYDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
 PLIST_SUB=	PMWVERSION="${PMWVERSION}"
 
diff --git a/x11-toolkits/py-tkinter/Makefile b/x11-toolkits/py-tkinter/Makefile
new file mode 100644
index 000000000000..8d38458dc6a2
--- /dev/null
+++ b/x11-toolkits/py-tkinter/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for:    py-Tkinter
+# Version required:     1.5.2
+# Date created:         12 Jan 1999
+# Whom:                 Thomas Gellekum <tg@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+DISTNAME=	py152
+PKGNAME=	py-tkinter-1.5.2
+CATEGORIES=	x11-toolkits python
+MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
+		ftp://ftp.cwi.nl/pub/python/src/
+EXTRACT_SUFX=	.tgz
+
+MAINTAINER=	tg@FreeBSD.org
+
+BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
+LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
+RUN_DEPENDS=	python:${PORTSDIR}/lang/python
+
+DIST_SUBDIR=	python
+WRKSRC=		${WRKDIR}/Python-1.5.2/Modules
+ALL_TARGET=	sharedmods
+MAKE_FLAGS=	OPT="${CFLAGS}"
+
+PYTHONSCRIPTDIR=	${PREFIX}/lib/python1.5
+
+post-extract:
+	@${CP} ${FILESDIR}/Setup ${WRKSRC}
+	@${CP} ${PYTHONSCRIPTDIR}/config/Makefile.pre.in ${WRKSRC}
+
+do-configure:
+	@(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)
+
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/_tkinter.so ${PYTHONSCRIPTDIR}/site-packages
+
+.include <bsd.port.mk>
diff --git a/x11-toolkits/py-tkinter/distinfo b/x11-toolkits/py-tkinter/distinfo
new file mode 100644
index 000000000000..72ca6a75cf6c
--- /dev/null
+++ b/x11-toolkits/py-tkinter/distinfo
@@ -0,0 +1 @@
+MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752
diff --git a/x11-toolkits/py-tkinter/files/Setup b/x11-toolkits/py-tkinter/files/Setup
new file mode 100644
index 000000000000..d0c27c930ba2
--- /dev/null
+++ b/x11-toolkits/py-tkinter/files/Setup
@@ -0,0 +1,47 @@
+*shared*
+
+# The _tkinter module.
+#
+# The TKPATH variable is always enabled, to save you the effort.
+TKPATH=:lib-tk
+
+# The command for _tkinter is long and site specific.  Please
+# uncomment and/or edit those parts as indicated.  If you don't have a
+# specific extension (e.g. Tix or BLT), leave the corresponding line
+# commented out.  (Leave the trailing backslashes in!  If you
+# experience strange errors, you may want to join all uncommented
+# lines and remove the backslashes -- the backslash interpretation is
+# done by the shell's "read" command and it may not be implemented on
+# every system.
+
+# *** Always uncomment this (leave the leading underscore in!):
+_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -I${X11BASE}/include -I${PREFIX}/include/tcl8.2 -I${PREFIX}/include/tk8.2 -L${PREFIX}/lib -ltk82 -ltcl82 -L${X11BASE}/lib -lX11
+
+# *** Uncommend and edit to reflect where your X11 header files are:
+#	-I/usr/X11R6/include \
+# *** Or uncomment this for Solaris:
+#	-I/usr/openwin/include \
+# *** Uncomment and edit to reflect where your Tcl/Tk headers are:
+#	-I/usr/local/include/tcl8.1 -I/usr/local/include/tk8.1 \
+# *** Uncomment and edit for Tix extension only:
+#	-DWITH_TIX -ltix4.1.8.0 \
+# *** Uncomment and edit for BLT extension only:
+#	-DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \
+# *** Uncomment and edit for PIL (TkImaging) extension only:
+#	-DWITH_PIL -I../Extensions/Imaging/libImaging  tkImaging.c \
+# *** Uncomment and edit for Mesa (what's Mesa?):
+#	-lGL -lGLU -lMesatk -lMesaaux \
+# *** Uncomment and edit for TOGL extension only:
+#	-DWITH_TOGL togl.c \
+# *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
+#	-L/usr/local/lib \
+# *** Uncomment and edit to reflect your Tcl/Tk versions:
+#	-ltk80 -ltcl80 \
+# *** Uncomment and edit to reflect where your X11 libraries are:
+#	-L/usr/X11R6/lib \
+# *** Or uncomment this for Solaris:
+#	-L/usr/openwin/lib \
+# *** Always uncomment this; X11 libraries to link with:
+#	-lX11 -lXext -lXmu
+
+
diff --git a/x11-toolkits/py-tkinter/pkg-comment b/x11-toolkits/py-tkinter/pkg-comment
new file mode 100644
index 000000000000..2af2980ff94f
--- /dev/null
+++ b/x11-toolkits/py-tkinter/pkg-comment
@@ -0,0 +1 @@
+Python bindings to the Tk widget set.
diff --git a/x11-toolkits/py-tkinter/pkg-descr b/x11-toolkits/py-tkinter/pkg-descr
new file mode 100644
index 000000000000..2af2980ff94f
--- /dev/null
+++ b/x11-toolkits/py-tkinter/pkg-descr
@@ -0,0 +1 @@
+Python bindings to the Tk widget set.
diff --git a/x11-toolkits/py-tkinter/pkg-plist b/x11-toolkits/py-tkinter/pkg-plist
new file mode 100644
index 000000000000..b8deafa6c8f2
--- /dev/null
+++ b/x11-toolkits/py-tkinter/pkg-plist
@@ -0,0 +1 @@
+lib/python1.5/site-packages/_tkinter.so