[pkgsrc/trunk]: pkgsrc/mk OSF1 and HPUX: Separate the version component from ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/09de717f8dd2
branches:  trunk
changeset: 534317:09de717f8dd2
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Tue Oct 16 11:34:16 2007 +0000

description:
OSF1 and HPUX: Separate the version component from ${LOWER_OPSYS}
into ${LOWER_OPSYS_VERSUFFIX}.
When assigning GNU_MACHINE_PLATFORM, strip numerical characters from
LOWER_OPSYS. (final component is eg. osf5.1 not osf15.1)

diffstat:

 mk/bsd.prefs.mk |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r d54b9608351e -r 09de717f8dd2 mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Tue Oct 16 09:34:18 2007 +0000
+++ b/mk/bsd.prefs.mk   Tue Oct 16 11:34:16 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.270 2007/10/13 19:38:53 joerg Exp $
+# $NetBSD: bsd.prefs.mk,v 1.271 2007/10/16 11:34:16 tnn Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -207,7 +207,8 @@
 MAKEFLAGS+=            LOWER_ARCH=${LOWER_ARCH:Q}
 MACHINE_ARCH?=         ${LOWER_ARCH}
 OS_VERSION:=           ${OS_VERSION:C/^V//}
-LOWER_OPSYS?=          osf${OS_VERSION}
+LOWER_OPSYS?=          osf1
+LOWER_OPSYS_VERSUFFIX?=        ${OS_VERSION}
 LOWER_VENDOR?=         dec
 
 .elif ${OPSYS} == "HPUX"
@@ -215,8 +216,9 @@
 .if ${MACHINE_ARCH} == "9000"
 MACHINE_ARCH=          hppa
 .endif
-LOWER_VENDOR=          hp
-LOWER_OPSYS?=          hpux${OS_VERSION}
+LOWER_OPSYS?=          hpux
+LOWER_OPSYS_VERSUFFIX?=        ${OS_VERSION}
+LOWER_VENDOR?=         hp
 
 .elif ${OPSYS} == "SunOS"
 .  if ${MACHINE_ARCH} == "sparc"
@@ -255,8 +257,8 @@
 
 NATIVE_MACHINE_PLATFORM?=      ${OPSYS}-${OS_VERSION}-${NATIVE_MACHINE_ARCH}
 MACHINE_PLATFORM?=             ${OPSYS}-${OS_VERSION}-${MACHINE_ARCH}
-NATIVE_MACHINE_GNU_PLATFORM?=  ${NATIVE_LOWER_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}
-MACHINE_GNU_PLATFORM?=         ${LOWER_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}
+NATIVE_MACHINE_GNU_PLATFORM?=  ${NATIVE_LOWER_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS:C/[0-9]//g}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}
+MACHINE_GNU_PLATFORM?=         ${LOWER_ARCH}-${LOWER_VENDOR}-${LOWER_OPSYS:C/[0-9]//g}${APPEND_ELF}${LOWER_OPSYS_VERSUFFIX}
 
 # Needed to prevent an "install:" target from being created in bsd.own.mk.
 NEED_OWN_INSTALL_TARGET=no