[pkgsrc/trunk]: pkgsrc/lang don't override LOWER_OPSYS, handle PY_PLATNAME in...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e2aeaf444acf
branches:  trunk
changeset: 482614:e2aeaf444acf
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat Oct 30 16:24:20 2004 +0000

description:
don't override LOWER_OPSYS, handle PY_PLATNAME in the same way as
python23.

diffstat:

 lang/python21/Makefile.common |   8 +++-----
 lang/python22/Makefile.common |   8 +++-----
 lang/python22/PLIST.Linux     |  20 ++++++++++----------
 lang/python22/PLIST.SunOS     |  32 ++++++++++++++++----------------
 4 files changed, 32 insertions(+), 36 deletions(-)

diffs (114 lines):

diff -r 682d0279b367 -r e2aeaf444acf lang/python21/Makefile.common
--- a/lang/python21/Makefile.common     Sat Oct 30 16:17:53 2004 +0000
+++ b/lang/python21/Makefile.common     Sat Oct 30 16:24:20 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2004/08/02 16:59:22 recht Exp $
+# $NetBSD: Makefile.common,v 1.6 2004/10/30 16:26:27 grant Exp $
 #
 
 DISTNAME=      Python-2.1.3
@@ -24,14 +24,12 @@
 .endif
 PLIST_SRC+=    ${.CURDIR}/../../lang/python21/PLIST.common_end
 
-.if ${OPSYS} == "SunOS"
-LOWER_OPSYS=   sunos
-.endif
-
 .if ${OPSYS} == "Darwin"
 PY_PLATNAME=   ${LOWER_OPSYS}
 .elif ${OPSYS} == "IRIX"
 PY_PLATNAME=   ${LOWER_OPSYS:C/\..*//}
+.elif ${OPSYS} == "SunOS"
+PY_PLATNAME=   sunos${OS_VERSION:C/\..*//}
 .else
 PY_PLATNAME=   ${LOWER_OPSYS}${OS_VERSION:C/\..*//}
 .endif
diff -r 682d0279b367 -r e2aeaf444acf lang/python22/Makefile.common
--- a/lang/python22/Makefile.common     Sat Oct 30 16:17:53 2004 +0000
+++ b/lang/python22/Makefile.common     Sat Oct 30 16:24:20 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2004/10/03 23:25:39 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.6 2004/10/30 16:24:20 grant Exp $
 #
 
 DISTNAME=      Python-2.2.3
@@ -22,14 +22,12 @@
 .endif
 PLIST_SRC+=    ${.CURDIR}/../../lang/python22/PLIST.common_end
 
-.if ${OPSYS} == "SunOS"
-LOWER_OPSYS=   sunos
-.endif
-
 .if ${OPSYS} == "Darwin"
 PLIST_SUBST+=  PY_PLATNAME=${LOWER_OPSYS}
 .elif ${OPSYS} == "IRIX"
 PLIST_SUBST+=   PY_PLATNAME=${LOWER_OPSYS:C/\..*//}
+.elif ${OPSYS} == "SunOS"
+PLIST_SUBST+=  PY_PLATNAME=sunos${OS_VERSION:C/\..*//}
 .else
 PLIST_SUBST+=  PY_PLATNAME=${LOWER_OPSYS}${OS_VERSION:C/\..*//}
 .endif
diff -r 682d0279b367 -r e2aeaf444acf lang/python22/PLIST.Linux
--- a/lang/python22/PLIST.Linux Sat Oct 30 16:17:53 2004 +0000
+++ b/lang/python22/PLIST.Linux Sat Oct 30 16:24:20 2004 +0000
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST.Linux,v 1.2 2004/01/24 08:13:14 grant Exp $
-lib/python${PY_VER_SUFFIX}/plat-linux2/CDROM.py
-lib/python${PY_VER_SUFFIX}/plat-linux2/CDROM.pyc
-lib/python${PY_VER_SUFFIX}/plat-linux2/CDROM.pyo
-lib/python${PY_VER_SUFFIX}/plat-linux2/DLFCN.py
-lib/python${PY_VER_SUFFIX}/plat-linux2/DLFCN.pyc
-lib/python${PY_VER_SUFFIX}/plat-linux2/DLFCN.pyo
-lib/python${PY_VER_SUFFIX}/plat-linux2/TYPES.py
-lib/python${PY_VER_SUFFIX}/plat-linux2/TYPES.pyc
-lib/python${PY_VER_SUFFIX}/plat-linux2/TYPES.pyo
+@comment $NetBSD: PLIST.Linux,v 1.3 2004/10/30 16:24:20 grant 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
 lib/python${PY_VER_SUFFIX}/lib-dynload/linuxaudiodev.so
diff -r 682d0279b367 -r e2aeaf444acf lang/python22/PLIST.SunOS
--- a/lang/python22/PLIST.SunOS Sat Oct 30 16:17:53 2004 +0000
+++ b/lang/python22/PLIST.SunOS Sat Oct 30 16:24:20 2004 +0000
@@ -1,17 +1,17 @@
-@comment $NetBSD: PLIST.SunOS,v 1.2 2004/01/24 08:13:14 grant Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.3 2004/10/30 16:24:20 grant Exp $
 lib/python${PY_VER_SUFFIX}/lib-dynload/sunaudiodev.so
-lib/python${PY_VER_SUFFIX}/plat-sunos5/CDIO.py
-lib/python${PY_VER_SUFFIX}/plat-sunos5/CDIO.pyc
-lib/python${PY_VER_SUFFIX}/plat-sunos5/CDIO.pyo
-lib/python${PY_VER_SUFFIX}/plat-sunos5/DLFCN.py
-lib/python${PY_VER_SUFFIX}/plat-sunos5/DLFCN.pyc
-lib/python${PY_VER_SUFFIX}/plat-sunos5/DLFCN.pyo
-lib/python${PY_VER_SUFFIX}/plat-sunos5/STROPTS.py
-lib/python${PY_VER_SUFFIX}/plat-sunos5/STROPTS.pyc
-lib/python${PY_VER_SUFFIX}/plat-sunos5/STROPTS.pyo
-lib/python${PY_VER_SUFFIX}/plat-sunos5/SUNAUDIODEV.py
-lib/python${PY_VER_SUFFIX}/plat-sunos5/SUNAUDIODEV.pyc
-lib/python${PY_VER_SUFFIX}/plat-sunos5/SUNAUDIODEV.pyo
-lib/python${PY_VER_SUFFIX}/plat-sunos5/TYPES.py
-lib/python${PY_VER_SUFFIX}/plat-sunos5/TYPES.pyc
-lib/python${PY_VER_SUFFIX}/plat-sunos5/TYPES.pyo
+lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/CDIO.py
+lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/CDIO.pyc
+lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/CDIO.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}/STROPTS.py
+lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/STROPTS.pyc
+lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/STROPTS.pyo
+lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/SUNAUDIODEV.py
+lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/SUNAUDIODEV.pyc
+lib/python${PY_VER_SUFFIX}/plat-${PY_PLATNAME}/SUNAUDIODEV.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