--- makepkg	2007-06-20 23:38:43.000000000 +0200
+++ /usr/bin/makepkg	2007-06-21 10:59:52.000000000 +0200
@@ -801,7 +801,6 @@
 else
 	msg "Extracting Sources..."
 	for netfile in "${source[@]}"; do
-		unziphack=0
 		file=$(strip_url "$netfile")
 		if in_array "$file" ${noextract[@]}; then
 			#skip source files in the noextract=() array
@@ -817,8 +816,7 @@
 			*application/x-tar*)
 				cmd="tar -xf $file" ;;
 			*application/x-zip*)
-				unziphack=1
-				cmd="unzip -qqo $file" ;;
+				cmd="bsdtar -x -f $file" ;;
 			*application/x-cpio*)
 				cmd="bsdtar -x -f $file" ;;
 			*application/x-gzip*)
@@ -830,12 +828,9 @@
 			msg2 "$cmd"
 			$cmd
 			if [ $? -ne 0 ]; then
-				# unzip will return a 1 as a warning, it is not an error
-				if [ "$unziphack" != "1" -o $? -ne 1 ]; then
-					error "Failed to extract $file"
-					msg "Aborting..."
-					exit 1
-				fi
+				error "Failed to extract $file"
+				msg "Aborting..."
+				exit 1
 			fi
 		fi
 	done