5 files changed, 25 insertions, 84 deletions

diff --git a/devel/py-turbocheetah/Makefile b/devel/py-turbocheetah/Makefile
index ab335fa6ff8b..88c6059079ff 100644
--- a/devel/py-turbocheetah/Makefile
+++ b/devel/py-turbocheetah/Makefile
@@ -6,42 +6,19 @@
 #
 
 PORTNAME=	TurboCheetah
-PORTVERSION=	0.9.5
+PORTVERSION=	1.0
 CATEGORIES=	devel python
-MASTER_SITES=	http://files.turbogears.org/eggs/ \
+MASTER_SITES=	CHEESESHOP \
+		http://files.turbogears.org/eggs/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PYTURBOCHEETAH_EGG}
-EXTRACT_SUFX=
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	TurboGears plugin to support use of Cheetah templates
 
-BUILD_DEPENDS=	easy_install:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS=	${BUILD_DEPENDS}
-RUN_DEPENDS+=	cheetah:${PORTSDIR}/devel/py-cheetah
+RUN_DEPENDS=	cheetah:${PORTSDIR}/devel/py-cheetah
 
-USE_PYTHON=	2.4
-
-BROKEN=		does not install
-
-NO_BUILD=	yes
-
-SUB_FILES+=	pkg-deinstall pkg-install
-SUB_LIST+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR} \
-		EGG="${PORTNAME}==${PORTVERSION}"
-
-EASY_INSTALL=	${LOCALBASE}/bin/easy_install
-EASY_INSTALL_ARGS=	-b ${WRKSRC} -N -d ${PYTHON_SITELIBDIR} -s ${PREFIX}/bin
-
-DATADIR=	${PYTHON_SITELIBDIR}/${PYTURBOCHEETAH_EGG}
-
-PYTURBOCHEETAH_EGG=	${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
-
-do-extract:
-	@${MKDIR} ${WRKSRC}
-
-do-install:
-	${EASY_INSTALL} ${EASY_INSTALL_ARGS} ${DISTDIR}/${DISTFILES}
+USE_PYTHON=		2.4+
+USE_PYDISTUTILS=	easy_install
 
 .include <bsd.port.mk>
diff --git a/devel/py-turbocheetah/distinfo b/devel/py-turbocheetah/distinfo
index 63dd2a7864d2..3e83baeb4da3 100644
--- a/devel/py-turbocheetah/distinfo
+++ b/devel/py-turbocheetah/distinfo
@@ -1,3 +1,3 @@
-MD5 (TurboCheetah-0.9.5-py2.4.egg) = 68616454b994f1f87b1bd5b0689a0f4d
-SHA256 (TurboCheetah-0.9.5-py2.4.egg) = 289f8b3b2d5f11ce2cf63d3ccbce7646e5176830dfed396a3ad0872e839d412e
-SIZE (TurboCheetah-0.9.5-py2.4.egg) = 7492
+MD5 (TurboCheetah-1.0.tar.gz) = daf99f38f6696ac64b7df8ac2e003a03
+SHA256 (TurboCheetah-1.0.tar.gz) = 9e4c7ecb0d061bfb58281363ee1b09337083f013a8b4d0355326a5d8668f450c
+SIZE (TurboCheetah-1.0.tar.gz) = 4335
diff --git a/devel/py-turbocheetah/files/pkg-deinstall.in b/devel/py-turbocheetah/files/pkg-deinstall.in
deleted file mode 100644
index c2a4012d7b2e..000000000000
--- a/devel/py-turbocheetah/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-turbocheetah/files/pkg-install.in b/devel/py-turbocheetah/files/pkg-install.in
deleted file mode 100644
index 9cddbe28f167..000000000000
--- a/devel/py-turbocheetah/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-turbocheetah/pkg-plist b/devel/py-turbocheetah/pkg-plist
index e95b920c7c66..efd45a434117 100644
--- a/devel/py-turbocheetah/pkg-plist
+++ b/devel/py-turbocheetah/pkg-plist
@@ -1,19 +1,16 @@
-@comment $FreeBSD$
-%%DATADIR%%/EGG-INFO/PKG-INFO
-%%DATADIR%%/EGG-INFO/SOURCES.txt
-%%DATADIR%%/EGG-INFO/entry_points.txt
-%%DATADIR%%/EGG-INFO/not-zip-safe
-%%DATADIR%%/EGG-INFO/requires.txt
-%%DATADIR%%/EGG-INFO/top_level.txt
-%%DATADIR%%/turbocheetah/__init__.py
-%%DATADIR%%/turbocheetah/__init__.pyc
-%%DATADIR%%/turbocheetah/cheetahsupport.py
-%%DATADIR%%/turbocheetah/cheetahsupport.pyc
-%%DATADIR%%/turbocheetah/tests/__init__.py
-%%DATADIR%%/turbocheetah/tests/__init__.pyc
-%%DATADIR%%/turbocheetah/tests/test_template.py
-%%DATADIR%%/turbocheetah/tests/test_template.pyc
-@dirrm %%DATADIR%%/turbocheetah/tests
-@dirrm %%DATADIR%%/turbocheetah
-@dirrm %%DATADIR%%/EGG-INFO
-@dirrm %%DATADIR%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbocheetah/cheetahsupport.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbocheetah/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbocheetah/cheetahsupport.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbocheetah/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbocheetah/cheetahsupport.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbocheetah/__init__.pyo
+%%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
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbocheetah
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%