diff options
37 files changed, 336 insertions, 431 deletions
diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile index 94d37481832..1809692916b 100644 --- a/databases/py-gdbm/Makefile +++ b/databases/py-gdbm/Makefile @@ -1,39 +1,23 @@ -# $NetBSD: Makefile,v 1.12 2000/08/21 21:01:29 hubertf Exp $ +# $NetBSD: Makefile,v 1.13 2000/10/22 20:01:51 tsarna Exp $ # -DISTNAME= py152 -PKGNAME= py-gdbm-1.5.2 -WRKSRC= ${WRKDIR}/Python-1.5.2/Modules +DISTNAME= ${PY_DISTNAME} +PKGNAME= py-gdbm-${PY_VERSION} +WRKSRC= ${PY_WRKSRC} CATEGORIES= databases -MASTER_SITES= ftp://ftp.python.org/pub/python/src/ -EXTRACT_SUFX= .tgz +MASTER_SITES= ${PY_MASTER_SITES} MAINTAINER= dolecek@ics.muni.cz HOMEPAGE= http://www.python.org/doc/lib/module-gdbm.html -DEPENDS+= python-1.5.2:../../lang/python DEPENDS+= gdbm>=1.7.3:../../databases/gdbm -DIST_SUBDIR= python +EXTRACT_ELEMENTS= ${PY_MODULES}/gdbmmodule.c -ALL_TARGET= default - -EXTRACT_ELEMENTS= Python-1.5.2/Modules/gdbmmodule.c - -PYTHON_CONFIGDIR= ${LOCALBASE}/lib/python1.5/config/ - -.if ${MACHINE_ARCH} == "sparc64" -IGNORE="${PKGNAME} needs dynamic loading" -.endif - -do-configure: - ${SED} -e 's%@LOCALBASE@%${LOCALBASE}%g' ${FILESDIR}/Setup.in \ - >${WRKSRC}/Setup.in - (cd ${WRKSRC}; \ - ${CP} ${PYTHON_CONFIGDIR}/Makefile.pre.in .;\ - ${MAKE} -f Makefile.pre.in boot;) +do-configure: python-std-do-configure do-install: - ${INSTALL_DATA} ${WRKSRC}/gdbmmodule.so ${LOCALBASE}/lib/python1.5/lib-dynload + ${INSTALL_DATA} ${WRKSRC}/gdbmmodule.so ${PY_LIBDIR}/lib-dynload +.include "../../lang/python/Makefile.inc" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-gdbm/files/md5 b/databases/py-gdbm/files/md5 index cc887d2c66d..c593fe3ba07 100644 --- a/databases/py-gdbm/files/md5 +++ b/databases/py-gdbm/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.5 1999/04/14 06:17:31 tsarna Exp $ +$NetBSD: md5,v 1.6 2000/10/22 20:01:51 tsarna Exp $ -MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 diff --git a/databases/py-gdbm/pkg/PLIST b/databases/py-gdbm/pkg/PLIST index b63981c46db..1cf50043511 100644 --- a/databases/py-gdbm/pkg/PLIST +++ b/databases/py-gdbm/pkg/PLIST @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1 1998/05/23 21:46:05 tron Exp $ -lib/python1.5/lib-dynload/gdbmmodule.so +@comment $NetBSD: PLIST,v 1.2 2000/10/22 20:01:51 tsarna Exp $ +lib/python2.0/lib-dynload/gdbmmodule.so diff --git a/devel/py-curses/Makefile b/devel/py-curses/Makefile index ff58ee0286c..bc015025aac 100644 --- a/devel/py-curses/Makefile +++ b/devel/py-curses/Makefile @@ -1,34 +1,23 @@ -# $NetBSD: Makefile,v 1.10 2000/08/21 21:01:30 hubertf Exp $ +# $NetBSD: Makefile,v 1.11 2000/10/22 20:01:52 tsarna Exp $ # -DISTNAME= cursesmodule-1.5b1 -PKGNAME= py-curses-1.5b1 +DISTNAME= ${PY_DISTNAME} +PKGNAME= py-curses-${PY_VERSION} +WRKSRC= ${PY_WRKSRC} CATEGORIES= devel -MASTER_SITES= ftp://starship.skyport.net/pub/crew/andrich/Unsupported/ +MASTER_SITES= ${PY_MASTER_SITES} MAINTAINER= tsarna@netbsd.org -HOMEPAGE= http://starship.skyport.net/crew/amk/howto/curses/curses.html +HOMEPAGE= http://www.python.org/doc/current/lib/module-curses.html -DEPENDS+= python-1.5.2:../../lang/python -DEPENDS+= ncurses>=4.2:../../devel/ncurses +DEPENDS+= ncurses>=4.2:../../devel/ncurses -WRKSRC= ${WRKDIR}/cursesmodule -ALL_TARGET= default +EXTRACT_ELEMENTS= ${PY_MODULES}/_cursesmodule.c -PYTHON_CONFIGDIR= ${LOCALBASE}/lib/python1.5/config/ - -.if ${MACHINE_ARCH} == "sparc64" -IGNORE="${PKGNAME} needs dynamic loading" -.endif - -do-configure: - ${SED} -e 's%@LOCALBASE@%${LOCALBASE}%g' \ - ${FILESDIR}/Setup.in \ - >${WRKSRC}/Setup.in - ( cd ${WRKSRC} ;\ - ${MAKE} -f Makefile.pre.in boot) +do-configure: python-std-do-configure do-install: - ${INSTALL_DATA} ${WRKSRC}/cursesmodule.so ${LOCALBASE}/lib/python1.5/lib-dynload + ${INSTALL_DATA} ${WRKSRC}/_cursesmodule.so ${PY_LIBDIR}/lib-dynload +.include "../../lang/python/Makefile.inc" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-curses/files/Setup.in b/devel/py-curses/files/Setup.in index dec2951cf91..9dd99d6e1f6 100644 --- a/devel/py-curses/files/Setup.in +++ b/devel/py-curses/files/Setup.in @@ -1,4 +1,8 @@ -# $NetBSD: Setup.in,v 1.1 1998/08/12 01:50:01 tsarna Exp $ +# $NetBSD: Setup.in,v 1.2 2000/10/22 20:01:52 tsarna Exp $ # *shared* -cursesmodule cursesmodule.c -I@LOCALBASE@/include -L@LOCALBASE@/lib -lncurses +_curses _cursesmodule.c -DHAVE_NCURSES_H -I@LOCALBASE@/include \ + -L@LOCALBASE@/lib -R@LOCALBASE@/lib -lncurses +# +# NetBSD curses (doesn't work): +# _curses _cursesmodule.c -lcurses diff --git a/devel/py-curses/files/md5 b/devel/py-curses/files/md5 index 1d75520c07f..813328bf4af 100644 --- a/devel/py-curses/files/md5 +++ b/devel/py-curses/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1 1998/08/12 01:50:02 tsarna Exp $ +$NetBSD: md5,v 1.2 2000/10/22 20:01:52 tsarna Exp $ -MD5 (cursesmodule-1.5b1.tar.gz) = 8d200bc921d31f0a4710b725fb0627e6 +MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 diff --git a/devel/py-curses/files/patch-sum b/devel/py-curses/files/patch-sum deleted file mode 100644 index dae14c91305..00000000000 --- a/devel/py-curses/files/patch-sum +++ /dev/null @@ -1,3 +0,0 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:40 agc Exp $ - -MD5 (patch-aa) = 05c7caa0827cabe28fd1cdfee9fe2a39 diff --git a/devel/py-curses/patches/patch-aa b/devel/py-curses/patches/patch-aa deleted file mode 100644 index c920ae94a2f..00000000000 --- a/devel/py-curses/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.1 1998/08/12 01:50:02 tsarna Exp $ - -Remove this patch when/if ncurses becomes standard - ---- cursesmodule.c.orig Tue Aug 11 19:47:48 1998 -+++ cursesmodule.c Tue Aug 11 19:48:01 1998 -@@ -40,7 +40,7 @@ - /* Includes */ - - #include "Python.h" --#include <curses.h> -+#include <ncurses.h> - - #ifdef __sgi__ - /* No attr_t type is available */ diff --git a/devel/py-curses/pkg/PLIST b/devel/py-curses/pkg/PLIST index aad3ad6c853..05dd8da606d 100644 --- a/devel/py-curses/pkg/PLIST +++ b/devel/py-curses/pkg/PLIST @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1 1998/08/12 01:50:02 tsarna Exp $ -lib/python1.5/lib-dynload/cursesmodule.so +@comment $NetBSD: PLIST,v 1.2 2000/10/22 20:01:53 tsarna Exp $ +lib/python2.0/lib-dynload/_cursesmodule.so diff --git a/lang/py-extclass/Makefile b/lang/py-extclass/Makefile index 057b7e3d120..0bc75b5bfdf 100644 --- a/lang/py-extclass/Makefile +++ b/lang/py-extclass/Makefile @@ -1,42 +1,37 @@ -# $NetBSD: Makefile,v 1.7 2000/07/28 16:40:18 tsarna Exp $ +# $NetBSD: Makefile,v 1.8 2000/10/22 20:01:53 tsarna Exp $ # -DISTNAME= Zope-2.2.0-src -PKGNAME= py-extclass-2.2.0 +DISTNAME= Zope-2.2.2-src +PKGNAME= py-extclass-2.2.2 CATEGORIES= lang -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.digicool.com/releases/ExtensionClass -DEPENDS+= python-1.5.2:../../lang/python - -ALL_TARGET= default -PYTHON_LIBDIR= ${LOCALBASE}/lib/python1.5/site-packages -PYTHON_CONFIGDIR= ${LOCALBASE}/lib/python1.5/config EXTRACT_ELEMENTS= ${DISTNAME}/lib/Components/ExtensionClass WRKSRC= ${WRKDIR}/${DISTNAME}/lib/Components/ExtensionClass 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}; ${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: - (cd ${WRKSRC}; ${INSTALL_DATA} ExtensionClass.h \ - ${LOCALBASE}/include/python1.5 ; \ - ${INSTALL_SCRIPT_DIR} ${PYTHON_LIBDIR} ; \ - ${INSTALL_SCRIPT} Xaq.py* ComputedAttribute.py* ${PYTHON_LIBDIR} ; \ - ${INSTALL_PROGRAM} *.so ${PYTHON_LIBDIR} ; \ - ${INSTALL_SCRIPT_DIR} ${PYTHON_LIBDIR}/extclass_test ; \ - ${INSTALL_SCRIPT} test_*.py* ${PYTHON_LIBDIR}/extclass_test ; \ - ${INSTALL_DATA_DIR} ${PYTHON_LIBDIR}/extclass_doc ; \ - ${INSTALL_DATA} *.txt *.stx ${PYTHON_LIBDIR}/extclass_doc) - + (cd ${WRKSRC}; ${INSTALL_DATA} ExtensionClass.h ${PY_INCDIR} ; \ + ${INSTALL_SCRIPT_DIR} ${PY_SITEPKG} ; \ + ${INSTALL_SCRIPT} Xaq.py* ${PY_SITEPKG} ; \ + ${INSTALL_PROGRAM} *.so ${PY_SITEPKG} ; \ + ${INSTALL_SCRIPT_DIR} ${PY_SITEPKG}/extclass_test ; \ + ${INSTALL_SCRIPT} test_*.py* ${PY_SITEPKG}/extclass_test ; \ + ${INSTALL_DATA_DIR} ${PY_SITEPKG}/extclass_doc ; \ + ${INSTALL_DATA} *.txt *.stx ${PY_SITEPKG}/extclass_doc) + +.include "../../lang/python/Makefile.inc" .include "../../mk/bsd.pkg.mk" diff --git a/lang/py-extclass/files/md5 b/lang/py-extclass/files/md5 index 90041ac5895..2ae5045b22c 100644 --- a/lang/py-extclass/files/md5 +++ b/lang/py-extclass/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.4 2000/07/28 16:40:18 tsarna Exp $ +$NetBSD: md5,v 1.5 2000/10/22 20:01:53 tsarna Exp $ -MD5 (Zope-2.2.0-src.tgz) = e9a66aa64a75317ff6cefe3d3dce6286 +MD5 (python/Zope-2.2.2-src.tgz) = 83c8197f18bf97ad62bf2c5e424e2b82 diff --git a/lang/py-extclass/pkg/PLIST b/lang/py-extclass/pkg/PLIST index 455bc8e0c8b..8c3c8c65c3f 100644 --- a/lang/py-extclass/pkg/PLIST +++ b/lang/py-extclass/pkg/PLIST @@ -1,51 +1,48 @@ -@comment $NetBSD: PLIST,v 1.2 2000/07/28 16:40:18 tsarna Exp $ -include/python1.5/ExtensionClass.h -lib/python1.5/site-packages/Acquisition.so -lib/python1.5/site-packages/ComputedAttribute.so -lib/python1.5/site-packages/ComputedAttribute.py -lib/python1.5/site-packages/ComputedAttribute.pyc -lib/python1.5/site-packages/ComputedAttribute.pyo -lib/python1.5/site-packages/ExtensionClass.so -lib/python1.5/site-packages/MethodObject.so -lib/python1.5/site-packages/Missing.so -lib/python1.5/site-packages/MultiMapping.so -lib/python1.5/site-packages/Record.so -lib/python1.5/site-packages/Sync.so -lib/python1.5/site-packages/ThreadLock.so -lib/python1.5/site-packages/Xaq.py -lib/python1.5/site-packages/Xaq.pyc -lib/python1.5/site-packages/Xaq.pyo -lib/python1.5/site-packages/extclass_doc/COPYRIGHT.txt -lib/python1.5/site-packages/extclass_doc/Acquisition.stx -lib/python1.5/site-packages/extclass_doc/ExtensionClass.stx -lib/python1.5/site-packages/extclass_doc/MultiMapping.stx -lib/python1.5/site-packages/extclass_doc/index.stx -lib/python1.5/site-packages/extclass_test/test_Sync.py -lib/python1.5/site-packages/extclass_test/test_ThreadLock.py -lib/python1.5/site-packages/extclass_test/test_acquisition.py -lib/python1.5/site-packages/extclass_test/test_add.py -lib/python1.5/site-packages/extclass_test/test_binding.py -lib/python1.5/site-packages/extclass_test/test_explicit_acquisition.py -lib/python1.5/site-packages/extclass_test/test_func_attr.py -lib/python1.5/site-packages/extclass_test/test_method_hook.py -lib/python1.5/site-packages/extclass_test/test_MultiMapping.py -lib/python1.5/site-packages/extclass_test/test_MultiMapping.pyc -lib/python1.5/site-packages/extclass_test/test_MultiMapping.pyo -lib/python1.5/site-packages/extclass_test/test_Sync.pyc -lib/python1.5/site-packages/extclass_test/test_Sync.pyo -lib/python1.5/site-packages/extclass_test/test_ThreadLock.pyc -lib/python1.5/site-packages/extclass_test/test_ThreadLock.pyo -lib/python1.5/site-packages/extclass_test/test_acquisition.pyc -lib/python1.5/site-packages/extclass_test/test_acquisition.pyo -lib/python1.5/site-packages/extclass_test/test_add.pyc -lib/python1.5/site-packages/extclass_test/test_add.pyo -lib/python1.5/site-packages/extclass_test/test_binding.pyc -lib/python1.5/site-packages/extclass_test/test_binding.pyo -lib/python1.5/site-packages/extclass_test/test_explicit_acquisition.pyc -lib/python1.5/site-packages/extclass_test/test_explicit_acquisition.pyo -lib/python1.5/site-packages/extclass_test/test_func_attr.pyc -lib/python1.5/site-packages/extclass_test/test_func_attr.pyo -lib/python1.5/site-packages/extclass_test/test_method_hook.pyc -lib/python1.5/site-packages/extclass_test/test_method_hook.pyo -@dirrm lib/python1.5/site-packages/extclass_doc -@dirrm lib/python1.5/site-packages/extclass_test +@comment $NetBSD: PLIST,v 1.3 2000/10/22 20:01:53 tsarna Exp $ +include/python2.0/ExtensionClass.h +lib/python2.0/site-packages/Acquisition.so +lib/python2.0/site-packages/ComputedAttribute.so +lib/python2.0/site-packages/ExtensionClass.so +lib/python2.0/site-packages/MethodObject.so +lib/python2.0/site-packages/Missing.so +lib/python2.0/site-packages/MultiMapping.so +lib/python2.0/site-packages/Record.so +lib/python2.0/site-packages/Sync.so +lib/python2.0/site-packages/ThreadLock.so +lib/python2.0/site-packages/Xaq.py +lib/python2.0/site-packages/Xaq.pyc +lib/python2.0/site-packages/Xaq.pyo +lib/python2.0/site-packages/extclass_doc/COPYRIGHT.txt +lib/python2.0/site-packages/extclass_doc/Acquisition.stx +lib/python2.0/site-packages/extclass_doc/ExtensionClass.stx +lib/python2.0/site-packages/extclass_doc/MultiMapping.stx +lib/python2.0/site-packages/extclass_doc/index.stx +lib/python2.0/site-packages/extclass_test/test_Sync.py +lib/python2.0/site-packages/extclass_test/test_ThreadLock.py +lib/python2.0/site-packages/extclass_test/test_acquisition.py +lib/python2.0/site-packages/extclass_test/test_add.py +lib/python2.0/site-packages/extclass_test/test_binding.py +lib/python2.0/site-packages/extclass_test/test_explicit_acquisition.py +lib/python2.0/site-packages/extclass_test/test_func_attr.py +lib/python2.0/site-packages/extclass_test/test_method_hook.py +lib/python2.0/site-packages/extclass_test/test_MultiMapping.py +lib/python2.0/site-packages/extclass_test/test_MultiMapping.pyc +lib/python2.0/site-packages/extclass_test/test_MultiMapping.pyo +lib/python2.0/site-packages/extclass_test/test_Sync.pyc +lib/python2.0/site-packages/extclass_test/test_Sync.pyo +lib/python2.0/site-packages/extclass_test/test_ThreadLock.pyc +lib/python2.0/site-packages/extclass_test/test_ThreadLock.pyo +lib/python2.0/site-packages/extclass_test/test_acquisition.pyc +lib/python2.0/site-packages/extclass_test/test_acquisition.pyo +lib/python2.0/site-packages/extclass_test/test_add.pyc +lib/python2.0/site-packages/extclass_test/test_add.pyo +lib/python2.0/site-packages/extclass_test/test_binding.pyc +lib/python2.0/site-packages/extclass_test/test_binding.pyo +lib/python2.0/site-packages/extclass_test/test_explicit_acquisition.pyc +lib/python2.0/site-packages/extclass_test/test_explicit_acquisition.pyo +lib/python2.0/site-packages/extclass_test/test_func_attr.pyc +lib/python2.0/site-packages/extclass_test/test_func_attr.pyo +lib/python2.0/site-packages/extclass_test/test_method_hook.pyc +lib/python2.0/site-packages/extclass_test/test_method_hook.pyo +@dirrm lib/python2.0/site-packages/extclass_doc +@dirrm lib/python2.0/site-packages/extclass_test diff --git a/lang/py-html-docs/Makefile b/lang/py-html-docs/Makefile index f8106c22f30..4e315ec6289 100644 --- a/lang/py-html-docs/Makefile +++ b/lang/py-html-docs/Makefile @@ -1,15 +1,17 @@ -# $NetBSD: Makefile,v 1.7 2000/01/02 04:22:31 tsarna Exp $ +# $NetBSD: Makefile,v 1.8 2000/10/22 20:01:50 tsarna Exp $ # -DISTNAME= html-1.5.2 -PKGNAME= py-html-docs-1.5.2 +DISTNAME= html-2.0 +PKGNAME= py-html-docs-2.0 CATEGORIES= lang -MASTER_SITES= ftp://ftp.python.org/pub/python/doc/1.5.2/ -EXTRACT_SUFX= .tgz +MASTER_SITES= http://www.python.org/ftp/python/doc/2.0/ +EXTRACT_SUFX= .tar.bz2 MAINTAINER= tsarna@netbsd.org HOMEPAGE= http://www.python.org/doc/ +DIST_SUBDIR= python + NO_WRKSUBDIR= yes NO_CONFIGURE= yes diff --git a/lang/py-html-docs/files/md5 b/lang/py-html-docs/files/md5 index dfe45e25f43..7216b27e766 100644 --- a/lang/py-html-docs/files/md5 +++ b/lang/py-html-docs/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.5 1999/09/21 01:01:26 hubertf Exp $ +$NetBSD: md5,v 1.6 2000/10/22 20:01:50 tsarna Exp $ -MD5 (html-1.5.2.tgz) = ca863b3aac948f9c564ce1763a668f06 +MD5 (python/html-2.0.tar.bz2) = 7c6979e71828254b1303eadc60257961 diff --git a/lang/python/Makefile b/lang/python/Makefile index 2e14132dc5b..1558b65a1f8 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.18 2000/01/09 01:19:11 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2000/10/22 20:01:48 tsarna Exp $ # -DISTNAME= py152 -PKGNAME= python-1.5.2 +DISTNAME= BeOpen-Python-2.0 +PKGNAME= python-2.0 CATEGORIES= lang -MASTER_SITES= ftp://ftp.python.org/pub/python/src/ -EXTRACT_SUFX= .tgz +MASTER_SITES= http://www.pythonlabs.com/products/python2.0/downloads/ MAINTAINER= tsarna@netbsd.org HOMEPAGE= http://www.python.org/ @@ -14,8 +13,9 @@ PLIST_SRC= ${WRKDIR}/.PLIST_SRC DIST_SUBDIR= python -WRKSRC= ${WRKDIR}/Python-1.5.2 +WRKSRC= ${WRKDIR}/Python-2.0 GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --without-threads # Make sure having environment variable OPT doesn't affect the # installed module-building Makefile @@ -23,6 +23,11 @@ MAKE_ENV+= 'OPT=${CFLAGS}' CONFIGURE_ENV+= 'OPT=${CFLAGS}' SCRIPTS_ENV+= 'OPT=${CFLAGS}' +# If Building on NetBSD 1.5, include SSL support +.if exists(/usr/include/openssl/ssl.h) +SSLFLAGS= -DUSE_SSL -I/usr/include/openssl -lssl -lcrypto +.endif + # Handle the module setup file: # - disable a few broken modules on 64 bit platforms (nothing important) # - handle machines with no dynamic loader @@ -40,23 +45,33 @@ ZOULARIS?= ${PREFIX}/bsd MODADD= -I${ZOULARIS}/include -L${ZOULARIS}/lib -R${ZOULARIS}/lib .endif -post-configure: +pre-configure: + ${SED} -e 's,@NO64BIT@,${NO64BIT},g' \ + -e 's,@NOSHARED@,${NOSHARED},g' \ + -e 's,@MODADD@,${MODADD},g' \ + -e 's,@SSLFLAGS@,${SSLFLAGS},g' \ + ${FILESDIR}/Setup.in >${WRKSRC}/Modules/Setup.in ${SED} -e 's,@NO64BIT@,${NO64BIT},g' \ -e 's,@NOSHARED@,${NOSHARED},g' \ -e 's,@MODADD@,${MODADD},g' \ - ${FILESDIR}/Setup >${WRKSRC}/Modules/Setup + ${FILESDIR}/Setup.config.in >${WRKSRC}/Modules/Setup.config.in post-install: ${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC} - (cd ${PREFIX}; ${FIND} lib/python1.5 -type f -print >>${PLIST_SRC}) - (cd ${PREFIX}; ${FIND} include/python1.5 -type f -print \ + (cd ${PREFIX}; ${FIND} lib/python2.0 -type f -print | \ + ${GREP} -v site-packages >>${PLIST_SRC}) + ${ECHO} lib/python2.0/site-packages/README >>${PLIST_SRC} + (cd ${PREFIX}; ${FIND} include/python2.0 -type f -print \ >>${PLIST_SRC}) - (cd ${PREFIX}; ${FIND} -d include/python1.5 -type d -print | \ + (cd ${PREFIX}; ${FIND} -d include/python2.0 -type d -print | \ + ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}) + (cd ${PREFIX}; ${FIND} -d lib/python2.0 -type d -print | \ + ${GREP} -v site-packages | tee /tmp/x | \ + ${GREP} -vx lib/python2.0 | tee /tmp/y | \ ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}) - ${ECHO} "@unexec ${RM} -rf %D/lib/python1.5" >>${PLIST_SRC} # Reinstall Python binary to get it stripped - ${RM} ${PREFIX}/bin/python ${PREFIX}/bin/python1.5 - ${INSTALL_PROGRAM} ${WRKSRC}/python ${PREFIX}/bin - ${LN} ${PREFIX}/bin/python ${PREFIX}/bin/python1.5 + ${RM} ${PREFIX}/bin/python2.0 ${PREFIX}/bin/python + ${INSTALL_PROGRAM} ${WRKSRC}/python ${PREFIX}/bin/python2.0 + ${LN} ${PREFIX}/bin/python2.0 ${PREFIX}/bin/python .include "../../mk/bsd.pkg.mk" diff --git a/lang/python/Makefile.inc b/lang/python/Makefile.inc new file mode 100644 index 00000000000..f22d8c30594 --- /dev/null +++ b/lang/python/Makefile.inc @@ -0,0 +1,39 @@ +# $NetBSD: Makefile.inc,v 1.1 2000/10/22 20:01:48 tsarna Exp $ +# + +PY_VERSION= 2.0 +PY_DISTNAME= BeOpen-Python-${PY_VERSION} +PY_MASTER_SITES=http://www.pythonlabs.com/products/python${PY_VERSION}/downloads/ +DIST_SUBDIR?= python + +PY_WRKSRC= ${WRKDIR}/Python-${PY_VERSION}/Modules +PY_MODULES= Python-${PY_VERSION}/Modules + +PY_CONFIGDIR= ${LOCALBASE}/lib/python${PY_VERSION}/config +PY_LIBPATH= lib/python${PY_VERSION} +PY_LIBDIR= ${LOCALBASE}/${PY_LIBPATH} +PY_SITEPATH= ${PY_LIBPATH}/site-packages +PY_SITEPKG= ${PY_LIBDIR}/site-packages +PY_PROG= ${LOCALBASE}/bin/python${PY_VERSION} +PY_INCDIR= ${LOCALBASE}/include/python${PY_VERSION} + +PY_COMPILEDIR= ${PY_PROG} ${PY_LIBDIR}/compileall.py + +DEPENDS+= python-${PY_VERSION}*:../../lang/python + +ALL_TARGET?= default + +.if ${MACHINE_ARCH} == "sparc64" +IGNORE="${PKGNAME} needs dynamic loading" +.endif + +# This is used for standard modules shipped with Python but build as +# separate packages. + +python-std-do-configure: + ${SED} -e 's%@LOCALBASE@%${LOCALBASE}%g' \ + -e 's%@X11BASE@%${X11BASE}%g' ${FILESDIR}/Setup.in \ + >${WRKSRC}/Setup.in + ( cd ${WRKSRC} ;\ + ${CP} ${PY_CONFIGDIR}/Makefile.pre.in .;\ + ${MAKE} -f Makefile.pre.in boot) diff --git a/lang/python/files/Setup.config.in b/lang/python/files/Setup.config.in new file mode 100644 index 00000000000..b0e56951705 --- /dev/null +++ b/lang/python/files/Setup.config.in @@ -0,0 +1,18 @@ +# This file is transmogrified into Setup.config by config.status. + +# The purpose of this file is to conditionally enable certain modules +# based on configure-time options. Currently thread support and +# garbage collection support are the only two modules so enabled. + +@USE_THREAD_MODULE@thread threadmodule.c + +# Garbage collection enabled with --with-cycle-gc +@USE_GC_MODULE@gc gcmodule.c + +# You may want this to be built as a dynamically loaded module; uncomment +# the following line in that case: + +*shared* + +# bsddb module enabled by --with-libdb or presence of db.h +bsddb bsddbmodule.c @MODADD@ diff --git a/lang/python/files/Setup b/lang/python/files/Setup.in index baf34663735..ed1c2cab784 100644 --- a/lang/python/files/Setup +++ b/lang/python/files/Setup.in @@ -1,6 +1,6 @@ # -*- makefile -*- # -# $NetBSD: Setup,v 1.6 1999/05/15 17:00:14 tsarna Exp $ +# $NetBSD: Setup.in,v 1.1 2000/10/22 20:01:49 tsarna Exp $ # # The file Setup is used by the makesetup script to construct the files # Makefile and config.c, from Makefile.pre and config.c.in, @@ -82,7 +82,7 @@ TESTPATH= # Path components for machine- or system-dependent modules and shared libraries MACHDEPPATH=:plat-$(MACHDEP) -COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(STDWINPATH)$(TKPATH) +COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(TKPATH) PYTHONPATH=$(COREPYTHONPATH) @@ -96,14 +96,13 @@ regex regexmodule.c regexpr.c # Regular expressions, GNU Emacs style pcre pcremodule.c pypcre.c # Regular expressions, Perl style (for re.py) posix posixmodule.c # posix (UNIX) system calls signal signalmodule.c # signal(2) +_sre _sre.c # Fredrik Lundh's new regular expressions # The SGI specific GL module: GLHACK=-Dclear=__GLclear #gl glmodule.c cgensupport.c -I$(srcdir) $(GLHACK) -lgl -lX11 -# The thread module is now automatically enabled, see Setup.thread. - # Pure module. Cannot be linked dynamically. # -DWITH_QUANTIFY, -DWITH_PURIFY, or -DWITH_ALL_PURE #WHICH_PURE_PRODUCTS=-DWITH_ALL_PURE @@ -137,8 +136,13 @@ strop stropmodule.c # fast string operations implemented in C struct structmodule.c # binary structure packing/unpacking time timemodule.c # -lm # time operations and variables operator operator.c # operator.add() and similar goodies +_codecs _codecsmodule.c # access to the builtin codecs and codec registry + +unicodedata unicodedata.c unicodedatabase.c + # static Unicode character database +ucnhash ucnhash.c # Unicode Character Name expansion hash table -#_locale _localemodule.c # access to ISO C locale support +_locale _localemodule.c # access to ISO C locale support # Modules with some UNIX dependencies -- on by default: @@ -148,10 +152,17 @@ operator operator.c # operator.add() and similar goodies fcntl fcntlmodule.c # fcntl(2) and ioctl(2) pwd pwdmodule.c # pwd(3) grp grpmodule.c # grp(3) -select selectmodule.c # select(2); not on ancient System V -socket socketmodule.c # socket(2); not on ancient System V -#_socket socketmodule.c # socket(2); use this one for BeOS sockets errno errnomodule.c # posix (UNIX) errno values +mmap mmapmodule.c # Memory-mapped files (also works on Win32) +select selectmodule.c # select(2); not on ancient System V +#_socket socketmodule.c # socket(2) + +# Socket module compiled with SSL support; you must edit the SSL variable: +#SSL=/usr/local/ssl +#_socket socketmodule.c \ +# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ +# -L$(SSL)/lib -lssl -lcrypto +_socket socketmodule.c @SSLFLAGS@ # The crypt module is now disabled by default because it breaks builds # on many systems (where -lcrypt is needed), e.g. Linux (I believe). @@ -161,7 +172,7 @@ crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems # Some more UNIX dependent modules -- off by default, since these # are not supported by all UNIX systems: -nis nismodule.c # Sun yellow pages -- not everywhere +nis nismodule.c # Sun yellow pages -- not everywhere termios termios.c # Steen Lumholt's termios module resource resource.c # Jeremy Hylton's rlimit interface @@ -175,26 +186,6 @@ resource resource.c # Jeremy Hylton's rlimit interface @NO64BIT@rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably) -# The stdwin module provides a simple, portable (between X11 and Mac) -# windowing interface. You need to ftp the STDWIN library, e.g. from -# ftp://ftp.cwi.nl/pub/stdwin. (If you get it elsewhere, be sure to -# get version 1.0 or higher!) The STDWIN variable must point to the -# STDWIN toplevel directory. - -# Uncomment and edit as needed: -#STDWIN=/ufs/guido/src/stdwin - -# Uncomment these lines: -#STDWINPATH=:lib-stdwin -#LIBTEXTEDIT=$(STDWIN)/$(MACHDEP)/Packs/textedit/libtextedit.a -#LIBX11STDWIN=$(STDWIN)/$(MACHDEP)/Ports/x11/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBX11STDWIN) -lX11 - -# Use this instead of the last two lines above for alphanumeric stdwin: -#LIBALFASTDWIN=$(STDWIN)/$(MACHDEP)/Ports/alfa/libstdwin.a -#stdwin stdwinmodule.c -I$(STDWIN)/H $(LIBTEXTEDIT) $(LIBALFASTDWIN) -ltermcap - - # The md5 module implements the RSA Data Security, Inc. MD5 # Message-Digest Algorithm, described in RFC 1321. The necessary files # md5c.c and md5.h are included here. @@ -264,6 +255,11 @@ sha shamodule.c #sunaudiodev sunaudiodev.c +# Linux specific modules -- off by default: + +#linuxaudiodev linuxaudiodev.c + + # George Neville-Neil's timing module: timing timingmodule.c @@ -320,12 +316,12 @@ rotor rotormodule.c # enigma-inspired encryption syslog syslogmodule.c # syslog daemon interface -# Lance's curses module. This requires the System V version of -# curses, sometimes known as ncurses (e.g. on Linux, link with -# -lncurses instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include +# Curses support, requring the System V version of curses, often +# provided by the ncurses library. e.g. on Linux, link with -lncurses +# instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include # -L/usr/5lib before -lcurses). -#curses cursesmodule.c -lcurses -ltermcap +# _curses _cursesmodule.c -lcurses -ltermcap @@ -351,30 +347,14 @@ new newmodule.c # The standard Unix dbm module: -dbm dbmmodule.c # dbm(3) may require -lndbm or similar +#dbm dbmmodule.c # dbm(3) may require -lndbm or similar # Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm: #gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm - -# Berkeley DB interface. -# -# This requires the Berkeley DB code, see -# ftp://ftp.cs.berkeley.edu/pub/4bsd/db.1.85.tar.gz -# -# Edit the variables DB and DBPORT to point to the db top directory -# and the subdirectory of PORT where you built it. -# -# (See http://www.jenkon-dev.com/~rd/python/ for an interface to -# BSD DB 2.1.0.) - -#DB=/depot/sundry/src/berkeley-db/db.1.85 -#DBPORT=$(DB)/PORT/irix.5.3 -bsddb bsddbmodule.c @MODADD@ - # David Wayne Williams' soundex module (obsolete -- this will disappear!) -soundex soundex.c +#soundex soundex.c # Helper module for various ascii-encoders binascii binascii.c @@ -409,6 +389,28 @@ cPickle cPickle.c # See http://www.cdrom.com/pub/infozip/zlib/ zlib zlibmodule.c @MODADD@ -lz +# Interface to the Expat XML parser +# +# Expat is written by James Clark and must be downloaded separately +# (see below). The pyexpat module was written by Paul Prescod after a +# prototype by Jack Jansen. +# +# The Expat dist includes Windows .lib and .dll files. Home page is at +# http://www.jclark.com/xml/expat.html, the current production release is +# always ftp://ftp.jclark.com/pub/xml/expat.zip. +# +# EXPAT_DIR, below, should point to the expat/ directory created by +# unpacking the Expat source distribution. +# +# Note: the expat build process doesn't yet build a libexpat.a; you can +# do this manually while we try convince the author to add it. To do so, +# cd to EXPAT_DIR, run "make" if you have not done so, then run: +# +# ar cr libexpat.a xmltok/*.o xmlparse/*.o +# +#EXPAT_DIR=/usr/local/src/expat +#pyexpat pyexpat.c -I$(EXPAT_DIR)/xmlparse -L$(EXPAT_DIR) -lexpat + # Example -- included for reference only: # xx xxmodule.c diff --git a/lang/python/files/md5 b/lang/python/files/md5 index a34d654fdc5..2ea75c91d30 100644 --- a/lang/python/files/md5 +++ b/lang/python/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.8 1999/04/14 04:51:27 tsarna Exp $ +$NetBSD: md5,v 1.9 2000/10/22 20:01:49 tsarna Exp $ -MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 diff --git a/lang/python/files/patch-sum b/lang/python/files/patch-sum deleted file mode 100644 index 55360f1b274..00000000000 --- a/lang/python/files/patch-sum +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: patch-sum,v 1.2 2000/09/10 20:59:06 wiz Exp $ - -MD5 (patch-aa) = 92cd2dace0eb2cc5e0d28ce8d26472ec -MD5 (patch-ab) = 44ceb9b4e2e5fe8430e53fcf400a6d88 -MD5 (patch-ac) = 07c1bb21ea1df7e6bf8fa2b3c95c5617 diff --git a/lang/python/patches/patch-aa b/lang/python/patches/patch-aa deleted file mode 100644 index 72cce81d66e..00000000000 --- a/lang/python/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.5 1999/04/14 05:11:22 tsarna Exp $ - -Deal with egcs's unexpectedly long version string. - ---- Python/getversion.c.orig Tue Apr 13 23:58:15 1999 -+++ Python/getversion.c Tue Apr 13 23:58:22 1999 -@@ -39,7 +39,7 @@ - Py_GetVersion() - { - static char version[100]; -- sprintf(version, "%.10s (%.40s) %.40s", PY_VERSION, -+ sprintf(version, "%.10s (%.40s) %.50s", PY_VERSION, - Py_GetBuildInfo(), Py_GetCompiler()); - return version; - } diff --git a/lang/python/patches/patch-ab b/lang/python/patches/patch-ab deleted file mode 100644 index 561d98ece96..00000000000 --- a/lang/python/patches/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2000/09/10 20:59:07 wiz Exp $ - -If libnet is installed, this check results in a link error. -- wiz - ---- configure.in.orig Sat Apr 10 18:01:48 1999 -+++ configure.in -@@ -548,7 +548,6 @@ - *) - AC_CHECK_LIB(nsl, t_open, [LIBS="-lnsl $LIBS"]) # SVR4 - AC_CHECK_LIB(socket, socket, [LIBS="-lsocket $LIBS"], [], $LIBS) # SVR4 sockets --AC_CHECK_LIB(net, socket, [LIBS="-lnet $LIBS"], [], $LIBS) # BeOS - ;; - esac - diff --git a/lang/python/patches/patch-ac b/lang/python/patches/patch-ac deleted file mode 100644 index f3e23c4cbe1..00000000000 --- a/lang/python/patches/patch-ac +++ /dev/null @@ -1,53 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2000/09/10 20:59:07 wiz Exp $ - -If libnet is installed, this check results in a link error. -- wiz - ---- configure.orig Sat Apr 10 18:02:18 1999 -+++ configure -@@ -2499,46 +2499,6 @@ - echo "$ac_t""no" 1>&6 - fi - # SVR4 sockets --echo $ac_n "checking for socket in -lnet""... $ac_c" 1>&6 --echo "configure:2504: checking for socket in -lnet" >&5 --ac_lib_var=`echo net'_'socket | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-lnet $LIBS $LIBS" --cat > conftest.$ac_ext <<EOF --#line 2512 "configure" --#include "confdefs.h" --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char socket(); -- --int main() { --socket() --; return 0; } --EOF --if { (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -- --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- LIBS="-lnet $LIBS" --else -- echo "$ac_t""no" 1>&6 --fi -- # BeOS - ;; - esac - diff --git a/lang/python/pkg/PLIST.pre b/lang/python/pkg/PLIST.pre index 34d48d527d5..b54a255b330 100644 --- a/lang/python/pkg/PLIST.pre +++ b/lang/python/pkg/PLIST.pre @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.pre,v 1.1 1999/04/14 04:51:29 tsarna Exp $ +@comment $NetBSD: PLIST.pre,v 1.2 2000/10/22 20:01:50 tsarna Exp $ bin/python -bin/python1.5 +bin/python2.0 man/man1/python.1 diff --git a/misc/py-readline/Makefile b/misc/py-readline/Makefile index 78957c20917..4bdce7445c9 100644 --- a/misc/py-readline/Makefile +++ b/misc/py-readline/Makefile @@ -1,37 +1,23 @@ -# $NetBSD: Makefile,v 1.12 2000/08/21 21:01:32 hubertf Exp $ +# $NetBSD: Makefile,v 1.13 2000/10/22 20:01:50 tsarna Exp $ # -DISTNAME= py152 -PKGNAME= py-readline-1.5.2 -WRKSRC= ${WRKDIR}/Python-1.5.2/Modules +DISTNAME= ${PY_DISTNAME} +PKGNAME= py-readline-${PY_VERSION} +WRKSRC= ${PY_WRKSRC} CATEGORIES= misc -MASTER_SITES= ftp://ftp.python.org/pub/python/src/ -EXTRACT_SUFX= .tgz +MASTER_SITES= ${PY_MASTER_SITES} MAINTAINER= tsarna@netbsd.org HOMEPAGE= http://www.python.org/doc/tut/interacting.html -DEPENDS+= python-1.5.2:../../lang/python DEPENDS+= readline>=4.0:../../devel/readline -DIST_SUBDIR= python -ALL_TARGET= default -EXTRACT_ELEMENTS= Python-1.5.2/Modules/readline.c +EXTRACT_ELEMENTS= ${PY_MODULES}/readline.c -PYTHON_CONFIGDIR= ${LOCALBASE}/lib/python1.5/config - -.if ${MACHINE_ARCH} == "sparc64" -IGNORE="${PKGNAME} needs dynamic loading" -.endif - -do-configure: - ${SED} 's%@LOCALBASE@%${LOCALBASE}%g' ${FILESDIR}/Setup.in \ - >${WRKSRC}/Setup.in - (cd ${WRKSRC}; \ - ${LN} -s ${PYTHON_CONFIGDIR}/Makefile.pre.in; \ - ${MAKE} -f Makefile.pre.in boot) +do-configure: python-std-do-configure do-install: - ${INSTALL_DATA} ${WRKSRC}/readline.so ${LOCALBASE}/lib/python1.5/lib-dynload + ${INSTALL_DATA} ${WRKSRC}/readline.so ${PY_LIBDIR}/lib-dynload +.include "../../lang/python/Makefile.inc" .include "../../mk/bsd.pkg.mk" diff --git a/misc/py-readline/files/md5 b/misc/py-readline/files/md5 index efb9cfdb98e..26dee4471d6 100644 --- a/misc/py-readline/files/md5 +++ b/misc/py-readline/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.5 1999/04/14 05:47:45 tsarna Exp $ +$NetBSD: md5,v 1.6 2000/10/22 20:01:50 tsarna Exp $ -MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 diff --git a/misc/py-readline/pkg/PLIST b/misc/py-readline/pkg/PLIST index 1c73bbb1d18..0f54c4aff62 100644 --- a/misc/py-readline/pkg/PLIST +++ b/misc/py-readline/pkg/PLIST @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1 1998/05/14 21:54:04 tron Exp $ -lib/python1.5/lib-dynload/readline.so +@comment $NetBSD: PLIST,v 1.2 2000/10/22 20:01:51 tsarna Exp $ +lib/python2.0/lib-dynload/readline.so diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile index 0ed882c7183..6ddb468e557 100644 --- a/print/py-reportlab/Makefile +++ b/print/py-reportlab/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2000/08/31 22:39:45 tsarna Exp $ +# $NetBSD: Makefile,v 1.2 2000/10/22 20:01:55 tsarna Exp $ # -DISTNAME= ReportLab_1_00 -PKGNAME= py-reportlab-1.00 +DISTNAME= ReportLab_1_01 +PKGNAME= py-reportlab-1.01 CATEGORIES= print MASTER_SITES= ftp://ftp.reportlab.com/ EXTRACT_SUFX= .tgz @@ -10,35 +10,32 @@ EXTRACT_SUFX= .tgz MAINTAINER= tsarna@netbsd.org HOMEPAGE= http://www.reportlab.com/ -DEPENDS+= python-1.5.2:../../lang/python - -WRKSRC= ${WRKDIR}/reportlab/pdfbase +WRKSRC= ${WRKDIR}/reportlab/lib 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 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 ${WRKDIR}; \ - ${LOCALBASE}/bin/python ${PREFIX}/lib/python1.5/compileall.py . ; \ - ${LOCALBASE}/bin/python -O ${PREFIX}/lib/python1.5/compileall.py . ) + ${PY_PROG} ${PY_LIBDIR}/compileall.py . ; \ + ${PY_PROG} -O ${PY_LIBDIR}/compileall.py . ) (cd ${WRKSRC}; \ ${MAKE} clean; ${RM} -f *.c *.orig Makefile* Setup* sedscript ) do-install: - ${INSTALL_SCRIPT_DIR} ${PYTHON_LIBDIR} + ${INSTALL_SCRIPT_DIR} ${PY_LIBDIR} ${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC} - (cd ${WRKDIR}; ${PAX} -r -w -v -p p reportlab ${PYTHON_LIBDIR}) - (cd ${PREFIX}; ${FIND} ${SITE_PKG}/reportlab \ + (cd ${WRKDIR}; ${PAX} -r -w -v -p p reportlab ${PY_SITEPKG}) + (cd ${PREFIX}; ${FIND} ${PY_SITEPATH}/reportlab \ -type f -print >>${PLIST_SRC}) - (cd ${PREFIX}; ${FIND} -d ${SITE_PKG}/reportlab \ + (cd ${PREFIX}; ${FIND} -d ${PY_SITEPATH}/reportlab \ -type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}) +.include "../../lang/python/Makefile.inc" .include "../../mk/bsd.pkg.mk" + diff --git a/print/py-reportlab/files/md5 b/print/py-reportlab/files/md5 index 2bd88317f52..c3e442bffea 100644 --- a/print/py-reportlab/files/md5 +++ b/print/py-reportlab/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 2000/08/31 22:39:45 tsarna Exp $ +$NetBSD: md5,v 1.2 2000/10/22 20:01:55 tsarna Exp $ -MD5 (ReportLab_1_00.tgz) = 6c8da48a5e5483842419da9e195a6748 +MD5 (python/ReportLab_1_01.tgz) = 0c4126432624875bf36fac56faa963e7 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 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 diff --git a/x11/py-Tk/Makefile b/x11/py-Tk/Makefile index 0f258e8d187..258ba47b855 100644 --- a/x11/py-Tk/Makefile +++ b/x11/py-Tk/Makefile @@ -1,43 +1,28 @@ -# $NetBSD: Makefile,v 1.14 2000/08/31 02:35:17 tsarna Exp $ +# $NetBSD: Makefile,v 1.15 2000/10/22 20:01:51 tsarna Exp $ # -DISTNAME= py152 -PKGNAME= py-Tk-1.5.2 +DISTNAME= ${PY_DISTNAME} +PKGNAME= py-Tk-${PY_VERSION} CATEGORIES= x11 -MASTER_SITES= ftp://ftp.python.org/pub/python/src/ -EXTRACT_SUFX= .tgz +MASTER_SITES= ${PY_MASTER_SITES} MAINTAINER= tsarna@netbsd.org HOMEPAGE= http://www.python.org/topics/tkinter/ -DEPENDS+= python-1.5.2:../../lang/python DEPENDS+= tk-*:../../x11/tk DEPENDS+= tcl-*:../../lang/tcl -DIST_SUBDIR= python - USE_X11= yes -WRKSRC= ${WRKDIR}/Python-1.5.2/Modules -ALL_TARGET= default -EXTRACT_ELEMENTS= Python-1.5.2/Modules/_tkinter.c \ - Python-1.5.2/Modules/tkappinit.c - -PYTHON_CONFIGDIR= ${LOCALBASE}/lib/python1.5/config +WRKSRC= ${PY_WRKSRC} -.if ${MACHINE_ARCH} == "sparc64" -IGNORE="${PKGNAME} needs dynamic loading" -.endif +EXTRACT_ELEMENTS= ${PY_MODULES}/_tkinter.c \ + ${PY_MODULES}/tkappinit.c -do-configure: - ${SED} -e 's%@LOCALBASE@%${LOCALBASE}%g' \ - -e 's%@X11BASE@%${X11BASE}%g' ${FILESDIR}/Setup.in \ - >${WRKSRC}/Setup.in - ( cd ${WRKSRC} ;\ - ${LN} -s ${PYTHON_CONFIGDIR}/Makefile.pre.in ;\ - ${MAKE} -f Makefile.pre.in boot) +do-configure: python-std-do-configure do-install: - ${INSTALL_DATA} ${WRKSRC}/_tkinter.so ${LOCALBASE}/lib/python1.5/lib-dynload - ${INSTALL_DATA} ${WRKSRC}/Setup.in ${PYTHON_CONFIGDIR}/Setup.tk + ${INSTALL_DATA} ${WRKSRC}/_tkinter.so ${PY_LIBDIR}/lib-dynload + ${INSTALL_DATA} ${WRKSRC}/Setup.in ${PY_CONFIGDIR}/Setup.tk +.include "../../lang/python/Makefile.inc" .include "../../mk/bsd.pkg.mk" diff --git a/x11/py-Tk/files/md5 b/x11/py-Tk/files/md5 index 841097cecf5..a040eea471c 100644 --- a/x11/py-Tk/files/md5 +++ b/x11/py-Tk/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.6 1999/04/14 06:15:57 tsarna Exp $ +$NetBSD: md5,v 1.7 2000/10/22 20:01:52 tsarna Exp $ -MD5 (python/py152.tgz) = e9d677ae6d5a3efc6937627ed8a3e752 +MD5 (python/BeOpen-Python-2.0.tar.gz) = 8c4a64891d3dc6422df2514c603f0c98 diff --git a/x11/py-Tk/pkg/PLIST b/x11/py-Tk/pkg/PLIST index b18a6ee4024..412f4ebfe76 100644 --- a/x11/py-Tk/pkg/PLIST +++ b/x11/py-Tk/pkg/PLIST @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.3 1999/06/29 01:48:57 sakamoto Exp $ -lib/python1.5/lib-dynload/_tkinter.so -lib/python1.5/config/Setup.tk +@comment $NetBSD: PLIST,v 1.4 2000/10/22 20:01:52 tsarna Exp $ +lib/python2.0/lib-dynload/_tkinter.so +lib/python2.0/config/Setup.tk |