Tue Oct 18 21:59:19 2011 UTC ()
Deal with the fact that if /usr/include/ndbm.h exists on Linux it probably
belongs to gdbm_compat.  I.E. _don't_ use ndbm on Linux.


(sbd)
diff -r1.35 -r1.36 pkgsrc/lang/python24/distinfo
diff -r1.6 -r1.7 pkgsrc/lang/python24/patches/patch-am
diff -r1.17 -r1.18 pkgsrc/lang/python25/distinfo
diff -r1.7 -r1.8 pkgsrc/lang/python25/patches/patch-am
diff -r1.38 -r1.39 pkgsrc/lang/python26/distinfo
diff -r1.16 -r1.17 pkgsrc/lang/python26/patches/patch-am
diff -r1.9 -r1.10 pkgsrc/lang/python27/distinfo
diff -r1.3 -r1.4 pkgsrc/lang/python27/patches/patch-am
diff -r1.3 -r1.4 pkgsrc/lang/python31/distinfo
diff -r1.2 -r1.3 pkgsrc/lang/python31/patches/patch-am
diff -r1.57 -r1.58 pkgsrc/security/cyrus-sasl/Makefile
cvs diff -r1.35 -r1.36 pkgsrc/lang/python24/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/python24/Attic/distinfo 2011/09/14 17:00:20 1.35
+++ pkgsrc/lang/python24/Attic/distinfo 2011/10/18 21:59:17 1.36
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1$NetBSD: distinfo,v 1.35 2011/09/14 17:00:20 hans Exp $ 1$NetBSD: distinfo,v 1.36 2011/10/18 21:59:17 sbd Exp $
2 2
3SHA1 (Python-2.4.6.tar.bz2) = cb1972a554a458f6a26d3e047b359251865d7c96 3SHA1 (Python-2.4.6.tar.bz2) = cb1972a554a458f6a26d3e047b359251865d7c96
4RMD160 (Python-2.4.6.tar.bz2) = 0687989193dec2ac108142759281be7ddcf7f31e 4RMD160 (Python-2.4.6.tar.bz2) = 0687989193dec2ac108142759281be7ddcf7f31e
5Size (Python-2.4.6.tar.bz2) = 8154677 bytes 5Size (Python-2.4.6.tar.bz2) = 8154677 bytes
6SHA1 (patch-aa) = 310309e6778fd809b7758efa8db7333ed498e5e5 6SHA1 (patch-aa) = 310309e6778fd809b7758efa8db7333ed498e5e5
7SHA1 (patch-ab) = 98b94620baf5d9d5e8681529297124c2d07a901b 7SHA1 (patch-ab) = 98b94620baf5d9d5e8681529297124c2d07a901b
8SHA1 (patch-ac) = 4a7a83c9a7bb26254d17907fe15f895276910364 8SHA1 (patch-ac) = 4a7a83c9a7bb26254d17907fe15f895276910364
9SHA1 (patch-ad) = 44a13d3f9814d471f266ab641024ad74be046ec1 9SHA1 (patch-ad) = 44a13d3f9814d471f266ab641024ad74be046ec1
10SHA1 (patch-ae) = 7e00d719044fa0f205692392d9ebe87146715206 10SHA1 (patch-ae) = 7e00d719044fa0f205692392d9ebe87146715206
11SHA1 (patch-af) = f468e8c172fc5aaae1bf843898a30c00ec753537 11SHA1 (patch-af) = f468e8c172fc5aaae1bf843898a30c00ec753537
12SHA1 (patch-ag) = 0cdc08af9d37ae7d00a06ab81c30efa021ef28ac 12SHA1 (patch-ag) = 0cdc08af9d37ae7d00a06ab81c30efa021ef28ac
13SHA1 (patch-ah) = 154b40eec926a6dcc968c635467807766d1cfaa3 13SHA1 (patch-ah) = 154b40eec926a6dcc968c635467807766d1cfaa3
14SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8 14SHA1 (patch-ai) = 6435c5a7269c14d94eab6fb9777b9d059507e7b8
15SHA1 (patch-aj) = e471737ade95423039661b475f2dd0fc27aa9dac 15SHA1 (patch-aj) = e471737ade95423039661b475f2dd0fc27aa9dac
16SHA1 (patch-ak) = 4c6708eb29757179e6855d8fbe78cab92c5a18d5 16SHA1 (patch-ak) = 4c6708eb29757179e6855d8fbe78cab92c5a18d5
17SHA1 (patch-al) = 3bcbdcacc451c8a354ea2d9e9887e61edaabfa41 17SHA1 (patch-al) = 3bcbdcacc451c8a354ea2d9e9887e61edaabfa41
18SHA1 (patch-am) = 31158eee32363963e2f6d0bd528f0b291453de74 18SHA1 (patch-am) = 3db16b0d139c9ae113378aeb94a4cdf9828148ce
19SHA1 (patch-an) = 0ae5b3d547c7dbe1366c5ae6c60c11516e4550b8 19SHA1 (patch-an) = 0ae5b3d547c7dbe1366c5ae6c60c11516e4550b8
20SHA1 (patch-ao) = 1ef48142acd8b591b11013b46048d9145f235843 20SHA1 (patch-ao) = 1ef48142acd8b591b11013b46048d9145f235843
21SHA1 (patch-ap) = 8fbfecdb80ee851db569b64201ccd94bd3552a81 21SHA1 (patch-ap) = 8fbfecdb80ee851db569b64201ccd94bd3552a81
22SHA1 (patch-aq) = 3d13cd79d50b70302d1b6ee598759a51f0b98532 22SHA1 (patch-aq) = 3d13cd79d50b70302d1b6ee598759a51f0b98532
23SHA1 (patch-ar) = f132998e3e81f3093f9bddf32fe6dcb40fcfa76f 23SHA1 (patch-ar) = f132998e3e81f3093f9bddf32fe6dcb40fcfa76f
24SHA1 (patch-at) = 9d66115cc561c99dcc3478678aa286c1c0c3df6b 24SHA1 (patch-at) = 9d66115cc561c99dcc3478678aa286c1c0c3df6b
cvs diff -r1.6 -r1.7 pkgsrc/lang/python24/patches/Attic/patch-am (expand / switch to unified diff)

