Update to use bsd.python.mk.

4 files changed, 16 insertions, 54 deletions

diff --git a/x11-toolkits/py-tkinter/Makefile b/x11-toolkits/py-tkinter/Makefile
index f3458be5151a..6b8ed9dabbdf 100644
--- a/x11-toolkits/py-tkinter/Makefile
+++ b/x11-toolkits/py-tkinter/Makefile
@@ -5,35 +5,34 @@
 # $FreeBSD$
 #
 
-PORTNAME=	py-tkinter
-PORTVERSION= 	1.5.2
+PORTNAME=	tkinter
+PORTVERSION= 	${PYTHON_PORTVERSION}
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
-DISTNAME=	py152
-EXTRACT_SUFX=	.tgz
+PKGNAMEPREFIX=	py-
+DISTFILES=	${PYTHON_DISTFILE}
 
 MAINTAINER=	tg@FreeBSD.org
 
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
-LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python
+LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
 
 DIST_SUBDIR=	python
-WRKSRC=		${WRKDIR}/Python-1.5.2/Modules
+USE_PYTHON=	yes
+WRKSRC=		${PYTHON_WRKSRC}/Modules
+CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
 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}
+	@${CP} ${PYTHON_LIBDIR}/config/Makefile.pre.in ${WRKSRC}
 
 do-configure:
-	@(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)
+	@(cd ${WRKSRC}; \
+		${SETENV} ${CONFIGURE_ENV} ${MAKE} -f Makefile.pre.in boot)
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/_tkinter.so ${PYTHONSCRIPTDIR}/site-packages
+	${INSTALL_DATA} ${WRKSRC}/_tkinter.so ${PYTHON_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-tkinter/distinfo b/x11-toolkits/py-tkinter/distinfo
index 72ca6a75cf6c..9f240a38aab8 100644
--- a/x11-toolkits/py-tkinter/distinfo
+++ b/x11-toolkits/py-tkinter/distinfo
@@ -1 +1,3 @@
 MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752
+MD5 (python/Python-1.6.tar.gz) = 9d72ef93d7698769d9d3be7c17d5ad92
+MD5 (python/BeOpen-Python-2.0b1.tar.gz) = ad8b95886e5049fc9c79a50f4ea3debf
diff --git a/x11-toolkits/py-tkinter/files/Setup b/x11-toolkits/py-tkinter/files/Setup
index d0c27c930ba2..6a90582bf2da 100644
--- a/x11-toolkits/py-tkinter/files/Setup
+++ b/x11-toolkits/py-tkinter/files/Setup
@@ -5,43 +5,4 @@
 # 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
-
-
+_tkinter _tkinter.c tkappinit.c -DWITH_APPINIT -I${X11BASE}/include -I${PREFIX}/include/tcl8.3 -I${PREFIX}/include/tk8.3 -L${PREFIX}/lib -ltk83 -ltcl83 -L${X11BASE}/lib -lX11
diff --git a/x11-toolkits/py-tkinter/pkg-plist b/x11-toolkits/py-tkinter/pkg-plist
index b8deafa6c8f2..84452c3628ba 100644
--- a/x11-toolkits/py-tkinter/pkg-plist
+++ b/x11-toolkits/py-tkinter/pkg-plist
@@ -1 +1 @@
-lib/python1.5/site-packages/_tkinter.so
+lib/%%PYTHON_VERSION%%/site-packages/_tkinter.so