Sun Apr 18 09:20:25 2010 UTC ()
Nav.o now gets build and installed on 64-bit Mac OS X


(adam)
diff -r1.21 -r1.22 pkgsrc/lang/python26/Makefile
diff -r1.5 -r1.6 pkgsrc/lang/python26/PLIST.Darwin
cvs diff -r1.21 -r1.22 pkgsrc/lang/python26/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python26/Attic/Makefile 2010/02/11 21:21:49 1.21
+++ pkgsrc/lang/python26/Attic/Makefile 2010/04/18 09:20:25 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.21 2010/02/11 21:21:49 tnn Exp $ 1# $NetBSD: Makefile,v 1.22 2010/04/18 09:20:25 adam Exp $
2 2
3DISTNAME= Python-2.6.4 3DISTNAME= Python-2.6.4
4PKGNAME= ${DISTNAME:S/Python/python26/} 4PKGNAME= ${DISTNAME:S/Python/python26/}
5PKGREVISION= 4 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
@@ -98,31 +98,26 @@ PLIST_VARS+= extra-so @@ -98,31 +98,26 @@ PLIST_VARS+= extra-so
98PLIST.extra-so= yes 98PLIST.extra-so= yes
99.endif 99.endif
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 
112PLIST_VARS+= nav 
113. if !defined(ABI) || ${ABI} != "64" 
114PLIST.nav= yes 
115. endif 
116.endif 111.endif
117 112
118PLIST_VARS+= dll nis no-nis 113PLIST_VARS+= dll nis no-nis
119.if ${OPSYS} == "IRIX" 114.if ${OPSYS} == "IRIX"
120. if ${ABI} == "64" 115. if ${ABI} == "64"
121PLIST.no-nis= yes 116PLIST.no-nis= yes
122. else 117. else
123PLIST.nis= yes 118PLIST.nis= yes
124. endif 119. endif
125.else 120.else
126PLIST.dll= yes 121PLIST.dll= yes
127. if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat) 122. if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat)
128PLIST.nis= yes 123PLIST.nis= yes
cvs diff -r1.5 -r1.6 pkgsrc/lang/python26/Attic/PLIST.Darwin (expand / switch to unified diff)

--- pkgsrc/lang/python26/Attic/PLIST.Darwin 2009/10/21 08:24:11 1.5
+++ pkgsrc/lang/python26/Attic/PLIST.Darwin 2010/04/18 09:20:25 1.6
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1@comment $NetBSD: PLIST.Darwin,v 1.5 2009/10/21 08:24:11 tron Exp $ 1@comment $NetBSD: PLIST.Darwin,v 1.6 2010/04/18 09:20:25 adam Exp $
2lib/libpython${PY_VER_SUFFIX}.dylib 2lib/libpython${PY_VER_SUFFIX}.dylib
3lib/python${PY_VER_SUFFIX}/lib-dynload/ColorPicker.so 3lib/python${PY_VER_SUFFIX}/lib-dynload/ColorPicker.so
4lib/python${PY_VER_SUFFIX}/lib-dynload/MacOS.so 4lib/python${PY_VER_SUFFIX}/lib-dynload/MacOS.so
5${PLIST.nav}lib/python${PY_VER_SUFFIX}/lib-dynload/Nav.so 5lib/python${PY_VER_SUFFIX}/lib-dynload/Nav.so
6lib/python${PY_VER_SUFFIX}/lib-dynload/OSATerminology.so 6lib/python${PY_VER_SUFFIX}/lib-dynload/OSATerminology.so
7lib/python${PY_VER_SUFFIX}/lib-dynload/_AE.so 7lib/python${PY_VER_SUFFIX}/lib-dynload/_AE.so
8lib/python${PY_VER_SUFFIX}/lib-dynload/_AH.so 8lib/python${PY_VER_SUFFIX}/lib-dynload/_AH.so
9lib/python${PY_VER_SUFFIX}/lib-dynload/_App.so 9lib/python${PY_VER_SUFFIX}/lib-dynload/_App.so
10lib/python${PY_VER_SUFFIX}/lib-dynload/_CF.so 10lib/python${PY_VER_SUFFIX}/lib-dynload/_CF.so
11lib/python${PY_VER_SUFFIX}/lib-dynload/_CG.so 11lib/python${PY_VER_SUFFIX}/lib-dynload/_CG.so
12lib/python${PY_VER_SUFFIX}/lib-dynload/_CarbonEvt.so 12lib/python${PY_VER_SUFFIX}/lib-dynload/_CarbonEvt.so
13lib/python${PY_VER_SUFFIX}/lib-dynload/_Cm.so 13lib/python${PY_VER_SUFFIX}/lib-dynload/_Cm.so
14lib/python${PY_VER_SUFFIX}/lib-dynload/_Ctl.so 14lib/python${PY_VER_SUFFIX}/lib-dynload/_Ctl.so
15lib/python${PY_VER_SUFFIX}/lib-dynload/_Dlg.so 15lib/python${PY_VER_SUFFIX}/lib-dynload/_Dlg.so
16lib/python${PY_VER_SUFFIX}/lib-dynload/_Drag.so 16lib/python${PY_VER_SUFFIX}/lib-dynload/_Drag.so
17lib/python${PY_VER_SUFFIX}/lib-dynload/_Evt.so 17lib/python${PY_VER_SUFFIX}/lib-dynload/_Evt.so
18lib/python${PY_VER_SUFFIX}/lib-dynload/_File.so 18lib/python${PY_VER_SUFFIX}/lib-dynload/_File.so