Tue Jan 26 12:15:26 2010 UTC ()
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.


(tron)
diff -r1.18 -r1.19 pkgsrc/lang/python26/Makefile
diff -r1.7 -r1.8 pkgsrc/lang/python26/PLIST.common
diff -r1.17 -r1.18 pkgsrc/lang/python26/distinfo
diff -r1.7 -r1.8 pkgsrc/lang/python26/patches/patch-am
cvs diff -r1.18 -r1.19 pkgsrc/lang/python26/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python26/Attic/Makefile 2010/01/21 16:28:51 1.18
+++ pkgsrc/lang/python26/Attic/Makefile 2010/01/26 12:15:26 1.19
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.18 2010/01/21 16:28:51 heinz Exp $ 1# $NetBSD: Makefile,v 1.19 2010/01/26 12:15:26 tron Exp $
2 2
3DISTNAME= Python-2.6.4 3DISTNAME= Python-2.6.4
4PKGNAME= ${DISTNAME:S/Python/python26/} 4PKGNAME= ${DISTNAME:S/Python/python26/}
5PKGREVISION= 3 5PKGREVISION= 4
6CATEGORIES= lang python 6CATEGORIES= lang python
7MASTER_SITES= http://www.python.org/ftp/python/2.6.4/ 7MASTER_SITES= http://www.python.org/ftp/python/2.6.4/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@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
@@ -100,27 +100,27 @@ PLIST.extra-so= yes @@ -100,27 +100,27 @@ PLIST.extra-so= yes
100 100
101# ossaudiodev is only available on x86 for the following platforms 101# ossaudiodev is only available on x86 for the following platforms
102PLIST_VARS+= oss 102PLIST_VARS+= oss
103.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \ 103.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
104 (${PY_PLATNAME} == "linux2" || ${OPSYS} == "FreeBSD") 104 (${PY_PLATNAME} == "linux2" || ${OPSYS} == "FreeBSD")
105PLIST.oss= yes 105PLIST.oss= yes
106.endif 106.endif
107 107
108# Make sure python modules can link correctly 108# Make sure python modules can link correctly
109.if ${OPSYS} == "Darwin" 109.if ${OPSYS} == "Darwin"
110INSTALL_UNSTRIPPED= yes 110INSTALL_UNSTRIPPED= yes
111 111
112PLIST_VARS+= nav 112PLIST_VARS+= nav
113. if ${ABI} != "64" 113. if !defined(ABI) || ${ABI} != "64"
114PLIST.nav= yes 114PLIST.nav= yes
115. endif 115. endif
116.endif 116.endif
117 117
118PLIST_VARS+= bsddb dll nis no-nis 118PLIST_VARS+= bsddb dll nis no-nis
119.if ${OPSYS} == "IRIX" 119.if ${OPSYS} == "IRIX"
120. if ${ABI} == "64" 120. if ${ABI} == "64"
121PLIST.no-nis= yes 121PLIST.no-nis= yes
122. else 122. else
123PLIST.nis= yes 123PLIST.nis= yes
124. endif 124. endif
125.else 125.else
126. include "../../mk/bdb.buildlink3.mk" 126. include "../../mk/bdb.buildlink3.mk"
cvs diff -r1.7 -r1.8 pkgsrc/lang/python26/Attic/PLIST.common (expand / switch to unified diff)

