CVS commit: pkgsrc/lang/python27

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Sep 28 11:01:38 UTC 2018

Modified Files:
        pkgsrc/lang/python27: Makefile PLIST.Darwin

Log Message:
Fix for Darwin/Xcode 10 (missing QuickTime.framework); PLIST_VARS cleanup


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 pkgsrc/lang/python27/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/python27/PLIST.Darwin

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/python27/Makefile
diff -u pkgsrc/lang/python27/Makefile:1.74 pkgsrc/lang/python27/Makefile:1.75
--- pkgsrc/lang/python27/Makefile:1.74  Sun Jun 17 19:21:21 2018
+++ pkgsrc/lang/python27/Makefile       Fri Sep 28 11:01:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2018/06/17 19:21:21 adam Exp $
+# $NetBSD: Makefile,v 1.75 2018/09/28 11:01:37 adam Exp $
 
 .include "dist.mk"
 
@@ -81,25 +81,29 @@ IS_64BIT_PLATFORM?= yes
 IS_64BIT_PLATFORM?=    no
 .endif
 
+PLIST_VARS+=   dl dll extra-so nis no-nis qt
+
 # the dl module isn't built for 64 bit archs
-PLIST_VARS+=   dl
 .if empty(IS_64BIT_PLATFORM:M[yY][eE][sS])
 PLIST.dl=      yes
 .endif
 
 # setup.py causes some modules to be built if the platform is *not* 64bit.
-PLIST_VARS+=   extra-so
 .if !empty(IS_64BIT_PLATFORM:M[nN][oO])
 PLIST.extra-so=        yes
 .endif
 
 # For Xcode 5 we need to search the SDK path for headers, otherwise certain
 # modules will not be built.
-.if ${OPSYS} == "Darwin" && exists(${OSX_SDK_PATH}/usr/include)
-CFLAGS+=               -I${OSX_SDK_PATH:Q}/usr/include
+.if ${OPSYS} == "Darwin"
+.  if exists(${OSX_SDK_PATH}/usr/include)
+CFLAGS+=       -I${OSX_SDK_PATH:Q}/usr/include
+.  endif
+.  if exists(${OSX_SDK_PATH}/System/Library/Frameworks/QuickTime.framework)
+PLIST.qt=      yes
+.  endif
 .endif
 
-PLIST_VARS+=   dll nis no-nis
 .if ${OPSYS} == "IRIX"
 .  if ${ABI} == "64"
 PLIST.no-nis=  yes

Index: pkgsrc/lang/python27/PLIST.Darwin
diff -u pkgsrc/lang/python27/PLIST.Darwin:1.2 pkgsrc/lang/python27/PLIST.Darwin:1.3
--- pkgsrc/lang/python27/PLIST.Darwin:1.2       Sun May 19 20:37:14 2013
+++ pkgsrc/lang/python27/PLIST.Darwin   Fri Sep 28 11:01:37 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.Darwin,v 1.2 2013/05/19 20:37:14 adam Exp $
+@comment $NetBSD: PLIST.Darwin,v 1.3 2018/09/28 11:01:37 adam Exp $
 lib/python${PY_VER_SUFFIX}/lib-dynload/ColorPicker.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/MacOS.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/Nav.so
@@ -27,7 +27,7 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_
 lib/python${PY_VER_SUFFIX}/lib-dynload/_OSA.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_Qd.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_Qdoffs.so
-lib/python${PY_VER_SUFFIX}/lib-dynload/_Qt.so
+${PLIST.qt}lib/python${PY_VER_SUFFIX}/lib-dynload/_Qt.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_Res.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_scproxy.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/_Scrap.so