- Update to 1.2.2

- Convert easy_install support to <bsd.python.mk>
- Update WWW url in pkg-descr

PR:		ports/130784
Submitted by:	nivit

4 files changed, 66 insertions, 79 deletions

diff --git a/www/py-tgwebservices/Makefile b/www/py-tgwebservices/Makefile
index f4622dd74e21..86148676908e 100644
--- a/www/py-tgwebservices/Makefile
+++ b/www/py-tgwebservices/Makefile
@@ -6,34 +6,23 @@
 #
 
 PORTNAME=	tgwebservices
-PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTVERSION=	1.2.2
+#PORTREVISION=	0
 CATEGORIES=	www python
-MASTER_SITES=	http://cheeseshop.python.org/packages/source/T/${PYTGWEBSERVICES}/ \
+MASTER_SITES=	CHEESESHOP \
 		LOCAL/nivit/${PYTGWEBSERVICES}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PYTGWEBSERVICES}-${PORTVERSION}
+DISTNAME=	TGWebServices-${PORTVERSION}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Multiprotocol Web Services for TurboGears
 
-BUILD_DEPENDS=	${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools \
-		${PYTHON_PKGNAMEPREFIX}TurboGears>=1.0.1:${PORTSDIR}/www/py-turbogears \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}TurboGears>=1.0.1:${PORTSDIR}/www/py-turbogears \
 		${PYTHON_PKGNAMEPREFIX}Genshi>=0.3.6:${PORTSDIR}/textproc/py-genshi
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PYTHON=	2.4+
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_NOEGGINFO=	yes # XXX convert easy_install support to bsd.python.mk's
+USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	TGWebServices
 
-PLIST_SUB=	EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
-		PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} \
-		PYTGWEBSERVICES_EGG=${PYTGWEBSERVICES_EGG}
-
-EASY_INSTALL_CMD?=	easy_install-${PYTHON_VER}
-
-PYTGWEBSERVICES=	TGWebServices
-PYTGWEBSERVICES_EGG=	${PYTGWEBSERVICES}-${PORTVERSION}-py${PYTHON_VER}.egg
-
 .include <bsd.port.mk>
diff --git a/www/py-tgwebservices/distinfo b/www/py-tgwebservices/distinfo
index 920cc3624a16..763d7e3ac00d 100644
--- a/www/py-tgwebservices/distinfo
+++ b/www/py-tgwebservices/distinfo
@@ -1,3 +1,3 @@
-MD5 (TGWebServices-1.1.2.tar.gz) = 0a60e665f0823388676862d1dd2d1946
-SHA256 (TGWebServices-1.1.2.tar.gz) = 45e76d8ad416d5e1db74d26c240833de4c922320f7d2cf4cc475ec27d75983ad
-SIZE (TGWebServices-1.1.2.tar.gz) = 21374
+MD5 (TGWebServices-1.2.2.tar.gz) = 9e92db6bff99e961218aba6de94dff87
+SHA256 (TGWebServices-1.2.2.tar.gz) = 5ee7323212b738802e8b1e07e9b9bf934ac9048ad734c05513224a3e8f89ad7a
+SIZE (TGWebServices-1.2.2.tar.gz) = 21037
diff --git a/www/py-tgwebservices/pkg-descr b/www/py-tgwebservices/pkg-descr
index 23e60f56562f..73d568488f54 100644
--- a/www/py-tgwebservices/pkg-descr
+++ b/www/py-tgwebservices/pkg-descr
@@ -7,4 +7,4 @@ generates enough type information for statically typed languages
 (Java and C#, for example) to generate good client code on their end.
 
 Author:	Kevin Dangoor
-WWW:	http://tgwebservices.python-hosting.com/
+WWW:	http://code.google.com/p/tgws/
diff --git a/www/py-tgwebservices/pkg-plist b/www/py-tgwebservices/pkg-plist
index 40ea167f81f1..69942a03c076 100644
--- a/www/py-tgwebservices/pkg-plist
+++ b/www/py-tgwebservices/pkg-plist
@@ -1,59 +1,57 @@
 @comment $FreeBSD$
-@unexec %%EASY_INSTALL_CMD%% -q -N -m -S %D/%%PYTHON_SITELIBDIR%% %%PORTNAME%%==%%PORTVERSION%%
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/controllers.py
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/controllers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/controllers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/iconv.py
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/iconv.pyc
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/iconv.pyo
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/release.py
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/release.pyc
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/release.pyo
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/runtime.py
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/runtime.pyc
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/runtime.pyo
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/soap.py
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/soap.pyc
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/soap.pyo
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/templates/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/templates/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/templates/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/templates/soap.html
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/templates/wsdl.html
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/tests/fixtures.py
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/tests/fixtures.pyc
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/tests/fixtures.pyo
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/tests/test_controllers.py
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/tests/test_controllers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/tests/test_controllers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/tests/test_json.py
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/tests/test_json.pyc
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/tests/test_json.pyo
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/tests/test_soap.py
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/tests/test_soap.pyc
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/tests/test_soap.pyo
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/tests/test_xml.py
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/tests/test_xml.pyc
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/tests/test_xml.pyo
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/xml.py
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/xml.pyc
-%%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/xml.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices/templates
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/tgwebservices
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYTGWEBSERVICES_EGG%%
-@exec %%EASY_INSTALL_CMD%% -q -N -S %D/%%PYTHON_SITELIBDIR%% %%PORTNAME%%==%%PORTVERSION%%
+%%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%%/tgwebservices/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/controllers.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/controllers.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/controllers.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/iconv.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/iconv.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/iconv.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/release.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/release.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/release.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/runtime.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/runtime.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/runtime.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/soap.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/soap.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/soap.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/templates/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/templates/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/templates/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/templates/soap.html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/templates/wsdl.html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/tests/fixtures.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/tests/fixtures.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/tests/fixtures.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/tests/test_controllers.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/tests/test_controllers.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/tests/test_controllers.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/tests/test_json.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/tests/test_json.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/tests/test_json.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/tests/test_soap.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/tests/test_soap.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/tests/test_soap.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/tests/test_xml.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/tests/test_xml.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/tests/test_xml.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/xml_.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/xml_.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/xml_.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/tests
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices/templates
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tgwebservices
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%