- Update to 1.12 (maintainer);

- use USE_PYTHON (maintainer, sobomax);
- precompile all .py files being installed;
- make it working with python versions other that 1.52 by using Pmw python
  module from ports instead of port's own pre-compiled for python1.52 version;
- install files into ${PREFIX}/share/ptkei, not into ${PREFIX}/ptkei.

Submitted by:	maintainer
Improved by:	sobomax

5 files changed, 91 insertions, 69 deletions

diff --git a/games/ptkei/Makefile b/games/ptkei/Makefile
index 444f23b00c3d..3aff218e4ef6 100644
--- a/games/ptkei/Makefile
+++ b/games/ptkei/Makefile
@@ -6,26 +6,28 @@
 #
 
 PORTNAME=	ptkei
-PORTVERSION=	1.10
+PORTVERSION=	1.12
 CATEGORIES=	games
-MASTER_SITES=	http://www.cse.buffalo.edu/~koconnor/ptkei/download/
+MASTER_SITES=	ftp://www.empire.cx/pub/empire/clients/
 
 MAINTAINER=	darius@dons.net.au
 
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
+		${PYTHON_SITELIBDIR}/Pmw/__init__.py:${PORTSDIR}/x11-toolkits/pmw
 
-NO_BUILD=	yes
+USE_PYTHON=	yes
+
+do-build:
+	@find ${WRKSRC} -name "*.pyc" | xargs ${RM}
+	@find ${WRKSRC} \( -type f -or -type l \) | xargs ${CHMOD} 644
+	@find ${WRKSRC} -type d | xargs ${CHMOD} 755
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} 2>/dev/null
 
 do-install:
