From owner-freebsd-python@FreeBSD.ORG  Wed Jan 25 02:35:33 2006
Return-Path: <owner-freebsd-python@FreeBSD.ORG>
X-Original-To: freebsd-python@freebsd.org
Delivered-To: freebsd-python@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3CC8516A41F
	for <freebsd-python@freebsd.org>; Wed, 25 Jan 2006 02:35:33 +0000 (GMT)
	(envelope-from yasi@yasi.to)
Received: from smtp-o01.eonet.ne.jp (smtp-o01.eonet.ne.jp [203.140.81.16])
	by mx1.FreeBSD.org (Postfix) with SMTP id 88C2D43D45
	for <freebsd-python@freebsd.org>; Wed, 25 Jan 2006 02:35:28 +0000 (GMT)
	(envelope-from yasi@yasi.to)
Received: (qmail 24642 invoked from network); 25 Jan 2006 11:35:26 +0900
Received: from unknown (HELO AA0000-MSAS13s.eo.k-opti.ad.jp)
	by aa0000-moms11d4 with SMTP; 25 Jan 2006 11:35:26 +0900
Received: (qmail 16199 invoked from network); 25 Jan 2006 11:35:26 +0900
Received: from unknown (HELO ?127.0.0.1?) (yasi%zeus.eonet.ne.jp@58.70.61.200)
	by aa0000-msas13s with SMTP; 25 Jan 2006 11:35:26 +0900
Message-ID: <43D6E3EF.8000703@yasi.to>
Date: Wed, 25 Jan 2006 11:35:27 +0900
From: HAYASHI Yasushi <yasi@yasi.to>
User-Agent: Mozilla Thunderbird 1.0.7 (Windows/20050923)
X-Accept-Language: ja, en-us, en
MIME-Version: 1.0
To: Hye-Shik Chang <hyeshik@gmail.com>
References: <43D2D331.2090207@yasi.to>
	<4f0b69dc0601211801i5a40a98dg7777028d5623c59c@mail.gmail.com>
In-Reply-To: <4f0b69dc0601211801i5a40a98dg7777028d5623c59c@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: freebsd-python@freebsd.org
Subject: Re: How to change Mk/bsd.python.mk ?
X-BeenThere: freebsd-python@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: FreeBSD-specific Python issues <freebsd-python.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-python>, 
	<mailto:freebsd-python-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-python>
List-Post: <mailto:freebsd-python@freebsd.org>
List-Help: <mailto:freebsd-python-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-python>,
	<mailto:freebsd-python-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jan 2006 02:35:33 -0000

Dear Hye-Shik

Hye-Shik Chang wrote:
> If the PR includes changes to Mk/bsd.python.mk, a committer who
> treats the PR will change it together.  Otherwise, please send me
> a patch or file a new PR for that.

Thank you.

How about my patch below?

-- 
Yasushi Hayashi
yasi@yasi.to



--- /usr/ports/Mk/bsd.python.mk	Tue Jan 24 06:14:05 2006
+++ /usr/ports/Mk/bsd.python.mk.new	Wed Jan 25 10:40:21 2006
@@ -151,7 +151,7 @@
  _PYTHON_PORTBRANCH=		2.4
  _PYTHON_ALLBRANCHES=	2.4 2.3 2.2 2.1 2.5 # preferred first
  _ZOPE_PORTBRANCH=		2.7
-_ZOPE_ALLBRANCHES=		2.7 2.8 3.1
+_ZOPE_ALLBRANCHES=		2.7 2.8 2.9 3.2


  # Determine version number of Zope to use
@@ -384,6 +384,9 @@
  .if ${ZOPE_VERSION} == "3.2"
  SZOPEBASEDIR?=			www/Zope3
  ZOPE_PORTSDIR=			${PORTSDIR}/www/zope3
+.elif ${ZOPE_VERSION} == "2.9"
+SZOPEBASEDIR?=			www/Zope29
+ZOPE_PORTSDIR=			${PORTSDIR}/www/zope29
  .elif ${ZOPE_VERSION} == "2.8"
  SZOPEBASEDIR?=			www/Zope28
  ZOPE_PORTSDIR=			${PORTSDIR}/www/zope28
@@ -393,7 +396,7 @@
  .else
  check-makevars::
  	@${ECHO} "Makefile error: bad value for ZOPE_VERSION: ${ZOPE_VERSION}."
-	@${ECHO} "Legal values are:	2.7 (default), 2.8, 3.2"
+	@${ECHO} "Legal values are:	2.7 (default), 2.8, 2.9, 3.2"
  	@${FALSE}
  .endif
  ZOPEBASEDIR?=			${PREFIX}/${SZOPEBASEDIR}