pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/python27 Fix for Darwin/Xcode 10 (missing QuickTi...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5ef0d07c2097
branches:  trunk
changeset: 313373:5ef0d07c2097
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Sep 28 11:01:37 2018 +0000

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

diffstat:

 lang/python27/Makefile     |  16 ++++++++++------
 lang/python27/PLIST.Darwin |   4 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diffs (62 lines):

diff -r 77f2b4692689 -r 5ef0d07c2097 lang/python27/Makefile
--- a/lang/python27/Makefile    Fri Sep 28 08:00:02 2018 +0000
+++ b/lang/python27/Makefile    Fri Sep 28 11:01:37 2018 +0000
@@ -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?=    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
diff -r 77f2b4692689 -r 5ef0d07c2097 lang/python27/PLIST.Darwin
--- a/lang/python27/PLIST.Darwin        Fri Sep 28 08:00:02 2018 +0000
+++ b/lang/python27/PLIST.Darwin        Fri Sep 28 11:01:37 2018 +0000
@@ -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/_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



Home | Main Index | Thread Index | Old Index