[pkgsrc/trunk]: pkgsrc/lang/python27 "sys.platform is now always 'linux2' on ...

[sbd <sbd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/27232153e712
branches:  trunk
changeset: 603669:27232153e712
user:      sbd <sbd%pkgsrc.org@localhost>
date:      Thu May 10 08:10:00 2012 +0000

description:
"sys.platform is now always 'linux2' on Linux", so revert the linux3 handling
and always set PY_PLATNAME to 'linux2'.

diffstat:

 lang/python27/Makefile     |   8 +++-----
 lang/python27/PLIST.Linux  |  10 ++++++++++
 lang/python27/PLIST.Linux2 |  10 ----------
 3 files changed, 13 insertions(+), 15 deletions(-)

diffs (55 lines):

diff -r f254eaebbec2 -r 27232153e712 lang/python27/Makefile
--- a/lang/python27/Makefile    Thu May 10 07:50:11 2012 +0000
+++ b/lang/python27/Makefile    Thu May 10 08:10:00 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/04/13 18:47:27 adam Exp $
+# $NetBSD: Makefile,v 1.16 2012/05/10 08:10:00 sbd Exp $
 
 .include "dist.mk"
 
@@ -69,15 +69,13 @@
 PY_PLATNAME=   sunos${OS_VERSION:C/\..*//}
 .elif ${OPSYS} == "HPUX"
 PY_PLATNAME=   hp-ux11
+.elif ${OPSYS} == "Linux"
+PY_PLATNAME=   linux2
 .else
 PY_PLATNAME=   ${LOWER_OPSYS}${OS_VERSION:C/\..*//}
 .endif
 PLIST_SUBST+=  PY_PLATNAME=${PY_PLATNAME:Q}
 
-.if ${PY_PLATNAME} == "linux2"
-PLIST_SRC+=    ${.CURDIR}/../../lang/python27/PLIST.Linux2
-.endif
-
 .if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \
     (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \
     (defined(ABI) && ${ABI} == "64")
diff -r f254eaebbec2 -r 27232153e712 lang/python27/PLIST.Linux
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python27/PLIST.Linux Thu May 10 08:10:00 2012 +0000
@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST.Linux,v 1.3 2012/05/10 08:10:00 sbd Exp $
+lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/CDROM.py
+lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/CDROM.pyc
+lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/CDROM.pyo
+lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/DLFCN.py
+lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/DLFCN.pyc
+lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/DLFCN.pyo
+lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/TYPES.py
+lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/TYPES.pyc
+lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/TYPES.pyo
diff -r f254eaebbec2 -r 27232153e712 lang/python27/PLIST.Linux2
--- a/lang/python27/PLIST.Linux2        Thu May 10 07:50:11 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST.Linux2,v 1.1 2012/03/05 08:23:24 sbd Exp $
-lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/CDROM.py
-lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/CDROM.pyc
-lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/CDROM.pyo
-lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/DLFCN.py
-lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/DLFCN.pyc
-lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/DLFCN.pyo
-lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/TYPES.py
-lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/TYPES.pyc
-lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/TYPES.pyo