Fri Sep 28 11:01:38 2018 UTC ()
Fix for Darwin/Xcode 10 (missing QuickTime.framework); PLIST_VARS cleanup


(adam)
diff -r1.74 -r1.75 pkgsrc/lang/python27/Makefile
diff -r1.2 -r1.3 pkgsrc/lang/python27/PLIST.Darwin
cvs diff -r1.74 -r1.75 pkgsrc/lang/python27/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/python27/Makefile 2018/06/17 19:21:21 1.74
+++ pkgsrc/lang/python27/Makefile 2018/09/28 11:01:37 1.75
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.74 2018/06/17 19:21:21 adam Exp $ 1# $NetBSD: Makefile,v 1.75 2018/09/28 11:01:37 adam Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python27-${PY_DISTVERSION} 5PKGNAME= python27-${PY_DISTVERSION}
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= lang python 7CATEGORIES= lang python
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.python.org/ 10HOMEPAGE= https://www.python.org/
11COMMENT= Interpreted, interactive, object-oriented programming language 11COMMENT= Interpreted, interactive, object-oriented programming language
12LICENSE= python-software-foundation 12LICENSE= python-software-foundation
13 13
14DEPENDS= mozilla-rootcerts>=1.0.20150804nb1:../../security/mozilla-rootcerts 14DEPENDS= mozilla-rootcerts>=1.0.20150804nb1:../../security/mozilla-rootcerts
@@ -71,45 +71,49 @@ PY_PLATNAME= linux2 @@ -71,45 +71,49 @@ PY_PLATNAME= linux2
71PY_PLATNAME= sco_sv3 71PY_PLATNAME= sco_sv3
72.else 72.else
73PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//} 73PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//}
74.endif 74.endif
75PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q} 75PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q}
76 76
77.if !empty(LP64PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@) || \ 77.if !empty(LP64PLATFORMS:@.PLAT.@${MACHINE_PLATFORM:M${.PLAT.}}@) || \
78 (defined(ABI) && ${ABI} == "64") 78 (defined(ABI) && ${ABI} == "64")
79IS_64BIT_PLATFORM?= yes 79IS_64BIT_PLATFORM?= yes
80.else 80.else
81IS_64BIT_PLATFORM?= no 81IS_64BIT_PLATFORM?= no
82.endif 82.endif
83 83
 84PLIST_VARS+= dl dll extra-so nis no-nis qt
 85
84# the dl module isn't built for 64 bit archs 86# the dl module isn't built for 64 bit archs
85PLIST_VARS+= dl 
86.if empty(IS_64BIT_PLATFORM:M[yY][eE][sS]) 87.if empty(IS_64BIT_PLATFORM:M[yY][eE][sS])
87PLIST.dl= yes 88PLIST.dl= yes
88.endif 89.endif
89 90
90# setup.py causes some modules to be built if the platform is *not* 64bit. 91# setup.py causes some modules to be built if the platform is *not* 64bit.
91PLIST_VARS+= extra-so 
92.if !empty(IS_64BIT_PLATFORM:M[nN][oO]) 92.if !empty(IS_64BIT_PLATFORM:M[nN][oO])
93PLIST.extra-so= yes 93PLIST.extra-so= yes
94.endif 94.endif
95 95
96# For Xcode 5 we need to search the SDK path for headers, otherwise certain 96# For Xcode 5 we need to search the SDK path for headers, otherwise certain
97# modules will not be built. 97# modules will not be built.
98.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH}/usr/include) 98.if ${OPSYS} == "Darwin"
99CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include 99. if exists(${OSX_SDK_PATH}/usr/include)
 100CFLAGS+= -I${OSX_SDK_PATH:Q}/usr/include
 101. endif
 102. if exists(${OSX_SDK_PATH}/System/Library/Frameworks/QuickTime.framework)
 103PLIST.qt= yes
 104. endif
