4 files changed, 6 insertions, 50 deletions
diff --git a/lang/python26/PLIST.common b/lang/python26/PLIST.common
index bc7439179de..aecc02a56f9 100644
--- a/lang/python26/PLIST.common
+++ b/lang/python26/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.2 2009/04/24 01:32:50 hasso Exp $
+@comment $NetBSD: PLIST.common,v 1.3 2009/05/21 20:47:38 tnn Exp $
 bin/2to3
 bin/idle
 bin/pydoc${PY_VER_SUFFIX}
@@ -2268,45 +2268,6 @@ lib/python${PY_VER_SUFFIX}/sndhdr.pyo
 lib/python${PY_VER_SUFFIX}/socket.py
 lib/python${PY_VER_SUFFIX}/socket.pyc
 lib/python${PY_VER_SUFFIX}/socket.pyo
-lib/python${PY_VER_SUFFIX}/sqlite3/__init__.py
-lib/python${PY_VER_SUFFIX}/sqlite3/__init__.pyc
-lib/python${PY_VER_SUFFIX}/sqlite3/__init__.pyo
-lib/python${PY_VER_SUFFIX}/sqlite3/dbapi2.py
-lib/python${PY_VER_SUFFIX}/sqlite3/dbapi2.pyc
-lib/python${PY_VER_SUFFIX}/sqlite3/dbapi2.pyo
-lib/python${PY_VER_SUFFIX}/sqlite3/dump.py
-lib/python${PY_VER_SUFFIX}/sqlite3/dump.pyc
-lib/python${PY_VER_SUFFIX}/sqlite3/dump.pyo
-lib/python${PY_VER_SUFFIX}/sqlite3/test/__init__.py
-lib/python${PY_VER_SUFFIX}/sqlite3/test/__init__.pyc
-lib/python${PY_VER_SUFFIX}/sqlite3/test/__init__.pyo
-lib/python${PY_VER_SUFFIX}/sqlite3/test/dbapi.py
-lib/python${PY_VER_SUFFIX}/sqlite3/test/dbapi.pyc
-lib/python${PY_VER_SUFFIX}/sqlite3/test/dbapi.pyo
-lib/python${PY_VER_SUFFIX}/sqlite3/test/dump.py
-lib/python${PY_VER_SUFFIX}/sqlite3/test/dump.pyc
-lib/python${PY_VER_SUFFIX}/sqlite3/test/dump.pyo
-lib/python${PY_VER_SUFFIX}/sqlite3/test/factory.py
-lib/python${PY_VER_SUFFIX}/sqlite3/test/factory.pyc
-lib/python${PY_VER_SUFFIX}/sqlite3/test/factory.pyo
-lib/python${PY_VER_SUFFIX}/sqlite3/test/hooks.py
-lib/python${PY_VER_SUFFIX}/sqlite3/test/hooks.pyc
-lib/python${PY_VER_SUFFIX}/sqlite3/test/hooks.pyo
-lib/python${PY_VER_SUFFIX}/sqlite3/test/py25tests.py
-lib/python${PY_VER_SUFFIX}/sqlite3/test/py25tests.pyc
-lib/python${PY_VER_SUFFIX}/sqlite3/test/py25tests.pyo
-lib/python${PY_VER_SUFFIX}/sqlite3/test/regression.py
-lib/python${PY_VER_SUFFIX}/sqlite3/test/regression.pyc
-lib/python${PY_VER_SUFFIX}/sqlite3/test/regression.pyo
-lib/python${PY_VER_SUFFIX}/sqlite3/test/transactions.py
-lib/python${PY_VER_SUFFIX}/sqlite3/test/transactions.pyc
-lib/python${PY_VER_SUFFIX}/sqlite3/test/transactions.pyo
-lib/python${PY_VER_SUFFIX}/sqlite3/test/types.py
-lib/python${PY_VER_SUFFIX}/sqlite3/test/types.pyc
-lib/python${PY_VER_SUFFIX}/sqlite3/test/types.pyo
-lib/python${PY_VER_SUFFIX}/sqlite3/test/userfunctions.py
-lib/python${PY_VER_SUFFIX}/sqlite3/test/userfunctions.pyc
-lib/python${PY_VER_SUFFIX}/sqlite3/test/userfunctions.pyo
 lib/python${PY_VER_SUFFIX}/sre.py
 lib/python${PY_VER_SUFFIX}/sre.pyc
 lib/python${PY_VER_SUFFIX}/sre.pyo
