Fri Jul 24 14:50:34 2009 UTC ()
gdbm is in disabled_module_list, yet if it's found on the system
the module gets built anyway. Don't do that.


(schmonz)
diff -r1.8 -r1.9 pkgsrc/lang/python25/distinfo
diff -r1.2 -r1.3 pkgsrc/lang/python25/patches/patch-am
cvs diff -r1.8 -r1.9 pkgsrc/lang/python25/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/python25/Attic/distinfo 2009/04/11 19:42:23 1.8
+++ pkgsrc/lang/python25/Attic/distinfo 2009/07/24 14:50:33 1.9
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: distinfo,v 1.8 2009/04/11 19:42:23 snj Exp $ 1$NetBSD: distinfo,v 1.9 2009/07/24 14:50:33 schmonz 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) = 7985a6e2edd3eef86bd2833a36818e3e1e315a25 17SHA1 (patch-am) = 8910340d0a54ac0a053d50199e0dd77162c3b613
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.2 -r1.3 pkgsrc/lang/python25/patches/Attic/patch-am (expand / switch to unified diff)

--- pkgsrc/lang/python25/patches/Attic/patch-am 2009/04/11 19:42:23 1.2
+++ pkgsrc/lang/python25/patches/Attic/patch-am 2009/07/24 14:50:33 1.3
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-am,v 1.2 2009/04/11 19:42:23 snj Exp $ 1$NetBSD: patch-am,v 1.3 2009/07/24 14:50:33 schmonz Exp $
2 2
3--- setup.py.orig 2008-10-16 11:58:19.000000000 -0700 3--- setup.py.orig 2008-10-16 14:58:19.000000000 -0400
4+++ setup.py 2009-03-20 15:01:44.000000000 -0700 4+++ setup.py
5@@ -15,7 +15,7 @@ from distutils.command.install import in 5@@ -15,7 +15,7 @@ from distutils.command.install import in
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", "_sqlite", "_tkinter", "bsddb", "cjkcodecs" "gdbm", "mpz", "expat", "readline"] 10+disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", "_sqlite", "_tkinter", "bsddb", "cjkcodecs" "gdbm", "mpz", "expat", "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 @@ class PyBuildExt(build_ext): 14@@ -243,9 +243,15 @@ class PyBuildExt(build_ext):
15 return sys.platform 15 return sys.platform
16  16
17 def detect_modules(self): 17 def detect_modules(self):
@@ -354,24 +354,37 @@ $NetBSD: patch-am,v 1.2 2009/04/11 19:42 @@ -354,24 +354,37 @@ $NetBSD: patch-am,v 1.2 2009/04/11 19:42
354 exts.append( Extension('dbm', ['dbmmodule.c'], 354 exts.append( Extension('dbm', ['dbmmodule.c'],
355 define_macros=[('HAVE_NDBM_H',None)], 355 define_macros=[('HAVE_NDBM_H',None)],
356 libraries = ndbm_libs ) ) 356 libraries = ndbm_libs ) )
357+ elif find_file("ndbm.h", db_incs, []) is not None: 357+ elif find_file("ndbm.h", db_incs, []) is not None:
358+ exts.append( Extension('dbm', ['dbmmodule.c'], 358+ exts.append( Extension('dbm', ['dbmmodule.c'],
359+ library_dirs=dblib_dir, 359+ library_dirs=dblib_dir,
360+ runtime_library_dirs=dblib_dir, 360+ runtime_library_dirs=dblib_dir,
361+ include_dirs=db_incs, 361+ include_dirs=db_incs,
362+ define_macros=[('HAVE_NDBM_H',None)], 362+ define_macros=[('HAVE_NDBM_H',None)],
363+ libraries=dblibs)) 363+ libraries=dblibs))
364 elif (self.compiler.find_library_file(lib_dirs, 'gdbm') 364 elif (self.compiler.find_library_file(lib_dirs, 'gdbm')
365 and find_file("gdbm/ndbm.h", inc_dirs, []) is not None): 365 and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
366 exts.append( Extension('dbm', ['dbmmodule.c'], 366 exts.append( Extension('dbm', ['dbmmodule.c'],
 367@@ -899,9 +692,9 @@ class PyBuildExt(build_ext):
 368 libraries=dblibs))
 369
 370 # Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm:
 371- if (self.compiler.find_library_file(lib_dirs, 'gdbm')):
 372- exts.append( Extension('gdbm', ['gdbmmodule.c'],
 373- libraries = ['gdbm'] ) )
 374+ #if (self.compiler.find_library_file(lib_dirs, 'gdbm')):
 375+ # exts.append( Extension('gdbm', ['gdbmmodule.c'],
 376+ # libraries = ['gdbm'] ) )
 377
 378 # Unix-only modules
 379 if platform not in ['mac', 'win32']:
367@@ -1536,8 +1329,8 @@ def main(): 380@@ -1536,8 +1329,8 @@ def main():
368 ext_modules=[Extension('_struct', ['_struct.c'])], 381 ext_modules=[Extension('_struct', ['_struct.c'])],
369  382
370 # Scripts to install 383 # Scripts to install
371- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', 384- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
372- 'Lib/smtpd.py'] 385- 'Lib/smtpd.py']
373+ scripts = ['Tools/scripts/pydoc2.5', 386+ scripts = ['Tools/scripts/pydoc2.5',
374+ 'Lib/smtpd2.5.py'] 387+ 'Lib/smtpd2.5.py']
375 ) 388 )
376  389
377 # --install-platlib 390 # --install-platlib