From fcb0de9be8d5f4972e60c7d49876b547d8fe2bec 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...
---
 databases/py-gdbm/Makefile  | 34 +++++++++-------------------------
 databases/py-gdbm/files/md5 |  4 ++--
 databases/py-gdbm/pkg/PLIST |  4 ++--
 3 files changed, 13 insertions(+), 29 deletions(-)

(limited to 'databases/py-gdbm')

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
-- 
cgit v1.2.3