From owner-freebsd-ports  Sun Jan 13  4: 0:48 2002
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id A9A2F37B416
	for <freebsd-ports@hub.freebsd.org>; Sun, 13 Jan 2002 04:00:03 -0800 (PST)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g0DC03X02675;
	Sun, 13 Jan 2002 04:00:03 -0800 (PST)
	(envelope-from gnats)
Received: from akaraka.yonsei.ac.kr (akaraka.yonsei.ac.kr [165.132.134.53])
	by hub.freebsd.org (Postfix) with ESMTP
	id D2A0C37B416; Sun, 13 Jan 2002 03:50:29 -0800 (PST)
Received: (from perky@localhost)
	by akaraka.yonsei.ac.kr (8.11.6/8.11.4) id g0DBoQ458216;
	Sun, 13 Jan 2002 20:50:26 +0900 (KST)
	(envelope-from perky)
Message-Id: <200201131150.g0DBoQ458216@akaraka.yonsei.ac.kr>
Date: Sun, 13 Jan 2002 20:50:26 +0900 (KST)
From: Hye-Shik Chang <perky@fallin.lv>
Reply-To: Hye-Shik Chang <perky@fallin.lv>
To: FreeBSD-gnats-submit@freebsd.org
Cc: "HAYASHI Yasushi" <yasi@yasi.to>,
	"Neil Blakey-Milner" <nbm@freebsd.org>
X-Send-Pr-Version: 3.113
Subject: ports/33836: Fix port : www/zope (make compatible with Python 2.2)
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org


>Number:         33836
>Category:       ports
>Synopsis:       Fix port : www/zope (make compatible with Python 2.2)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 13 04:00:03 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Hye-Shik Chang
>Release:        FreeBSD 4.5-PRERELEASE i386
>Organization:
Yonsei University
>Environment:
System: FreeBSD akaraka.yonsei.ac.kr 4.5-PRERELEASE FreeBSD 4.5-PRERELEASE #0: Mon Dec 24 06:07:50 KST 2001 root@akaraka.yonsei.ac.kr:/usr/src/sys/compile/RYOKO i386

>Description:
- temporary fix for compatibility to python 2.2

(Makefile.pre.in was set obsolete by BDFL of Python)

>How-To-Repeat:

>Fix:

diff -ruN zope.orig/Makefile zope/Makefile
--- zope.orig/Makefile	Sat Oct 20 06:09:35 2001
+++ zope/Makefile	Sun Jan 13 20:47:36 2002
@@ -7,7 +7,7 @@
 
 PORTNAME=	zope
 PORTVERSION=	2.4.2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	www python zope
 MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
@@ -49,6 +49,19 @@
 		VERSION=${PORTVERSION} \
 		WEBBASEDIR=${WEBBASEDIR}
 
+.include <bsd.port.pre.mk>
+
+MF_TEMPLATE=	${ZOPEBASEDIR}/lib/python/Products/PluginIndexes/TextIndex/Splitter/ZopeSplitter/Makefile.pre.in
+post-patch:
+.if ${PYTHON_REL} >= 220
+# temporary trick until next release
+	@${SED} -e 's,.*config\(/Makefile.pre.in\).*,    return "${MF_TEMPLATE}",' \
+		-e 's,.*sys.version.*,,' \
+		-e 's,\(cp %s \.\),if [ ! -f ./Makefile.pre.in ]; then (\1); fi,' \
+		${WRKSRC}/inst/do.py > ${WRKSRC}/inst/do.py.tmp \
+		&& ${MV} -f ${WRKSRC}/inst/do.py.tmp ${WRKSRC}/inst/do.py
+.endif
+
 # I decided to consider the whole souce tree to be part of the package
 # since in there, Zope can live on its own. I can use Zope's own building
 # mechanism.
@@ -121,4 +134,4 @@
 	@${ECHO} "===>   For Apache changes see ${APACHE_CONFDIR}/apache.conf.Zope-Changes."
 	@${ECHO} "===>   Zope.cgi and pcgi-wrapper live in ${CGIBINDIR}."
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message