--- pkgsrc/lang/python24/patches/Attic/patch-am 2009/09/19 09:30:41 1.6
+++ pkgsrc/lang/python24/patches/Attic/patch-am 2011/10/18 21:59:17 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-am,v 1.6 2009/09/19 09:30:41 obache Exp $ 1$NetBSD: patch-am,v 1.7 2011/10/18 21:59:17 sbd Exp $
2 2
3--- setup.py.orig 2006-10-08 17:41:25.000000000 +0000 3--- setup.py.orig 2006-10-08 17:41:25.000000000 +0000
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", "_tkinter", "gdbm", "pyexpat", "readline"] 10+disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_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@@ -239,9 +239,15 @@ 14@@ -239,9 +239,15 @@
@@ -251,42 +251,54 @@ $NetBSD: patch-am,v 1.6 2009/09/19 09:30 @@ -251,42 +251,54 @@ $NetBSD: patch-am,v 1.6 2009/09/19 09:30
251+ exts.append(Extension('bsddb185', ['bsddbmodule.c'], 251+ exts.append(Extension('bsddb185', ['bsddbmodule.c'],
252+ library_dirs=dblib_dir, 252+ library_dirs=dblib_dir,
253+ runtime_library_dirs=dblib_dir, 253+ runtime_library_dirs=dblib_dir,
254+ include_dirs=db_incs, 254+ include_dirs=db_incs,
255+ define_macros=bsddb185_define_macros, 255+ define_macros=bsddb185_define_macros,
256+ libraries=dblibs)) 256+ libraries=dblibs))
257+ except: 257+ except:
258+ db_incs = None 258+ db_incs = None
259+ dblibs = [] 259+ dblibs = []
260+ dblib_dir = None 260+ dblib_dir = None
261  261
262 # The standard Unix dbm module: 262 # The standard Unix dbm module:
263 if platform not in ['cygwin']: 263 if platform not in ['cygwin']:
264@@ -689,11 +574,13 @@ 264@@ -686,16 +571,21 @@
265 exts.append( Extension('dbm', ['dbmmodule.c'], 265 ndbm_libs = ['ndbm']
 266 else:
 267 ndbm_libs = []
 268- exts.append( Extension('dbm', ['dbmmodule.c'],
 269+ if not self.compiler.find_library_file(lib_dirs, 'gdbm_compat'):
 270+ exts.append( Extension('dbm', ['dbmmodule.c'],
266 define_macros=[('HAVE_NDBM_H',None)], 271 define_macros=[('HAVE_NDBM_H',None)],
267 libraries = ndbm_libs ) ) 272 libraries = ndbm_libs ) )
268- elif (self.compiler.find_library_file(lib_dirs, 'gdbm') 273- elif (self.compiler.find_library_file(lib_dirs, 'gdbm')
269- and find_file("gdbm/ndbm.h", inc_dirs, []) is not None): 274- and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
270+ elif find_file("ndbm.h", db_incs, []) is not None: 275- exts.append( Extension('dbm', ['dbmmodule.c'],
271 exts.append( Extension('dbm', ['dbmmodule.c'], 
272- define_macros=[('HAVE_GDBM_NDBM_H',None)], 276- define_macros=[('HAVE_GDBM_NDBM_H',None)],
273- libraries = ['gdbm'] ) ) 277- libraries = ['gdbm'] ) )
 278- elif db_incs is not None:
 279- exts.append( Extension('dbm', ['dbmmodule.c'],
 280+
 281+ if not module_enabled(exts, 'dbm'):
 282+ if find_file("ndbm.h", db_incs, []) is not None:
 283+ exts.append( Extension('dbm', ['dbmmodule.c'],
274+ library_dirs=dblib_dir, 284+ library_dirs=dblib_dir,
275+ runtime_library_dirs=dblib_dir, 285+ runtime_library_dirs=dblib_dir,
276+ include_dirs=db_incs, 286+ include_dirs=db_incs,
277+ define_macros=[('HAVE_NDBM_H',None)], 287+ define_macros=[('HAVE_NDBM_H',None)],
278+ libraries=dblibs)) 288+ libraries=dblibs))
279 elif db_incs is not None: 289+ elif db_incs is not None:
280 exts.append( Extension('dbm', ['dbmmodule.c'], 290+ exts.append( Extension('dbm', ['dbmmodule.c'],
281 library_dirs=dblib_dir, 291 library_dirs=dblib_dir,
282@@ -1224,8 +1111,8 @@ 292 runtime_library_dirs=dblib_dir,
 293 include_dirs=db_incs,
 294@@ -1224,8 +1114,8 @@
283 ext_modules=[Extension('struct', ['structmodule.c'])], 295 ext_modules=[Extension('struct', ['structmodule.c'])],
284  296
285 # Scripts to install 297 # Scripts to install
286- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', 298- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
287- 'Lib/smtpd.py'] 299- 'Lib/smtpd.py']
288+ scripts = ['Tools/scripts/pydoc2.4', 300+ scripts = ['Tools/scripts/pydoc2.4',
289+ 'Lib/smtpd2.4.py'] 301+ 'Lib/smtpd2.4.py']
290 ) 302 )
291  303
292 # --install-platlib 304 # --install-platlib
cvs diff -r1.17 -r1.18 pkgsrc/lang/python25/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/python25/Attic/distinfo 2011/09/14 17:06:32 1.17
+++ pkgsrc/lang/python25/Attic/distinfo 2011/10/18 21:59:18 1.18
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: distinfo,v 1.17 2011/09/14 17:06:32 hans Exp $ 1$NetBSD: distinfo,v 1.18 2011/10/18 21:59:18 sbd Exp $
2 2
3SHA1 (Python-2.5.6.tar.bz2) = 29f6dd41bf09c5e04311b367cbb7604fa016e699 3SHA1 (Python-2.5.6.tar.bz2) = 29f6dd41bf09c5e04311b367cbb7604fa016e699
4RMD160 (Python-2.5.6.tar.bz2) = 92f0a955971f187a7d50c6422168202ec551bf22 4RMD160 (Python-2.5.6.tar.bz2) = 92f0a955971f187a7d50c6422168202ec551bf22
5Size (Python-2.5.6.tar.bz2) = 9821788 bytes 5Size (Python-2.5.6.tar.bz2) = 9821788 bytes
6SHA1 (patch-SA43463) = df776e171f1794bae52b6e98bc71ae63734b7693 6SHA1 (patch-SA43463) = df776e171f1794bae52b6e98bc71ae63734b7693
7SHA1 (patch-aa) = d44e67645dc86ff14f5daf5705de02c6f330cc48 7SHA1 (patch-aa) = d44e67645dc86ff14f5daf5705de02c6f330cc48
8SHA1 (patch-ab) = d35025df83e70d129f9fbcd277652b0eea83b026 8SHA1 (patch-ab) = d35025df83e70d129f9fbcd277652b0eea83b026
9SHA1 (patch-ac) = 4de5b8dc20b41dc3bb4acd38011ef59570318d3f 9SHA1 (patch-ac) = 4de5b8dc20b41dc3bb4acd38011ef59570318d3f
10SHA1 (patch-ad) = 9b401fc293ffb06ca1dd03526f6c38a8f28201ac 10SHA1 (patch-ad) = 9b401fc293ffb06ca1dd03526f6c38a8f28201ac
11SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b 11SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b
12SHA1 (patch-ag) = 95be54a4c8fe291cd7edd14a9180bbcb07bba2ce 12SHA1 (patch-ag) = 95be54a4c8fe291cd7edd14a9180bbcb07bba2ce
13SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa 13SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa
14SHA1 (patch-ai) = a89bee00860910f53a23b1c670d9c091846a03c1 14SHA1 (patch-ai) = a89bee00860910f53a23b1c670d9c091846a03c1
15SHA1 (patch-aj) = a75d680a6b8b1ad3c9222dcb841f4fb10db6d16d 15SHA1 (patch-aj) = a75d680a6b8b1ad3c9222dcb841f4fb10db6d16d
16SHA1 (patch-ak) = 948362c15ad59abeef46971f9b870b70655a62c7 16SHA1 (patch-ak) = 948362c15ad59abeef46971f9b870b70655a62c7
17SHA1 (patch-al) = a4e28f73d8da2f83fcfbb5daec8d7c2c5bb4ff7f 17SHA1 (patch-al) = a4e28f73d8da2f83fcfbb5daec8d7c2c5bb4ff7f
18SHA1 (patch-am) = d2e59cbc21542c436f1b1957e6089b4cda21ef8b 18SHA1 (patch-am) = ba4a651cc5ab930c9b2abd030d6376110b5d90fa
19SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab 19SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
20SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2 20SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2
21SHA1 (patch-ap) = b864db92761c843a91374663bd2dbcfa57b317cf 21SHA1 (patch-ap) = b864db92761c843a91374663bd2dbcfa57b317cf
22SHA1 (patch-ar) = 2a0c3f9a798afdfda7af4823e67579b2e000c072 22SHA1 (patch-ar) = 2a0c3f9a798afdfda7af4823e67579b2e000c072
23SHA1 (patch-at) = 6fdd64ce70eb8c2de5336f3415f45bc467e46373 23SHA1 (patch-at) = 6fdd64ce70eb8c2de5336f3415f45bc467e46373
24SHA1 (patch-au) = c1a759765095d246151ba027ed06f423e05c9218 24SHA1 (patch-au) = c1a759765095d246151ba027ed06f423e05c9218
25SHA1 (patch-av) = a1d41cb3a93879d54f0964ff84a63a297c333156 25SHA1 (patch-av) = a1d41cb3a93879d54f0964ff84a63a297c333156
cvs diff -r1.7 -r1.8 pkgsrc/lang/python25/patches/Attic/patch-am (expand / switch to unified diff)

--- pkgsrc/lang/python25/patches/Attic/patch-am 2011/06/04 05:08:20 1.7
+++ pkgsrc/lang/python25/patches/Attic/patch-am 2011/10/18 21:59:18 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-am,v 1.7 2011/06/04 05:08:20 obache Exp $ 1$NetBSD: patch-am,v 1.8 2011/10/18 21:59:18 sbd Exp $
2 2
3--- setup.py.orig 2008-10-16 18:58:19.000000000 +0000 3--- setup.py.orig 2008-10-16 18:58:19.000000000 +0000
4+++ setup.py 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", "_sqlite3", "_tkinter", "gdbm", "pyexpat", "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 @@ class PyBuildExt(build_ext): 14@@ -243,9 +243,15 @@ class PyBuildExt(build_ext):
@@ -340,49 +340,58 @@ $NetBSD: patch-am,v 1.7 2011/06/04 05:08 @@ -340,49 +340,58 @@ $NetBSD: patch-am,v 1.7 2011/06/04 05:08
340+ exts.append(Extension('bsddb185', ['bsddbmodule.c'], 340+ exts.append(Extension('bsddb185', ['bsddbmodule.c'],
341+ library_dirs=dblib_dir, 341+ library_dirs=dblib_dir,
342+ runtime_library_dirs=dblib_dir, 342+ runtime_library_dirs=dblib_dir,
343+ include_dirs=db_incs, 343+ include_dirs=db_incs,
344+ define_macros=bsddb185_define_macros, 344+ define_macros=bsddb185_define_macros,
345+ libraries=dblibs)) 345+ libraries=dblibs))
346+ except: 346+ except:
347+ db_incs = None 347+ db_incs = None
348+ dblibs = [] 348+ dblibs = []
349+ dblib_dir = None 349+ dblib_dir = None
350  350
351 # The standard Unix dbm module: 351 # The standard Unix dbm module:
352 if platform not in ['cygwin']: 352 if platform not in ['cygwin']:
353@@ -884,11 +670,6 @@ class PyBuildExt(build_ext): 353@@ -881,15 +667,13 @@ class PyBuildExt(build_ext):
354 exts.append( Extension('dbm', ['dbmmodule.c'], 354 ndbm_libs = ['ndbm']
 355 else:
 356 ndbm_libs = []
 357- exts.append( Extension('dbm', ['dbmmodule.c'],
 358+
 359+ if not self.compiler.find_library_file(lib_dirs, 'gdbm_compat'):
 360+ exts.append( Extension('dbm', ['dbmmodule.c'],
355 define_macros=[('HAVE_NDBM_H',None)], 361 define_macros=[('HAVE_NDBM_H',None)],
356 libraries = ndbm_libs ) ) 362 libraries = ndbm_libs ) )
357- elif (self.compiler.find_library_file(lib_dirs, 'gdbm') 363- elif (self.compiler.find_library_file(lib_dirs, 'gdbm')
358- and find_file("gdbm/ndbm.h", inc_dirs, []) is not None): 364- and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
359- exts.append( Extension('dbm', ['dbmmodule.c'], 365- exts.append( Extension('dbm', ['dbmmodule.c'],
360- define_macros=[('HAVE_GDBM_NDBM_H',None)], 366- define_macros=[('HAVE_GDBM_NDBM_H',None)],
361- libraries = ['gdbm'] ) ) 367- libraries = ['gdbm'] ) )
362 elif db_incs is not None: 368- elif db_incs is not None:
 369+
 370+ if not module_enabled(exts, 'dbm'):
363 exts.append( Extension('dbm', ['dbmmodule.c'], 371 exts.append( Extension('dbm', ['dbmmodule.c'],
364 library_dirs=dblib_dir, 372 library_dirs=dblib_dir,
365@@ -899,9 +680,9 @@ class PyBuildExt(build_ext): 373 runtime_library_dirs=dblib_dir,
 374@@ -899,9 +683,9 @@ class PyBuildExt(build_ext):
366 libraries=dblibs)) 375 libraries=dblibs))
367  376
368 # Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm: 377 # Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm:
369- if (self.compiler.find_library_file(lib_dirs, 'gdbm')): 378- if (self.compiler.find_library_file(lib_dirs, 'gdbm')):
370- exts.append( Extension('gdbm', ['gdbmmodule.c'], 379- exts.append( Extension('gdbm', ['gdbmmodule.c'],
371- libraries = ['gdbm'] ) ) 380- libraries = ['gdbm'] ) )
372+ #if (self.compiler.find_library_file(lib_dirs, 'gdbm')): 381+ #if (self.compiler.find_library_file(lib_dirs, 'gdbm')):
373+ # exts.append( Extension('gdbm', ['gdbmmodule.c'], 382+ # exts.append( Extension('gdbm', ['gdbmmodule.c'],
374+ # libraries = ['gdbm'] ) ) 383+ # libraries = ['gdbm'] ) )
375  384
376 # Unix-only modules 385 # Unix-only modules
377 if platform not in ['mac', 'win32']: 386 if platform not in ['mac', 'win32']:
378@@ -1536,8 +1317,8 @@ def main(): 387@@ -1536,8 +1320,8 @@ def main():
379 ext_modules=[Extension('_struct', ['_struct.c'])], 388 ext_modules=[Extension('_struct', ['_struct.c'])],
380  389
381 # Scripts to install 390 # Scripts to install
382- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', 391- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
383- 'Lib/smtpd.py'] 392- 'Lib/smtpd.py']
384+ scripts = ['Tools/scripts/pydoc2.5', 393+ scripts = ['Tools/scripts/pydoc2.5',
385+ 'Lib/smtpd2.5.py'] 394+ 'Lib/smtpd2.5.py']
386 ) 395 )
387  396
388 # --install-platlib 397 # --install-platlib
cvs diff -r1.38 -r1.39 pkgsrc/lang/python26/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/python26/Attic/distinfo 2011/10/01 03:11:15 1.38
+++ pkgsrc/lang/python26/Attic/distinfo 2011/10/18 21:59:18 1.39
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: distinfo,v 1.38 2011/10/01 03:11:15 dsainty Exp $ 1$NetBSD: distinfo,v 1.39 2011/10/18 21:59:18 sbd Exp $
2 2
3SHA1 (Python-2.6.7.tar.bz2) = 5d35eb746e85fb3deaff8518448137c9b9fb6daa 3SHA1 (Python-2.6.7.tar.bz2) = 5d35eb746e85fb3deaff8518448137c9b9fb6daa
4RMD160 (Python-2.6.7.tar.bz2) = 513e84a7cb76ca876e3803bb03ed558bd0378063 4RMD160 (Python-2.6.7.tar.bz2) = 513e84a7cb76ca876e3803bb03ed558bd0378063
5Size (Python-2.6.7.tar.bz2) = 11084667 bytes 5Size (Python-2.6.7.tar.bz2) = 11084667 bytes
6SHA1 (patch-Mac_Modules_fm___Fmmodule.c) = b9314bccb51b4fe672b81559068f7a79d2965f94 6SHA1 (patch-Mac_Modules_fm___Fmmodule.c) = b9314bccb51b4fe672b81559068f7a79d2965f94
7SHA1 (patch-Mac_Modules_qd___Qdmodule.c) = 45c748b15b9436d45ba137460389638aa7108c8d 7SHA1 (patch-Mac_Modules_qd___Qdmodule.c) = 45c748b15b9436d45ba137460389638aa7108c8d
8SHA1 (patch-Mac_Modules_qdoffs___Qdoffsmodule.c) = 9994f0c1a908f18f1f3df3f05b184f082c018365 8SHA1 (patch-Mac_Modules_qdoffs___Qdoffsmodule.c) = 9994f0c1a908f18f1f3df3f05b184f082c018365
9SHA1 (patch-SA43463) = a0285ce9eb1d994bb05cd54812f3fc9cb678fe7f 9SHA1 (patch-SA43463) = a0285ce9eb1d994bb05cd54812f3fc9cb678fe7f
10SHA1 (patch-aa) = 0528fc5da76d5f1d19586ea3dda1acd09a4b0113 10SHA1 (patch-aa) = 0528fc5da76d5f1d19586ea3dda1acd09a4b0113
11SHA1 (patch-ab) = b47aa9d18a7c1a99ac8cc8b29c64867443f303e5 11SHA1 (patch-ab) = b47aa9d18a7c1a99ac8cc8b29c64867443f303e5
12SHA1 (patch-ac) = 57c88d47f82630e67bcd27ab61bf4362035da2f2 12SHA1 (patch-ac) = 57c88d47f82630e67bcd27ab61bf4362035da2f2
13SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b 13SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b
14SHA1 (patch-ae) = a6d578b5f12eb42fbbcc11791576d2686a4807d9 14SHA1 (patch-ae) = a6d578b5f12eb42fbbcc11791576d2686a4807d9
15SHA1 (patch-ah) = 501d220b41e578402f3400fe88e582aa2408a147 15SHA1 (patch-ah) = 501d220b41e578402f3400fe88e582aa2408a147
16SHA1 (patch-al) = e18800d53de022e4c24055f7d03b69af2837b089 16SHA1 (patch-al) = e18800d53de022e4c24055f7d03b69af2837b089
17SHA1 (patch-am) = aebb81db4aa38c3c1ef57ed4e25422685c362db2 17SHA1 (patch-am) = 740d3b3b0793d7ed152438b9dacbae457dc71076
18SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab 18SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
19SHA1 (patch-ao) = 8c6a156b0f0c2a6d319658477fff348e6a0c3603 19SHA1 (patch-ao) = 8c6a156b0f0c2a6d319658477fff348e6a0c3603
20SHA1 (patch-ap) = d23a869a449ab9dc166cfa149913b20c9acad9cb 20SHA1 (patch-ap) = d23a869a449ab9dc166cfa149913b20c9acad9cb
21SHA1 (patch-au) = 38030fc45afc2a8f53a41f26b649e731642b9148 21SHA1 (patch-au) = 38030fc45afc2a8f53a41f26b649e731642b9148
22SHA1 (patch-av) = d6bf0419015656a8d2f13d3132873e453c8a6b6e 22SHA1 (patch-av) = d6bf0419015656a8d2f13d3132873e453c8a6b6e
23SHA1 (patch-az) = 473419352f6e1ff3c6e6268e81457e6f8a1fccb8 23SHA1 (patch-az) = 473419352f6e1ff3c6e6268e81457e6f8a1fccb8
24SHA1 (patch-ba) = 97dcf72d7380a2d257220669845c52a698165fcf 24SHA1 (patch-ba) = 97dcf72d7380a2d257220669845c52a698165fcf
25SHA1 (patch-bb) = 6cdd94dd1e69630159194c7c153b6c4e46c81456 25SHA1 (patch-bb) = 6cdd94dd1e69630159194c7c153b6c4e46c81456
26SHA1 (patch-bc) = 09aaa254a54109026bb262a949b4006235df7858 26SHA1 (patch-bc) = 09aaa254a54109026bb262a949b4006235df7858
cvs diff -r1.16 -r1.17 pkgsrc/lang/python26/patches/Attic/patch-am (expand / switch to unified diff)

--- pkgsrc/lang/python26/patches/Attic/patch-am 2011/10/01 03:11:15 1.16
+++ pkgsrc/lang/python26/patches/Attic/patch-am 2011/10/18 21:59:18 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-am,v 1.16 2011/10/01 03:11:15 dsainty Exp $ 1$NetBSD: patch-am,v 1.17 2011/10/18 21:59:18 sbd Exp $
2 2
3Disabled modules for normal build: 3Disabled modules for normal build:
4bsddb 4bsddb
5curses 5curses
6curses_panel 6curses_panel
7elementtree 7elementtree
8sqlite3 8sqlite3
9tkinter 9tkinter
10gdbm 10gdbm
11pyexpat 11pyexpat
12readline 12readline
13{linux,oss,sun}audiodev 13{linux,oss,sun}audiodev
14spwd 14spwd
@@ -288,41 +288,48 @@ support building the "nis" and "crypt" m @@ -288,41 +288,48 @@ support building the "nis" and "crypt" m
288- exts.append(Extension('bsddb185', ['bsddbmodule.c'])) 288- exts.append(Extension('bsddb185', ['bsddbmodule.c']))
289- else: 289- else:
290- missing.append('bsddb185') 290- missing.append('bsddb185')
291+ libraries = os.getenv("PY_BDB_TYPE", "") 291+ libraries = os.getenv("PY_BDB_TYPE", "")
292+ if libraries: 292+ if libraries:
293+ exts.append(Extension('bsddb185', ['bsddbmodule.c'], 293+ exts.append(Extension('bsddb185', ['bsddbmodule.c'],
294+ libraries=["db"])) 294+ libraries=["db"]))
295 else: 295 else:
296- missing.append('bsddb185') 296- missing.append('bsddb185')
297+ exts.append(Extension('bsddb185', ['bsddbmodule.c'])) 297+ exts.append(Extension('bsddb185', ['bsddbmodule.c']))
298  298
299 # The standard Unix dbm module: 299 # The standard Unix dbm module:
300 if platform not in ['cygwin']: 300 if platform not in ['cygwin']:
301@@ -1131,7 +974,7 @@ 301@@ -1128,10 +971,12 @@
302 exts.append( Extension('dbm', ['dbmmodule.c'], 302 ndbm_libs = ['ndbm']
 303 else:
 304 ndbm_libs = []
 305- exts.append( Extension('dbm', ['dbmmodule.c'],
 306+ # Don't use gdbm_compat!
 307+ if not self.compiler.find_library_file(lib_dirs, 'gdbm_compat'):
 308+ exts.append( Extension('dbm', ['dbmmodule.c'],
303 define_macros=[('HAVE_NDBM_H',None)], 309 define_macros=[('HAVE_NDBM_H',None)],
304 libraries = ndbm_libs ) ) 310 libraries = ndbm_libs ) )
305- elif self.compiler.find_library_file(lib_dirs, 'gdbm'): 311- elif self.compiler.find_library_file(lib_dirs, 'gdbm'):
306+ elif 1==0 and self.compiler.find_library_file(lib_dirs, 'gdbm'): 312+ elif 1==0 and self.compiler.find_library_file(lib_dirs, 'gdbm'):
307 gdbm_libs = ['gdbm'] 313 gdbm_libs = ['gdbm']
308 if self.compiler.find_library_file(lib_dirs, 'gdbm_compat'): 314 if self.compiler.find_library_file(lib_dirs, 'gdbm_compat'):
309 gdbm_libs.append('gdbm_compat') 315 gdbm_libs.append('gdbm_compat')
310@@ -1147,14 +990,11 @@ 316@@ -1147,14 +990,12 @@
311 libraries = gdbm_libs ) ) 317 libraries = gdbm_libs ) )
312 else: 318 else:
313 missing.append('dbm') 319 missing.append('dbm')
314- elif db_incs is not None: 320- elif db_incs is not None:
315+ elif 1==1: 321+
 322+ if not module_enabled(exts, 'dbm'):
