[pkgsrc/pkgsrc-2009Q4]: pkgsrc/lang/python26 Pullup ticket 2973 - requested b...

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dfb5816c333d
branches:  pkgsrc-2009Q4
changeset: 569215:dfb5816c333d
user:      spz <spz%pkgsrc.org@localhost>
date:      Tue Jan 26 16:02:46 2010 +0000

description:
Pullup ticket 2973 - requested by tron
build fix

Revisions pulled up:
- pkgsrc/lang/python26/Makefile         1.18->1.19
- pkgsrc/lang/python26/PLIST.common     1.8
- pkgsrc/lang/python26/distinfo         1.18
- pkgsrc/lang/python26/patches/patch-am 1.8

   -------------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   tron
   Date:           Tue Jan 26 12:15:26 UTC 2010

   Modified Files:
           pkgsrc/lang/python26: Makefile PLIST.common distinfo
           pkgsrc/lang/python26/patches: patch-am

   Log Message:
   Fix build problems under Mac OS X reported by Taylor R Campbell
   on the "pkgsrc-users" mailing list:
   1.) Fix 64-Bit ABI check for Snow Leopard so it doesn't break the build
       on older version of Mac OS X.
   2.) Properly disable the "pyexpat" module and remove it from the
       package list.

   Bump package revision because of these changes.


   To generate a diff of this commit:
   cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/python26/Makefile
   cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/python26/PLIST.common
   cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/python26/distinfo
   cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/python26/patches/patch-am

diffstat:

 lang/python26/Makefile         |  6 +++---
 lang/python26/PLIST.common     |  3 +--
 lang/python26/distinfo         |  4 ++--
 lang/python26/patches/patch-am |  4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diffs (76 lines):

diff -r 94559a4f0766 -r dfb5816c333d lang/python26/Makefile
--- a/lang/python26/Makefile    Tue Jan 26 15:10:39 2010 +0000
+++ b/lang/python26/Makefile    Tue Jan 26 16:02:46 2010 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2009/12/20 23:58:27 tnn Exp $
+# $NetBSD: Makefile,v 1.16.2.1 2010/01/26 16:02:46 spz Exp $
 
 DISTNAME=      Python-2.6.4
 PKGNAME=       ${DISTNAME:S/Python/python26/}
-PKGREVISION=   2
+PKGREVISION=   4
 CATEGORIES=    lang python
 MASTER_SITES=  http://www.python.org/ftp/python/2.6.4/
 EXTRACT_SUFX=  .tar.bz2
@@ -109,7 +109,7 @@
 INSTALL_UNSTRIPPED=    yes
 
 PLIST_VARS+=   nav
-.  if ${ABI} != "64"
+.  if !defined(ABI) || ${ABI} != "64"
 PLIST.nav=     yes
 .  endif
 .endif
diff -r 94559a4f0766 -r dfb5816c333d lang/python26/PLIST.common
--- a/lang/python26/PLIST.common        Tue Jan 26 15:10:39 2010 +0000
+++ b/lang/python26/PLIST.common        Tue Jan 26 16:02:46 2010 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.7 2009/11/03 02:20:54 wiz Exp $
+@comment $NetBSD: PLIST.common,v 1.7.2.1 2010/01/26 16:02:47 spz Exp $
 bin/2to3
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -1729,7 +1729,6 @@
 lib/python${PY_VER_SUFFIX}/lib-dynload/operator.so
 ${PLIST.oss}lib/python${PY_VER_SUFFIX}/lib-dynload/ossaudiodev.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
 lib/python${PY_VER_SUFFIX}/lib-dynload/select.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/strop.so
diff -r 94559a4f0766 -r dfb5816c333d lang/python26/distinfo
--- a/lang/python26/distinfo    Tue Jan 26 15:10:39 2010 +0000
+++ b/lang/python26/distinfo    Tue Jan 26 16:02:46 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2009/11/16 21:12:05 jakllsch Exp $
+$NetBSD: distinfo,v 1.17.2.1 2010/01/26 16:02:47 spz Exp $
 
 SHA1 (Python-2.6.4.tar.bz2) = bee572680d1966501247cb2b26e0e51f94d1cd13
 RMD160 (Python-2.6.4.tar.bz2) = fd33853842110fa3636dd296f2f27646fd2b151a
@@ -10,7 +10,7 @@
 SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b
 SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa
 SHA1 (patch-al) = c39144cfa4a540900fac879b5faa990628fcee3e
-SHA1 (patch-am) = d531f1ddb7a7bac9c56d9b947f8a0a2666c9c017
+SHA1 (patch-am) = 952cadccc4cef28da7f297f35a5073dcce38033b
 SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
 SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2
 SHA1 (patch-ap) = 39d81b01fa9e1b894be9ae0922881337bb4d17da
diff -r 94559a4f0766 -r dfb5816c333d lang/python26/patches/patch-am
--- a/lang/python26/patches/patch-am    Tue Jan 26 15:10:39 2010 +0000
+++ b/lang/python26/patches/patch-am    Tue Jan 26 16:02:46 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.7 2009/11/16 10:40:21 joerg Exp $
+$NetBSD: patch-am,v 1.7.2.1 2010/01/26 16:02:47 spz Exp $
 
 Disabled modules for normal build:
 bsdddb
@@ -19,7 +19,7 @@
  
  # 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