@@ -3489,9 +3450,6 @@ lib/python${PY_VER_SUFFIX}/test/test_softspace.pyo
 lib/python${PY_VER_SUFFIX}/test/test_sort.py
 lib/python${PY_VER_SUFFIX}/test/test_sort.pyc
 lib/python${PY_VER_SUFFIX}/test/test_sort.pyo
-lib/python${PY_VER_SUFFIX}/test/test_sqlite.py
-lib/python${PY_VER_SUFFIX}/test/test_sqlite.pyc
-lib/python${PY_VER_SUFFIX}/test/test_sqlite.pyo
 lib/python${PY_VER_SUFFIX}/test/test_ssl.py
 lib/python${PY_VER_SUFFIX}/test/test_ssl.pyc
 lib/python${PY_VER_SUFFIX}/test/test_ssl.pyo
diff --git a/lang/python26/PLIST.common_end b/lang/python26/PLIST.common_end
index 699cca757d3..93a76076c1b 100644
--- a/lang/python26/PLIST.common_end
+++ b/lang/python26/PLIST.common_end
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common_end,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
+@comment $NetBSD: PLIST.common_end,v 1.2 2009/05/21 20:47:38 tnn Exp $
 @dirrm lib/python${PY_VER_SUFFIX}/xml/sax
 @dirrm lib/python${PY_VER_SUFFIX}/xml/parsers
 @dirrm lib/python${PY_VER_SUFFIX}/xml/etree
@@ -7,8 +7,6 @@
 @dirrm lib/python${PY_VER_SUFFIX}/wsgiref
 @dirrm lib/python${PY_VER_SUFFIX}/test/decimaltestdata
 @dirrm lib/python${PY_VER_SUFFIX}/test
-@dirrm lib/python${PY_VER_SUFFIX}/sqlite3/test
-@dirrm lib/python${PY_VER_SUFFIX}/sqlite3
 @dirrm lib/python${PY_VER_SUFFIX}/site-packages
 @dirrm lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}
 @dirrm lib/python${PY_VER_SUFFIX}/multiprocessing/dummy
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index 969ea91fbf8..8dbc094dc2e 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2009/04/24 01:32:50 hasso Exp $
+$NetBSD: distinfo,v 1.4 2009/05/21 20:47:38 tnn Exp $
 
 SHA1 (Python-2.6.2.tar.bz2) = 125d4ed90f82de1d44f288150bbbda23a6cd27a4
 RMD160 (Python-2.6.2.tar.bz2) = 85fa3540cbacf4d0547d2381eb3aa76bef35c2e1
@@ -13,7 +13,7 @@ SHA1 (patch-ai) = 53815e5cd82bf889ec3130b31f8f6ac202dd0948
 SHA1 (patch-aj) = a75d680a6b8b1ad3c9222dcb841f4fb10db6d16d
 SHA1 (patch-ak) = 948362c15ad59abeef46971f9b870b70655a62c7
 SHA1 (patch-al) = c39144cfa4a540900fac879b5faa990628fcee3e
-SHA1 (patch-am) = 34d6dac6eee3cc946e74f15d2acc9fe9c592a9be
+SHA1 (patch-am) = 712f72a2a0a7b480976006a774e4d50998575209
 SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
 SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2
 SHA1 (patch-ap) = 39d81b01fa9e1b894be9ae0922881337bb4d17da
diff --git a/lang/python26/patches/patch-am b/lang/python26/patches/patch-am
index 401627cf539..7a0b6d7c0da 100644
--- a/lang/python26/patches/patch-am
+++ b/lang/python26/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.2 2009/04/24 01:32:50 hasso Exp $
+$NetBSD: patch-am,v 1.3 2009/05/21 20:47:38 tnn Exp $
 
 --- setup.py.orig	2009-03-31 21:20:48 +0300
 +++ setup.py	2009-04-20 16:30:08 +0300
@@ -7,7 +7,7 @@ $NetBSD: patch-am,v 1.2 2009/04/24 01:32:50 hasso 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", "_sqlite", "_tkinter", "bsddb", "cjkcodecs" "gdbm", "mpz", "expat", "readline"]
++disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", "_sqlite3", "_tkinter", "bsddb", "cjkcodecs" "gdbm", "mpz", "expat", "readline"]
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if