3 files changed, 58 insertions, 60 deletions

diff --git a/www/py-Lightbox/Makefile b/www/py-Lightbox/Makefile
index 5d655fcfb0a5..7da053fe9d07 100644
--- a/www/py-Lightbox/Makefile
+++ b/www/py-Lightbox/Makefile
@@ -6,35 +6,21 @@
 #
 
 PORTNAME=	Lightbox
-PORTVERSION=	2.0.p1
-PORTREVISION=	1
+PORTVERSION=	2.1
+#PORTREVISION=	0
 CATEGORIES=	www python
-MASTER_SITES=	http://files.turbogears.org/eggs/ \
+MASTER_SITES=	CHEESESHOP \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/_p/}-py${PYTHON_VER}.egg
-EXTRACT_SUFX=
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Lightbox photo display widget for TurboGears
 
-BUILD_DEPENDS=	${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools \
-		${PYTHON_PKGNAMEPREFIX}TurboGears>=1.0.1:${PORTSDIR}/www/py-turbogears
-RUN_DEPENDS+=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}TurboGears>=1.0:${PORTSDIR}/www/py-turbogears
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scriptaculous>=1.8.1:${PORTSDIR}/www/py-scriptaculous
 
-USE_PYTHON=	2.4
-
-PLIST_SUB=	EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
-		PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION:S/.p/_p/} \
-		PYLIGHTBOX_EGG=${PYLIGHTBOX_EGG}
-
-EASY_INSTALL_CMD?=	easy_install-${PYTHON_VER}
-PYLIGHTBOX_EGG=	${DISTNAME}
-
-do-build:
-	@${DO_NADA}
-
-do-install:
-	@${EASY_INSTALL_CMD} -N ${DISTDIR}/${PYLIGHTBOX_EGG}
+USE_PYTHON=	2.4+
+USE_PYDISTUTILS=	easy_install
+USE_ZIP=	yes
 
 .include <bsd.port.mk>
diff --git a/www/py-Lightbox/distinfo b/www/py-Lightbox/distinfo
index 7c2525c47b02..2861095f1ea6 100644
--- a/www/py-Lightbox/distinfo
+++ b/www/py-Lightbox/distinfo
@@ -1,3 +1,3 @@
-MD5 (Lightbox-2.0_p1-py2.4.egg) = d8bbe54387ffd0a9c6938fc234d97987
-SHA256 (Lightbox-2.0_p1-py2.4.egg) = 48180819ac33bb7f7d868f4d41a47260ee5ec50f7d0016ca13ddb2819ee13bae
-SIZE (Lightbox-2.0_p1-py2.4.egg) = 55535
+MD5 (Lightbox-2.1.zip) = bb7a0a2ad6b71c949f06fb09b3ed2011
+SHA256 (Lightbox-2.1.zip) = e59e80780e5453369cf7edcd422ce2df7e5d1b809097abab2ff55fc86613bbd5
+SIZE (Lightbox-2.1.zip) = 171085
diff --git a/www/py-Lightbox/pkg-plist b/www/py-Lightbox/pkg-plist
index c7298b7d80fc..43778e4de113 100644
--- a/www/py-Lightbox/pkg-plist
+++ b/www/py-Lightbox/pkg-plist
@@ -1,36 +1,48 @@
 @comment $FreeBSD$
-@unexec %%EASY_INSTALL_CMD%% -q -N -m -S %D/%%PYTHON_SITELIBDIR%% %%PORTNAME%%==%%PORTVERSION%%
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/EGG-INFO/paster_plugins.txt
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/EGG-INFO/requires.txt
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/EGG-INFO/sqlobject.txt
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/release.py
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/release.pyc
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/static/css/lightbox.css
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/static/images/blank.gif
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/static/images/close.gif
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/static/images/image-1.jpg
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/static/images/loading.gif
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/static/images/next.gif
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/static/images/prev.gif
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/static/images/thumb-1.jpg
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/static/javascript/lightbox.js
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/templates/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/templates/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/widgets.py
-%%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/widgets.pyc
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/templates
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/static/javascript
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/static/images
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/static/css
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox/static
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/lightbox
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYLIGHTBOX_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/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/release.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/release.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/release.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/css/lightbox.css
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/images/blank.gif
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/images/bullet.gif
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/images/close.gif
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/images/closelabel.gif
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/images/donate-button.gif
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/images/download-icon.gif
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/images/image-1.jpg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/images/image-3.jpg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/images/image-4.jpg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/images/loading.gif
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/images/next.gif
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/images/nextlabel.gif
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/images/prev.gif
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/images/prevlabel.gif
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/images/thumb-1.jpg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/images/thumb-3.jpg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/images/thumb-4.jpg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/javascript/lightbox.js
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/templates/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/templates/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/templates/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/widgets.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/widgets.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/widgets.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/templates
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/javascript
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/images
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static/css
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox/static
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/lightbox
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%