Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Sep 2013 13:42:49 +0000 (UTC)
From:      Ruslan Makhmatkhanov <rm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r328002 - in head: . Mk Mk/Uses databases/py-psycopg devel/py-Products.ATContentTypes devel/py-Products.Archetypes devel/py-Products.CMFCore devel/py-Products.CMFDiffTool devel/py-Produ...
Message-ID:  <201309231342.r8NDgnS3025599@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rm
Date: Mon Sep 23 13:42:48 2013
New Revision: 328002
URL: http://svnweb.freebsd.org/changeset/ports/328002

Log:
  - add new USES target: zope, and convert the tree to it
  - old USE_ZOPE knob support was removed from bsd.python.mk
  - update CHANGES and bsd.sanity.mk accordingly
  - add ZOPE options knob and use it in lang/py-mx-base
  
  The work is done by Marcus von Appen, but any problems are mine.
  
  Submitted by:	mva (python ML)

Added:
  head/Mk/Uses/zope.mk   (contents, props changed)
Modified:
  head/CHANGES
  head/KNOBS
  head/Mk/bsd.python.mk
  head/Mk/bsd.sanity.mk
  head/databases/py-psycopg/Makefile
  head/databases/py-psycopg/pkg-descr
  head/devel/py-Products.ATContentTypes/Makefile
  head/devel/py-Products.Archetypes/Makefile
  head/devel/py-Products.CMFCore/Makefile
  head/devel/py-Products.CMFDiffTool/Makefile
  head/devel/py-Products.CMFDynamicViewFTI/Makefile
  head/devel/py-Products.CMFEditions/Makefile
  head/devel/py-Products.CMFUid/Makefile
  head/devel/py-Products.ExtendedPathIndex/Makefile
  head/devel/py-Products.GenericSetup/Makefile
  head/devel/py-Products.LDAPUserFolder/Makefile
  head/devel/py-Products.PasswordResetTool/Makefile
  head/devel/py-Products.PloneTestCase/Makefile
  head/devel/py-Products.PluginRegistry/Makefile
  head/devel/py-Products.ResourceRegistries/Makefile
  head/devel/py-Products.ZopeVersionControl/Makefile
  head/devel/py-five.customerize/Makefile
  head/devel/py-five.globalrequest/Makefile
  head/devel/py-five.localsitemanager/Makefile
  head/devel/py-zope.dublincore/Makefile
  head/lang/py-mx-base/Makefile
  head/security/py-Products.PlonePAS/Makefile
  head/security/py-Products.PluggableAuthService/Makefile
  head/security/py-plone.app.openid/Makefile
  head/security/py-plone.openid/Makefile
  head/security/py-plone.protect/Makefile
  head/security/py-plone.session/Makefile
  head/www/py-plone.app.caching/Makefile
  head/www/py-plone.app.collection/Makefile
  head/www/py-plone.app.content/Makefile
  head/www/py-plone.app.contentmenu/Makefile
  head/www/py-plone.app.contentrules/Makefile
  head/www/py-plone.app.controlpanel/Makefile
  head/www/py-plone.app.customerize/Makefile
  head/www/py-plone.app.dexterity/Makefile
  head/www/py-plone.app.form/Makefile
  head/www/py-plone.app.iterate/Makefile
  head/www/py-plone.app.jquerytools/Makefile
  head/www/py-plone.app.layout/Makefile
  head/www/py-plone.app.portlets/Makefile
  head/www/py-plone.app.registry/Makefile
  head/www/py-plone.app.testing/Makefile
  head/www/py-plone.app.upgrade/Makefile
  head/www/py-plone.app.users/Makefile
  head/www/py-plone.app.viewletmanager/Makefile
  head/www/py-plone.app.vocabularies/Makefile
  head/www/py-plone.app.workflow/Makefile
  head/www/py-plone.app.z3cform/Makefile
  head/www/py-plone.browserlayer/Makefile
  head/www/py-plone.cachepurging/Makefile
  head/www/py-plone.caching/Makefile
  head/www/py-plone.dexterity/Makefile
  head/www/py-plone.locking/Makefile
  head/www/py-plone.portlet.static/Makefile
  head/www/py-plone.resource/Makefile
  head/www/py-plone.theme/Makefile
  head/www/py-plone.z3cform/Makefile