-	${MKDIR} ${PREFIX}/ptkei
-	${CP} -r ${WRKSRC}/* ${PREFIX}/ptkei
-	${SED} -e "s#%%PREFIX%%#${PREFIX}#" <${FILESDIR}/ptkei > ${PREFIX}/bin/ptkei
-	${CHMOD} -R 644 ${PREFIX}/ptkei
-	${CHMOD} 755 ${PREFIX}/ptkei
-	${CHMOD} 755 ${PREFIX}/ptkei/src
-	${CHMOD} 755 ${PREFIX}/ptkei/scripts
-	${CHMOD} 755 ${PREFIX}/ptkei/doc
-	${CHMOD} 755 ${PREFIX}/ptkei/doc/pics
-	${CHMOD} 755 ${PREFIX}/bin/ptkei
+	${MKDIR} ${PREFIX}/share/ptkei
+	${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${PREFIX}/share/ptkei --unlink -xf -
+	${SED} -e "s#%%PREFIX%%#${PREFIX}# ; s#%%PYTHON_CMD%%#${PYTHON_CMD}#" \
+		${FILESDIR}/ptkei > ${WRKDIR}/ptkei.tmp
+	${INSTALL_SCRIPT} ${WRKDIR}/ptkei.tmp ${PREFIX}/bin/ptkei
 
 .include <bsd.port.mk>
diff --git a/games/ptkei/distinfo b/games/ptkei/distinfo
index cb4bcc094a83..1fc65c6dd5c2 100644
--- a/games/ptkei/distinfo
+++ b/games/ptkei/distinfo
@@ -1 +1 @@
-MD5 (ptkei-1.10.tar.gz) = 53bca994e78a4c415c09cf72d8d3372e
+MD5 (ptkei-1.12.tar.gz) = 70ac66ade36d707f4b232ac887c6f7f5
diff --git a/games/ptkei/files/ptkei b/games/ptkei/files/ptkei
index 7b0fb91b705a..9010d986a9ce 100644
--- a/games/ptkei/files/ptkei
+++ b/games/ptkei/files/ptkei
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-python %%PREFIX%%/ptkei/empire.py $*
+%%PYTHON_CMD%% %%PREFIX%%/share/ptkei/empire.py $*
diff --git a/games/ptkei/pkg-descr b/games/ptkei/pkg-descr
index 32cd08f3bb6f..f60cbf57e620 100644
--- a/games/ptkei/pkg-descr
+++ b/games/ptkei/pkg-descr
@@ -1,3 +1,3 @@
 Ptkei is a Python/Tk graphical client for Wolfpack Empire servers.
 
-WWW: http://www.cse.buffalo.edu/~koconnor/ptkei/
+WWW: http://www.empire.cx/~kevin/ptkei/
diff --git a/games/ptkei/pkg-plist b/games/ptkei/pkg-plist
index c934befd1be5..ea782e0465ab 100644
--- a/games/ptkei/pkg-plist
+++ b/games/ptkei/pkg-plist
@@ -1,53 +1,73 @@
 bin/ptkei
-ptkei/COPYING
-ptkei/TkOption
-ptkei/TkOption.w32
-ptkei/TkOption.x11
-ptkei/connect.emp
-ptkei/doc/CREDITS
-ptkei/doc/README.html
-ptkei/doc/TIPS.html
-ptkei/doc/TODO
-ptkei/doc/commands.html
-ptkei/doc/gui.html
-ptkei/doc/pics/login.gif
-ptkei/doc/pics/map.gif
-ptkei/doc/pics/mover.gif
-ptkei/doc/pics/queue.gif
-ptkei/doc/pics/status.gif
-ptkei/doc/pics/wread.gif
-ptkei/empire.py
-ptkei/first.emp
-ptkei/scripts/README
-ptkei/scripts/bundlepmw.py
-ptkei/scripts/create
-ptkei/scripts/dummyfunc.py
-ptkei/scripts/snapshot
-ptkei/scripts/stript
-ptkei/scripts/untab
-ptkei/src/CenWin.py
-ptkei/src/ChangeLog
-ptkei/src/LoginWin.py
-ptkei/src/MapWin.py
-ptkei/src/OutWin.py
-ptkei/src/Pmw.pyc
-ptkei/src/TeleWin.py
-ptkei/src/Tk_List.py
-ptkei/src/Tk_Pane.py
-ptkei/src/Tk_VDB.py
-ptkei/src/empCmd.py
-ptkei/src/empCurses.py
-ptkei/src/empDb.py
-ptkei/src/empEval.py
-ptkei/src/empParse.py
-ptkei/src/empPath.py
-ptkei/src/empQueue.py
-ptkei/src/empSector.py
-ptkei/src/empText.py
-ptkei/src/empTk.py
-ptkei/start.emp
-@dirrm ptkei/doc/pics
-@dirrm ptkei/doc
-@dirrm ptkei/scripts
-@dirrm ptkei/src
-@dirrm ptkei
+share/ptkei/COPYING
+share/ptkei/TkOption
+share/ptkei/TkOption.w32
+share/ptkei/TkOption.x11
+share/ptkei/connect.emp
+share/ptkei/doc/CREDITS
+share/ptkei/doc/README.html
+share/ptkei/doc/TIPS.html
+share/ptkei/doc/TODO
+share/ptkei/doc/commands.html
+share/ptkei/doc/gui.html
+share/ptkei/doc/pics/login.gif
+share/ptkei/doc/pics/map.gif
+share/ptkei/doc/pics/mover.gif
+share/ptkei/doc/pics/queue.gif
+share/ptkei/doc/pics/status.gif
+share/ptkei/doc/pics/wread.gif
+share/ptkei/empire.py
+share/ptkei/empire.pyc
+share/ptkei/first.emp
+share/ptkei/scripts/README
+share/ptkei/scripts/bundlepmw.py
+share/ptkei/scripts/bundlepmw.pyc
+share/ptkei/scripts/create
+share/ptkei/scripts/dummyfunc.py
+share/ptkei/scripts/dummyfunc.pyc
+share/ptkei/scripts/snapshot
+share/ptkei/scripts/stript
+share/ptkei/scripts/untab
+share/ptkei/src/CenWin.py
+share/ptkei/src/CenWin.pyc
+share/ptkei/src/ChangeLog
+share/ptkei/src/LoginWin.py
+share/ptkei/src/LoginWin.pyc
+share/ptkei/src/MapWin.py
+share/ptkei/src/MapWin.pyc
+share/ptkei/src/OutWin.py
+share/ptkei/src/OutWin.pyc
+share/ptkei/src/TeleWin.py
+share/ptkei/src/TeleWin.pyc
+share/ptkei/src/Tk_List.py
+share/ptkei/src/Tk_List.pyc
+share/ptkei/src/Tk_Pane.py
+share/ptkei/src/Tk_Pane.pyc
+share/ptkei/src/Tk_VDB.py
+share/ptkei/src/Tk_VDB.pyc
+share/ptkei/src/empCmd.py
+share/ptkei/src/empCmd.pyc
+share/ptkei/src/empCurses.py
+share/ptkei/src/empCurses.pyc
+share/ptkei/src/empDb.py
+share/ptkei/src/empDb.pyc
+share/ptkei/src/empEval.py
+share/ptkei/src/empEval.pyc
+share/ptkei/src/empParse.py
+share/ptkei/src/empParse.pyc
+share/ptkei/src/empPath.py
+share/ptkei/src/empPath.pyc
+share/ptkei/src/empQueue.py
+share/ptkei/src/empQueue.pyc
+share/ptkei/src/empSector.py
+share/ptkei/src/empSector.pyc
+share/ptkei/src/empText.py
+share/ptkei/src/empText.pyc
+share/ptkei/src/empTk.py
+share/ptkei/src/empTk.pyc
+share/ptkei/start.emp
+@dirrm share/ptkei/src
+@dirrm share/ptkei/scripts
+@dirrm share/ptkei/doc/pics
+@dirrm share/ptkei/doc
+@dirrm share/ptkei