From d903c4837e28843b4628db14d7bcf295ca42fee4 Mon Sep 17 00:00:00 2001
From: tsarna <tsarna>
Date: Sun, 22 Oct 2000 20:01:48 +0000
Subject: First batch of upgrades for Python 2.0:

lang/python             upgraded to 2.0
lang/py-html-docs       upgraded to 2.0
misc/py-readline        upgraded to 2.0
databases/py-gdbm       upgraded to 2.0
x11/py-Tk               upgraded to 2.0
devel/py-curses         upgraded to 2.0
lang/py-extclass        upgraded to 2.2.2 and for Python 2.0
textproc/py-dtml        upgraded to 2.2.2 and for Python 2.0
www/py-zpublisher       upgraded to 2.2.2 and for Python 2.0
print/py-reportlab      upgraded to 1.01 and for Python 2.0

More coming...
---
 www/py-zpublisher/Makefile  | 29 ++++++++++++++---------------
 www/py-zpublisher/files/md5 |  4 ++--
 2 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'www/py-zpublisher')

diff --git a/www/py-zpublisher/Makefile b/www/py-zpublisher/Makefile
index d875ac24146..dc48abe2146 100644
--- a/www/py-zpublisher/Makefile
+++ b/www/py-zpublisher/Makefile
@@ -1,37 +1,36 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/07/28 17:51:15 tsarna Exp $
+# $NetBSD: Makefile,v 1.2 2000/10/22 20:01:54 tsarna Exp $
 #
 
-DISTNAME=	Zope-2.2.0-src
-PKGNAME=	py-zpublisher-2.2.0
+DISTNAME=	Zope-2.2.2-src
+PKGNAME=	py-zpublisher-2.2.2
 CATEGORIES=	www
-MASTER_SITES=   http://www.zope.org/Products/Zope/2.2.0/
+MASTER_SITES=   http://www.zope.org/Products/Zope/2.2.2/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tsarna@netbsd.org
 HOMEPAGE=	http://classic.zope.org:8080/Documentation/Reference/ORB
 
-DEPENDS+=	py-extclass>=2.2.0:../../lang/python
+DEPENDS+=	py-extclass>=2.2.2:../../lang/python
 
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
-SITE_PKG=		lib/python1.5/site-packages
-PYTHON_LIBDIR=		${LOCALBASE}/${SITE_PKG}
 EXTRACT_ELEMENTS=	${DISTNAME}/lib/python/ZPublisher
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/lib/python
 
 do-build:
-	(cd ${WRKSRC}/..; ${LOCALBASE}/bin/python ${PREFIX}/lib/python1.5/compileall.py .)
-	(cd ${WRKSRC}/..; ${LOCALBASE}/bin/python -O ${PREFIX}/lib/python1.5/compileall.py .)
+	(cd ${WRKSRC}/..; ${PY_PROG} ${PY_LIBDIR}/compileall.py .)
+	(cd ${WRKSRC}/..; ${PY_PROG} -O ${PY_LIBDIR}/compileall.py .)
 
 do-install:
-	${INSTALL_SCRIPT_DIR} ${PYTHON_LIBDIR}
+	${INSTALL_SCRIPT_DIR} ${PY_SITEPKG}
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	(cd ${WRKSRC}; ${PAX} -r -w -v -p e ZPublisher ${PYTHON_LIBDIR})
-	${CHMOD} 755 ${PYTHON_LIBDIR}/ZPublisher/Test.py
-	(cd ${PREFIX}; ${FIND} ${SITE_PKG}/ZPublisher \
+	(cd ${WRKSRC}; ${PAX} -r -w -v -p e ZPublisher ${PY_SITEPKG})
+	${CHMOD} 755 ${PY_SITEPKG}/ZPublisher/Test.py
+	(cd ${PREFIX}; ${FIND} ${PY_SITEPATH}/ZPublisher \
 		-type f -print >>${PLIST_SRC})
-	(cd ${PREFIX}; ${FIND} -d ${SITE_PKG}/ZPublisher \
+	(cd ${PREFIX}; ${FIND} -d ${PY_SITEPATH}/ZPublisher \
 		-type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
-	${LN} -sf ../${SITE_PKG}/ZPublisher/Test.py ${PREFIX}/bin/bobo
+	${LN} -sf ../${PY_SITEPATH}/ZPublisher/Test.py ${PREFIX}/bin/bobo
 
+.include "../../lang/python/Makefile.inc"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-zpublisher/files/md5 b/www/py-zpublisher/files/md5
index d93204f708f..dd6920e20a7 100644
--- a/www/py-zpublisher/files/md5
+++ b/www/py-zpublisher/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/07/28 17:51:15 tsarna Exp $
+$NetBSD: md5,v 1.2 2000/10/22 20:01:54 tsarna Exp $
 
-MD5 (Zope-2.2.0-src.tgz) = e9a66aa64a75317ff6cefe3d3dce6286
+MD5 (python/Zope-2.2.2-src.tgz) = 83c8197f18bf97ad62bf2c5e424e2b82
-- 
cgit v1.2.3