diff --git a/devel/py-turbojson/Makefile b/devel/py-turbojson/Makefile
index dced0d06e856..2d8ed41af8a1 100644
--- a/devel/py-turbojson/Makefile
+++ b/devel/py-turbojson/Makefile
@@ -6,20 +6,18 @@
 #
 
 PORTNAME=	TurboJson
-PORTVERSION=	1.2.1
+PORTVERSION=	1.1.4
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP \
-		http://www.turbogears.org/2.0/downloads/2.0.1/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python template plugin for TurboGears that supports json
 
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}simplejson>=1.9.1:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}prioritized_methods>=0.2.1:${PORTSDIR}/devel/py-prioritized_methods
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
+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}DecoratorTools>=1.7:${PORTSDIR}/devel/py-decoratortools
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=	easy_install
 
diff --git a/devel/py-turbojson/distinfo b/devel/py-turbojson/distinfo
index 0a409179b47a..794a8640ad73 100644
--- a/devel/py-turbojson/distinfo
+++ b/devel/py-turbojson/distinfo
@@ -1,3 +1,3 @@
-MD5 (TurboJson-1.2.1.tar.gz) = 57fbcd25c831c53ae9d4c595233925eb
-SHA256 (TurboJson-1.2.1.tar.gz) = ac704107df0f552455303b98ed7046eae6945104aaeadd18393b2937c64ca7e9
-SIZE (TurboJson-1.2.1.tar.gz) = 5847
+MD5 (TurboJson-1.1.4.tar.gz) = f05f01b84b7d8eaa5f161b0af123bfb7
+SHA256 (TurboJson-1.1.4.tar.gz) = 3b6128b7266eddb8450abb6a974c8291cc70ad37164a05fed62f0531678ade2b
+SIZE (TurboJson-1.1.4.tar.gz) = 8500
diff --git a/devel/py-turbojson/pkg-plist b/devel/py-turbojson/pkg-plist
index ddf68a1c022f..0849e8e62d79 100644
--- a/devel/py-turbojson/pkg-plist
+++ b/devel/py-turbojson/pkg-plist
@@ -1 +1,39 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+@comment $FreeBSD$
+%%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/prioritized_methods.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/prioritized_methods.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/prioritized_methods.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_prioritized_methods.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/tests/test_prioritized_methods.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/tests/test_prioritized_methods.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
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
diff --git a/devel/py-turbojson11/Makefile b/devel/py-turbojson11/Makefile
index dced0d06e856..2d8ed41af8a1 100644
--- a/devel/py-turbojson11/Makefile
+++ b/devel/py-turbojson11/Makefile
@@ -6,20 +6,18 @@
 #
 
 PORTNAME=	TurboJson
-PORTVERSION=	1.2.1
+PORTVERSION=	1.1.4
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP \
-		http://www.turbogears.org/2.0/downloads/2.0.1/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Python template plugin for TurboGears that supports json
 
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}simplejson>=1.9.1:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}prioritized_methods>=0.2.1:${PORTSDIR}/devel/py-prioritized_methods
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
+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}DecoratorTools>=1.7:${PORTSDIR}/devel/py-decoratortools
 USE_PYTHON=	2.4+
 USE_PYDISTUTILS=	easy_install
 
diff --git a/devel/py-turbojson11/distinfo b/devel/py-turbojson11/distinfo
index 0a409179b47a..794a8640ad73 100644
--- a/devel/py-turbojson11/distinfo
+++ b/devel/py-turbojson11/distinfo
@@ -1,3 +1,3 @@
-MD5 (TurboJson-1.2.1.tar.gz) = 57fbcd25c831c53ae9d4c595233925eb
-SHA256 (TurboJson-1.2.1.tar.gz) = ac704107df0f552455303b98ed7046eae6945104aaeadd18393b2937c64ca7e9
-SIZE (TurboJson-1.2.1.tar.gz) = 5847
+MD5 (TurboJson-1.1.4.tar.gz) = f05f01b84b7d8eaa5f161b0af123bfb7
+SHA256 (TurboJson-1.1.4.tar.gz) = 3b6128b7266eddb8450abb6a974c8291cc70ad37164a05fed62f0531678ade2b
+SIZE (TurboJson-1.1.4.tar.gz) = 8500
diff --git a/devel/py-turbojson11/pkg-plist b/devel/py-turbojson11/pkg-plist
index ddf68a1c022f..0849e8e62d79 100644
--- a/devel/py-turbojson11/pkg-plist
+++ b/devel/py-turbojson11/pkg-plist
@@ -1 +1,39 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+@comment $FreeBSD$
+%%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/prioritized_methods.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/prioritized_methods.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/prioritized_methods.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_prioritized_methods.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/tests/test_prioritized_methods.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/turbojson/tests/test_prioritized_methods.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
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%