Modified: head/CHANGES
==============================================================================
--- head/CHANGES	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/CHANGES	Mon Sep 23 13:42:48 2013	(r328002)
@@ -39,6 +39,14 @@ AUTHOT: bapt@FreeBSD.org
   really important to double check the pkg-plist to make sure all the files
   the maintainer want to package are in! make makeplist can help in that area.
 
+20130923:
+AUTHOR: mva@FreeBSD.org
+
+  * New USES: zope
+
+  This replaces the previous USE_ZOPE knob. All other zope related knobs
+  for port Makefiles still exist. See Mk/Uses/zope.mk for details.
+
 20130920:
 AUTHOR: bdrewery@FreeBSD.org
 

Modified: head/KNOBS
==============================================================================
--- head/KNOBS	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/KNOBS	Mon Sep 23 13:42:48 2013	(r328002)
@@ -255,4 +255,5 @@ XVID			XVID multimedia MPEG4 codec suppo
 YAHOO			Adds Yahoo! Messenger Protocol support
 ZIP			Adds ZIP support
 ZLIB			Adds Zlib support
+ZOPE			Zope support
 ZVBI			Adds support to access raw VBI capture devices

Added: head/Mk/Uses/zope.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/Mk/Uses/zope.mk	Mon Sep 23 13:42:48 2013	(r328002)
@@ -0,0 +1,94 @@
+# $FreeBSD$
+#
+# Provide support for Zope-related ports
+#
+# MAINTAINER: zope@FreeBSD.org
+#
+# SZOPEBASEDIR		- relative base directory of zope server
+# ZOPEBASEDIR		- absolute base directory of zope that is
+#					  ${LOCALBASE}/${SZOPEBASEDIR} by default,
+# ZOPEPRODUCTDIR	- directory, where products for zope can be found
+#
+# ZOPE_VERSION		- Version of zope that will be used in the port. Set this
+#					  in your /etc/make.conf in case you want to use a
+#					  specific version of zope.
+#
+.if !defined(_INCLUDE_USES_ZOPE_MK)
+_INCLUDE_USES_ZOPE_MK=	yes
+
+_ZOPE_PORTBRANCH=	2.13
+_ZOPE_ALLBRANCHES=	2.13
+
+_PYTHON_VER_REQUIRED=	python2.7
+
+.if defined(ZOPE_VERSION)
+_ZOPE_VERSION:=	${ZOPE_VERSION}
+.else
+_ZOPE_VERSION:=	${_ZOPE_PORTBRANCH}
+.endif
+
+# Validate Zope version whether it meets USE_ZOPE version restriction.
+_ZOPE_VERSION_CHECK:=		${USE_ZOPE:C/^([1-9]\.[0-9]*)$/\1-\1/}
+_ZOPE_VERSION_MINIMUM_TMP:=	${_ZOPE_VERSION_CHECK:C/([1-9]\.[0-9]*)[-+].*/\1/}
+_ZOPE_VERSION_MINIMUM:=		${_ZOPE_VERSION_MINIMUM_TMP:M[1-9].[0-9]}
+_ZOPE_VERSION_MAXIMUM_TMP:=	${_ZOPE_VERSION_CHECK:C/.*-([1-9]\.[0-9]*)/\1/}
+_ZOPE_VERSION_MAXIMUM:=		${_ZOPE_VERSION_MAXIMUM_TMP:M[1-9].[0-9]}
+
+.if !empty(_ZOPE_VERSION_MINIMUM) && ( \
+		${_ZOPE_VERSION} < ${_ZOPE_VERSION_MINIMUM})
+_ZOPE_VERSION_NONSUPPORTED=	${_ZOPE_VERSION_MINIMUM} at least
+.elif !empty(_ZOPE_VERSION_MAXIMUM) && ( \
+		${_ZOPE_VERSION} > ${_ZOPE_VERSION_MAXIMUM})
+_ZOPE_VERSION_NONSUPPORTED=	${_ZOPE_VERSION_MAXIMUM} at most
+.endif
+
+# If we have an unsupported version of Zope, try another.
+.if defined(_ZOPE_VERSION_NONSUPPORTED)
+.if defined(ZOPE_VERSION)
+IGNORE=			needs Zope ${_ZOPE_VERSION_NONSUPPORTED}.\
+				But you specified ${_ZOPE_VERSION}
+.else
+.undef _ZOPE_VERSION
+.for ver in ${_ZOPE_ALLBRANCHES}
+__VER=		${ver}
+.if !defined(_ZOPE_VERSION) && \
+	!(!empty(_ZOPE_VERSION_MINIMUM) && ( \
+		${__VER} < ${_ZOPE_VERSION_MINIMUM})) && \
+	!(!empty(_ZOPE_VERSION_MAXIMUM) && ( \
+		${__VER} > ${_ZOPE_VERSION_MAXIMUM}))
+_ZOPE_VERSION=	${ver}
+.endif
+.endfor
+.if !defined(_ZOPE_VERSION)
+IGNORE=			needs an unsupported version of Zope
+_ZOPE_VERSION=	${_ZOPE_PORTBRANCH} # just to avoid version sanity checking.
+.endif
+.endif # defined(ZOPE_VERSION)
+.endif # defined(_ZOPE_VERSION_NONSUPPORTED)
+
+ZOPE_VERSION?=	${_ZOPE_VERSION}
+
+.if !defined(PYTHON_VERSION)
+PYTHON_VERSION=	${_PYTHON_VER_REQUIRED}
+.elif ${PYTHON_VERSION} != ${_PYTHON_VER_REQUIRED}
+IGNORE+=	Zope requires Python ${_PYTHON_VER_REQUIRED}.\
+			But you or a port dependency specified ${PYTHON_VERSION}
+.endif # !defined(PYTHON_VERSION)
+
+# Zope-related variables
+.if ${ZOPE_VERSION} == ${_ZOPE_PORTBRANCH}
+RUN_DEPENDS+=	zope213>0:${PORTSDIR}/www/zope213
+.else
+check-makevars::
+	@${ECHO} "Makefile error: bad value for ZOPE_VERSION: ${ZOPE_VERSION}."
+	@${ECHO} "Legal values are: ${_ZOPE_PORTBRANCH} (default)"
+	@${FALSE}
+.endif
+ZOPEBASEDIR?=			${PREFIX}/${SZOPEBASEDIR}
+ZOPEPRODUCTDIR?=		Products
+
+# Zope specific substitutions
+PLIST_SUB+=		ZOPEBASEDIR=${SZOPEBASEDIR} \
+				ZOPEPRODUCTDIR=${SZOPEBASEDIR}/${ZOPEPRODUCTDIR}
+
+.endif # !defined(_INCLUDE_USES_ZOPE_MK)

