Index: trunk/fink/main/finkinfo/macathena-moira.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-moira.info (revision 122)
+++ trunk/fink/main/finkinfo/macathena-moira.info (revision 133)
@@ -1,4 +1,4 @@
 Package: macathena-moira
-Version: 20080304
+Version: 20080331
 Revision: 1
 Source: http://macathena.mit.edu/dist/moira-%v.tar.gz
@@ -12,5 +12,5 @@
 	queues, and several other aspects of the Athena environment.
 <<
-Source-MD5: ece31238f7715b8009d718c167b366f4
+Source-MD5: ef6afe1f325480972e9b97a92a6bbda2
 
 Depends: macathena-hesiod, libncurses5
Index: trunk/fink/main/finkinfo/macathena-attachandrun.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-attachandrun.info (revision 84)
+++ trunk/fink/main/finkinfo/macathena-attachandrun.info (revision 133)
@@ -1,5 +1,5 @@
 Package: macathena-attachandrun
-Version: 22699
-Revision: 2
+Version: 22847
+Revision: 1
 Source: http://macathena.mit.edu/dist/attachandrun-svn%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
@@ -12,5 +12,5 @@
 	a specified locker.
 <<
-Source-MD5: 9312e52dbd055c62861d9c5d0a076d9e
+Source-MD5: 8ea0fd361b9e73af6ccdda6f5eb64337
 DocFiles: athena-copyright
 
Index: trunk/fink/main/finkinfo/macathena-libgms.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-libgms.info (revision 121)
+++ trunk/fink/main/finkinfo/macathena-libgms.info (revision 133)
@@ -1,4 +1,4 @@
 Package: macathena-libgms
-Version: 22699
+Version: 22873
 Revision: 1
 Source: http://macathena.mit.edu/dist/libgms-svn%v.tar.gz
@@ -12,10 +12,9 @@
 	and messaged, the components of the global Athena message service.
 <<
-Source-MD5: ec1c32a06b11224f995c8c72029921f6
+Source-MD5: fde2960663bae9845a1cf0acdb7e5158
 DocFiles: athena-copyright
 
 BuildDepends: automake1.9, macathena-base (>= 76-1)
 UpdateConfigGuess: true
-PatchScript: sed -i ".bak" -e 's|/usr/tmp/.messages|%p/var/cache/macathena-libgms/messages|g' globalmessage.h
 CompileScript: <<
 	cp %p/share/macathena-base/athena-copyright %b/
Index: trunk/fink/main/finkinfo/macathena-libxj.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-libxj.info (revision 121)
+++ trunk/fink/main/finkinfo/macathena-libxj.info (revision 133)
@@ -1,5 +1,5 @@
 Package: macathena-libxj
-Version: 22699
-Revision: 2
+Version: 22848
+Revision: 1
 Source: http://macathena.mit.edu/dist/libxj-svn%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
@@ -7,5 +7,5 @@
 License: BSD
 Description: Widget library used by many Athena programs
-Source-MD5: 2a65781fb7171c82b78f7ca4aa213604
+Source-MD5: df4b797ed52e5b3f81240e32175364d9
 DocFiles: athena-copyright
 
Index: trunk/fink/main/finkinfo/macathena-machtype.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-machtype.info (revision 114)
+++ trunk/fink/main/finkinfo/macathena-machtype.info (revision 133)
@@ -1,5 +1,5 @@
 Package: macathena-machtype
-Version: 22699
-Revision: 3
+Version: 22847
+Revision: 1
 Source: http://macathena.mit.edu/dist/machtype-svn%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
@@ -7,5 +7,5 @@
 License: BSD
 Description: Print Athena machine type to standard output
-Source-MD5: f03f88e7ae085b16979d4ecd5a5f75d9
+Source-MD5: 947cc516faaea0c9bf9352450c8d3f0f
 DocFiles: athena-copyright
 
@@ -14,5 +14,5 @@
 UpdateConfigGuess: true
 PatchFile: %n.patch
-PatchFile-MD5: 0449dc3fae00f6f1e327ab5c0e19bf8b
+PatchFile-MD5: 3adc3811fca2e9adc1968617c5a6efe2
 PatchScript: patch -p0 < %{PatchFile}
 CompileScript: <<
Index: trunk/fink/main/finkinfo/macathena-discuss.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-discuss.info (revision 127)
+++ trunk/fink/main/finkinfo/macathena-discuss.info (revision 133)
@@ -1,5 +1,5 @@
 Package: macathena-discuss
 Version: 22713
-Revision: 2
+Revision: 1
 Source: http://macathena.mit.edu/dist/discuss-svn%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
@@ -17,6 +17,4 @@
 BuildDepends: fink (>= 0.24.12), automake1.9, macathena-base (>= 76-1), readline
 UpdateConfigGuess: true
-PatchFile: %n.patch
-PatchFile-MD5: dfd9f5a28f4a01ca59d2f8fb2e18e7a5
 ConfigureParams: --with-krb5 --with-ss=%p
 CompileScript: <<
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
Index: trunk/fink/main/finkinfo/macathena-athrun.info
===================================================================
--- trunk/fink/main/finkinfo/macathena-athrun.info (revision 84)
+++ trunk/fink/main/finkinfo/macathena-athrun.info (revision 133)
@@ -1,5 +1,5 @@
 Package: macathena-athrun
-Version: 22699
-Revision: 2
+Version: 22847
+Revision: 1
 Source: http://macathena.mit.edu/dist/athrun-svn%v.tar.gz
 Maintainer: SIPB MacAthena Project <sipb-macathena@mit.edu>
@@ -12,5 +12,5 @@
 	a specified locker.
 <<
-Source-MD5: a7426af81c089db2b63a6336482a713c
+Source-MD5: e917ba48b3c96b77e767cf6cac8ecc0b
 DocFiles: athena-copyright