316 exts.append( Extension('dbm', ['dbmmodule.c'], 323 exts.append( Extension('dbm', ['dbmmodule.c'],
317- library_dirs=dblib_dir, 324- library_dirs=dblib_dir,
318- runtime_library_dirs=dblib_dir, 325- runtime_library_dirs=dblib_dir,
319- include_dirs=db_incs, 326- include_dirs=db_incs,
320 define_macros=[('HAVE_BERKDB_H',None), 327 define_macros=[('HAVE_BERKDB_H',None),
321 ('DB_DBM_HSEARCH',None)], 328 ('DB_DBM_HSEARCH',None)],
322- libraries=dblibs)) 329- libraries=dblibs))
323+ libraries=["db"])) 330+ libraries=["db"]))
324 else: 331 else:
325 missing.append('dbm') 332 missing.append('dbm')
326  333
327@@ -1408,6 +1248,14 @@ 334@@ -1408,6 +1248,14 @@
328 ) 335 )
cvs diff -r1.9 -r1.10 pkgsrc/lang/python27/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/python27/distinfo 2011/09/30 08:37:24 1.9
+++ pkgsrc/lang/python27/distinfo 2011/10/18 21:59:18 1.10
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: distinfo,v 1.9 2011/09/30 08:37:24 yyamano Exp $ 1$NetBSD: distinfo,v 1.10 2011/10/18 21:59:18 sbd Exp $
2 2
3SHA1 (Python-2.7.2.tar.bz2) = 417bdeea77abfaf1b9257fc6b4a04aaa209f4547 3SHA1 (Python-2.7.2.tar.bz2) = 417bdeea77abfaf1b9257fc6b4a04aaa209f4547
4RMD160 (Python-2.7.2.tar.bz2) = c3bf4f09b7c429a4d9f4cc251c795304cd5232c5 4RMD160 (Python-2.7.2.tar.bz2) = c3bf4f09b7c429a4d9f4cc251c795304cd5232c5
5Size (Python-2.7.2.tar.bz2) = 11754834 bytes 5Size (Python-2.7.2.tar.bz2) = 11754834 bytes
6SHA1 (patch-Mac_Modules_fm___Fmmodule.c) = b9314bccb51b4fe672b81559068f7a79d2965f94 6SHA1 (patch-Mac_Modules_fm___Fmmodule.c) = b9314bccb51b4fe672b81559068f7a79d2965f94
7SHA1 (patch-Mac_Modules_qd___Qdmodule.c) = 45c748b15b9436d45ba137460389638aa7108c8d 7SHA1 (patch-Mac_Modules_qd___Qdmodule.c) = 45c748b15b9436d45ba137460389638aa7108c8d
8SHA1 (patch-Mac_Modules_qdoffs___Qdoffsmodule.c) = 9994f0c1a908f18f1f3df3f05b184f082c018365 8SHA1 (patch-Mac_Modules_qdoffs___Qdoffsmodule.c) = 9994f0c1a908f18f1f3df3f05b184f082c018365
9SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa 9SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa
10SHA1 (patch-ab) = 8c44f60d9ed0babb107bc4643b0437e2dd55d03a 10SHA1 (patch-ab) = 8c44f60d9ed0babb107bc4643b0437e2dd55d03a
11SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec 11SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec
12SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6 12SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6
13SHA1 (patch-ah) = 8e9ee44c7a054f1387b6d8ef8dbe9c1b8dc8d891 13SHA1 (patch-ah) = 8e9ee44c7a054f1387b6d8ef8dbe9c1b8dc8d891
14SHA1 (patch-al) = b97c2e73b9038e22f55ec226c2cbcc671466ad19 14SHA1 (patch-al) = b97c2e73b9038e22f55ec226c2cbcc671466ad19
15SHA1 (patch-am) = 8b546a0eb9b5e6d287b6fead2d0c20fd457b5b66 15SHA1 (patch-am) = 593f14d9f4ad9f46c57cc43a2a6402ffb9312437
16SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca 16SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca
17SHA1 (patch-ao) = 9996a444fc0034c9f01fd18f4ad7bf714a8c8d04 17SHA1 (patch-ao) = 9996a444fc0034c9f01fd18f4ad7bf714a8c8d04
18SHA1 (patch-au) = 18fce68df48e43c2927cc83e6b4b404b5e1103b7 18SHA1 (patch-au) = 18fce68df48e43c2927cc83e6b4b404b5e1103b7
19SHA1 (patch-av) = a14eaf4d5db6fc3b79ed896fbfcc34ca98051af2 19SHA1 (patch-av) = a14eaf4d5db6fc3b79ed896fbfcc34ca98051af2
20SHA1 (patch-aw) = 15652e241f371a22c7300f46771825ea74514fa0 20SHA1 (patch-aw) = 15652e241f371a22c7300f46771825ea74514fa0
21SHA1 (patch-ax) = bdb8e6555f36b1603c553e03a2d6d772e50c623b 21SHA1 (patch-ax) = bdb8e6555f36b1603c553e03a2d6d772e50c623b
22SHA1 (patch-az) = 473419352f6e1ff3c6e6268e81457e6f8a1fccb8 22SHA1 (patch-az) = 473419352f6e1ff3c6e6268e81457e6f8a1fccb8
cvs diff -r1.3 -r1.4 pkgsrc/lang/python27/patches/Attic/patch-am (expand / switch to unified diff)

