Wed Jan 27 08:43:04 2010 UTC ()
Properly disable pyexpat module here as well.
Bump PKGREVISION.


(wiz)
diff -r1.24 -r1.25 pkgsrc/lang/python25/Makefile
diff -r1.4 -r1.5 pkgsrc/lang/python25/PLIST.common
diff -r1.11 -r1.12 pkgsrc/lang/python25/distinfo
diff -r1.5 -r1.6 pkgsrc/lang/python25/patches/patch-am
cvs diff -r1.24 -r1.25 pkgsrc/lang/python25/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python25/Attic/Makefile 2010/01/21 16:28:51 1.24
+++ pkgsrc/lang/python25/Attic/Makefile 2010/01/27 08:43:04 1.25
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.24 2010/01/21 16:28:51 heinz Exp $ 1# $NetBSD: Makefile,v 1.25 2010/01/27 08:43:04 wiz Exp $
2 2
3DISTNAME= Python-2.5.4 3DISTNAME= Python-2.5.4
4PKGNAME= python25-2.5.4 4PKGNAME= python25-2.5.4
5PKGREVISION= 4 5PKGREVISION= 5
6CATEGORIES= lang python 6CATEGORIES= lang python
7MASTER_SITES= http://www.python.org/ftp/python/2.5.4/ 7MASTER_SITES= http://www.python.org/ftp/python/2.5.4/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= recht@NetBSD.org 10MAINTAINER= recht@NetBSD.org
11HOMEPAGE= http://www.python.org/ 11HOMEPAGE= http://www.python.org/
12COMMENT= Interpreted, interactive, object-oriented programming language 12COMMENT= Interpreted, interactive, object-oriented programming language
13LICENSE= python-software-foundation 13LICENSE= python-software-foundation
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17# Remember to update pkgsrc/lang/python/srcdist.mk when version changes 17# Remember to update pkgsrc/lang/python/srcdist.mk when version changes
18 18
cvs diff -r1.4 -r1.5 pkgsrc/lang/python25/Attic/PLIST.common (expand / switch to unified diff)