Modified: head/Mk/bsd.python.mk
==============================================================================
--- head/Mk/bsd.python.mk	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/Mk/bsd.python.mk	Mon Sep 23 13:42:48 2013	(r328002)
@@ -210,76 +210,9 @@ Python_Include_MAINTAINER=	python@FreeBS
 #
 # USE_TWISTED_RUN	- Same as USE_TWISTED but add only run dependency.
 #
-# USE_ZOPE			- Use Zope - an object-based web application platform, this
-#					  also sets up:
-# SZOPEBASEDIR		- relative base directory of zope server
-# ZOPEBASEDIR		- absolute base directory of zope that is
-#					  ${LOCALBASE}/${SZOPEBASEDIR} by default,
-# ZOPEPRODUCTDIR	- directory, where products for zope can be found
-#
-# ZOPE_VERSION		- Version of zope that will be used in the port. Set this
-#					  in your /etc/make.conf in case you want to use a
-#					  specific version of zope.
-#
 
 _PYTHON_PORTBRANCH=		2.7
 _PYTHON_ALLBRANCHES=	2.7 2.6 3.3 3.2 3.1	# preferred first
-_ZOPE_PORTBRANCH=		2.13
-_ZOPE_ALLBRANCHES=		2.13
-
-
-# Determine version number of Zope to use
-.if defined(USE_ZOPE)
-.if defined(ZOPE_VERSION)
-_ZOPE_VERSION:=			${ZOPE_VERSION}
-.else
-_ZOPE_VERSION:=			${_ZOPE_PORTBRANCH}
-.endif
-
-# Validate Zope version whether it meets USE_ZOPE version restriction.
-_ZOPE_VERSION_CHECK:=		${USE_ZOPE:C/^([1-9]\.[0-9]*)$/\1-\1/}
-_ZOPE_VERSION_MINIMUM_TMP:=	${_ZOPE_VERSION_CHECK:C/([1-9]\.[0-9]*)[-+].*/\1/}
-_ZOPE_VERSION_MINIMUM:=		${_ZOPE_VERSION_MINIMUM_TMP:M[1-9].[0-9]}
-_ZOPE_VERSION_MAXIMUM_TMP:=	${_ZOPE_VERSION_CHECK:C/.*-([1-9]\.[0-9]*)/\1/}
-_ZOPE_VERSION_MAXIMUM:=		${_ZOPE_VERSION_MAXIMUM_TMP:M[1-9].[0-9]}
-
-.if !empty(_ZOPE_VERSION_MINIMUM) && ( \
-		${_ZOPE_VERSION} < ${_ZOPE_VERSION_MINIMUM})
-_ZOPE_VERSION_NONSUPPORTED=	${_ZOPE_VERSION_MINIMUM} at least
-.elif !empty(_ZOPE_VERSION_MAXIMUM) && ( \
-		${_ZOPE_VERSION} > ${_ZOPE_VERSION_MAXIMUM})
-_ZOPE_VERSION_NONSUPPORTED=	${_ZOPE_VERSION_MAXIMUM} at most
-.endif
-
-# If we have an unsupported version of Zope, try another.
-.if defined(_ZOPE_VERSION_NONSUPPORTED)
-.if defined(ZOPE_VERSION)
-IGNORE=				needs Zope ${_ZOPE_VERSION_NONSUPPORTED}.\
-					But you specified ${_ZOPE_VERSION}
-.else
-.undef _ZOPE_VERSION
-.for ver in ${_ZOPE_ALLBRANCHES}
-__VER=		${ver}
-.if !defined(_ZOPE_VERSION) && \
-	!(!empty(_ZOPE_VERSION_MINIMUM) && ( \
-		${__VER} < ${_ZOPE_VERSION_MINIMUM})) && \
-	!(!empty(_ZOPE_VERSION_MAXIMUM) && ( \
-		${__VER} > ${_ZOPE_VERSION_MAXIMUM}))
-_ZOPE_VERSION=	${ver}
-.endif
-.endfor
-.if !defined(_ZOPE_VERSION)
-IGNORE=				needs an unsupported version of Zope
-_ZOPE_VERSION=	${_ZOPE_PORTBRANCH} # just to avoid version sanity checking.
-.endif
-.endif	# defined(ZOPE_VERSION)
-.endif	# defined(_ZOPE_VERSION_NONSUPPORTED)
-
-ZOPE_VERSION?=	${_ZOPE_VERSION}
-
-PYTHON_VERSION=	python2.7
-.endif	# defined(USE_ZOPE)
-
 
 # Determine version number of Python to use
 .if !defined(PYTHON_DEFAULT_VERSION)