100.endif 105.endif
101 106
102PLIST_VARS+= dll nis no-nis 
103.if ${OPSYS} == "IRIX" 107.if ${OPSYS} == "IRIX"
104. if ${ABI} == "64" 108. if ${ABI} == "64"
105PLIST.no-nis= yes 109PLIST.no-nis= yes
106. else 110. else
107PLIST.nis= yes 111PLIST.nis= yes
108. endif 112. endif
109.else 113.else
110PLIST.dll= yes 114PLIST.dll= yes
111. if ${OPSYS} == "MirBSD" || "${OS_VARIANT}" == "chromeos" 115. if ${OPSYS} == "MirBSD" || "${OS_VARIANT}" == "chromeos"
112# neither nis nor no-nis 116# neither nis nor no-nis
113. elif ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat) 117. elif ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat)
114PLIST.nis= yes 118PLIST.nis= yes
115. else 119. else
cvs diff -r1.2 -r1.3 pkgsrc/lang/python27/PLIST.Darwin (expand / switch to unified diff)

--- pkgsrc/lang/python27/PLIST.Darwin 2013/05/19 20:37:14 1.2
+++ pkgsrc/lang/python27/PLIST.Darwin 2018/09/28 11:01:37 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST.Darwin,v 1.2 2013/05/19 20:37:14 adam Exp $ 1@comment $NetBSD: PLIST.Darwin,v 1.3 2018/09/28 11:01:37 adam Exp $
2lib/python${PY_VER_SUFFIX}/lib-dynload/ColorPicker.so 2lib/python${PY_VER_SUFFIX}/lib-dynload/ColorPicker.so
3lib/python${PY_VER_SUFFIX}/lib-dynload/MacOS.so 3lib/python${PY_VER_SUFFIX}/lib-dynload/MacOS.so
4lib/python${PY_VER_SUFFIX}/lib-dynload/Nav.so 4lib/python${PY_VER_SUFFIX}/lib-dynload/Nav.so
5lib/python${PY_VER_SUFFIX}/lib-dynload/OSATerminology.so 5lib/python${PY_VER_SUFFIX}/lib-dynload/OSATerminology.so
6lib/python${PY_VER_SUFFIX}/lib-dynload/_AE.so 6lib/python${PY_VER_SUFFIX}/lib-dynload/_AE.so
7lib/python${PY_VER_SUFFIX}/lib-dynload/_AH.so 7lib/python${PY_VER_SUFFIX}/lib-dynload/_AH.so
8lib/python${PY_VER_SUFFIX}/lib-dynload/_App.so 8lib/python${PY_VER_SUFFIX}/lib-dynload/_App.so
9lib/python${PY_VER_SUFFIX}/lib-dynload/_CF.so 9lib/python${PY_VER_SUFFIX}/lib-dynload/_CF.so
10lib/python${PY_VER_SUFFIX}/lib-dynload/_CG.so 10lib/python${PY_VER_SUFFIX}/lib-dynload/_CG.so
11lib/python${PY_VER_SUFFIX}/lib-dynload/_CarbonEvt.so 11lib/python${PY_VER_SUFFIX}/lib-dynload/_CarbonEvt.so
12lib/python${PY_VER_SUFFIX}/lib-dynload/_Cm.so 12lib/python${PY_VER_SUFFIX}/lib-dynload/_Cm.so
13lib/python${PY_VER_SUFFIX}/lib-dynload/_Ctl.so 13lib/python${PY_VER_SUFFIX}/lib-dynload/_Ctl.so
14lib/python${PY_VER_SUFFIX}/lib-dynload/_Dlg.so 14lib/python${PY_VER_SUFFIX}/lib-dynload/_Dlg.so
@@ -17,27 +17,27 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_ @@ -17,27 +17,27 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_
17lib/python${PY_VER_SUFFIX}/lib-dynload/_File.so 17lib/python${PY_VER_SUFFIX}/lib-dynload/_File.so
18lib/python${PY_VER_SUFFIX}/lib-dynload/_Fm.so 18lib/python${PY_VER_SUFFIX}/lib-dynload/_Fm.so
19lib/python${PY_VER_SUFFIX}/lib-dynload/_Folder.so 19lib/python${PY_VER_SUFFIX}/lib-dynload/_Folder.so
20lib/python${PY_VER_SUFFIX}/lib-dynload/_Help.so 20lib/python${PY_VER_SUFFIX}/lib-dynload/_Help.so
21lib/python${PY_VER_SUFFIX}/lib-dynload/_IBCarbon.so 21lib/python${PY_VER_SUFFIX}/lib-dynload/_IBCarbon.so
22lib/python${PY_VER_SUFFIX}/lib-dynload/_Icn.so 22lib/python${PY_VER_SUFFIX}/lib-dynload/_Icn.so
23lib/python${PY_VER_SUFFIX}/lib-dynload/_Launch.so 23lib/python${PY_VER_SUFFIX}/lib-dynload/_Launch.so
24lib/python${PY_VER_SUFFIX}/lib-dynload/_List.so 24lib/python${PY_VER_SUFFIX}/lib-dynload/_List.so
25lib/python${PY_VER_SUFFIX}/lib-dynload/_Menu.so 25lib/python${PY_VER_SUFFIX}/lib-dynload/_Menu.so
26lib/python${PY_VER_SUFFIX}/lib-dynload/_Mlte.so 26lib/python${PY_VER_SUFFIX}/lib-dynload/_Mlte.so
27lib/python${PY_VER_SUFFIX}/lib-dynload/_OSA.so 27lib/python${PY_VER_SUFFIX}/lib-dynload/_OSA.so
28lib/python${PY_VER_SUFFIX}/lib-dynload/_Qd.so 28lib/python${PY_VER_SUFFIX}/lib-dynload/_Qd.so
29lib/python${PY_VER_SUFFIX}/lib-dynload/_Qdoffs.so 29lib/python${PY_VER_SUFFIX}/lib-dynload/_Qdoffs.so
30lib/python${PY_VER_SUFFIX}/lib-dynload/_Qt.so 30${PLIST.qt}lib/python${PY_VER_SUFFIX}/lib-dynload/_Qt.so
31lib/python${PY_VER_SUFFIX}/lib-dynload/_Res.so 31lib/python${PY_VER_SUFFIX}/lib-dynload/_Res.so
32lib/python${PY_VER_SUFFIX}/lib-dynload/_scproxy.so 32lib/python${PY_VER_SUFFIX}/lib-dynload/_scproxy.so
33lib/python${PY_VER_SUFFIX}/lib-dynload/_Scrap.so 33lib/python${PY_VER_SUFFIX}/lib-dynload/_Scrap.so
34lib/python${PY_VER_SUFFIX}/lib-dynload/_Snd.so 34lib/python${PY_VER_SUFFIX}/lib-dynload/_Snd.so
35lib/python${PY_VER_SUFFIX}/lib-dynload/_TE.so 35lib/python${PY_VER_SUFFIX}/lib-dynload/_TE.so
36lib/python${PY_VER_SUFFIX}/lib-dynload/_Win.so 36lib/python${PY_VER_SUFFIX}/lib-dynload/_Win.so
37lib/python${PY_VER_SUFFIX}/lib-dynload/autoGIL.so 37lib/python${PY_VER_SUFFIX}/lib-dynload/autoGIL.so
38lib/python${PY_VER_SUFFIX}/lib-dynload/gestalt.so 38lib/python${PY_VER_SUFFIX}/lib-dynload/gestalt.so
39lib/python${PY_VER_SUFFIX}/lib-dynload/icglue.so 39lib/python${PY_VER_SUFFIX}/lib-dynload/icglue.so
40lib/python${PY_VER_SUFFIX}/plat-mac/${LOWER_VENDOR}single.py 40lib/python${PY_VER_SUFFIX}/plat-mac/${LOWER_VENDOR}single.py
41lib/python${PY_VER_SUFFIX}/plat-mac/${LOWER_VENDOR}single.pyc 41lib/python${PY_VER_SUFFIX}/plat-mac/${LOWER_VENDOR}single.pyc
42lib/python${PY_VER_SUFFIX}/plat-mac/${LOWER_VENDOR}single.pyo 42lib/python${PY_VER_SUFFIX}/plat-mac/${LOWER_VENDOR}single.pyo
43lib/python${PY_VER_SUFFIX}/plat-mac/${LOWER_VENDOR}trawmain.py 43lib/python${PY_VER_SUFFIX}/plat-mac/${LOWER_VENDOR}trawmain.py