--- pkgsrc/lang/python26/Attic/PLIST.common 2009/11/03 02:20:54 1.7
+++ pkgsrc/lang/python26/Attic/PLIST.common 2010/01/26 12:15:26 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST.common,v 1.7 2009/11/03 02:20:54 wiz Exp $ 1@comment $NetBSD: PLIST.common,v 1.8 2010/01/26 12:15:26 tron Exp $
2bin/2to3 2bin/2to3
3bin/pydoc${PY_VER_SUFFIX} 3bin/pydoc${PY_VER_SUFFIX}
4bin/python${PY_VER_SUFFIX} 4bin/python${PY_VER_SUFFIX}
5bin/python${PY_VER_SUFFIX}-config 5bin/python${PY_VER_SUFFIX}-config
6bin/smtpd${PY_VER_SUFFIX}.py 6bin/smtpd${PY_VER_SUFFIX}.py
7include/python${PY_VER_SUFFIX}/Python-ast.h 7include/python${PY_VER_SUFFIX}/Python-ast.h
8include/python${PY_VER_SUFFIX}/Python.h 8include/python${PY_VER_SUFFIX}/Python.h
9include/python${PY_VER_SUFFIX}/abstract.h 9include/python${PY_VER_SUFFIX}/abstract.h
10include/python${PY_VER_SUFFIX}/asdl.h 10include/python${PY_VER_SUFFIX}/asdl.h
11include/python${PY_VER_SUFFIX}/ast.h 11include/python${PY_VER_SUFFIX}/ast.h
12include/python${PY_VER_SUFFIX}/bitset.h 12include/python${PY_VER_SUFFIX}/bitset.h
13include/python${PY_VER_SUFFIX}/boolobject.h 13include/python${PY_VER_SUFFIX}/boolobject.h
14include/python${PY_VER_SUFFIX}/bufferobject.h 14include/python${PY_VER_SUFFIX}/bufferobject.h
@@ -1719,27 +1719,26 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/d @@ -1719,27 +1719,26 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/d
1719${PLIST.dl}lib/python${PY_VER_SUFFIX}/lib-dynload/dl.so 1719${PLIST.dl}lib/python${PY_VER_SUFFIX}/lib-dynload/dl.so
1720lib/python${PY_VER_SUFFIX}/lib-dynload/fcntl.so 1720lib/python${PY_VER_SUFFIX}/lib-dynload/fcntl.so
1721lib/python${PY_VER_SUFFIX}/lib-dynload/future_builtins.so 1721lib/python${PY_VER_SUFFIX}/lib-dynload/future_builtins.so
1722lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so 1722lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so
1723${PLIST.extra-so}lib/python${PY_VER_SUFFIX}/lib-dynload/imageop.so 1723${PLIST.extra-so}lib/python${PY_VER_SUFFIX}/lib-dynload/imageop.so
1724lib/python${PY_VER_SUFFIX}/lib-dynload/itertools.so 1724lib/python${PY_VER_SUFFIX}/lib-dynload/itertools.so
1725lib/python${PY_VER_SUFFIX}/lib-dynload/math.so 1725lib/python${PY_VER_SUFFIX}/lib-dynload/math.so
1726lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so 1726lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so
1727${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so 1727${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
1728${PLIST.no-nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so 1728${PLIST.no-nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so
1729lib/python${PY_VER_SUFFIX}/lib-dynload/operator.so 1729lib/python${PY_VER_SUFFIX}/lib-dynload/operator.so
1730${PLIST.oss}lib/python${PY_VER_SUFFIX}/lib-dynload/ossaudiodev.so 1730${PLIST.oss}lib/python${PY_VER_SUFFIX}/lib-dynload/ossaudiodev.so
1731lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so 1731lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
1732lib/python${PY_VER_SUFFIX}/lib-dynload/pyexpat.so 
1733lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so 1732lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
1734lib/python${PY_VER_SUFFIX}/lib-dynload/select.so 1733lib/python${PY_VER_SUFFIX}/lib-dynload/select.so
1735lib/python${PY_VER_SUFFIX}/lib-dynload/strop.so 1734lib/python${PY_VER_SUFFIX}/lib-dynload/strop.so
1736lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so 1735lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so
1737lib/python${PY_VER_SUFFIX}/lib-dynload/termios.so 1736lib/python${PY_VER_SUFFIX}/lib-dynload/termios.so
1738lib/python${PY_VER_SUFFIX}/lib-dynload/time.so 1737lib/python${PY_VER_SUFFIX}/lib-dynload/time.so
1739lib/python${PY_VER_SUFFIX}/lib-dynload/unicodedata.so 1738lib/python${PY_VER_SUFFIX}/lib-dynload/unicodedata.so
1740lib/python${PY_VER_SUFFIX}/lib-dynload/zlib.so 1739lib/python${PY_VER_SUFFIX}/lib-dynload/zlib.so
1741lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.py 1740lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.py
1742lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.pyc 1741lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.pyc
1743lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.pyo 1742lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.pyo
1744lib/python${PY_VER_SUFFIX}/lib-tk/Dialog.py 1743lib/python${PY_VER_SUFFIX}/lib-tk/Dialog.py
1745lib/python${PY_VER_SUFFIX}/lib-tk/Dialog.pyc 1744lib/python${PY_VER_SUFFIX}/lib-tk/Dialog.pyc
cvs diff -r1.17 -r1.18 pkgsrc/lang/python26/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/python26/Attic/distinfo 2009/11/16 21:12:05 1.17
+++ pkgsrc/lang/python26/Attic/distinfo 2010/01/26 12:15:26 1.18
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.17 2009/11/16 21:12:05 jakllsch Exp $ 1$NetBSD: distinfo,v 1.18 2010/01/26 12:15:26 tron Exp $
2 2
3SHA1 (Python-2.6.4.tar.bz2) = bee572680d1966501247cb2b26e0e51f94d1cd13 3SHA1 (Python-2.6.4.tar.bz2) = bee572680d1966501247cb2b26e0e51f94d1cd13
4RMD160 (Python-2.6.4.tar.bz2) = fd33853842110fa3636dd296f2f27646fd2b151a 4RMD160 (Python-2.6.4.tar.bz2) = fd33853842110fa3636dd296f2f27646fd2b151a
5Size (Python-2.6.4.tar.bz2) = 11249486 bytes 5Size (Python-2.6.4.tar.bz2) = 11249486 bytes
6SHA1 (patch-aa) = d44e67645dc86ff14f5daf5705de02c6f330cc48 6SHA1 (patch-aa) = d44e67645dc86ff14f5daf5705de02c6f330cc48
7SHA1 (patch-ab) = d35025df83e70d129f9fbcd277652b0eea83b026 7SHA1 (patch-ab) = d35025df83e70d129f9fbcd277652b0eea83b026
8SHA1 (patch-ac) = 858580a4e5c7474127eafb27bdfa96dc96cafad5 8SHA1 (patch-ac) = 858580a4e5c7474127eafb27bdfa96dc96cafad5
9SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b 9SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b
10SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b 10SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b
11SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa 11SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa
12SHA1 (patch-al) = c39144cfa4a540900fac879b5faa990628fcee3e 12SHA1 (patch-al) = c39144cfa4a540900fac879b5faa990628fcee3e
13SHA1 (patch-am) = d531f1ddb7a7bac9c56d9b947f8a0a2666c9c017 13SHA1 (patch-am) = 952cadccc4cef28da7f297f35a5073dcce38033b
14SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab 14SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
15SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2 15SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2
16SHA1 (patch-ap) = 39d81b01fa9e1b894be9ae0922881337bb4d17da 16SHA1 (patch-ap) = 39d81b01fa9e1b894be9ae0922881337bb4d17da
17SHA1 (patch-ar) = 2a0c3f9a798afdfda7af4823e67579b2e000c072 17SHA1 (patch-ar) = 2a0c3f9a798afdfda7af4823e67579b2e000c072
18SHA1 (patch-au) = cf68c1975f60d18bf37262fa41cbfef1585aeb55 18SHA1 (patch-au) = cf68c1975f60d18bf37262fa41cbfef1585aeb55
19SHA1 (patch-av) = a1d41cb3a93879d54f0964ff84a63a297c333156 19SHA1 (patch-av) = a1d41cb3a93879d54f0964ff84a63a297c333156
cvs diff -r1.7 -r1.8 pkgsrc/lang/python26/patches/Attic/patch-am (expand / switch to unified diff)

--- pkgsrc/lang/python26/patches/Attic/patch-am 2009/11/16 10:40:21 1.7
+++ pkgsrc/lang/python26/patches/Attic/patch-am 2010/01/26 12:15:26 1.8
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1$NetBSD: patch-am,v 1.7 2009/11/16 10:40:21 joerg Exp $ 1$NetBSD: patch-am,v 1.8 2010/01/26 12:15:26 tron Exp $
2 2
3Disabled modules for normal build: 3Disabled modules for normal build:
4bsdddb 4bsdddb
5curses 5curses
6curses_panel 6curses_panel
7elementtree 7elementtree
8Those have separate packages.  8Those have separate packages.
9 9
10Only check the BUILDLINK_DIR for libraries etc, do not pick up random 10Only check the BUILDLINK_DIR for libraries etc, do not pick up random
11headers and libraries from the system. 11headers and libraries from the system.
12 12
13Build the 1.85 compat module all the time against the BDB version of choice. 13Build the 1.85 compat module all the time against the BDB version of choice.
14 14
15--- setup.py.orig 2009-09-20 12:37:33.000000000 +0200 15--- setup.py.orig 2009-09-20 12:37:33.000000000 +0200
16+++ setup.py 16+++ setup.py
17@@ -17,7 +17,7 @@ from distutils.command.install import in 17@@ -17,7 +17,7 @@ from distutils.command.install import in
18 from distutils.command.install_lib import install_lib 18 from distutils.command.install_lib import install_lib
19  19
20 # This global variable is used to hold the list of modules to be disabled. 20 # This global variable is used to hold the list of modules to be disabled.
21-disabled_module_list = [] 21-disabled_module_list = []
22+disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", "_sqlite3", "_tkinter", "gdbm", "expat", "readline"] 22+disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", "_sqlite3", "_tkinter", "gdbm", "pyexpat", "readline"]
23  23
24 def add_dir_to_list(dirlist, dir): 24 def add_dir_to_list(dirlist, dir):
25 """Add the directory 'dir' to the list 'dirlist' (at the front) if 25 """Add the directory 'dir' to the list 'dirlist' (at the front) if
26@@ -309,9 +309,15 @@ class PyBuildExt(build_ext): 26@@ -309,9 +309,15 @@ class PyBuildExt(build_ext):
27 return sys.platform 27 return sys.platform
28  28
29 def detect_modules(self): 29 def detect_modules(self):
30- # Ensure that /usr/local is always used 30- # Ensure that /usr/local is always used
31- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') 31- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
32- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') 32- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
33+ # Add the buildlink directories for pkgsrc 33+ # Add the buildlink directories for pkgsrc
34+ if os.environ.has_key('BUILDLINK_DIR'): 34+ if os.environ.has_key('BUILDLINK_DIR'):
35+ dir = os.environ['BUILDLINK_DIR'] 35+ dir = os.environ['BUILDLINK_DIR']