Properly disable pyexpat module here as well.

Bump PKGREVISION.

4 files changed, 7 insertions, 8 deletions

diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 7784d45e32b..6bad9cf3fdb 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2010/01/21 16:28:51 heinz Exp $
+# $NetBSD: Makefile,v 1.25 2010/01/27 08:43:04 wiz Exp $
 
 DISTNAME=	Python-2.5.4
 PKGNAME=	python25-2.5.4
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	lang python
 MASTER_SITES=	http://www.python.org/ftp/python/2.5.4/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/lang/python25/PLIST.common b/lang/python25/PLIST.common
index febe57da4a9..e7742393cde 100644
--- a/lang/python25/PLIST.common
+++ b/lang/python25/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.4 2009/04/11 19:42:23 snj Exp $
+@comment $NetBSD: PLIST.common,v 1.5 2010/01/27 08:43:04 wiz Exp $
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}-config
@@ -1565,7 +1565,6 @@ ${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
 ${PLIST.no-nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/operator.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
-lib/python${PY_VER_SUFFIX}/lib-dynload/pyexpat.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
 ${PLIST.extra-so}lib/python${PY_VER_SUFFIX}/lib-dynload/rgbimg.so
 ${PLIST.oss}lib/python${PY_VER_SUFFIX}/lib-dynload/ossaudiodev.so
diff --git a/lang/python25/distinfo b/lang/python25/distinfo
index 6fd6d4c3675..4f95f6e8823 100644
--- a/lang/python25/distinfo
+++ b/lang/python25/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2009/09/19 09:18:53 obache Exp $
+$NetBSD: distinfo,v 1.12 2010/01/27 08:43:04 wiz Exp $
 
 SHA1 (Python-2.5.4.tar.bz2) = 0f2e819d6381f72f26c734e00a6780b3933ea404
 RMD160 (Python-2.5.4.tar.bz2) = 3a76c83464c3b1c38a60351ab054e33ac7195663
@@ -14,7 +14,7 @@ SHA1 (patch-ai) = a89bee00860910f53a23b1c670d9c091846a03c1
 SHA1 (patch-aj) = a75d680a6b8b1ad3c9222dcb841f4fb10db6d16d
 SHA1 (patch-ak) = 948362c15ad59abeef46971f9b870b70655a62c7
 SHA1 (patch-al) = 6247e3f85d555bae7850befbd7bfffbb233cecb3
-SHA1 (patch-am) = 9f3f418d9a9b652ea0098b34cb57bb5319445778
+SHA1 (patch-am) = 49ee3f90df54c0ef85b5cf7a9b9f1edb293375f2
 SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
 SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2
 SHA1 (patch-ap) = b864db92761c843a91374663bd2dbcfa57b317cf
diff --git a/lang/python25/patches/patch-am b/lang/python25/patches/patch-am
index 2d555b6c014..c25687146d3 100644
--- a/lang/python25/patches/patch-am
+++ b/lang/python25/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.5 2009/09/19 09:18:53 obache Exp $
+$NetBSD: patch-am,v 1.6 2010/01/27 08:43:04 wiz Exp $
 
 --- setup.py.orig	2008-10-16 14:58:19.000000000 -0400
 +++ setup.py
@@ -7,7 +7,7 @@ $NetBSD: patch-am,v 1.5 2009/09/19 09:18:53 obache Exp $
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", "_sqlite3", "_tkinter", "gdbm", "expat", "readline"]
++disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", "_sqlite3", "_tkinter", "gdbm", "pyexpat", "readline"]
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if