3 files changed, 22 insertions, 45 deletions

diff --git a/www/zope-cmfphoto/Makefile b/www/zope-cmfphoto/Makefile
index 0161d610a466..ce5643c7948e 100644
--- a/www/zope-cmfphoto/Makefile
+++ b/www/zope-cmfphoto/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	cmfphoto
-PORTVERSION=	0.4.r2
+PORTVERSION=	0.4.2
 CATEGORIES=	www zope
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	collective
 PKGNAMEPREFIX=	zope-
-DISTNAME=	CMFPhoto-0.4rc2
+DISTNAME=	CMFPhoto-${PORTVERSION}
 
 MAINTAINER=	kaeru@inigo-tech.com
 COMMENT=	CMFPhoto product for Zope/CMF
@@ -20,18 +20,32 @@ RUN_DEPENDS=	${LOCALBASE}/${SZOPEBASEDIR}/lib/python/Products/CMFDefault/__init_
 		${PYTHON_SITELIBDIR}/PIL/_imaging.so:${PORTSDIR}/graphics/py-imaging
 
 BROKEN=		"Broken dependency"
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2004-04-17
+# Seems to be a problem in bsd.python.mk:
+#   <http://lists.freebsd.org/pipermail/freebsd-python/2004-February/000051.html>
 
 USE_PYTHON=	yes
 USE_ZOPE=	yes
 DIST_SUBDIR=	zope
 
-WRKSRC=		${WRKDIR}/CMFPhoto
+ZOPEPRODUCTNAME=	CMFPhoto
+
+PLIST=		${WRKDIR}/pkg-plist
+WRKSRC=		${WRKDIR}/${ZOPEPRODUCTNAME}
 
 do-build:
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/Extensions/
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${WRKSRC}/Extensions
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${WRKSRC}
+ 
+pre-install:
+	@${RM} -f ${PLIST}
+	@${TOUCH} ${PLIST}
+	@cd ${WRKDIR} && \
+	for f in `${FIND} ${ZOPEPRODUCTNAME} -type f`; do \
+		${ECHO_CMD} %%ZOPEPRODUCTDIR%%/$${f} >> ${PLIST}; \
+	done; \
+	for d in `${FIND} -d ${ZOPEPRODUCTNAME} -type d`; do \
+		${ECHO_CMD} @dirrm %%ZOPEPRODUCTDIR%%/$${d} >> ${PLIST}; \
+	done; \
 
 do-install:
 	@${MKDIR} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/
diff --git a/www/zope-cmfphoto/distinfo b/www/zope-cmfphoto/distinfo
index 47beea108431..248bc79be02e 100644
--- a/www/zope-cmfphoto/distinfo
+++ b/www/zope-cmfphoto/distinfo
@@ -1 +1,2 @@
-MD5 (zope/CMFPhoto-0.4rc2.tar.gz) = b175ab4acf27fde98c61c03698ed1cbf
+MD5 (zope/CMFPhoto-0.4.2.tar.gz) = a2a11687dd5cdcf294bdfe173f598293
+SIZE (zope/CMFPhoto-0.4.2.tar.gz) = 32543
diff --git a/www/zope-cmfphoto/pkg-plist b/www/zope-cmfphoto/pkg-plist
deleted file mode 100644
index 45b042edd855..000000000000
--- a/www/zope-cmfphoto/pkg-plist
+++ /dev/null
@@ -1,38 +0,0 @@
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/EXIF.py
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/EXIF.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/Extensions/Install.py
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/Extensions/Install.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/Extensions/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/Extensions/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/Extensions/importPhotos.py
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/Extensions/importPhotos.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/Extensions/purgePhotoCache.py
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/Extensions/purgePhotoCache.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/HISTORY.txt
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/LICENSE.GPL
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/LICENSE.txt
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/Photo.py
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/Photo.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/README.txt
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/__init__.py
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/__init__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/__pkginfo__.py
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/__pkginfo__.pyc
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/i18n/cmfphoto-da.po
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/i18n/cmfphoto-de.po
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/i18n/cmfphoto-es.po
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/i18n/cmfphoto-ja.po
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/i18n/cmfphoto-nl.po
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/i18n/cmfphoto-sv.po
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/i18n/cmfphoto.pot
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/i18n/plone-cmfphoto-sv.po
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/refresh.txt
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/skins/photo_content/photo_display_sizes.py
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/skins/photo_content/photo_macros.pt
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/skins/photo_content/photo_view.pt
-%%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/version.txt
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/Extensions
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/i18n
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/skins/photo_content
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto/skins
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/CMFPhoto