diff options
63 files changed, 168 insertions, 153 deletions
@@ -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 @@ -255,4 +255,5 @@ XVID XVID multimedia MPEG4 codec support 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 diff --git a/Mk/Uses/zope.mk b/Mk/Uses/zope.mk new file mode 100644 index 000000000000..0ab4802053e7 --- /dev/null +++ b/Mk/Uses/zope.mk @@ -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) diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk index 5311f616bf21..74aa22434449 100644 --- a/Mk/bsd.python.mk +++ b/Mk/bsd.python.mk @@ -210,76 +210,9 @@ Python_Include_MAINTAINER= python@FreeBSD.org # # 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;${PREFIX}/;;}/${egg} # 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_PORTSDIR} \ .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=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} \ 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) diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk index d1a1842c853a..20e619eb6bf0 100644 --- a/Mk/bsd.sanity.mk +++ b/Mk/bsd.sanity.mk @@ -79,6 +79,10 @@ DEV_ERROR+= "USE_GETTEXT is unsupported, replaced by USES=gettext" 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 diff --git a/databases/py-psycopg/Makefile b/databases/py-psycopg/Makefile index f4c7c35a40d7..6842f04494fe 100644 --- a/databases/py-psycopg/Makefile +++ b/databases/py-psycopg/Makefile @@ -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_CMD} \ --with-mxdatetime-includes=${DATETIME_INC} .if defined(WITH_ZOPE) -USE_ZOPE= yes +USES+= zope PLIST_SUB+= ZOPE="" .else PLIST_SUB+= ZOPE="@comment " diff --git a/databases/py-psycopg/pkg-descr b/databases/py-psycopg/pkg-descr index 90f548340c47..879b5a51eb65 100644 --- a/databases/py-psycopg/pkg-descr +++ b/databases/py-psycopg/pkg-descr @@ -13,4 +13,4 @@ from the pool is used. That makes psycopg very fast in typical client-server applications that create a servicing thread every time a client request arrives. -WWW: http://initd.org/software/psycopg +WWW: http://initd.org/software/psycopg/ diff --git a/devel/py-Products.ATContentTypes/Makefile b/devel/py-Products.ATContentTypes/Makefile index d5fe9b693e27..a0e08e2db2ea 100644 --- a/devel/py-Products.ATContentTypes/Makefile +++ b/devel/py-Products.ATContentTypes/Makefile @@ -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 diff --git a/devel/py-Products.Archetypes/Makefile b/devel/py-Products.Archetypes/Makefile index 401082827ed8..786e8dddc08d 100644 --- a/devel/py-Products.Archetypes/Makefile +++ b/devel/py-Products.Archetypes/Makefile @@ -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 diff --git a/devel/py-Products.CMFCore/Makefile b/devel/py-Products.CMFCore/Makefile index df8d947abc64..350c4639cd86 100644 --- a/devel/py-Products.CMFCore/Makefile +++ b/devel/py-Products.CMFCore/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:${PORTSDIR}/devel/p DIST_SUBDIR= zope USE_PYTHON= -2.7 USE_PYDISTUTILS=easy_install -#USE_ZOPE= yes # cyclic dependency +#USES= zope # cyclic dependency NO_STAGE= yes diff --git a/devel/py-Products.CMFDiffTool/Makefile b/devel/py-Products.CMFDiffTool/Makefile index c313bd59c82b..33b8de3dc5d3 100644 --- a/devel/py-Products.CMFDiffTool/Makefile +++ b/devel/py-Products.CMFDiffTool/Makefile @@ -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 diff --git a/devel/py-Products.CMFDynamicViewFTI/Makefile b/devel/py-Products.CMFDynamicViewFTI/Makefile index a7e15e1dddf9..c019886e615d 100644 --- a/devel/py-Products.CMFDynamicViewFTI/Makefile +++ b/devel/py-Products.CMFDynamicViewFTI/Makefile @@ -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 diff --git a/devel/py-Products.CMFEditions/Makefile b/devel/py-Products.CMFEditions/Makefile index 72cc7492d5f1..be8b1e827363 100644 --- a/devel/py-Products.CMFEditions/Makefile +++ b/devel/py-Products.CMFEditions/Makefile @@ -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 diff --git a/devel/py-Products.CMFUid/Makefile b/devel/py-Products.CMFUid/Makefile index a50f4ed8f5aa..4dd38ba0c620 100644 --- a/devel/py-Products.CMFUid/Makefile +++ b/devel/py-Products.CMFUid/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=0:${PORTSDIR}/devel/py-Pro DIST_SUBDIR= zope USE_PYTHON= yes USE_PYDISTUTILS=easy_install -#USE_ZOPE= yes +#USES= zope NO_STAGE= yes diff --git a/devel/py-Products.ExtendedPathIndex/Makefile b/devel/py-Products.ExtendedPathIndex/Makefile index 9bc23fb808a5..c31b46494cbe 100644 --- a/devel/py-Products.ExtendedPathIndex/Makefile +++ b/devel/py-Products.ExtendedPathIndex/Makefile @@ -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 diff --git a/devel/py-Products.GenericSetup/Makefile b/devel/py-Products.GenericSetup/Makefile index bb5183bcc433..4fbbc3e438c5 100644 --- a/devel/py-Products.GenericSetup/Makefile +++ b/devel/py-Products.GenericSetup/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}five.localsitemanager>=0:${PORTSDIR}/devel/p DIST_SUBDIR= zope USE_PYTHON= -2.7 USE_PYDISTUTILS=easy_install -USE_ZOPE= yes +USES= zope NO_STAGE= yes diff --git a/devel/py-Products.LDAPUserFolder/Makefile b/devel/py-Products.LDAPUserFolder/Makefile index fd816b26d073..ef429247f0fb 100644 --- a/devel/py-Products.LDAPUserFolder/Makefile +++ b/devel/py-Products.LDAPUserFolder/Makefile @@ -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 diff --git a/devel/py-Products.PasswordResetTool/Makefile b/devel/py-Products.PasswordResetTool/Makefile index 5a1c001cf265..fb23dfcf9f3b 100644 --- a/devel/py-Products.PasswordResetTool/Makefile +++ b/devel/py-Products.PasswordResetTool/Makefile @@ -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 diff --git a/devel/py-Products.PloneTestCase/Makefile b/devel/py-Products.PloneTestCase/Makefile index 8336a5656ee5..482bb316e5b4 100644 --- a/devel/py-Products.PloneTestCase/Makefile +++ b/devel/py-Products.PloneTestCase/Makefile @@ -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 diff --git a/devel/py-Products.PluginRegistry/Makefile b/devel/py-Products.PluginRegistry/Makefile index 66ffdec829b2..38ab91426b4a 100644 --- a/devel/py-Products.PluginRegistry/Makefile +++ b/devel/py-Products.PluginRegistry/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.GenericSetup>=0:${PORTSDIR}/devel/p DIST_SUBDIR= zope USE_PYTHON= yes USE_PYDISTUTILS=easy_install -#USE_ZOPE= yes +#USES= zope NO_STAGE= yes diff --git a/devel/py-Products.ResourceRegistries/Makefile b/devel/py-Products.ResourceRegistries/Makefile index 9edb5954a705..fc3c811c7197 100644 --- a/devel/py-Products.ResourceRegistries/Makefile +++ b/devel/py-Products.ResourceRegistries/Makefile @@ -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 diff --git a/devel/py-Products.ZopeVersionControl/Makefile b/devel/py-Products.ZopeVersionControl/Makefile index e64156e6e830..bf881387f393 100644 --- a/devel/py-Products.ZopeVersionControl/Makefile +++ b/devel/py-Products.ZopeVersionControl/Makefile @@ -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 diff --git a/devel/py-five.customerize/Makefile b/devel/py-five.customerize/Makefile index 5370b332496b..0d915843144c 100644 --- a/devel/py-five.customerize/Makefile +++ b/devel/py-five.customerize/Makefile @@ -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 diff --git a/devel/py-five.globalrequest/Makefile b/devel/py-five.globalrequest/Makefile index 99c83a979916..9a8ef22e160d 100644 --- a/devel/py-five.globalrequest/Makefile +++ b/devel/py-five.globalrequest/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.globalrequest>=0:${PORTSDIR}/devel/py-z DIST_SUBDIR= zope USE_PYTHON= yes USE_PYDISTUTILS=easy_install -#USE_ZOPE= yes +#USES= zope NO_STAGE= yes diff --git a/devel/py-five.localsitemanager/Makefile b/devel/py-five.localsitemanager/Makefile index 69cd494aa559..6317730354ff 100644 --- a/devel/py-five.localsitemanager/Makefile +++ b/devel/py-five.localsitemanager/Makefile @@ -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 diff --git a/devel/py-zope.dublincore/Makefile b/devel/py-zope.dublincore/Makefile index 228c04fcd23c..5d07efadb003 100644 --- a/devel/py-zope.dublincore/Makefile +++ b/devel/py-zope.dublincore/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytz>=0:${PORTSDIR}/devel/py-pytz \ DIST_SUBDIR= zope USE_PYTHON= yes USE_PYDISTUTILS=easy_install -#USE_ZOPE= yes +#USES= zope NO_STAGE= yes diff --git a/lang/py-mx-base/Makefile b/lang/py-mx-base/Makefile index 18de65ab6c6b..924d734195b7 100644 --- a/lang/py-mx-base/Makefile +++ b/lang/py-mx-base/Makefile @@ -29,13 +29,12 @@ ADDITIONAL_DOCS= mx/DateTime/Doc/mxDateTime.pdf \ 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: diff --git a/security/py-Products.PlonePAS/Makefile b/security/py-Products.PlonePAS/Makefile index 88c4c2d61dac..139736d97cc6 100644 --- a/security/py-Products.PlonePAS/Makefile +++ b/security/py-Products.PlonePAS/Makefile @@ -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 diff --git a/security/py-Products.PluggableAuthService/Makefile b/security/py-Products.PluggableAuthService/Makefile index 980e0900ed83..293ebf7a03c5 100644 --- a/security/py-Products.PluggableAuthService/Makefile +++ b/security/py-Products.PluggableAuthService/Makefile @@ -17,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Products.PluginRegistry>=0:${PORTSDIR}/devel DIST_SUBDIR= zope USE_PYTHON= -2.7 USE_PYDISTUTILS=easy_install -USE_ZOPE= yes +USES= zope NO_STAGE= yes diff --git a/security/py-plone.app.openid/Makefile b/security/py-plone.app.openid/Makefile index f47fc55ba39d..7ee1decf54d0 100644 --- a/security/py-plone.app.openid/Makefile +++ b/security/py-plone.app.openid/Makefile @@ -24,7 +24,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.openid>=0:${PORTSDIR}/security/py-plon DIST_SUBDIR= zope USE_PYTHON= yes USE_PYDISTUTILS=easy_install -#USE_ZOPE= yes +#USES= zope NO_STAGE= yes diff --git a/security/py-plone.openid/Makefile b/security/py-plone.openid/Makefile index b4a50c462333..f9819e4f9f19 100644 --- a/security/py-plone.openid/Makefile +++ b/security/py-plone.openid/Makefile @@ -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 diff --git a/security/py-plone.protect/Makefile b/security/py-plone.protect/Makefile index a5f915080108..4046cbf40f1c 100644 --- a/security/py-plone.protect/Makefile +++ b/security/py-plone.protect/Makefile @@ -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 diff --git a/security/py-plone.session/Makefile b/security/py-plone.session/Makefile index 4b8c71d9e052..ded776a50d99 100644 --- a/security/py-plone.session/Makefile +++ b/security/py-plone.session/Makefile @@ -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 diff --git a/www/py-plone.app.caching/Makefile b/www/py-plone.app.caching/Makefile index 1942627ddd9b..7782a670063c 100644 --- a/www/py-plone.app.caching/Makefile +++ b/www/py-plone.app.caching/Makefile @@ -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 diff --git a/www/py-plone.app.collection/Makefile b/www/py-plone.app.collection/Makefile index aa1e4527900d..1bb930c8a87a 100644 --- a/www/py-plone.app.collection/Makefile +++ b/www/py-plone.app.collection/Makefile @@ -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 diff --git a/www/py-plone.app.content/Makefile b/www/py-plone.app.content/Makefile index 65779fce4e4c..7d9e90b6705a 100644 --- a/www/py-plone.app.content/Makefile +++ b/www/py-plone.app.content/Makefile @@ -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 diff --git a/www/py-plone.app.contentmenu/Makefile b/www/py-plone.app.contentmenu/Makefile index 079bc292f678..4c6f4ae03626 100644 --- a/www/py-plone.app.contentmenu/Makefile +++ b/www/py-plone.app.contentmenu/Makefile @@ -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 diff --git a/www/py-plone.app.contentrules/Makefile b/www/py-plone.app.contentrules/Makefile index ea36006cd6f4..fb14d76c3eb0 100644 --- a/www/py-plone.app.contentrules/Makefile +++ b/www/py-plone.app.contentrules/Makefile @@ -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 diff --git a/www/py-plone.app.controlpanel/Makefile b/www/py-plone.app.controlpanel/Makefile index 3df1bce3a5b1..bc91ae6073fd 100644 --- a/www/py-plone.app.controlpanel/Makefile +++ b/www/py-plone.app.controlpanel/Makefile @@ -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 diff --git a/www/py-plone.app.customerize/Makefile b/www/py-plone.app.customerize/Makefile index c4fd450d9c89..6bee3a68c206 100644 --- a/www/py-plone.app.customerize/Makefile +++ b/www/py-plone.app.customerize/Makefile @@ -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 diff --git a/www/py-plone.app.dexterity/Makefile b/www/py-plone.app.dexterity/Makefile index ec3b40a1a6fb..3ed85b06ecab 100644 --- a/www/py-plone.app.dexterity/Makefile +++ b/www/py-plone.app.dexterity/Makefile @@ -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 diff --git a/www/py-plone.app.form/Makefile b/www/py-plone.app.form/Makefile index 901cb32eba81..ae2cf6e4e06e 100644 --- a/www/py-plone.app.form/Makefile +++ b/www/py-plone.app.form/Makefile @@ -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 diff --git a/www/py-plone.app.iterate/Makefile b/www/py-plone.app.iterate/Makefile index 2c222b6e8c30..09158adbcbc4 100644 --- a/www/py-plone.app.iterate/Makefile +++ b/www/py-plone.app.iterate/Makefile @@ -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 diff --git a/www/py-plone.app.jquerytools/Makefile b/www/py-plone.app.jquerytools/Makefile index c7b7e8f3a548..ded8f87cc65a 100644 --- a/www/py-plone.app.jquerytools/Makefile +++ b/www/py-plone.app.jquerytools/Makefile @@ -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 diff --git a/www/py-plone.app.layout/Makefile b/www/py-plone.app.layout/Makefile index 0435a236db74..ec7ea1e3c9ef 100644 --- a/www/py-plone.app.layout/Makefile +++ b/www/py-plone.app.layout/Makefile @@ -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 diff --git a/www/py-plone.app.portlets/Makefile b/www/py-plone.app.portlets/Makefile index 54ae1e275e5b..8da563bbe735 100644 --- a/www/py-plone.app.portlets/Makefile +++ b/www/py-plone.app.portlets/Makefile @@ -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 diff --git a/www/py-plone.app.registry/Makefile b/www/py-plone.app.registry/Makefile index 8894609caa64..963d27423c69 100644 --- a/www/py-plone.app.registry/Makefile +++ b/www/py-plone.app.registry/Makefile @@ -26,9 +26,9 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}plone.registry>=1.0:${PORTSDIR}/www/py-plone 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 diff --git a/www/py-plone.app.testing/Makefile b/www/py-plone.app.testing/Makefile index 0e6ef1262f8e..b737bfb2b82b 100644 --- a/www/py-plone.app.testing/Makefile +++ b/www/py-plone.app.testing/Makefile @@ -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 diff --git a/www/py-plone.app.upgrade/Makefile b/www/py-plone.app.upgrade/Makefile index e5b8f0db86db..777a7d7c642f 100644 --- a/www/py-plone.app.upgrade/Makefile +++ b/www/py-plone.app.upgrade/Makefile @@ -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 diff --git a/www/py-plone.app.users/Makefile b/www/py-plone.app.users/Makefile index b924ac54cb3d..95d71828b07e 100644 --- a/www/py-plone.app.users/Makefile +++ b/www/py-plone.app.users/Makefile @@ -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 diff --git a/www/py-plone.app.viewletmanager/Makefile b/www/py-plone.app.viewletmanager/Makefile index cf87d0801e4c..868ff11e6078 100644 --- a/www/py-plone.app.viewletmanager/Makefile +++ b/www/py-plone.app.viewletmanager/Makefile @@ -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 diff --git a/www/py-plone.app.vocabularies/Makefile b/www/py-plone.app.vocabularies/Makefile index d39cc1b9b08b..d47be28eedf3 100644 --- a/www/py-plone.app.vocabularies/Makefile +++ b/www/py-plone.app.vocabularies/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.browser>=0:${PORTSDIR}/devel/py-zope.br DIST_SUBDIR= zope USE_PYTHON= yes USE_PYDISTUTILS=easy_install -USE_ZOPE= yes +USES= zope NO_STAGE= yes diff --git a/www/py-plone.app.workflow/Makefile b/www/py-plone.app.workflow/Makefile index 6d89178debb5..b06c41ef6c2d 100644 --- a/www/py-plone.app.workflow/Makefile +++ b/www/py-plone.app.workflow/Makefile @@ -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 diff --git a/www/py-plone.app.z3cform/Makefile b/www/py-plone.app.z3cform/Makefile index 23796e4886e4..adfaa3bedae6 100644 --- a/www/py-plone.app.z3cform/Makefile +++ b/www/py-plone.app.z3cform/Makefile @@ -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 diff --git a/www/py-plone.browserlayer/Makefile b/www/py-plone.browserlayer/Makefile index 3446a7bd13bb..c814e53601ca 100644 --- a/www/py-plone.browserlayer/Makefile +++ b/www/py-plone.browserlayer/Makefile @@ -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 diff --git a/www/py-plone.cachepurging/Makefile b/www/py-plone.cachepurging/Makefile index 987338fd5275..3f3afa4e2a15 100644 --- a/www/py-plone.cachepurging/Makefile +++ b/www/py-plone.cachepurging/Makefile @@ -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 diff --git a/www/py-plone.caching/Makefile b/www/py-plone.caching/Makefile index 7945437b98fb..a2fb4ad3f6a3 100644 --- a/www/py-plone.caching/Makefile +++ b/www/py-plone.caching/Makefile @@ -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 diff --git a/www/py-plone.dexterity/Makefile b/www/py-plone.dexterity/Makefile index 56c4fa17ea6d..025ddd8efc68 100644 --- a/www/py-plone.dexterity/Makefile +++ b/www/py-plone.dexterity/Makefile @@ -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 diff --git a/www/py-plone.locking/Makefile b/www/py-plone.locking/Makefile index d1a12ccadeb5..5cf5ef534164 100644 --- a/www/py-plone.locking/Makefile +++ b/www/py-plone.locking/Makefile @@ -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 diff --git a/www/py-plone.portlet.static/Makefile b/www/py-plone.portlet.static/Makefile index a192bf9674fe..6959d01c25ac 100644 --- a/www/py-plone.portlet.static/Makefile +++ b/www/py-plone.portlet.static/Makefile @@ -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 diff --git a/www/py-plone.resource/Makefile b/www/py-plone.resource/Makefile index 09d14e25ac5b..a60f0f3aa91d 100644 --- a/www/py-plone.resource/Makefile +++ b/www/py-plone.resource/Makefile @@ -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 diff --git a/www/py-plone.theme/Makefile b/www/py-plone.theme/Makefile index 449ebdd3ca5d..9d03ce266d36 100644 --- a/www/py-plone.theme/Makefile +++ b/www/py-plone.theme/Makefile @@ -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 diff --git a/www/py-plone.z3cform/Makefile b/www/py-plone.z3cform/Makefile index c1c4abc283dd..e944612f0bf4 100644 --- a/www/py-plone.z3cform/Makefile +++ b/www/py-plone.z3cform/Makefile @@ -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 |