Update to 2.2.2 and for new distutils-based build mechanism

5 files changed, 12 insertions, 34 deletions

diff --git a/x11/py-wxWindows/Makefile b/x11/py-wxWindows/Makefile
index 520d118bf57..7864dee2c59 100644
--- a/x11/py-wxWindows/Makefile
+++ b/x11/py-wxWindows/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2000/11/11 17:49:29 tron Exp $
+# $NetBSD: Makefile,v 1.7 2000/11/12 20:38:38 tsarna Exp $
 #
 
-DISTNAME=	wxPython-2.2.1
-PKGNAME=	py-wxWindows-2.2.1
+DISTNAME=	wxPython-2.2.2
+PKGNAME=	py-wxWindows-2.2.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wxpython/}
 
@@ -10,7 +10,7 @@ MAINTAINER=	tsarna@netbsd.org
 HOMEPAGE=	http://wxpython.org/
 
 DEPENDS+=       python>=2.0:../../lang/python
-DEPENDS+=       wxGTK>=2.2.1:../../x11/wxGTK
+DEPENDS+=       wxGTK>=2.2.2:../../x11/wxGTK
 
 PLIST_SRC=      ${WRKDIR}/.PLIST_SRC
 SITE_PKG=	lib/python2.0/site-packages
@@ -18,15 +18,16 @@ PYTHON_LIBDIR=	${LOCALBASE}/${SITE_PKG}
 
 USE_GMAKE=	yes
 
+BUILD_OPTS=	BUILD_GLCANVAS=0
+
 do-build:
-	(cd ${WRKSRC}/src; WXWIN=${PREFIX} \
-	${PREFIX}/bin/python ../distrib/build.py -b)
+	(cd ${WRKSRC}; ${PREFIX}/bin/python setup.py ${BUILD_OPTS} build)
 
 do-install:
+	(cd ${WRKSRC}; ${PREFIX}/bin/python setup.py install)
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	(cd ${WRKSRC}/src; ${GMAKE} install)
 	(cd ${PYTHON_LIBDIR}/wxPython; \
-	${PREFIX}/bin/python ${PREFIX}/lib/python2.0/compileall.py . \
+	${PREFIX}/bin/python ${PREFIX}/lib/python2.0/compileall.py . ; \
 	${PREFIX}/bin/python -O ${PREFIX}/lib/python2.0/compileall.py . )
 	(cd ${PREFIX}; ${FIND} ${SITE_PKG}/wxPython \
 		-type f -print >>${PLIST_SRC})
diff --git a/x11/py-wxWindows/files/md5 b/x11/py-wxWindows/files/md5
index 7aebea1c072..ca476365dee 100644
--- a/x11/py-wxWindows/files/md5
+++ b/x11/py-wxWindows/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2000/10/26 16:26:34 tsarna Exp $
+$NetBSD: md5,v 1.3 2000/11/12 20:38:39 tsarna Exp $
 
-MD5 (wxPython-2.2.1.tar.gz) = 48b39076d362e568b0c7cd49f613b2ee
+MD5 (wxPython-2.2.2.tar.gz) = 879c7e42c9a8af0379fa15dc39d0212c
diff --git a/x11/py-wxWindows/files/patch-sum b/x11/py-wxWindows/files/patch-sum
deleted file mode 100644
index 312bfb334e6..00000000000
--- a/x11/py-wxWindows/files/patch-sum
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: patch-sum,v 1.1 2000/07/30 00:27:05 tsarna Exp $
-
-MD5 (patch-aa) = 97aecdd27f7373fdf00f5f49c0824ba1
-MD5 (patch-ab) = 911fb102f1190cfbe4e3939b7196c8fa
diff --git a/x11/py-wxWindows/patches/patch-aa b/x11/py-wxWindows/patches/patch-aa
deleted file mode 100644
index 710b102906f..00000000000
--- a/x11/py-wxWindows/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2000/09/03 13:51:43 wiz Exp $
-
---- distrib/build.py.orig	Sat Jul 29 19:17:22 2000
-+++ distrib/build.py	Sat Jul 29 19:17:29 2000
-@@ -277,7 +277,7 @@
- 
- 
-         else:
--            self.MAKE      = 'make'
-+            self.MAKE      = 'gmake'
-             self.PYLIB     = '$(EXECPREFIX)/lib/python$(PYVERSION)'
-             self.LIBPL     = '$(PYLIB)/config'
-             self.PYTHONLIB = '$(LIBPL)/libpython$(PYVERSION).a'
diff --git a/x11/py-wxWindows/pkg/PLIST.pre b/x11/py-wxWindows/pkg/PLIST.pre
index 7d3d095e2ee..3bec8ed2697 100644
--- a/x11/py-wxWindows/pkg/PLIST.pre
+++ b/x11/py-wxWindows/pkg/PLIST.pre
@@ -1,7 +1 @@
-@comment $NetBSD: PLIST.pre,v 1.3 2000/10/26 16:44:59 tsarna Exp $
-lib/libwxPyHelpers.so.1.0.0
-lib/libwxPyHelpers.so.1.0
-lib/libwxPyHelpers.so.1
-lib/libwxPyHelpers.so
-lib/libwxPyHelpers.2.2.so.1
-lib/libwxPyHelpers.2.2.so
+@comment $NetBSD: PLIST.pre,v 1.4 2000/11/12 20:38:41 tsarna Exp $