svn commit: r304098 - head/Mk

[Ruslan Mahmatkhanov]

Author: rm
Date: Tue Sep 11 14:27:22 2012
New Revision: 304098
URL: http://svn.freebsd.org/changeset/ports/304098

Log:
  - trim check for unsupported python versions
  - change depends for USE_ZOPE case to make it work with current zope version
  
  Submitted by:	lwhsu (final patch revision)
  Reviewed by:	crees
  Discussed in:	python

Modified:
  head/Mk/bsd.python.mk

Modified: head/Mk/bsd.python.mk
==============================================================================
--- head/Mk/bsd.python.mk	Tue Sep 11 14:05:31 2012	(r304097)
+++ head/Mk/bsd.python.mk	Tue Sep 11 14:27:22 2012	(r304098)
@@ -501,7 +501,7 @@ PYDISTUTILS_EGGINFODIR?=${PYTHONPREFIX_S
 	(defined(INSTALLS_EGGINFO) ||	\
 		(defined(USE_PYDISTUTILS) && \
 		 ${USE_PYDISTUTILS} != "easy_install")) && \
-	 defined(PYTHON_REL) && ${PYTHON_REL} >= 250
+	 defined(PYTHON_REL)
 . for egg in ${PYDISTUTILS_EGGINFO}
 PLIST_FILES+=	${PYDISTUTILS_EGGINFODIR:S;${PREFIX}/;;}/${egg}
 . endfor
@@ -513,7 +513,7 @@ CONFIGURE_ENV+=	PYTHON="${PYTHON_CMD}"
 # Zope-related variables
 .if defined(USE_ZOPE)
 .if ${ZOPE_VERSION} == "2.13"
-ZOPE_PORTSDIR=		${PORTSDIR}/www/zope213
+ZOPE_DEPENDS=	zope213>0:${PORTSDIR}/www/zope213
 .else
 check-makevars::
 	@${ECHO} "Makefile error: bad value for ZOPE_VERSION: ${ZOPE_VERSION}."
@@ -543,7 +543,7 @@ RUN_DEPENDS+=	${PYTHON_CMD}:${PYTHON_POR
 .endif		# ${PYTHON_NO_DEPENDS} == "NO"
 
 .if defined(USE_ZOPE)
-RUN_DEPENDS+=	${ZOPESKELDIR}/bin/zopectl.in:${ZOPE_PORTSDIR}
+RUN_DEPENDS+=	${ZOPE_DEPENDS}
 .endif
 
 # set $PREFIX as Python's one