Mon Jan 31 08:18:45 2011 UTC ()
Remove the unneeded backslashes from the AIX OS_VERSION setting.
Closes PR/44421.


(sbd)
diff -r1.312 -r1.313 pkgsrc/mk/bsd.prefs.mk
cvs diff -r1.312 -r1.313 pkgsrc/mk/bsd.prefs.mk (expand / switch to unified diff)

--- pkgsrc/mk/bsd.prefs.mk 2011/01/23 19:07:25 1.312
+++ pkgsrc/mk/bsd.prefs.mk 2011/01/31 08:18:44 1.313
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.prefs.mk,v 1.312 2011/01/23 19:07:25 agc Exp $ 1# $NetBSD: bsd.prefs.mk,v 1.313 2011/01/31 08:18:44 sbd Exp $
2# 2#
3# This file includes the mk.conf file, which contains the user settings. 3# This file includes the mk.conf file, which contains the user settings.
4# 4#
5# Packages should include this file before any of the .if directives, as 5# Packages should include this file before any of the .if directives, as
6# well as before modifying variables like CFLAGS, LDFLAGS, and so on. 6# well as before modifying variables like CFLAGS, LDFLAGS, and so on.
7# Otherwise the behavior may be unexpected. 7# Otherwise the behavior may be unexpected.
8# 8#
9# When mk.conf is included by this file, the following variables are 9# When mk.conf is included by this file, the following variables are
10# defined: 10# defined:
11# 11#
12# ACCEPTABLE_LICENSES 12# ACCEPTABLE_LICENSES
13# This variable is set to the list of Open Source licenses. See 13# This variable is set to the list of Open Source licenses. See
14# mk/license.mk for details. 14# mk/license.mk for details.
@@ -105,27 +105,27 @@ LOWER_OPSYS?= netbsd @@ -105,27 +105,27 @@ LOWER_OPSYS?= netbsd
105.elif ${OPSYS} == "AIX" 105.elif ${OPSYS} == "AIX"
106LOWER_ARCH!= _cpuid=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $$1 }'`; \ 106LOWER_ARCH!= _cpuid=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $$1 }'`; \
107 if /usr/sbin/lsattr -El $$_cpuid | grep ' POWER' >/dev/null 2>&1; then \ 107 if /usr/sbin/lsattr -El $$_cpuid | grep ' POWER' >/dev/null 2>&1; then \
108 echo rs6000; \ 108 echo rs6000; \
109 else \ 109 else \
110 echo powerpc; \ 110 echo powerpc; \
111 fi 111 fi
112MACHINE_ARCH?= ${LOWER_ARCH} 112MACHINE_ARCH?= ${LOWER_ARCH}
113. if exists(/usr/bin/oslevel) 113. if exists(/usr/bin/oslevel)
114_OS_VERSION!= /usr/bin/oslevel 114_OS_VERSION!= /usr/bin/oslevel
115. else 115. else
116_OS_VERSION!= echo `${UNAME} -v`.`${UNAME} -r` 116_OS_VERSION!= echo `${UNAME} -v`.`${UNAME} -r`
117. endif 117. endif
118OS_VERSION= ${_OS_VERSION:C/\([0-9]*\.[0-9]*\).*/\1/} 118OS_VERSION= ${_OS_VERSION:C/([0-9]*\.[0-9]*).*/\1/}
119LOWER_OPSYS_VERSUFFIX= ${_OS_VERSION} 119LOWER_OPSYS_VERSUFFIX= ${_OS_VERSION}
120LOWER_OPSYS?= aix 120LOWER_OPSYS?= aix
121LOWER_VENDOR?= ibm 121LOWER_VENDOR?= ibm
122 122
123.elif ${OPSYS} == "BSDOS" 123.elif ${OPSYS} == "BSDOS"
124LOWER_OPSYS?= bsdi 124LOWER_OPSYS?= bsdi
125 125
126.elif ${OPSYS} == "Darwin" 126.elif ${OPSYS} == "Darwin"
127LOWER_OPSYS?= darwin 127LOWER_OPSYS?= darwin
128.if empty(OS_VERSION:M[1-9].*.*) 128.if empty(OS_VERSION:M[1-9].*.*)
129# Automatically select the ABI under Mac OS X Snow Leopard. We don't 129# Automatically select the ABI under Mac OS X Snow Leopard. We don't
130# use this at the moment because too many third party programs don't 130# use this at the moment because too many third party programs don't
131# work with it. 131# work with it.