OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Jun-2007 18:25:49
Branch: HEAD Handle: 2007060417254800
Modified files:
openpkg-src/openpkg shtool
Log:
upgrade to the latest snapshot of GNU shtool which includes again an
improved Mac OS X detection
Summary:
Revision Changes Path
1.39 +15 -10 openpkg-src/openpkg/shtool
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/shtool
============================================================================
$ cvs diff -u -r1.38 -r1.39 shtool
--- openpkg-src/openpkg/shtool 4 Jun 2007 08:08:00 -0000 1.38
+++ openpkg-src/openpkg/shtool 4 Jun 2007 16:25:48 -0000 1.39
@@ -2968,29 +2968,34 @@
i?86 ) AC="iX86" ;;
esac
# determine system
+ unset v1; unset v2; unset v3
eval `echo "${UNAME_RELEASE}" |\
sed -e 's/^/#/' \
-e
's/^#\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/v1="\1"; v2="\2";
v3="\3"/' \
-e 's/^#\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/v1="\1";
v2="\2"/' \
-e 's/^#\([0-9][0-9]*\).*$/v1="\1"/' \
-e 's/^#.*$/v1="0"/'`
- ST="[Apple ]${UNAME_SYSTEM} <${v1}>${v2+.$v2}${v3+[.$v3]}"
+ ST="[Apple ]<${UNAME_SYSTEM} ${v1}>${v2+.$v2}${v3+[.$v3]}"
SP="$ST"
- v="`(sw_vers) 2>/dev/null | grep 'ProductVersion:' | sed -e
's/^ProductVersion: *//'`"
- if [ ".$v" != . ]; then
- # use given Mac OS X product information
- SP="[Apple ]Mac OS X ${v}"
- else
- # fetch Mac OS X product information manually
+ v="`(sw_vers) 2>/dev/null | grep 'ProductVersion:' | sed -e
's/^ProductVersion:[^0-9]*\([0-9][0-9.]*\).*$/\1/'`"
+ if [ ".$v" = . ]; then
for name in System Server; do
if [ -f
/System/Library/CoreServices/${name}Version.plist ]; then
v=`(defaults read
"/System/Library/CoreServices/${name}Version" "ProductVersion") 2>/dev/null`
- if [ ".$v" != . ]; then
- SP="[Apple ]Mac OS X ${v}"
- fi
+ [ ".$v" != . ] && break
fi
done
fi
+ if [ ".$v" != . ]; then
+ unset v1; unset v2; unset v3
+ eval `echo "${v}" |\
+ sed -e 's/^/#/' \
+ -e
's/^#\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/v1="\1"; v2="\2";
v3="\3"/' \
+ -e
's/^#\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/v1="\1"; v2="\2"/' \
+ -e 's/^#\([0-9][0-9]*\).*$/v1="\1"/' \
+ -e 's/^#.*$/v1="0"/'`
+ SP="[Apple ]Mac OS X ${v1}${v2+.$v2}${v3+[.$v3]}"
+ fi
SC="4.4BSD/Mach3.0"
;;
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
