- Update to 1.8.1.1

- Change MASTER_SITES
- Convert easy_install support to <bsd.python.mk>
- Set USE_PYTHON to 2.4+

PR:		ports/130757
Submitted by:	nivit

3 files changed, 62 insertions, 68 deletions

diff --git a/www/py-scriptaculous/Makefile b/www/py-scriptaculous/Makefile
index 7e02cb90afa2..43773cbb7ebf 100644
--- a/www/py-scriptaculous/Makefile
+++ b/www/py-scriptaculous/Makefile
@@ -6,40 +6,25 @@
 #
 
 PORTNAME=	scriptaculous
-PORTVERSION=	1.6.2
-PORTREVISION=	1
+PORTVERSION=	1.8.1.1
+#PORTREVISION=	0
 CATEGORIES=	www python
-MASTER_SITES=	http://files.turbogears.org/eggs/ \
+MASTER_SITES=	http://static.ossdl.de/tgwidgets/downloads/ \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PYSCRIPTACULOUS_EGG}
-EXTRACT_SUFX=
+DISTNAME=	Scriptaculous-${PORTVERSION}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Scriptaculous packaged as TurboGears widgets
 
-RUN_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
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
-NO_BUILD=	yes
+PYDISTUTILS_PKGNAME=	Scriptaculous
 
 # Use the same version of www/py-turbogears
-USE_PYTHON=	2.4
-
-PLIST_SUB=	EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
-		PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION} \
-		PYSCRIPTACULOUS_EGG=${PYSCRIPTACULOUS_EGG}
-
-EASY_INSTALL_CMD?=	easy_install-${PYTHON_VER}
-EASY_INSTALL_ARGS=	-N
-
-PYSCRIPTACULOUS_EGG=	${PORTNAME:S/^s/S/}-${PORTVERSION}-py${PYTHON_VER}.egg
-
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-
-do-install:
-	@${EASY_INSTALL_CMD} ${EASY_INSTALL_ARGS} ${DISTDIR}/${PYSCRIPTACULOUS_EGG}
+USE_PYTHON=	2.4+
+USE_PYDISTUTILS=	easy_install
+USE_ZIP=	yes
 
 .include <bsd.port.mk>
diff --git a/www/py-scriptaculous/distinfo b/www/py-scriptaculous/distinfo
index d88c8abde8d5..a5911d97429d 100644
--- a/www/py-scriptaculous/distinfo
+++ b/www/py-scriptaculous/distinfo
@@ -1,3 +1,3 @@
-MD5 (Scriptaculous-1.6.2-py2.4.egg) = 085414933f9e51692c5ef07efe8a86f2
-SHA256 (Scriptaculous-1.6.2-py2.4.egg) = 9304d571e6fe606ded21ea77bd333ca9e274aadc6ad24a7415af2b261e9c4dd4
-SIZE (Scriptaculous-1.6.2-py2.4.egg) = 53195
+MD5 (Scriptaculous-1.8.1.1.zip) = ec7273837c1e5ad1e76c61f31006d4f3
+SHA256 (Scriptaculous-1.8.1.1.zip) = 787e9f133947140f3873ef7dc5a0d37075cd4e84698dc1da2c1253a3e189a5bf
+SIZE (Scriptaculous-1.8.1.1.zip) = 77689
diff --git a/www/py-scriptaculous/pkg-plist b/www/py-scriptaculous/pkg-plist
index 5de71d405335..e3a4e61502cf 100644
--- a/www/py-scriptaculous/pkg-plist
+++ b/www/py-scriptaculous/pkg-plist
@@ -1,41 +1,50 @@
 @comment $FreeBSD$
-@unexec %%EASY_INSTALL_CMD%% -q -N -m -S %D/%%PYTHON_SITELIBDIR%% %%PORTNAME%%==%%PORTVERSION%%
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/EGG-INFO/paster_plugins.txt
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/EGG-INFO/sqlobject.txt
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/release.py
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/release.pyc
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/static/javascript/builder.js
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/static/javascript/controls.js
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/static/javascript/dragdrop.js
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/static/javascript/effects.js
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/static/javascript/prototype.js
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/static/javascript/scriptaculous.js
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/static/javascript/slider.js
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/static/javascript/unittest.js
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/templates/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/templates/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/tests/test_controllers.py
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/tests/test_controllers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/tests/test_model.py
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/tests/test_model.pyc
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/widgets.py
-%%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/widgets.pyc
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/templates
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/static/javascript
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous/static
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/scriptaculous
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYSCRIPTACULOUS_EGG%%
-@exec %%EASY_INSTALL_CMD%% -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/paster_plugins.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/sqlobject.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/release.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/release.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/release.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/static/css/autocomplete.css
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/static/javascript/builder.js
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/static/javascript/controls.js
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/static/javascript/dragdrop.js
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/static/javascript/effects.js
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/static/javascript/prototype.js
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/static/javascript/scriptaculous.js
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/static/javascript/slider.js
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/static/javascript/sound.js
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/static/javascript/unittest.js
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/templates/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/templates/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/templates/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/templates/autocomplete.kid
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/tests/test_controllers.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/tests/test_controllers.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/tests/test_controllers.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/tests/test_model.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/tests/test_model.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/tests/test_model.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/widgets.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/widgets.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/widgets.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/tests
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/templates
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/static/javascript
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/static/css
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous/static
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/scriptaculous
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%