ports/104576: Update port: www/plone to 2.1.4

[TAOKA Fumiyoshi]

>Number:         104576
>Category:       ports
>Synopsis:       Update port: www/plone to 2.1.4
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 19 16:30:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     TAOKA Fumiyoshi
>Release:        
>Organization:
>Environment:
>Description:

[1] Update to Plone 2.1.4. 

    http://plone.org/products/plone/releases/2.1.4 said:
	Fourth maintenance release in the Plone 2.1 series.
	This features a number of important security and bug
	fixes, and is a required upgrade for Plone 2.1 users.

[2] Add a dependency on py-imaging, which is now required by
    Plone 2.1.4.

[3] Keep hotfix things in Makefile for the future.
	
>How-To-Repeat:
>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/plone/Makefile,v
retrieving revision 1.20
diff -u -r1.20 Makefile
--- Makefile	10 May 2006 18:50:33 -0000	1.20
+++ Makefile	19 Oct 2006 15:22:18 -0000
@@ -6,21 +6,23 @@
 #
 
 PORTNAME=	plone
-PORTVERSION=	2.1.2
-PORTREVISION=	1
+PORTVERSION=	2.1.4
 CATEGORIES=	www zope
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/plone\/:src/g} \
-		http://plone.org/products/plonehotfix20060410/releases/1.0/:hotfix
-DISTFILES=	Plone-${PORTVERSION}.tar.gz:src ${HOTFIX}.tar.gz:hotfix
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/plone\/:src/g}
+DISTFILES=	Plone-${PORTVERSION}.tar.gz:src
 DIST_SUBDIR=	zope
+#HOTFIX=		PloneHotfix20060410
+#MASTER_SITES+=	http://plone.org/products/plonehotfix20060410/releases/1.0/:hotfix
+#DISTFILES+=	${HOTFIX}.tar.gz:hotfix
 
 MAINTAINER=	filippo.natali at gmail.com
 COMMENT=	A user friendly implementation of the CMF written on top of ZOPE
 
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging
+
 WRKSRC=	${WRKDIR}/Plone-${PORTVERSION}
 USE_ZOPE=	yes
 USE_PYTHON=	yes
-HOTFIX=	PloneHotfix20060410
 PLIST=	${WRKDIR}/pkg-plist
 
 CONFLICTS=	zope-archetypes-[0-9]* \
@@ -63,7 +65,9 @@
 .for m in ${_MODULES}
 	-${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/$m
 .endfor
+.if defined(HOTFIX)
 	-${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKDIR}/${HOTFIX}
+.endif
 
 pre-install:
 	@${RM} -f ${PLIST}
@@ -77,6 +81,7 @@
 			${ECHO_CMD} @dirrm %%ZOPEBASEDIR%%/Products/$${i} >> ${PLIST}; \
 		done; \
 	done
+.if defined(HOTFIX)
 	@cd ${WRKDIR}; \
 	for i in `${FIND} ${HOTFIX} -type f`; do \
 		${ECHO_CMD} %%ZOPEBASEDIR%%/Products/$${i} >> ${PLIST}; \
@@ -84,6 +89,7 @@
 	for i in `${FIND} -d ${HOTFIX} -type d`; do \
 		${ECHO_CMD} @dirrm %%ZOPEBASEDIR%%/Products/$${i} >> ${PLIST}; \
 	done
+.endif
 
 do-install:
 	@${MKDIR} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}
@@ -92,9 +98,11 @@
 	@${FIND} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/$m -type f -print0 \
 		| ${XARGS} -0 -- ${CHMOD} a-w
 .endfor
+.if defined(HOTFIX)
 	@${CP} -R ${WRKDIR}/${HOTFIX} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}
 	@${FIND} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/${HOTFIX} -type f -print0 \
 		| ${XARGS} -0 -- ${CHMOD} a-w
+.endif
 
 post-install:
 .if !defined(BATCH)
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/www/plone/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo	18 Apr 2006 13:48:23 -0000	1.11
+++ distinfo	19 Oct 2006 15:06:44 -0000
@@ -1,6 +1,3 @@
-MD5 (zope/Plone-2.1.2.tar.gz) = 863311e29550f9b4bf6c2502fdbed1fa
-SHA256 (zope/Plone-2.1.2.tar.gz) = e9c0b53d887b53310daab656ef83b0abecdde39b679806a0f04f3cda222fbac2
-SIZE (zope/Plone-2.1.2.tar.gz) = 7126486
-MD5 (zope/PloneHotfix20060410.tar.gz) = fecdb36acae4751f6a8975c2068247c3
-SHA256 (zope/PloneHotfix20060410.tar.gz) = f1d86b78c39392d4b9e81f9a3e854cccdcc1bcd8bf51fb6468cc1c8c9a4d30f1
-SIZE (zope/PloneHotfix20060410.tar.gz) = 2972
+MD5 (zope/Plone-2.1.4.tar.gz) = 0b938c37102137daa086b51f140e4322
+SHA256 (zope/Plone-2.1.4.tar.gz) = 9409dc2d6fe13eb05aa991420173e2be632eb5862f98312e7449efe74dec9764
+SIZE (zope/Plone-2.1.4.tar.gz) = 7549024
>Release-Note:
>Audit-Trail:
>Unformatted: