From f85bca23c322cba83beac2db5ad03a5165d7623a Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Tue, 22 Jan 2002 18:47:14 +0000
Subject: use buildlink file for python, but keep tied to version 2.0 because
of some dependencies
---
www/zope/Makefile | 7 +++++--
www/zope/files/Makefile.in | 10 +++++-----
www/zope/files/zope-install.py | 4 ++--
www/zope/files/zope-shutdown.py | 4 ++--
4 files changed, 14 insertions(+), 11 deletions(-)
(limited to 'www/zope')
diff --git a/www/zope/Makefile b/www/zope/Makefile
index 98f112b97d4..bb447bf3a40 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/02/25 04:18:25 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 2002/01/22 18:47:14 drochner Exp $
#
DISTNAME= Zope-2.2.2-src
@@ -20,6 +20,8 @@ PLIST_SRC= ${WRKDIR}/.PLIST_SRC
ZOPEDIR= ${PREFIX}/lib/zope
+PYTHON_VERSIONS_ACCEPTED= 20 # XXX for now
+
do-configure:
${SED} -e "s,@PREFIX@,${PREFIX}," \
<${FILESDIR}/Makefile.in > ${WRKSRC}/Makefile
@@ -32,7 +34,7 @@ do-install:
${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
${INSTALL_DATA_DIR} ${ZOPEDIR}
(cd ${WRKSRC}; ${PAX} -r -w -s'/.*\.[cho]$$//' . ${ZOPEDIR})
- ${PREFIX}/bin/python \
+ ${PYTHONBIN} \
${PREFIX}/lib/python2.0/compileall.py ${ZOPEDIR}
${CHMOD} -R a+rX ${ZOPEDIR}
(cd ${PREFIX}; ${FIND} lib/zope \( -type f -o -type l \) -print >>${PLIST_SRC})
@@ -44,4 +46,5 @@ do-install:
<${FILESDIR}/zope-shutdown.py >${PREFIX}/sbin/zope-shutdown
${CHMOD} 755 ${PREFIX}/sbin/zope-install ${PREFIX}/sbin/zope-shutdown
+.include "../../lang/python/application.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/zope/files/Makefile.in b/www/zope/files/Makefile.in
index 3ad4b7faf11..0fa884646e1 100644
--- a/www/zope/files/Makefile.in
+++ b/www/zope/files/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.6 2000/10/22 23:11:48 tsarna Exp $
+# $NetBSD: Makefile.in,v 1.7 2002/01/22 18:47:15 drochner Exp $
all: all-pcgi all-lib all-zodb all-search all-expat # link-cpickle
configure: config-pcgi config-lib config-zodb config-search \
@@ -13,7 +13,7 @@ all-pcgi:
config-lib:
(cd lib/python; \
cp @PREFIX@/lib/python2.0/config/Makefile.pre.in . ; \
- make -f Makefile.pre.in boot PYTHON=@PREFIX@/bin/python)
+ make -f Makefile.pre.in boot)
all-lib:
(cd lib/python; make)
@@ -21,7 +21,7 @@ all-lib:
config-zodb:
(cd lib/python/ZODB; \
cp @PREFIX@/lib/python2.0/config/Makefile.pre.in . ; \
- make -f Makefile.pre.in boot PYTHON=python)
+ make -f Makefile.pre.in boot)
all-zodb:
(cd lib/python/ZODB; make)
@@ -30,7 +30,7 @@ all-zodb:
config-search:
(cd lib/python/SearchIndex; \
cp @PREFIX@/lib/python2.0/config/Makefile.pre.in . ; \
- make -f Makefile.pre.in boot PYTHON=python)
+ make -f Makefile.pre.in boot)
all-search:
(cd lib/python/SearchIndex; make)
@@ -38,7 +38,7 @@ all-search:
config-expat:
(cd lib/python/Shared/DC/xml/pyexpat; \
cp @PREFIX@/lib/python2.0/config/Makefile.pre.in . ; \
- make -f Makefile.pre.in boot PYTHON=python)
+ make -f Makefile.pre.in boot)
all-expat:
(cd lib/python/Shared/DC/xml/pyexpat; make)
diff --git a/www/zope/files/zope-install.py b/www/zope/files/zope-install.py
index 5ca3d60fe91..31828578f0a 100755
--- a/www/zope/files/zope-install.py
+++ b/www/zope/files/zope-install.py
@@ -1,6 +1,6 @@
-#!/usr/pkg/bin/python
+#!/usr/pkg/bin/python2.0
#
-# $NetBSD: zope-install.py,v 1.5 2000/02/15 02:48:40 tsarna Exp $
+# $NetBSD: zope-install.py,v 1.6 2002/01/22 18:47:15 drochner Exp $
#
# Copyright (c) 1998,1999 Endicor Technologies, Inc.
# All rights reserved. Written by Ty Sarna <tsarna@endicor.com>
diff --git a/www/zope/files/zope-shutdown.py b/www/zope/files/zope-shutdown.py
index 3fcfc575c3c..a6f9b5113dd 100755
--- a/www/zope/files/zope-shutdown.py
+++ b/www/zope/files/zope-shutdown.py
@@ -1,6 +1,6 @@
-#!/usr/pkg/bin/python
+#!/usr/pkg/bin/python2.0
#
-# $NetBSD: zope-shutdown.py,v 1.1 1999/07/02 12:55:33 tsarna Exp $
+# $NetBSD: zope-shutdown.py,v 1.2 2002/01/22 18:47:15 drochner Exp $
#
# Copyright (c) 1999 Endicor Technologies, Inc.
# All rights reserved. Written by Ty Sarna <tsarna@endicor.com>
--
cgit v1.2.3