--- pkgsrc/lang/python27/patches/Attic/patch-am 2011/06/13 11:31:13 1.3
+++ pkgsrc/lang/python27/patches/Attic/patch-am 2011/10/18 21:59:18 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-am,v 1.3 2011/06/13 11:31:13 obache Exp $ 1$NetBSD: patch-am,v 1.4 2011/10/18 21:59:18 sbd Exp $
2 2
3Disabled modules for normal build: 3Disabled modules for normal build:
4bsddb 4bsddb
5curses 5curses
6curses_panel 6curses_panel
7elementtree 7elementtree
8sqlite3 8sqlite3
9tkinter 9tkinter
10gdbm 10gdbm
11pyexpat 11pyexpat
12readline 12readline
13{linux,oss,sun}audiodev 13{linux,oss,sun}audiodev
14spwd 14spwd
@@ -260,53 +260,75 @@ Build the 1.85 compat module all the tim @@ -260,53 +260,75 @@ Build the 1.85 compat module all the tim
260- exts.append(Extension('bsddb185', ['bsddbmodule.c'])) 260- exts.append(Extension('bsddb185', ['bsddbmodule.c']))
261- else: 261- else:
262- missing.append('bsddb185') 262- missing.append('bsddb185')
263+ libraries = os.getenv("PY_BDB_TYPE", "") 263+ libraries = os.getenv("PY_BDB_TYPE", "")
264+ if libraries: 264+ if libraries:
265+ exts.append(Extension('bsddb185', ['bsddbmodule.c'], 265+ exts.append(Extension('bsddb185', ['bsddbmodule.c'],
266+ libraries=['db'])) 266+ libraries=['db']))
267 else: 267 else:
268- missing.append('bsddb185') 268- missing.append('bsddb185')
269+ exts.append(Extension('bsddb185', ['bsddbmodule.c'])) 269+ exts.append(Extension('bsddb185', ['bsddbmodule.c']))
270  270
271 dbm_order = ['gdbm'] 271 dbm_order = ['gdbm']
272 # The standard Unix dbm module: 272 # The standard Unix dbm module:
273@@ -1193,18 +1012,14 @@ class PyBuildExt(build_ext): 273@@ -1160,13 +979,15 @@ class PyBuildExt(build_ext):
 274 ndbm_libs = ['ndbm']
 275 else:
 276 ndbm_libs = []
 277- print "building dbm using ndbm"
 278- dbmext = Extension('dbm', ['dbmmodule.c'],
 279+ if not self.compiler.find_library_file(lib_dirs,
 280+ 'gdbm'):
 281+ print "building dbm using ndbm"
 282+ dbmext = Extension('dbm', ['dbmmodule.c'],
 283 define_macros=[
 284 ('HAVE_NDBM_H',None),
 285 ],
 286 libraries=ndbm_libs)
 287- break
 288+ break
 289
 290 elif cand == "gdbm":
 291 if self.compiler.find_library_file(lib_dirs, 'gdbm'):
 292@@ -1192,19 +1013,16 @@ class PyBuildExt(build_ext):
 293 ],
