From owner-svn-ports-all@FreeBSD.ORG  Tue Sep 11 14:27:23 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 968BC1065670;
	Tue, 11 Sep 2012 14:27:23 +0000 (UTC) (envelope-from rm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8239E8FC0A;
	Tue, 11 Sep 2012 14:27:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8BERNAT065064;
	Tue, 11 Sep 2012 14:27:23 GMT (envelope-from rm@svn.freebsd.org)
Received: (from rm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8BERNF0065062;
	Tue, 11 Sep 2012 14:27:23 GMT (envelope-from rm@svn.freebsd.org)
Message-Id: <201209111427.q8BERNF0065062@svn.freebsd.org>
From: Ruslan Mahmatkhanov <rm@FreeBSD.org>
Date: Tue, 11 Sep 2012 14:27:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r304098 - head/Mk
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Sep 2012 14:27:23 -0000

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