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

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/lang/python27/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/lang/python27/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.74
retrieving revision 1.78
diff -u -p -r1.74 -r1.78
--- pkgsrc/lang/python27/Makefile	2018/06/17 19:21:21	1.74
+++ pkgsrc/lang/python27/Makefile	2019/03/26 16:12:28	1.78
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.74 2018/06/17 19:21:21 adam Exp $
+# $NetBSD: Makefile,v 1.78 2019/03/26 16:12:28 gdt Exp $
 
 .include "dist.mk"
 
 PKGNAME=	python27-${PY_DISTVERSION}
-PKGREVISION=	1
 CATEGORIES=	lang python
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -22,7 +21,7 @@ CONFIGURE_ARGS+=	--with-dbmliborder=ndbm
 CONFIGURE_ARGS+=	--with-system-ffi
 CONFIGURE_ARGS+=	--with-threads
 CONFIGURE_ENV+=		MKDIR_P=${MKDIR:Q}
-CONFIGURE_ENV+=		OPT=${CFLAGS:Q}
+CONFIGURE_ENV+=		OPT=${CFLAGS:M*:Q}
 PKGCONFIG_OVERRIDE+=	Misc/python.pc.in
 
 LDFLAGS+=		-L${WRKSRC}
@@ -81,26 +80,32 @@ 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"
+# Assume that IRIX (and IRIX alone) does not support a libpython.so.
+# Assume that 32-bit IRIX has NIS and 64-bit IRIX does not.
 .  if ${ABI} == "64"
 PLIST.no-nis=	yes
 .  else
@@ -108,9 +113,14 @@ PLIST.nis=	yes
 .  endif
 .else
 PLIST.dll=	yes
+# Determine if lib-dynload/nis.so (PLIST.nis) or
+# lib-dynload/nis-failed.so (PLIST.no-nis) will be built.
 .  if ${OPSYS} == "MirBSD" || "${OS_VARIANT}" == "chromeos"
 # neither nis nor no-nis
 .  elif ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat)
+# \todo Explain the "!= NetBSD"; that seems to declare that any
+# remaining system other than NetBSD will have NIS, even if ypcat is
+# missing.
 PLIST.nis=	yes
 .  else
 PLIST.no-nis=	yes
@@ -151,7 +161,7 @@ REPLACE_FILES.py27+=	Lib/smtpd.py
 REPLACE_FILES.py27+=	Lib/smtplib.py
 REPLACE_FILES.py27+=	Lib/symbol.py
 REPLACE_FILES.py27+=	Lib/tabnanny.py
-REPLACE_FILES.py27+=	Lib/test/bisect.py
+REPLACE_FILES.py27+=	Lib/test/bisect_cmd.py
 REPLACE_FILES.py27+=	Lib/test/curses_tests.py
 REPLACE_FILES.py27+=	Lib/test/re_tests.py
 REPLACE_FILES.py27+=	Lib/test/pystone.py
@@ -167,23 +177,16 @@ SUBST_STAGE.libffi=	pre-configure
 SUBST_FILES.libffi=	setup.py
 SUBST_SED.libffi=	-e 's,/usr/include/ffi,${BUILDLINK_PREFIX.libffi}/include,'
 
+# XXX: It might be needed to add manually more paths like ${PREFIX}/qt5/lib
+# Test: python -c 'from ctypes.util import find_library; print(find_library("ffi"));'
 SUBST_CLASSES+=		findlib
-SUBST_MESSAGE.findlib=	Fixing find_library_file on Darwin.
+SUBST_MESSAGE.findlib=	Fixing find_library().
 SUBST_STAGE.findlib=	pre-configure
-SUBST_FILES.findlib=	Lib/distutils/unixccompiler.py
+SUBST_FILES.findlib=	Lib/ctypes/macholib/dyld.py
+SUBST_FILES.findlib+=	Lib/ctypes/util.py
+SUBST_FILES.findlib+=	Lib/distutils/unixccompiler.py
 SUBST_SED.findlib=	-e 's,/usr/local,${PREFIX},'
-
-# XXX: It might be needed to add manually more paths like ${PREFIX}/qt5/lib
-# Testing:
-# >>> from ctypes.util import find_library
-# >>> find_library("m")
-# 'libm.so.0'
-
-SUBST_CLASSES+=		pfindlib
-SUBST_MESSAGE.pfindlib=	Fixing find_library() on POSIX-like (excluding Darwin) systems.
-SUBST_STAGE.pfindlib=	pre-configure
-SUBST_FILES.pfindlib=	Lib/ctypes/util.py
-SUBST_SED.pfindlib=	-e 's!\(-Wl,-t -o\)!${COMPILER_RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib \1!'
+SUBST_SED.findlib+=	-e 's!\(-Wl,-t -o\)!${COMPILER_RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib \1!'
 
 .include "options.mk"
 
@@ -197,7 +200,7 @@ SUBST_CLASSES+=		cacert
 SUBST_MESSAGE.cacert=	Configuring location of default CA certificate file.
 SUBST_STAGE.cacert=	pre-configure
 SUBST_FILES.cacert=	Modules/_ssl.c
-SUBST_SED.cacert=	-e 's,@PREFIX@,${PREFIX},'
+SUBST_VARS.cacert=	PREFIX
 
 post-extract:
 	${LN} -s ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Tools/scripts/smtpd${PY_VER_SUFFIX}.py