274 libraries = gdbm_libs) 294 libraries = gdbm_libs)
275 break 295 break
276 elif cand == "bdb": 296- elif cand == "bdb":
277- if db_incs is not None: 297- if db_incs is not None:
278- print "building dbm using bdb" 298- print "building dbm using bdb"
279- dbmext = Extension('dbm', ['dbmmodule.c'], 299- dbmext = Extension('dbm', ['dbmmodule.c'],
280- library_dirs=dblib_dir, 300- library_dirs=dblib_dir,
281- runtime_library_dirs=dblib_dir, 301- runtime_library_dirs=dblib_dir,
282- include_dirs=db_incs, 302- include_dirs=db_incs,
283- define_macros=[ 303- define_macros=[
284- ('HAVE_BERKDB_H', None), 304- ('HAVE_BERKDB_H', None),
285- ('DB_DBM_HSEARCH', None), 305- ('DB_DBM_HSEARCH', None),
286- ], 306- ],
287- libraries=dblibs) 307- libraries=dblibs)
288- break 308- break
 309+
 310+ if cand == "bdb" and dbmext is None:
289+ print "building dbm using bdb" 311+ print "building dbm using bdb"
290+ dbmext = Extension('dbm', ['dbmmodule.c'], 312+ dbmext = Extension('dbm', ['dbmmodule.c'],
291+ define_macros=[ 313+ define_macros=[
292+ ('HAVE_BERKDB_H', None), 314+ ('HAVE_BERKDB_H', None),
293+ ('DB_DBM_HSEARCH', None), 315+ ('DB_DBM_HSEARCH', None),
294+ ], 316+ ],
295+ libraries=["db"]) 317+ libraries=["db"])
296+ break 318+ break
297 if dbmext is not None: 319 if dbmext is not None:
298 exts.append(dbmext) 320 exts.append(dbmext)
299 else: 321 else:
300@@ -2066,9 +1881,9 @@ def main(): 322@@ -2066,9 +1884,9 @@ def main():
301 ext_modules=[Extension('_struct', ['_struct.c'])], 323 ext_modules=[Extension('_struct', ['_struct.c'])],
302  324
303 # Scripts to install 325 # Scripts to install
304- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', 326- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
305- 'Tools/scripts/2to3', 327- 'Tools/scripts/2to3',
306- 'Lib/smtpd.py'] 328- 'Lib/smtpd.py']
307+ scripts = ['Tools/scripts/pydoc2.7', 329+ scripts = ['Tools/scripts/pydoc2.7',
308+ 'Tools/scripts/2to3-2.7', 330+ 'Tools/scripts/2to3-2.7',
309+ 'Lib/smtpd2.7.py'] 331+ 'Lib/smtpd2.7.py']
310 ) 332 )
311  333
312 # --install-platlib 334 # --install-platlib
cvs diff -r1.3 -r1.4 pkgsrc/lang/python31/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/python31/Attic/distinfo 2011/09/10 11:23:12 1.3
+++ pkgsrc/lang/python31/Attic/distinfo 2011/10/18 21:59:18 1.4
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: distinfo,v 1.3 2011/09/10 11:23:12 obache Exp $ 1$NetBSD: distinfo,v 1.4 2011/10/18 21:59:18 sbd Exp $
2 2
3SHA1 (Python-3.1.4.tar.bz2) = 043d0240247f289205deeb0e620d799005202b3c 3SHA1 (Python-3.1.4.tar.bz2) = 043d0240247f289205deeb0e620d799005202b3c
4RMD160 (Python-3.1.4.tar.bz2) = d537706808b00989a636418b6b6a06357b6bb94b 4RMD160 (Python-3.1.4.tar.bz2) = d537706808b00989a636418b6b6a06357b6bb94b
5Size (Python-3.1.4.tar.bz2) = 9887870 bytes 5Size (Python-3.1.4.tar.bz2) = 9887870 bytes
6SHA1 (patch-aa) = ae156c486007cfd14d378dd211108d3af4b841b1 6SHA1 (patch-aa) = ae156c486007cfd14d378dd211108d3af4b841b1
7SHA1 (patch-ab) = 7d4d6aa9239f53f1ce9ecd377890d71557c58ca4 7SHA1 (patch-ab) = 7d4d6aa9239f53f1ce9ecd377890d71557c58ca4
8SHA1 (patch-ah) = f93c0aab7b0d5e8e9f80433dda5ed5a22861f6b9 8SHA1 (patch-ah) = f93c0aab7b0d5e8e9f80433dda5ed5a22861f6b9
9SHA1 (patch-al) = 48e348c64cf54756cf5b10254661ac089bec3e0a 9SHA1 (patch-al) = 48e348c64cf54756cf5b10254661ac089bec3e0a
10SHA1 (patch-am) = 47d6b7993c1c8e3e203490eb14bf66888f3e39d6 10SHA1 (patch-am) = c7861e5c3bee63efa360218a2ff4685a23b45a3e
11SHA1 (patch-an) = 933acde107b735931d26ace4eef251000b9f07ba 11SHA1 (patch-an) = 933acde107b735931d26ace4eef251000b9f07ba
12SHA1 (patch-ao) = dca396744edc5c0f86c8912bf54347a630cd865b 12SHA1 (patch-ao) = dca396744edc5c0f86c8912bf54347a630cd865b
13SHA1 (patch-au) = a2cefb240d91121315d02104416324c971af6a20 13SHA1 (patch-au) = a2cefb240d91121315d02104416324c971af6a20
14SHA1 (patch-av) = dcbcd47a50b56d1fd8b5e5594b94a155c52d5e39 14SHA1 (patch-av) = dcbcd47a50b56d1fd8b5e5594b94a155c52d5e39
15SHA1 (patch-aw) = 598e4710c426110012048946786a6d72f050e0fc 15SHA1 (patch-aw) = 598e4710c426110012048946786a6d72f050e0fc
cvs diff -r1.2 -r1.3 pkgsrc/lang/python31/patches/Attic/patch-am (expand / switch to unified diff)