--- pkgsrc/lang/python25/Attic/PLIST.common 2009/04/11 19:42:23 1.4
+++ pkgsrc/lang/python25/Attic/PLIST.common 2010/01/27 08:43:04 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST.common,v 1.4 2009/04/11 19:42:23 snj Exp $ 1@comment $NetBSD: PLIST.common,v 1.5 2010/01/27 08:43:04 wiz Exp $
2bin/pydoc${PY_VER_SUFFIX} 2bin/pydoc${PY_VER_SUFFIX}
3bin/python${PY_VER_SUFFIX} 3bin/python${PY_VER_SUFFIX}
4bin/python${PY_VER_SUFFIX}-config 4bin/python${PY_VER_SUFFIX}-config
5bin/smtpd${PY_VER_SUFFIX}.py 5bin/smtpd${PY_VER_SUFFIX}.py
6include/python${PY_VER_SUFFIX}/Python-ast.h 6include/python${PY_VER_SUFFIX}/Python-ast.h
7include/python${PY_VER_SUFFIX}/Python.h 7include/python${PY_VER_SUFFIX}/Python.h
8include/python${PY_VER_SUFFIX}/abstract.h 8include/python${PY_VER_SUFFIX}/abstract.h
9include/python${PY_VER_SUFFIX}/asdl.h 9include/python${PY_VER_SUFFIX}/asdl.h
10include/python${PY_VER_SUFFIX}/ast.h 10include/python${PY_VER_SUFFIX}/ast.h
11include/python${PY_VER_SUFFIX}/bitset.h 11include/python${PY_VER_SUFFIX}/bitset.h
12include/python${PY_VER_SUFFIX}/boolobject.h 12include/python${PY_VER_SUFFIX}/boolobject.h
13include/python${PY_VER_SUFFIX}/bufferobject.h 13include/python${PY_VER_SUFFIX}/bufferobject.h
14include/python${PY_VER_SUFFIX}/cStringIO.h 14include/python${PY_VER_SUFFIX}/cStringIO.h
@@ -1555,27 +1555,26 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/c @@ -1555,27 +1555,26 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/c
1555lib/python${PY_VER_SUFFIX}/lib-dynload/datetime.so 1555lib/python${PY_VER_SUFFIX}/lib-dynload/datetime.so
1556lib/python${PY_VER_SUFFIX}/lib-dynload/dbm.so 1556lib/python${PY_VER_SUFFIX}/lib-dynload/dbm.so
1557${PLIST.dl}lib/python${PY_VER_SUFFIX}/lib-dynload/dl.so 1557${PLIST.dl}lib/python${PY_VER_SUFFIX}/lib-dynload/dl.so
1558lib/python${PY_VER_SUFFIX}/lib-dynload/fcntl.so 1558lib/python${PY_VER_SUFFIX}/lib-dynload/fcntl.so
1559lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so 1559lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so
1560${PLIST.extra-so}lib/python${PY_VER_SUFFIX}/lib-dynload/imageop.so 1560${PLIST.extra-so}lib/python${PY_VER_SUFFIX}/lib-dynload/imageop.so
1561lib/python${PY_VER_SUFFIX}/lib-dynload/itertools.so 1561lib/python${PY_VER_SUFFIX}/lib-dynload/itertools.so
1562lib/python${PY_VER_SUFFIX}/lib-dynload/math.so 1562lib/python${PY_VER_SUFFIX}/lib-dynload/math.so
1563lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so 1563lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so
1564${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so 1564${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
1565${PLIST.no-nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so 1565${PLIST.no-nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so
1566lib/python${PY_VER_SUFFIX}/lib-dynload/operator.so 1566lib/python${PY_VER_SUFFIX}/lib-dynload/operator.so
1567lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so 1567lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
1568lib/python${PY_VER_SUFFIX}/lib-dynload/pyexpat.so 
1569lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so 1568lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
1570${PLIST.extra-so}lib/python${PY_VER_SUFFIX}/lib-dynload/rgbimg.so 1569${PLIST.extra-so}lib/python${PY_VER_SUFFIX}/lib-dynload/rgbimg.so
1571${PLIST.oss}lib/python${PY_VER_SUFFIX}/lib-dynload/ossaudiodev.so 1570${PLIST.oss}lib/python${PY_VER_SUFFIX}/lib-dynload/ossaudiodev.so
1572lib/python${PY_VER_SUFFIX}/lib-dynload/select.so 1571lib/python${PY_VER_SUFFIX}/lib-dynload/select.so
1573lib/python${PY_VER_SUFFIX}/lib-dynload/strop.so 1572lib/python${PY_VER_SUFFIX}/lib-dynload/strop.so
1574lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so 1573lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so
1575lib/python${PY_VER_SUFFIX}/lib-dynload/termios.so 1574lib/python${PY_VER_SUFFIX}/lib-dynload/termios.so
1576lib/python${PY_VER_SUFFIX}/lib-dynload/time.so 1575lib/python${PY_VER_SUFFIX}/lib-dynload/time.so
1577lib/python${PY_VER_SUFFIX}/lib-dynload/unicodedata.so 1576lib/python${PY_VER_SUFFIX}/lib-dynload/unicodedata.so
1578lib/python${PY_VER_SUFFIX}/lib-dynload/zlib.so 1577lib/python${PY_VER_SUFFIX}/lib-dynload/zlib.so
1579lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.py 1578lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.py
1580lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.pyc 1579lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.pyc
1581lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.pyo 1580lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.pyo
cvs diff -r1.11 -r1.12 pkgsrc/lang/python25/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/python25/Attic/distinfo 2009/09/19 09:18:53 1.11
+++ pkgsrc/lang/python25/Attic/distinfo 2010/01/27 08:43:04 1.12
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: distinfo,v 1.11 2009/09/19 09:18:53 obache Exp $ 1$NetBSD: distinfo,v 1.12 2010/01/27 08:43:04 wiz Exp $
2 2
3SHA1 (Python-2.5.4.tar.bz2) = 0f2e819d6381f72f26c734e00a6780b3933ea404 3SHA1 (Python-2.5.4.tar.bz2) = 0f2e819d6381f72f26c734e00a6780b3933ea404
4RMD160 (Python-2.5.4.tar.bz2) = 3a76c83464c3b1c38a60351ab054e33ac7195663 4RMD160 (Python-2.5.4.tar.bz2) = 3a76c83464c3b1c38a60351ab054e33ac7195663
5Size (Python-2.5.4.tar.bz2) = 9821313 bytes 5Size (Python-2.5.4.tar.bz2) = 9821313 bytes
6SHA1 (patch-aa) = d44e67645dc86ff14f5daf5705de02c6f330cc48 6SHA1 (patch-aa) = d44e67645dc86ff14f5daf5705de02c6f330cc48
7SHA1 (patch-ab) = d35025df83e70d129f9fbcd277652b0eea83b026 7SHA1 (patch-ab) = d35025df83e70d129f9fbcd277652b0eea83b026
8SHA1 (patch-ac) = 4de5b8dc20b41dc3bb4acd38011ef59570318d3f 8SHA1 (patch-ac) = 4de5b8dc20b41dc3bb4acd38011ef59570318d3f
9SHA1 (patch-ad) = eb4948ee5aaae93f8a193defac7638a37f65caed 9SHA1 (patch-ad) = eb4948ee5aaae93f8a193defac7638a37f65caed
10SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b 10SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b
11SHA1 (patch-ag) = 95be54a4c8fe291cd7edd14a9180bbcb07bba2ce 11SHA1 (patch-ag) = 95be54a4c8fe291cd7edd14a9180bbcb07bba2ce
12SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa 12SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa
13SHA1 (patch-ai) = a89bee00860910f53a23b1c670d9c091846a03c1 13SHA1 (patch-ai) = a89bee00860910f53a23b1c670d9c091846a03c1
14SHA1 (patch-aj) = a75d680a6b8b1ad3c9222dcb841f4fb10db6d16d 14SHA1 (patch-aj) = a75d680a6b8b1ad3c9222dcb841f4fb10db6d16d
15SHA1 (patch-ak) = 948362c15ad59abeef46971f9b870b70655a62c7 15SHA1 (patch-ak) = 948362c15ad59abeef46971f9b870b70655a62c7
16SHA1 (patch-al) = 6247e3f85d555bae7850befbd7bfffbb233cecb3 16SHA1 (patch-al) = 6247e3f85d555bae7850befbd7bfffbb233cecb3
17SHA1 (patch-am) = 9f3f418d9a9b652ea0098b34cb57bb5319445778 17SHA1 (patch-am) = 49ee3f90df54c0ef85b5cf7a9b9f1edb293375f2
18SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab 18SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
19SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2 19SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2
20SHA1 (patch-ap) = b864db92761c843a91374663bd2dbcfa57b317cf 20SHA1 (patch-ap) = b864db92761c843a91374663bd2dbcfa57b317cf
21SHA1 (patch-ar) = 2a0c3f9a798afdfda7af4823e67579b2e000c072 21SHA1 (patch-ar) = 2a0c3f9a798afdfda7af4823e67579b2e000c072
22SHA1 (patch-at) = 6fdd64ce70eb8c2de5336f3415f45bc467e46373 22SHA1 (patch-at) = 6fdd64ce70eb8c2de5336f3415f45bc467e46373
23SHA1 (patch-au) = c1a759765095d246151ba027ed06f423e05c9218 23SHA1 (patch-au) = c1a759765095d246151ba027ed06f423e05c9218
24SHA1 (patch-av) = a1d41cb3a93879d54f0964ff84a63a297c333156 24SHA1 (patch-av) = a1d41cb3a93879d54f0964ff84a63a297c333156
cvs diff -r1.5 -r1.6 pkgsrc/lang/python25/patches/Attic/patch-am (expand / switch to unified diff)

--- pkgsrc/lang/python25/patches/Attic/patch-am 2009/09/19 09:18:53 1.5
+++ pkgsrc/lang/python25/patches/Attic/patch-am 2010/01/27 08:43:04 1.6
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-am,v 1.5 2009/09/19 09:18:53 obache Exp $ 1$NetBSD: patch-am,v 1.6 2010/01/27 08:43:04 wiz Exp $
2 2
3--- setup.py.orig 2008-10-16 14:58:19.000000000 -0400 3--- setup.py.orig 2008-10-16 14:58:19.000000000 -0400
4+++ setup.py 4+++ setup.py
5@@ -15,7 +15,7 @@ 5@@ -15,7 +15,7 @@
6 from distutils.command.install_lib import install_lib 6 from distutils.command.install_lib import install_lib
7  7
8 # This global variable is used to hold the list of modules to be disabled. 8 # This global variable is used to hold the list of modules to be disabled.
9-disabled_module_list = [] 9-disabled_module_list = []
10+disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", "_sqlite3", "_tkinter", "gdbm", "expat", "readline"] 10+disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", "_sqlite3", "_tkinter", "gdbm", "pyexpat", "readline"]
11  11
12 def add_dir_to_list(dirlist, dir): 12 def add_dir_to_list(dirlist, dir):
13 """Add the directory 'dir' to the list 'dirlist' (at the front) if 13 """Add the directory 'dir' to the list 'dirlist' (at the front) if
14@@ -243,9 +243,15 @@ 14@@ -243,9 +243,15 @@
15 return sys.platform 15 return sys.platform
16  16
17 def detect_modules(self): 17 def detect_modules(self):
18- # Ensure that /usr/local is always used 18- # Ensure that /usr/local is always used
19- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') 19- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
20- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') 20- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
21+ # Add the buildlink directories for pkgsrc 21+ # Add the buildlink directories for pkgsrc
22+ if os.environ.has_key('BUILDLINK_DIR'): 22+ if os.environ.has_key('BUILDLINK_DIR'):
23+ dir = os.environ['BUILDLINK_DIR'] 23+ dir = os.environ['BUILDLINK_DIR']