5 files changed, 23 insertions, 79 deletions

diff --git a/devel/py-turbokid/Makefile b/devel/py-turbokid/Makefile
index fc594faa2653..6525a239541e 100644
--- a/devel/py-turbokid/Makefile
+++ b/devel/py-turbokid/Makefile
@@ -6,40 +6,18 @@
 #
 
 PORTNAME=	TurboKid
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.4
 CATEGORIES=	devel python
-MASTER_SITES=	http://cheeseshop.python.org/packages/${PYTHON_VER}/T/TurboKid/ \
+MASTER_SITES=	CHEESESHOP \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PYTURBOKID_EGG}
-EXTRACT_SUFX=
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python template plugin that supports Kid templates
 
-BUILD_DEPENDS=	easy_install:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS=	${BUILD_DEPENDS}
-RUN_DEPENDS+=	kid:${PORTSDIR}/devel/py-kid
+RUN_DEPENDS=	kid:${PORTSDIR}/devel/py-kid
 
 USE_PYTHON=	2.4+
-
-NO_BUILD=	yes
-
-PLIST_SUB+=	PYTURBOKID_EGG=${PYTURBOKID_EGG}
-
-SUB_FILES+=	pkg-deinstall pkg-install
-SUB_LIST+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \
-		EGG="${PORTNAME}==${PORTVERSION}"
-
-EASY_INSTALL=	${LOCALBASE}/bin/easy_install
-EASY_INSTALL_ARGS=	-N -b ${WRKSRC} -d ${PYTHON_SITELIBDIR} -s ${PREFIX}/bin
-
-PYTURBOKID_EGG=	${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
-
-do-extract:
-	${MKDIR} ${WRKSRC}
-
-do-install:
-	${EASY_INSTALL} ${EASY_INSTALL_ARGS} ${DISTDIR}/${DISTFILES}
+USE_PYDISTUTILS=	easy_install
 
 .include <bsd.port.mk>
diff --git a/devel/py-turbokid/distinfo b/devel/py-turbokid/distinfo
index 3a913d563cd3..f464886544cb 100644
--- a/devel/py-turbokid/distinfo
+++ b/devel/py-turbokid/distinfo
@@ -1,6 +1,3 @@
-MD5 (TurboKid-1.0.1-py2.4.egg) = 0e459c886ced830ba6c6dd0356536ed0
-MD5 (TurboKid-1.0.1-py2.5.egg) = 6fcb0d847e5cf8c13816433f75a95b4d
-SHA256 (TurboKid-1.0.1-py2.4.egg) = c68ace1d90ad56107b5c5ac1d4bc8e3d9feb0cf6a63bb3d5fcf9f4804e99e8cd
-SHA256 (TurboKid-1.0.1-py2.5.egg) = 5a2baafd41c767b520b7b7d4b3b6dafb9a2e0fbc1db19786c4f58b9862d266b3
-SIZE (TurboKid-1.0.1-py2.4.egg) = 7360
-SIZE (TurboKid-1.0.1-py2.5.egg) = 7271
+MD5 (TurboKid-1.0.4.tar.gz) = 0dc9eba1783244a9800b8c4316d38341
+SHA256 (TurboKid-1.0.4.tar.gz) = 4a570aa1aae4595c4cc99693d25894e6448cbf841d16e317c23be0a213bd7ac0
+SIZE (TurboKid-1.0.4.tar.gz) = 4080
diff --git a/devel/py-turbokid/files/pkg-deinstall.in b/devel/py-turbokid/files/pkg-deinstall.in
deleted file mode 100644
index c2a4012d7b2e..000000000000
--- a/devel/py-turbokid/files/pkg-deinstall.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-PKGNAME=$1
-#
-case $2 in
-    DEINSTALL)
-	easy_install -q -N -m -x -S %%PYTHON_SITELIBDIR%% %%EGG%%
-	;;
-    POST-DEINSTALL)
-	exit 0
-	;;
-    *)
-	echo "Unexpected Argument $2!!!"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/devel/py-turbokid/files/pkg-install.in b/devel/py-turbokid/files/pkg-install.in
deleted file mode 100644
index 9cddbe28f167..000000000000
--- a/devel/py-turbokid/files/pkg-install.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-PKGNAME=$1
-#
-case $2 in
-    POST-INSTALL)
-	easy_install -q -N -S %%PYTHON_SITELIBDIR%% %%EGG%%
-	;;
-    PRE-INSTALL)
-	;;
-    *)
-	echo "Unexpected Argument $2!!!"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/devel/py-turbokid/pkg-plist b/devel/py-turbokid/pkg-plist
index c48e20e321bf..016807c4c819 100644
--- a/devel/py-turbokid/pkg-plist
+++ b/devel/py-turbokid/pkg-plist
@@ -1,15 +1,17 @@
 @comment $FreeBSD$
-%%PYTHON_SITELIBDIR%%/%%PYTURBOKID_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYTURBOKID_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYTURBOKID_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYTURBOKID_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYTURBOKID_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYTURBOKID_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYTURBOKID_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYTURBOKID_EGG%%/turbokid/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYTURBOKID_EGG%%/turbokid/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYTURBOKID_EGG%%/turbokid/kidsupport.py
-%%PYTHON_SITELIBDIR%%/%%PYTURBOKID_EGG%%/turbokid/kidsupport.pyc
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYTURBOKID_EGG%%/turbokid
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYTURBOKID_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYTURBOKID_EGG%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbokid/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbokid/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbokid/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbokid/kidsupport.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbokid/kidsupport.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbokid/kidsupport.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbokid
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%