summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authortsarna <tsarna@pkgsrc.org>2000-10-22 20:01:48 +0000
committertsarna <tsarna@pkgsrc.org>2000-10-22 20:01:48 +0000
commit08a0ddac1a804b04d88a6d23fdbf87a9188c631e (patch)
treec352925946bcfeca99d8d2fdf70b124c2b2a773d /textproc
parentb923dbec15e3ffe405fa211c957396c51735628b (diff)
downloadpkgsrc-08a0ddac1a804b04d88a6d23fdbf87a9188c631e.tar.gz
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...
Diffstat (limited to 'textproc')
-rw-r--r--textproc/py-dtml/Makefile34
-rw-r--r--textproc/py-dtml/files/md54
-rw-r--r--textproc/py-dtml/pkg/PLIST.pre8
3 files changed, 22 insertions, 24 deletions
diff --git a/textproc/py-dtml/Makefile b/textproc/py-dtml/Makefile
index 237d5518585..4029ee6f3d0 100644
--- a/textproc/py-dtml/Makefile
+++ b/textproc/py-dtml/Makefile
@@ -1,22 +1,18 @@
-# $NetBSD: Makefile,v 1.6 2000/09/05 17:11:20 jdolecek Exp $
+# $NetBSD: Makefile,v 1.7 2000/10/22 20:01:54 tsarna Exp $
#
-DISTNAME= Zope-2.2.0-src
-PKGNAME= py-dtml-2.2.0
+DISTNAME= Zope-2.2.2-src
+PKGNAME= py-dtml-2.2.2
CATEGORIES= textproc
-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://www.zope.org/Documentation/Guides/DTML-HTML/DTML.html
-DEPENDS+= py-extclass-2.2.*:../../lang/py-extclass
+DEPENDS+= py-extclass>=2.2.2:../../lang/py-extclass
-ALL_TARGET= default
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
-SITE_PKG= lib/python1.5/site-packages
-PYTHON_LIBDIR= ${LOCALBASE}/${SITE_PKG}
-PYTHON_CONFIGDIR= ${LOCALBASE}/lib/python1.5/config
EXTRACT_ELEMENTS= ${DISTNAME}/lib/python/DocumentTemplate \
${DISTNAME}/lib/python/StructuredText \
${DISTNAME}/lib/python/ts_regex.py
@@ -25,23 +21,25 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/lib/python/DocumentTemplate
do-configure:
( cd ${WRKSRC} ;\
- ${CP} ${PYTHON_CONFIGDIR}/Makefile.pre.in . ;\
+ ${CP} ${PY_CONFIGDIR}/Makefile.pre.in . ;\
${MAKE} -f Makefile.pre.in boot)
post-build:
(cd ${WRKSRC}; make clean; ${RM} Makefile* sedscript release.* *.c)
- (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 p . ${PYTHON_LIBDIR})
- (cd ${PREFIX}; ${FIND} ${SITE_PKG}/DocumentTemplate \
- ${SITE_PKG}/StructuredText \
+ (cd ${WRKSRC}/..; ${PAX} -r -w -v -p p . ${PY_SITEPKG})
+ (cd ${PREFIX}; ${FIND} ${PY_SITEPATH}/DocumentTemplate \
+ ${PY_SITEPATH}/StructuredText \
-type f -print >>${PLIST_SRC})
- (cd ${PREFIX}; ${FIND} -d ${SITE_PKG}/DocumentTemplate \
- ${SITE_PKG}/StructuredText \
+ (cd ${PREFIX}; ${FIND} -d ${PY_SITEPATH}/DocumentTemplate \
+ ${PY_SITEPATH}/StructuredText \
-type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
+.include "../../lang/python/Makefile.inc"
.include "../../mk/bsd.pkg.mk"
+
diff --git a/textproc/py-dtml/files/md5 b/textproc/py-dtml/files/md5
index c430188c400..89659679f24 100644
--- a/textproc/py-dtml/files/md5
+++ b/textproc/py-dtml/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 2000/07/28 16:57:18 tsarna Exp $
+$NetBSD: md5,v 1.5 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
diff --git a/textproc/py-dtml/pkg/PLIST.pre b/textproc/py-dtml/pkg/PLIST.pre
index 3b31c05fd2e..6dd2b30cf6c 100644
--- a/textproc/py-dtml/pkg/PLIST.pre
+++ b/textproc/py-dtml/pkg/PLIST.pre
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.pre,v 1.1.1.1 2000/01/02 04:48:46 tsarna Exp $
-lib/python1.5/site-packages/ts_regex.py
-lib/python1.5/site-packages/ts_regex.pyc
-lib/python1.5/site-packages/ts_regex.pyo
+@comment $NetBSD: PLIST.pre,v 1.2 2000/10/22 20:01:54 tsarna Exp $
+lib/python2.0/site-packages/ts_regex.py
+lib/python2.0/site-packages/ts_regex.pyc
+lib/python2.0/site-packages/ts_regex.pyo