--- makeworld.org	2010-10-03 23:01:19.656217282 -0400
+++ makeworld	2010-10-03 23:04:51.175576820 -0400
@@ -134,14 +134,10 @@
 		if [ -f PKGBUILD ]; then
 			. PKGBUILD
 			buildstatus=0
-			if [ ! -f "$dest/$pkgname-$pkgver-$pkgrel-$CARCH.pkg.tar.gz" ]; then
-
+			if [ ! -f "$dest/$pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT" -a ! -f "$dest/$pkgname-$pkgver-$pkgrel-any$PKGEXT" ]; then
 				PKGDEST="$dest" makepkg $MAKEPKG_OPTS -m 2>&1 1>&2 | tee -a $toplevel/makepkg.log
 
-				#Tee screws up the reading of $? - just check for the completed
-				#package instead
-				#if [ $? -gt 0 ]; then 
-				if [ ! -f "$dest/$pkgname-$pkgver-$pkgrel-$CARCH.pkg.tar.gz" ]; then
+				if [ ${PIPESTATUS[0]} -ne 0 ]; then
 					buildstatus=2
 				else
 					buildstatus=1