[pkgsrc/trunk]: pkgsrc/lang/python26 Internally, Python has a set of modules ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fbfd3b1c766e
branches:  trunk
changeset: 594438:fbfd3b1c766e
user:      dsainty <dsainty%pkgsrc.org@localhost>
date:      Fri Oct 28 10:38:07 2011 +0000

description:
Internally, Python has a set of modules depending on "platform".  The
"platform" in Python terms is different for Linux kernel 2.* Vs Linux
kernel 3.*.  Add in support to pull in a different PLIST for Linux 3.*.

Fixes build under Ubuntu 11.10.

XXX Perhaps it would be cleaner to name the PLIST to match the python platform
name - since we already calculate that anyway, and that is exactly what drives
the contents of these PLISTs.

diffstat:

 lang/python26/Makefile     |  21 ++++++++++++++-------
 lang/python26/PLIST.Linux3 |   4 ++++
 2 files changed, 18 insertions(+), 7 deletions(-)

diffs (50 lines):

diff -r 7708e39442c1 -r fbfd3b1c766e lang/python26/Makefile
--- a/lang/python26/Makefile    Fri Oct 28 09:22:19 2011 +0000
+++ b/lang/python26/Makefile    Fri Oct 28 10:38:07 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2011/09/16 10:08:20 adam Exp $
+# $NetBSD: Makefile,v 1.43 2011/10/28 10:38:07 dsainty Exp $
 
 .include "dist.mk"
 
@@ -47,12 +47,6 @@
 
 PY_VER_SUFFIX=         2.6
 
-PLIST_SRC=     ${.CURDIR}/../../lang/python26/PLIST.common
-.if exists(${.CURDIR}/../../lang/python26/PLIST.${OPSYS})
-PLIST_SRC+=    ${.CURDIR}/../../lang/python26/PLIST.${OPSYS}
-.endif
-PLIST_SRC+=    ${.CURDIR}/../../lang/python26/PLIST.common_end
-
 .if ${OPSYS} == "NetBSD"
 PRIVILEGED_STAGES+=    clean
 # XXX work around a botched autoconf check which ignores libintl
@@ -74,6 +68,19 @@
 .endif
 PLIST_SUBST+=  PY_PLATNAME=${PY_PLATNAME:Q}
 
+# PLIST to match ${WRKSRC}/Lib/plat-linux3
+.if ${PY_PLATNAME} == "linux3"
+PL_OPSYS=${OPSYS}3
+.else
+PL_OPSYS=${OPSYS}
+.endif
+
+PLIST_SRC=     ${.CURDIR}/../../lang/python26/PLIST.common
+.if exists(${.CURDIR}/../../lang/python26/PLIST.${PL_OPSYS})
+PLIST_SRC+=    ${.CURDIR}/../../lang/python26/PLIST.${PL_OPSYS}
+.endif
+PLIST_SRC+=    ${.CURDIR}/../../lang/python26/PLIST.common_end
+
 .if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \
     (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \
     (defined(ABI) && ${ABI} == "64")
diff -r 7708e39442c1 -r fbfd3b1c766e lang/python26/PLIST.Linux3
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python26/PLIST.Linux3        Fri Oct 28 10:38:07 2011 +0000
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST.Linux3,v 1.1 2011/10/28 10:38:07 dsainty Exp $
+lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/IN.py
+lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/IN.pyc
+lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/IN.pyo