--- pkgsrc/lang/python31/patches/Attic/patch-am 2011/09/10 11:23:12 1.2
+++ pkgsrc/lang/python31/patches/Attic/patch-am 2011/10/18 21:59:18 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-am,v 1.2 2011/09/10 11:23:12 obache Exp $ 1$NetBSD: patch-am,v 1.3 2011/10/18 21:59:18 sbd Exp $
2 2
3--- setup.py.orig 2011-06-11 15:48:52.000000000 +0000 3--- setup.py.orig 2011-06-11 15:48:52.000000000 +0000
4+++ setup.py 4+++ setup.py
5@@ -17,7 +17,7 @@ from distutils.command.install_lib impor 5@@ -17,7 +17,7 @@ from distutils.command.install_lib impor
6 from distutils.spawn import find_executable 6 from distutils.spawn import find_executable
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", "pyexpat", "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@@ -362,9 +362,15 @@ class PyBuildExt(build_ext): 14@@ -362,9 +362,15 @@ class PyBuildExt(build_ext):
@@ -31,39 +31,68 @@ $NetBSD: patch-am,v 1.2 2011/09/10 11:23 @@ -31,39 +31,68 @@ $NetBSD: patch-am,v 1.2 2011/09/10 11:23
31  31
32 # Add paths specified in the environment variables LDFLAGS and 32 # Add paths specified in the environment variables LDFLAGS and
33@@ -674,9 +680,7 @@ class PyBuildExt(build_ext): 33@@ -674,9 +680,7 @@ class PyBuildExt(build_ext):
34 if krb5_h: 34 if krb5_h:
35 ssl_incs += krb5_h 35 ssl_incs += krb5_h
36 ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, 36 ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
37- ['/usr/local/ssl/lib', 37- ['/usr/local/ssl/lib',
38- '/usr/contrib/ssl/lib/' 38- '/usr/contrib/ssl/lib/'
39- ] ) 39- ] )
40+ [] ) 40+ [] )
41  41
42 if (ssl_incs is not None and 42 if (ssl_incs is not None and
43 ssl_libs is not None): 43 ssl_libs is not None):
44@@ -1315,6 +1319,14 @@ class PyBuildExt(build_ext): 44@@ -1054,13 +1058,15 @@ class PyBuildExt(build_ext):
 45 ndbm_libs = ['ndbm']
 46 else:
 47 ndbm_libs = []
 48- print("building dbm using ndbm")
 49- dbmext = Extension('_dbm', ['_dbmmodule.c'],
 50+ if not self.compiler.find_library_file(lib_dirs,
 51+ 'gdbm'):
 52+ print("building dbm using ndbm")
 53+ dbmext = Extension('_dbm', ['_dbmmodule.c'],
 54 define_macros=[
 55 ('HAVE_NDBM_H',None),
 56 ],
 57 libraries=ndbm_libs)
 58- break
 59+ break
 60
 61 elif cand == "gdbm":
 62 if self.compiler.find_library_file(lib_dirs, 'gdbm'):
 63@@ -1085,7 +1091,8 @@ class PyBuildExt(build_ext):
 64 ],
 65 libraries = gdbm_libs)
 66 break
 67- elif cand == "bdb":
 68+
 69+ if cand == "bdb" and dbmext is None:
 70 if db_incs is not None:
 71 print("building dbm using bdb")
 72 dbmext = Extension('_dbm', ['_dbmmodule.c'],
 73@@ -1315,6 +1322,14 @@ class PyBuildExt(build_ext):
45 macros = dict() 74 macros = dict()
46 libraries = [] 75 libraries = []
47  76
48+ elif platform.startswith('dragonfly'): 77+ elif platform.startswith('dragonfly'):
49+ macros = dict( 78+ macros = dict(
50+ HAVE_SEM_OPEN=0, 79+ HAVE_SEM_OPEN=0,
51+ HAVE_SEM_TIMEDWAIT=0, 80+ HAVE_SEM_TIMEDWAIT=0,
52+ HAVE_FD_TRANSFER=1, 81+ HAVE_FD_TRANSFER=1,
53+ ) 82+ )
54+ libraries = [] 83+ libraries = []
55+ 84+
56 else: # Linux and other unices 85 else: # Linux and other unices
57 macros = dict() 86 macros = dict()
58 libraries = ['rt'] 87 libraries = ['rt']
59@@ -1831,8 +1843,8 @@ def main(): 88@@ -1831,8 +1846,8 @@ def main():
60 # called unless there's at least one extension module defined. 89 # called unless there's at least one extension module defined.
61 ext_modules=[Extension('_struct', ['_struct.c'])], 90 ext_modules=[Extension('_struct', ['_struct.c'])],
62  91
63- scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3", 92- scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3",
64- "Tools/scripts/2to3"] 93- "Tools/scripts/2to3"]
65+ scripts = ["Tools/scripts/pydoc3.1", "Tools/scripts/idle3", 94+ scripts = ["Tools/scripts/pydoc3.1", "Tools/scripts/idle3",
66+ "Tools/scripts/2to3-3.1"] 95+ "Tools/scripts/2to3-3.1"]
67 ) 96 )
68  97
69 # --install-platlib 98 # --install-platlib
cvs diff -r1.57 -r1.58 pkgsrc/security/cyrus-sasl/Makefile (expand / switch to unified diff)

