5 files changed, 42 insertions, 94 deletions

diff --git a/devel/py-turbojson/Makefile b/devel/py-turbojson/Makefile
index 9d94de358e96..b1c28b93e89c 100644
--- a/devel/py-turbojson/Makefile
+++ b/devel/py-turbojson/Makefile
@@ -6,49 +6,20 @@
 #
 
 PORTNAME=	TurboJson
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	1.1.3
 CATEGORIES=	devel python
-MASTER_SITES=	http://files.turbogears.org/eggs/ \
+MASTER_SITES=	CHEESESHOP \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PYTURBOJSON_EGG}
-EXTRACT_SUFX=
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python template plugin for TurboGears that supports json
 
-BUILD_DEPENDS=	easy_install:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS=	${BUILD_DEPENDS}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/${PYRULEDISPATCH_EGG}:${PORTSDIR}/devel/py-ruledispatch \
-		${PYTHON_SITELIBDIR}/${PYSIMPLEJSON_EGG}:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_SITELIBDIR}/${PYSQLOBJECT_EGG}/sqlobject/__init__.py:${PORTSDIR}/databases/py-sqlobject
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}RuleDispatch>=0.5.a0.r2306:${PORTSDIR}/devel/py-ruledispatch \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=1.9.1:${PORTSDIR}/devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}sqlobject>=0.10.0_1:${PORTSDIR}/databases/py-sqlobject
 
-NO_BUILD=	yes
+USE_PYTHON=	2.4+
+USE_PYDISTUTILS=	easy_install
 
-USE_PYTHON=	2.4
-
-PLIST_SUB+=	PYTURBOJSON_EGG=${PYTURBOJSON_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
-
-PYTURBOJSON_EGG=	${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg
-
-do-extract:
-	${MKDIR} ${WRKSRC}
-
-do-install:
-	${EASY_INSTALL} ${EASY_INSTALL_ARGS} ${DISTDIR}/${DISTFILES}
-
-.include <bsd.port.pre.mk>
-
-PYRULEDISPATCH_EGG!=	${MAKE} -f ${PORTSDIR}/devel/py-ruledispatch/Makefile -V PYRULEDISPATCH_EGG
-PYSIMPLEJSON_EGG!=	${MAKE} -f ${PORTSDIR}/devel/py-simplejson/Makefile -V PYSIMPLEJSON_EGG
-PYSQLOBJECT_EGG!=	${MAKE} -f ${PORTSDIR}/databases/py-sqlobject/Makefile -V PYSQLOBJECT_EGG
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-turbojson/distinfo b/devel/py-turbojson/distinfo
index 0906aa82e908..2043eba111bb 100644
--- a/devel/py-turbojson/distinfo
+++ b/devel/py-turbojson/distinfo
@@ -1,3 +1,3 @@
-MD5 (TurboJson-1.0-py2.4.egg) = 97b67f60f13c18e42289b45dede2e618
-SHA256 (TurboJson-1.0-py2.4.egg) = e02e45e5106ea5d86c653ad221db48852c626263ffc87c1d3e808332a4e38f49
-SIZE (TurboJson-1.0-py2.4.egg) = 6858
+MD5 (TurboJson-1.1.3.tar.gz) = 9abbd9e50352941d6c658af3c43f0eb5
+SHA256 (TurboJson-1.1.3.tar.gz) = 3812c8a0787475e038762e6155d6155970efd964e372f0443dd83b1587610afd
+SIZE (TurboJson-1.1.3.tar.gz) = 5919
diff --git a/devel/py-turbojson/files/pkg-deinstall.in b/devel/py-turbojson/files/pkg-deinstall.in
deleted file mode 100644
index c2a4012d7b2e..000000000000
--- a/devel/py-turbojson/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-turbojson/files/pkg-install.in b/devel/py-turbojson/files/pkg-install.in
deleted file mode 100644
index 9cddbe28f167..000000000000
--- a/devel/py-turbojson/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-turbojson/pkg-plist b/devel/py-turbojson/pkg-plist
index 994e030d0a11..d678c58c099b 100644
--- a/devel/py-turbojson/pkg-plist
+++ b/devel/py-turbojson/pkg-plist
@@ -1,22 +1,32 @@
 @comment $FreeBSD$
-%%PYTHON_SITELIBDIR%%/%%PYTURBOJSON_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYTURBOJSON_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYTURBOJSON_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYTURBOJSON_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYTURBOJSON_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYTURBOJSON_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYTURBOJSON_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYTURBOJSON_EGG%%/turbojson/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYTURBOJSON_EGG%%/turbojson/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYTURBOJSON_EGG%%/turbojson/jsonify.py
-%%PYTHON_SITELIBDIR%%/%%PYTURBOJSON_EGG%%/turbojson/jsonify.pyc
-%%PYTHON_SITELIBDIR%%/%%PYTURBOJSON_EGG%%/turbojson/jsonsupport.py
-%%PYTHON_SITELIBDIR%%/%%PYTURBOJSON_EGG%%/turbojson/jsonsupport.pyc
-%%PYTHON_SITELIBDIR%%/%%PYTURBOJSON_EGG%%/turbojson/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYTURBOJSON_EGG%%/turbojson/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYTURBOJSON_EGG%%/turbojson/tests/test_jsonify.py
-%%PYTHON_SITELIBDIR%%/%%PYTURBOJSON_EGG%%/turbojson/tests/test_jsonify.pyc
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYTURBOJSON_EGG%%/turbojson/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYTURBOJSON_EGG%%/turbojson
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYTURBOJSON_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYTURBOJSON_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%%/turbojson/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/jsonify.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/jsonify.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/jsonify.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/jsonsupport.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/jsonsupport.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/jsonsupport.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/tests/test_jsonify.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/tests/test_jsonify.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/tests/test_jsonify.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/tests/test_sqlalchemy.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/tests/test_sqlalchemy.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/tests/test_sqlalchemy.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/tests/test_sqlobject.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/tests/test_sqlobject.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/tests/test_sqlobject.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/tests
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO