From 343553b29e89026ed1a0b6f713b455941f001eba Mon Sep 17 00:00:00 2001
From: sbd <sbd@pkgsrc.org>
Date: Mon, 5 Mar 2012 08:22:58 +0000
Subject: python install different files on Linux-2.* and Linux-3.*

---
 lang/python24/Makefile     |  6 +++++-
 lang/python24/PLIST.Linux  | 11 -----------
 lang/python24/PLIST.Linux2 | 11 +++++++++++
 lang/python25/Makefile     |  7 ++++++-
 lang/python25/PLIST.Linux  | 22 +++++++++++-----------
 lang/python27/Makefile     |  6 +++++-
 lang/python27/PLIST.Linux  | 10 ----------
 lang/python27/PLIST.Linux2 | 10 ++++++++++
 8 files changed, 48 insertions(+), 35 deletions(-)
 delete mode 100644 lang/python24/PLIST.Linux
 create mode 100644 lang/python24/PLIST.Linux2
 delete mode 100644 lang/python27/PLIST.Linux
 create mode 100644 lang/python27/PLIST.Linux2

(limited to 'lang')

diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 06d23dac2fd..0033b31bccd 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2012/01/18 13:59:11 adam Exp $
+# $NetBSD: Makefile,v 1.61 2012/03/05 08:22:58 sbd Exp $
 
 .include "dist.mk"
 
@@ -59,6 +59,10 @@ PY_PLATNAME=	${LOWER_OPSYS}${OS_VERSION:C/\..*//}
 .endif
 PLIST_SUBST+=	PY_PLATNAME=${PY_PLATNAME:Q}
 
+.if ${PY_PLATNAME} == "linux2"
+PLIST_SRC+=     ${.CURDIR}/../../lang/python24/PLIST.Linux2
+.endif
+
 .if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \
     (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \
     (defined(ABI) && ${ABI} == "64")
diff --git a/lang/python24/PLIST.Linux b/lang/python24/PLIST.Linux
deleted file mode 100644
index a7522643402..00000000000
--- a/lang/python24/PLIST.Linux
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.1.1.1 2004/12/05 23:27:28 recht Exp $
-lib/python${PY_VER_SUFFIX}/lib-dynload/linuxaudiodev.so
-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 --git a/lang/python24/PLIST.Linux2 b/lang/python24/PLIST.Linux2
new file mode 100644
index 00000000000..d3747192aa6
--- /dev/null
+++ b/lang/python24/PLIST.Linux2
@@ -0,0 +1,11 @@
+@comment $NetBSD: PLIST.Linux2,v 1.1 2012/03/05 08:22:58 sbd Exp $
+lib/python${PY_VER_SUFFIX}/lib-dynload/linuxaudiodev.so
+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 --git a/lang/python25/Makefile b/lang/python25/Makefile
index fb81d0f8f04..e9a3ee3af0f 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2012/02/15 16:08:25 drochner Exp $
+# $NetBSD: Makefile,v 1.38 2012/03/05 08:23:09 sbd Exp $
 
 .include "dist.mk"
 
@@ -64,6 +64,11 @@ PY_PLATNAME=	${LOWER_OPSYS}${OS_VERSION:C/\..*//}
 .endif
 PLIST_SUBST+=	PY_PLATNAME=${PY_PLATNAME:Q}
 
+PLIST_VARS+=	linux2
+.if ${PY_PLATNAME} == "linux2"
+PLIST.linux2=	yes
+.endif
+
 .if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \
     (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \
     (defined(ABI) && ${ABI} == "64")
diff --git a/lang/python25/PLIST.Linux b/lang/python25/PLIST.Linux
index 1669463325b..2f4d525cefc 100644
--- a/lang/python25/PLIST.Linux
+++ b/lang/python25/PLIST.Linux
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST.Linux,v 1.2 2008/05/17 22:46:34 tnn Exp $
-lib/python${PY_VER_SUFFIX}/lib-dynload/linuxaudiodev.so
+@comment $NetBSD: PLIST.Linux,v 1.3 2012/03/05 08:23:09 sbd Exp $
+${PLIST.linux2}lib/python${PY_VER_SUFFIX}/lib-dynload/linuxaudiodev.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/spwd.so
-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
+${PLIST.linux2}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/CDROM.py
+${PLIST.linux2}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/CDROM.pyc
+${PLIST.linux2}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/CDROM.pyo
+${PLIST.linux2}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/DLFCN.py
+${PLIST.linux2}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/DLFCN.pyc
+${PLIST.linux2}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/DLFCN.pyo
+${PLIST.linux2}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/TYPES.py
+${PLIST.linux2}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/TYPES.pyc
+${PLIST.linux2}lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/TYPES.pyo
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index b77ba876547..dda873cc81a 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/02/15 16:08:26 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2012/03/05 08:23:24 sbd Exp $
 
 .include "dist.mk"
 
@@ -75,6 +75,10 @@ PY_PLATNAME=	${LOWER_OPSYS}${OS_VERSION:C/\..*//}
 .endif
 PLIST_SUBST+=	PY_PLATNAME=${PY_PLATNAME:Q}
 
+.if ${PY_PLATNAME} == "linux2"
+PLIST_SRC+=     ${.CURDIR}/../../lang/python24/PLIST.Linux2
+.endif
+
 .if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \
     (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \
     (defined(ABI) && ${ABI} == "64")
diff --git a/lang/python27/PLIST.Linux b/lang/python27/PLIST.Linux
deleted file mode 100644
index 6004c2c8072..00000000000
--- a/lang/python27/PLIST.Linux
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.1.1.1 2011/02/22 08:51:59 obache 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 --git a/lang/python27/PLIST.Linux2 b/lang/python27/PLIST.Linux2
new file mode 100644
index 00000000000..b94ebd9d396
--- /dev/null
+++ b/lang/python27/PLIST.Linux2
@@ -0,0 +1,10 @@
+@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
-- 
cgit v1.2.3