@@ -555,20 +488,6 @@ PLIST_FILES+=	${PYDISTUTILS_EGGINFODIR:S
 # Fix for programs that build python from a GNU auto* environment
 CONFIGURE_ENV+=	PYTHON="${PYTHON_CMD}"
 
-# Zope-related variables
-.if defined(USE_ZOPE)
-.if ${ZOPE_VERSION} == "2.13"
-ZOPE_DEPENDS=	zope213>0:${PORTSDIR}/www/zope213
-.else
-check-makevars::
-	@${ECHO} "Makefile error: bad value for ZOPE_VERSION: ${ZOPE_VERSION}."
-	@${ECHO} "Legal values are: 2.13 (default)"
-	@${FALSE}
-.endif
-ZOPEBASEDIR?=			${PREFIX}/${SZOPEBASEDIR}
-ZOPEPRODUCTDIR?=		Products
-.endif
-
 # Python 3rd-party modules
 PYGAME=			${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
 PYNUMERIC=		${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
@@ -589,10 +508,6 @@ RUN_DEPENDS+=	${PYTHON_CMD}:${PYTHON_POR
 .endif
 .endif		# ${PYTHON_NO_DEPENDS} == "NO"
 
-.if defined(USE_ZOPE)
-RUN_DEPENDS+=	${ZOPE_DEPENDS}
-.endif
-
 # set $PREFIX as Python's one
 .if defined(USE_PYTHON_PREFIX)
 PREFIX=			${PYTHONBASE}
@@ -607,12 +522,6 @@ PLIST_SUB+=		PYTHON_INCLUDEDIR=${PYTHONP
 				PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} \
 				PYTHON_VERSION=${PYTHON_VERSION}
 
-# Zope specific substitutions
-.if defined(USE_ZOPE)
-PLIST_SUB+=		ZOPEBASEDIR=${SZOPEBASEDIR} \
-				ZOPEPRODUCTDIR=${SZOPEBASEDIR}/${ZOPEPRODUCTDIR}
-.endif
-
 # Twisted specific routines
 .if defined(USE_TWISTED) || defined(USE_TWISTED_BUILD) || defined(USE_TWISTED_RUN)
 

Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/Mk/bsd.sanity.mk	Mon Sep 23 13:42:48 2013	(r328002)
@@ -79,6 +79,10 @@ DEV_ERROR+=	"USE_GETTEXT is unsupported,
 DEV_ERROR+=	"USE_GNOME=pkgconfig is unsupported, please use USES=pkgconfig"
 .endif
 
+.if defined(USE_ZOPE) && ${USE_ZOPE} == yes
+DEV_ERROR+=	"USE_ZOPE=yes is unsupported, please use USES=zope instead"
+.endif
+
 .if defined(USE_GNOME) && ${USE_GNOME:Mgnomehack}
 DEV_WARNING+=	"USE_GNOME=gnomehack is deprecated, please use USES=pathfix"
 .endif

Modified: head/databases/py-psycopg/Makefile
==============================================================================
--- head/databases/py-psycopg/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/databases/py-psycopg/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -10,13 +10,13 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	psycopg-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The high performance Python adapter for PostgreSQL
+COMMENT=	High performance Python adapter for PostgreSQL
 
 RUN_DEPENDS=	${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
 BUILD_DEPENDS=	${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
 
 USE_PGSQL=	yes
-USE_GMAKE=	yes
+USES=		gmake
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 
@@ -29,7 +29,7 @@ CONFIGURE_ARGS=	--with-python=${PYTHON_C
 		--with-mxdatetime-includes=${DATETIME_INC}
 
 .if defined(WITH_ZOPE)
-USE_ZOPE=	yes
+USES+=		zope
 PLIST_SUB+=	ZOPE=""
 .else
 PLIST_SUB+=	ZOPE="@comment "

Modified: head/databases/py-psycopg/pkg-descr
==============================================================================
--- head/databases/py-psycopg/pkg-descr	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/databases/py-psycopg/pkg-descr	Mon Sep 23 13:42:48 2013	(r328002)
@@ -13,4 +13,4 @@ from the pool is used. That makes psycop
 applications that create a servicing thread every time a client request
 arrives.
 
-WWW: http://initd.org/software/psycopg
+WWW: http://initd.org/software/psycopg/

Modified: head/devel/py-Products.ATContentTypes/Makefile
==============================================================================
--- head/devel/py-Products.ATContentTypes/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/devel/py-Products.ATContentTypes/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -41,7 +41,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/devel/py-Products.Archetypes/Makefile
==============================================================================
--- head/devel/py-Products.Archetypes/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/devel/py-Products.Archetypes/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -52,7 +52,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/devel/py-Products.CMFCore/Makefile
==============================================================================
--- head/devel/py-Products.CMFCore/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/devel/py-Products.CMFCore/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five
 DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
-#USE_ZOPE=	yes # cyclic dependency
+#USES=		zope # cyclic dependency
 
 NO_STAGE=	yes
 

Modified: head/devel/py-Products.CMFDiffTool/Makefile
==============================================================================
--- head/devel/py-Products.CMFDiffTool/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/devel/py-Products.CMFDiffTool/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -20,7 +20,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-#USE_ZOPE=	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/devel/py-Products.CMFDynamicViewFTI/Makefile
==============================================================================
--- head/devel/py-Products.CMFDynamicViewFTI/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/devel/py-Products.CMFDynamicViewFTI/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -23,7 +23,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-#USE_ZOPE=	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/devel/py-Products.CMFEditions/Makefile
==============================================================================
--- head/devel/py-Products.CMFEditions/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/devel/py-Products.CMFEditions/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -29,7 +29,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/devel/py-Products.CMFUid/Makefile
==============================================================================
--- head/devel/py-Products.CMFUid/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/devel/py-Products.CMFUid/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Prod
 DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
-#USE_ZOPE=	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/devel/py-Products.ExtendedPathIndex/Makefile
==============================================================================
--- head/devel/py-Products.ExtendedPathIndex/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/devel/py-Products.ExtendedPathIndex/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -19,7 +19,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/devel/py-Products.GenericSetup/Makefile
==============================================================================
--- head/devel/py-Products.GenericSetup/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/devel/py-Products.GenericSetup/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}five
 DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/devel/py-Products.LDAPUserFolder/Makefile
==============================================================================
--- head/devel/py-Products.LDAPUserFolder/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/devel/py-Products.LDAPUserFolder/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -24,7 +24,7 @@ OPTIONS_DEFAULT=	POSIXGROUP_PATCH
 DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
-#USE_ZOPE=	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/devel/py-Products.PasswordResetTool/Makefile
==============================================================================
--- head/devel/py-Products.PasswordResetTool/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/devel/py-Products.PasswordResetTool/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -24,7 +24,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/devel/py-Products.PloneTestCase/Makefile
==============================================================================
--- head/devel/py-Products.PloneTestCase/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/devel/py-Products.PloneTestCase/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -25,7 +25,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/devel/py-Products.PluginRegistry/Makefile
==============================================================================
--- head/devel/py-Products.PluginRegistry/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/devel/py-Products.PluginRegistry/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Prod
 DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
-#USE_ZOPE=	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/devel/py-Products.ResourceRegistries/Makefile
==============================================================================
--- head/devel/py-Products.ResourceRegistries/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/devel/py-Products.ResourceRegistries/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -25,7 +25,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/devel/py-Products.ZopeVersionControl/Makefile
==============================================================================
--- head/devel/py-Products.ZopeVersionControl/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/devel/py-Products.ZopeVersionControl/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -21,7 +21,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-#USE_ZOPE=	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/devel/py-five.customerize/Makefile
==============================================================================
--- head/devel/py-five.customerize/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/devel/py-five.customerize/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -31,7 +31,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/devel/py-five.globalrequest/Makefile
==============================================================================
--- head/devel/py-five.globalrequest/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/devel/py-five.globalrequest/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -16,7 +16,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope
 DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
-#USE_ZOPE=	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/devel/py-five.localsitemanager/Makefile
==============================================================================
--- head/devel/py-five.localsitemanager/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/devel/py-five.localsitemanager/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -25,7 +25,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-#USE_ZOPE=	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/devel/py-zope.dublincore/Makefile
==============================================================================
--- head/devel/py-zope.dublincore/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/devel/py-zope.dublincore/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -22,7 +22,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytz
 DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
-#USE_ZOPE=	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/lang/py-mx-base/Makefile
==============================================================================
--- head/lang/py-mx-base/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/lang/py-mx-base/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -29,13 +29,12 @@ ADDITIONAL_DOCS=	mx/DateTime/Doc/mxDateT
 
 OPTIONSFILE=	${PORT_DBDIR}/${PORTNAME}/options
 OPTIONS_DEFINE=	DOCS ZOPE EXAMPLES
-ZOPE_DESC=	Use ZOPE
 
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MZOPE}
-USE_ZOPE=	yes
+USES=		zope
 .endif
 
 post-patch:

Modified: head/security/py-Products.PlonePAS/Makefile
==============================================================================
--- head/security/py-Products.PlonePAS/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/security/py-Products.PlonePAS/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -22,7 +22,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/security/py-Products.PluggableAuthService/Makefile
==============================================================================
--- head/security/py-Products.PluggableAuthService/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/security/py-Products.PluggableAuthService/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Prod
 DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/security/py-plone.app.openid/Makefile
==============================================================================
--- head/security/py-plone.app.openid/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/security/py-plone.app.openid/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -24,7 +24,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plon
 DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
-#USE_ZOPE=	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/security/py-plone.openid/Makefile
==============================================================================
--- head/security/py-plone.openid/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/security/py-plone.openid/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -21,7 +21,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-#USE_ZOPE=	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/security/py-plone.protect/Makefile
==============================================================================
--- head/security/py-plone.protect/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/security/py-plone.protect/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -19,7 +19,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-#USE_ZOPE=	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/security/py-plone.session/Makefile
==============================================================================
--- head/security/py-plone.session/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/security/py-plone.session/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -20,7 +20,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-#USE_ZOPE=	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.app.caching/Makefile
==============================================================================
--- head/www/py-plone.app.caching/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.app.caching/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -36,7 +36,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.app.collection/Makefile
==============================================================================
--- head/www/py-plone.app.collection/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.app.collection/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -34,7 +34,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.app.content/Makefile
==============================================================================
--- head/www/py-plone.app.content/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.app.content/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -32,7 +32,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.app.contentmenu/Makefile
==============================================================================
--- head/www/py-plone.app.contentmenu/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.app.contentmenu/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -30,7 +30,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.app.contentrules/Makefile
==============================================================================
--- head/www/py-plone.app.contentrules/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.app.contentrules/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -42,7 +42,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.app.controlpanel/Makefile
==============================================================================
--- head/www/py-plone.app.controlpanel/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.app.controlpanel/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -42,7 +42,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.app.customerize/Makefile
==============================================================================
--- head/www/py-plone.app.customerize/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.app.customerize/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -25,7 +25,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-#USE_ZOPE=	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.app.dexterity/Makefile
==============================================================================
--- head/www/py-plone.app.dexterity/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.app.dexterity/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -42,7 +42,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.app.form/Makefile
==============================================================================
--- head/www/py-plone.app.form/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.app.form/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -33,7 +33,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.app.iterate/Makefile
==============================================================================
--- head/www/py-plone.app.iterate/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.app.iterate/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -35,7 +35,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.app.jquerytools/Makefile
==============================================================================
--- head/www/py-plone.app.jquerytools/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.app.jquerytools/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -19,7 +19,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.app.layout/Makefile
==============================================================================
--- head/www/py-plone.app.layout/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.app.layout/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -36,7 +36,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.app.portlets/Makefile
==============================================================================
--- head/www/py-plone.app.portlets/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.app.portlets/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -49,7 +49,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.app.registry/Makefile
==============================================================================
--- head/www/py-plone.app.registry/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.app.registry/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -26,9 +26,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plon
 
 DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
-USE_PYDISTUTILS=	easy_install
+USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.app.testing/Makefile
==============================================================================
--- head/www/py-plone.app.testing/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.app.testing/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -25,7 +25,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.app.upgrade/Makefile
==============================================================================
--- head/www/py-plone.app.upgrade/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.app.upgrade/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -50,7 +50,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.app.users/Makefile
==============================================================================
--- head/www/py-plone.app.users/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.app.users/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -31,7 +31,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-#USE_ZOPE=	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.app.viewletmanager/Makefile
==============================================================================
--- head/www/py-plone.app.viewletmanager/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.app.viewletmanager/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -25,7 +25,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-#USE_ZOPE=	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.app.vocabularies/Makefile
==============================================================================
--- head/www/py-plone.app.vocabularies/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.app.vocabularies/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -25,7 +25,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope
 DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.app.workflow/Makefile
==============================================================================
--- head/www/py-plone.app.workflow/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.app.workflow/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -31,7 +31,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.app.z3cform/Makefile
==============================================================================
--- head/www/py-plone.app.z3cform/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.app.z3cform/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -24,7 +24,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.browserlayer/Makefile
==============================================================================
--- head/www/py-plone.browserlayer/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.browserlayer/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -21,7 +21,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-#USE_ZOPE=	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.cachepurging/Makefile
==============================================================================
--- head/www/py-plone.cachepurging/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.cachepurging/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -24,7 +24,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-#USE_ZOPE=	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.caching/Makefile
==============================================================================
--- head/www/py-plone.caching/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.caching/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -24,7 +24,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-#USE_ZOPE=	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.dexterity/Makefile
==============================================================================
--- head/www/py-plone.dexterity/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.dexterity/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -44,7 +44,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.locking/Makefile
==============================================================================
--- head/www/py-plone.locking/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.locking/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -26,7 +26,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-#USE_ZOPE	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.portlet.static/Makefile
==============================================================================
--- head/www/py-plone.portlet.static/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.portlet.static/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -25,7 +25,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-#USE_ZOPE=	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.resource/Makefile
==============================================================================
--- head/www/py-plone.resource/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.resource/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -27,7 +27,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.theme/Makefile
==============================================================================
--- head/www/py-plone.theme/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.theme/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -22,7 +22,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-#USE_ZOPE=	yes
+#USES=		zope
 
 NO_STAGE=	yes
 

Modified: head/www/py-plone.z3cform/Makefile
==============================================================================
--- head/www/py-plone.z3cform/Makefile	Mon Sep 23 13:33:59 2013	(r328001)
+++ head/www/py-plone.z3cform/Makefile	Mon Sep 23 13:42:48 2013	(r328002)
@@ -21,7 +21,7 @@ DIST_SUBDIR=	zope
 USE_PYTHON=	yes
 USE_PYDISTUTILS=easy_install
 USE_ZIP=	yes
-USE_ZOPE=	yes
+USES=		zope
 
 NO_STAGE=	yes
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309231342.r8NDgnS3025599>