diff -uNr dejagnu-1.4.3.orig/config.guess dejagnu-1.4.3/config.guess
--- dejagnu-1.4.3.orig/config.guess	2002-01-26 13:15:05.000000000 +1100
+++ dejagnu-1.4.3/config.guess	2003-05-10 15:08:12.836296520 +1000
@@ -207,7 +207,7 @@
 	echo m68k-sun-sunos${UNAME_RELEASE}
 	exit 0 ;;
     sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	UNAME_RELEASE=`(head -n 1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
@@ -386,7 +386,7 @@
 	fi
 	exit 0 ;;
     *:AIX:*:4)
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -n 1 | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
diff -uNr dejagnu-1.4.3.orig/contrib/bluegnu2.0.3/contrib/test-g++ dejagnu-1.4.3/contrib/bluegnu2.0.3/contrib/test-g++
--- dejagnu-1.4.3.orig/contrib/bluegnu2.0.3/contrib/test-g++	2002-01-26 13:15:06.000000000 +1100
+++ dejagnu-1.4.3/contrib/bluegnu2.0.3/contrib/test-g++	2003-05-10 15:08:12.857293328 +1000
@@ -51,7 +51,7 @@
 	cd $LOGDIR
 	echo "" >> $sum
 	echo "libg++ fails to make check:" >> $sum
-	tail -20 /tmp/clgpp$$ >> $sum
+	tail -n 20 /tmp/clgpp$$ >> $sum
 	if [ $status = 0 ]; then
 		status=1
 	fi
@@ -63,7 +63,7 @@
 	cd $LOGDIR
 	echo "" >> $sum
 	echo "libio fails to make check:" >> $sum
-	tail -20 /tmp/clgpp$$ >> $sum
+	tail -n 20 /tmp/clgpp$$ >> $sum
 	if [ $status = 0 ]; then
 		status=1
 	fi
@@ -75,7 +75,7 @@
 	cd $LOGDIR
 	echo "" >> $sum
 	echo "libstdc++ fails to make check:" >> $sum
-	tail -20 /tmp/clgpp$$ >> $sum
+	tail -n 20 /tmp/clgpp$$ >> $sum
 	if [ $status = 0 ]; then
 		status=1
 	fi
diff -uNr dejagnu-1.4.3.orig/contrib/bluegnu2.0.3/contrib/test-tool dejagnu-1.4.3/contrib/bluegnu2.0.3/contrib/test-tool
--- dejagnu-1.4.3.orig/contrib/bluegnu2.0.3/contrib/test-tool	2002-01-26 13:15:06.000000000 +1100
+++ dejagnu-1.4.3/contrib/bluegnu2.0.3/contrib/test-tool	2003-05-10 15:08:12.908285576 +1000
@@ -151,7 +151,7 @@
 	echo "Tests didn't run, probably because of a framework error."
 	if [ "$keepoutput" = yes ]; then
 		echo
-		tail -20 test-$tool.log
+		tail -n 20 test-$tool.log
 	else
 		echo "Unable to determine why.  Rerun with -keepoutput."
 	fi
@@ -169,13 +169,13 @@
 todayname=`date '+%y%m%d'`
 if [ "$update" = no ]; then
 	now=$testdir/$tool.sum
-	before=`ls $LOGDIR/$tool-??????.sum | tail -1`
+	before=`ls $LOGDIR/$tool-??????.sum | tail -n 1`
 else
 	mv -f $testdir/$tool.sum $LOGDIR/$tool-$todayname.sum || exit 2
 	mv -f $testdir/$tool.log $LOGDIR/$tool-$todayname.log || exit 2
 
-	now=`ls $LOGDIR/$tool-??????.sum | tail -1`
-	before=`ls $LOGDIR/$tool-??????.sum | tail -2 | sed 1q`
+	now=`ls $LOGDIR/$tool-??????.sum | tail -n 1`
+	before=`ls $LOGDIR/$tool-??????.sum | tail -n 2 | sed 1q`
 fi
 trap "rm -f $tmp $tmp1 $tmp2 $now_s $before_s" 0 1 2 3 5 9 13 15
 
@@ -286,7 +286,7 @@
     if [ $? != 0 ]; then
 	echo
    	echo "libio fails to make check:"
-   	tail -20 $TMPDIR/clgpp$$
+   	tail -n 20 $TMPDIR/clgpp$$
     fi
    fi
    if [ -f $DEVOBINDIR/libstdc++/run-make-check ]; then
@@ -295,7 +295,7 @@
     if [ $? != 0 ]; then
    	echo
    	echo "libstdc++ fails to make check:"
-   	tail -20 $TMPDIR/clgpp$$
+   	tail -n 20 $TMPDIR/clgpp$$
     fi
    fi
    if [ -f $DEVOBINDIR/libg++/run-make-check ]; then
@@ -304,7 +304,7 @@
     if [ $? != 0 ]; then
 	echo
  	echo "libg++ fails to make check:"
-    	tail -20 $TMPDIR/clgpp$$
+    	tail -n 20 $TMPDIR/clgpp$$
     fi
    fi
    rm -f $TMPDIR/clgpp$$
diff -uNr dejagnu-1.4.3.orig/contrib/test-g++ dejagnu-1.4.3/contrib/test-g++
--- dejagnu-1.4.3.orig/contrib/test-g++	2002-01-26 13:15:12.000000000 +1100
+++ dejagnu-1.4.3/contrib/test-g++	2003-05-10 15:08:12.927282688 +1000
@@ -53,7 +53,7 @@
 	cd $LOGDIR
 	echo "" >> $sum
 	echo "libg++ fails to make check:" >> $sum
-	tail -20 /tmp/clgpp$$ >> $sum
+	tail -n 20 /tmp/clgpp$$ >> $sum
 	if [ $status = 0 ]; then
 		status=1
 	fi
@@ -68,7 +68,7 @@
 	cd $LOGDIR
 	echo "" >> $sum
 	echo "libio fails to make check:" >> $sum
-	tail -20 /tmp/clgpp$$ >> $sum
+	tail -n 20 /tmp/clgpp$$ >> $sum
 	if [ $status = 0 ]; then
 		status=1
 	fi
@@ -80,7 +80,7 @@
 	cd $LOGDIR
 	echo "" >> $sum
 	echo "libstdc++ fails to make check:" >> $sum
-	tail -20 /tmp/clgpp$$ >> $sum
+	tail -n 20 /tmp/clgpp$$ >> $sum
 	if [ $status = 0 ]; then
 		status=1
 	fi
diff -uNr dejagnu-1.4.3.orig/contrib/test-tool dejagnu-1.4.3/contrib/test-tool
--- dejagnu-1.4.3.orig/contrib/test-tool	2002-01-26 13:15:12.000000000 +1100
+++ dejagnu-1.4.3/contrib/test-tool	2003-05-10 15:08:12.982274328 +1000
@@ -164,7 +164,7 @@
 	echo "Tests didn't run, probably because of a framework error."
 	if [ "$keepoutput" = yes ]; then
 		echo
-		tail -20 test-$tool.log
+		tail -n 20 test-$tool.log
 	else
 		echo "Unable to determine why.  Rerun with -keepoutput."
 	fi
@@ -308,7 +308,7 @@
     if [ $? != 0 ]; then
 	echo
    	echo "libio fails to make check:"
-   	tail -20 $TMPDIR/clgpp$$
+   	tail -n 20 $TMPDIR/clgpp$$
     fi
    fi
    if [ -f $DEVOBINDIR/libstdc++/run-make-check ]; then
@@ -317,7 +317,7 @@
     if [ $? != 0 ]; then
    	echo
    	echo "libstdc++ fails to make check:"
-   	tail -20 $TMPDIR/clgpp$$
+   	tail -n 20 $TMPDIR/clgpp$$
     fi
    fi
    if [ -f $DEVOBINDIR/libg++/run-make-check ]; then
@@ -326,7 +326,7 @@
     if [ $? != 0 ]; then
 	echo
  	echo "libg++ fails to make check:"
-    	tail -20 $TMPDIR/clgpp$$
+    	tail -n 20 $TMPDIR/clgpp$$
     fi
    fi
    rm -f $TMPDIR/clgpp$$
diff -uNr dejagnu-1.4.3.orig/example/hello/depcomp dejagnu-1.4.3/example/hello/depcomp
--- dejagnu-1.4.3.orig/example/hello/depcomp	2002-04-27 14:29:10.000000000 +1000
+++ dejagnu-1.4.3/example/hello/depcomp	2003-05-10 15:08:13.052263688 +1000
@@ -314,7 +314,7 @@
   if test "$stat" != 0; then exit $stat; fi
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tail +3 "$tmpdepfile" | tr ' ' '
+  tail -n +3 "$tmpdepfile" | tr ' ' '
 ' | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.