Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1551609881100000"
MIME-Version: 1.0
Date: Sun, 3 Mar 2019 10:44:41 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/lang/python27
To: pkgsrc-changes@NetBSD.org
Reply-To: adam@netbsd.org
Message-Id: <20190303104441.BF0DEFB16@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1551609881100000
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	adam
Date:		Sun Mar  3 10:44:41 UTC 2019

Modified Files:
	pkgsrc/lang/python27: Makefile options.mk

Log Message:
python27: clean-up SUBST to match other Python versions


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/lang/python27/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/python27/options.mk

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


--_----------=_1551609881100000
Content-Disposition: inline
Content-Length: 3134
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/python27/Makefile
diff -u pkgsrc/lang/python27/Makefile:1.75 pkgsrc/lang/python27/Makefile:1.76
--- pkgsrc/lang/python27/Makefile:1.75	Fri Sep 28 11:01:37 2018
+++ pkgsrc/lang/python27/Makefile	Sun Mar  3 10:44:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2018/09/28 11:01:37 adam Exp $
+# $NetBSD: Makefile,v 1.76 2019/03/03 10:44:41 adam Exp $
 
 .include "dist.mk"
 
@@ -171,23 +171,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"
 

Index: pkgsrc/lang/python27/options.mk
diff -u pkgsrc/lang/python27/options.mk:1.1 pkgsrc/lang/python27/options.mk:1.2
--- pkgsrc/lang/python27/options.mk:1.1	Tue Jul 26 16:44:28 2016
+++ pkgsrc/lang/python27/options.mk	Sun Mar  3 10:44:41 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2016/07/26 16:44:28 kamil Exp $
+# $NetBSD: options.mk,v 1.2 2019/03/03 10:44:41 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.python27
 PKG_SUPPORTED_OPTIONS+=	x11
@@ -10,11 +10,11 @@ PKG_SUGGESTED_OPTIONS=	x11
 .if !empty(PKG_OPTIONS:Mx11)
 # Support for native X11 paths as an option
 # This code is no-op for modular X11, however for simplicity don't make it conditional.
-SUBST_CLASSES+=			x11findlib
-SUBST_MESSAGE.x11findlib=	Fixing find_library() for native X11.
-SUBST_STAGE.x11findlib=		pre-configure
-SUBST_FILES.x11findlib=		Lib/ctypes/util.py
-SUBST_SED.x11findlib=		-e 's!\(-Wl,-t -o\)!${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib \1!'
+SUBST_CLASSES+=		xfindlib
+SUBST_MESSAGE.xfindlib=	Fixing find_library() for native X11.
+SUBST_STAGE.xfindlib=	pre-configure
+SUBST_FILES.xfindlib=	Lib/ctypes/util.py
+SUBST_SED.xfindlib=	-e 's!\(-Wl,-t -o\)!${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib \1!'
 
 # Required to get definition of X11BASE and retain X11 rpath paths for linker
 # We need to pass rpath to _ctypes.so to get functional dlopen(3) for X11 libs


--_----------=_1551609881100000--