--- pkgsrc/security/cyrus-sasl/Makefile 2011/09/17 11:32:02 1.57
+++ pkgsrc/security/cyrus-sasl/Makefile 2011/10/18 21:59:18 1.58
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile,v 1.57 2011/09/17 11:32:02 obache Exp $ 1# $NetBSD: Makefile,v 1.58 2011/10/18 21:59:18 sbd Exp $
2 2
3SVR4_PKGNAME= csasl 3SVR4_PKGNAME= csasl
4COMMENT= Simple Authentication and Security Layer 4COMMENT= Simple Authentication and Security Layer
5 5
6PKG_DESTDIR_SUPPORT= user-destdir 6PKG_DESTDIR_SUPPORT= user-destdir
7 7
8.include "Makefile.common" 8.include "Makefile.common"
9 9
10.if exists(/usr/include/ndbm.h) 10.if exists(/usr/include/ndbm.h) && ${OPSYS} != "Linux"
11SASL_DBTYPE?= ndbm 11SASL_DBTYPE?= ndbm
12.else 12.else
13SASL_DBTYPE?= berkeley 13SASL_DBTYPE?= berkeley
14.endif 14.endif
15BUILD_DEFS+= SASL_DBTYPE 15BUILD_DEFS+= SASL_DBTYPE
16 16
17.if ${SASL_DBTYPE} == "berkeley" 17.if ${SASL_DBTYPE} == "berkeley"
18BDB_ACCEPTED= db3 db4 18BDB_ACCEPTED= db3 db4
19. include "../../mk/bdb.buildlink3.mk" 19. include "../../mk/bdb.buildlink3.mk"
20CONFIGURE_ENV+= with_bdb=${BDB_TYPE} 20CONFIGURE_ENV+= with_bdb=${BDB_TYPE}
21.endif 21.endif
22 22
23CONFIGURE_ARGS+= --with-dblib=${SASL_DBTYPE:Q} 23CONFIGURE_ARGS+= --with-dblib=${SASL_DBTYPE:Q}