Index: trunk/fink/main/finkinfo/macathena-machtype.patch
===================================================================
--- trunk/fink/main/finkinfo/macathena-machtype.patch (revision 114)
+++ trunk/fink/main/finkinfo/macathena-machtype.patch (revision 133)
@@ -1,4 +1,4 @@
---- machtype_linux.sh.orig	2007-12-24 21:51:18.000000000 -0600
-+++ machtype_linux.sh	2007-12-25 00:20:57.000000000 -0600
+--- machtype_linux.sh.orig	2008-04-06 20:52:37.000000000 -0400
++++ machtype_linux.sh	2008-04-06 20:54:57.000000000 -0400
 @@ -1,4 +1,4 @@
 -#!/bin/sh
@@ -20,5 +20,5 @@
  
  if [ $display ] ; then
--        /sbin/lspci | awk -F: '/VGA/ {print $3}' | sed -n -e 's/^ //' -e p
+-	lspci | awk -F: '/VGA/ {print $3}' | sed -n -e 's/^ //' -e p
 +	system_profiler SPDisplaysDataType | awk 'NR==3 { print }' | sed "s/^ *\(.*\):$/\1/"
  	printed=1
@@ -26,8 +26,10 @@
  
  if [ $rdsk ]; then
--	awk '/^SCSI device/ { print; }
--	     /^hd[a-z]:/ { print; }
--	     /^Floppy/ { for (i=3; i <= NF; i += 3) print $i ": " $(i+2); }' \
--	     /var/log/dmesg
+-	for d in /sys/block/[fhs]d*; do
+-	    echo $(basename "$d"): \
+-		$(xargs -I @ expr @ '*' 8 / 15625 < "$d/size")MB \
+-		$(cat "$d/device/model" ||
+-		  cat "/proc/ide/$(basename "$d")/model")
+-	done 2>/dev/null
 +	disks=`ls /dev/disk* | grep 'disk[0-9]*$'`
 +	for disk in $disks
@@ -39,15 +41,15 @@
  
  if [ $memory ] ; then
+-	if [ $verbose ]; then
+-		awk '/^MemTotal:/ { printf "user=%d, phys=%d (%d M)\n",
+-					   $2, $2, $2/1024 }' \
+-		    /proc/meminfo
+-	else
+-		awk '/^MemTotal:/ { printf "%d\n", $2 }' /proc/meminfo
 +	physmem=$(($(sysctl -n hw.physmem)/1024))
 +	usermem=$(($(sysctl -n hw.usermem)/1024))
- 	if [ $verbose ]; then
--		awk 'BEGIN { FS="[^0-9]+" }
--		     /^Memory:/ { printf "user=%d, phys=%d (%d M)\n",
--				         $2*1.024, $3*1.024, $3/1000; }' \
--		    /var/log/dmesg
++ 	if [ $verbose ]; then
 +		printf "user=%d, phys=%d (%d M)\n" $usermem $physmem $((physmem/1024))
- 	else
--		awk 'BEGIN { FS="[^0-9]+" }
--		     /^Memory:/ { printf "%d\n", $3*1.024; }' /var/log/dmesg
++ 	else
 +		echo $physmem
  	fi