diff -rc tar-1.11.2-fsf/INSTALL tar-1.11.2-amiga/INSTALL
*** tar-1.11.2-fsf/INSTALL	Fri Jan 22 17:16:53 1993
--- tar-1.11.2-amiga/INSTALL	Thu Feb 24 12:21:19 1994
***************
*** 33,40 ****
  DIR is the directory that contains the source code.
  
  By default, `make install' will install the package's files in
! /usr/local/bin, /usr/local/lib, /usr/local/man, etc.  You can specify
! an installation prefix other than /usr/local by giving `configure' the
  option `--prefix=PATH'.  Alternately, you can do so by giving a value
  for the `prefix' variable when you run `make', e.g.,
  	make prefix=/usr/gnu
--- 33,40 ----
  DIR is the directory that contains the source code.
  
  By default, `make install' will install the package's files in
! /gnu/bin, /gnu/lib, /gnu/man, etc.  You can specify
! an installation prefix other than /gnu by giving `configure' the
  option `--prefix=PATH'.  Alternately, you can do so by giving a value
  for the `prefix' variable when you run `make', e.g.,
  	make prefix=/usr/gnu
diff -rc tar-1.11.2-fsf/Makefile.in tar-1.11.2-amiga/Makefile.in
*** tar-1.11.2-fsf/Makefile.in	Thu Mar 25 18:59:26 1993
--- tar-1.11.2-amiga/Makefile.in	Thu Feb 24 12:21:05 1994
***************
*** 74,83 ****
  RTAPELIB = @RTAPELIB@
  LIBS = @LIBS@
  
! CFLAGS = -g
! LDFLAGS = -g
  
! prefix = /usr/local
  exec_prefix = $(prefix)
  
  # Prefix for each installed program, normally empty or `g'.
--- 74,83 ----
  RTAPELIB = @RTAPELIB@
  LIBS = @LIBS@
  
! CFLAGS = -O2
! LDFLAGS =
  
! prefix = /gnu
  exec_prefix = $(prefix)
  
  # Prefix for each installed program, normally empty or `g'.
***************
*** 87,93 ****
  bindir = $(exec_prefix)/bin
  
  # Where to put the rmt executable.
! libdir = /etc
  
  # The directory to install the info files in.
  infodir = $(prefix)/info
--- 87,93 ----
  bindir = $(exec_prefix)/bin
  
  # Where to put the rmt executable.
! libdir = /gnu/etc
  
  # The directory to install the info files in.
  infodir = $(prefix)/info
diff -rc tar-1.11.2-fsf/buffer.c tar-1.11.2-amiga/buffer.c
*** tar-1.11.2-fsf/buffer.c	Fri Mar 19 20:05:11 1993
--- tar-1.11.2-amiga/buffer.c	Thu Feb 24 12:18:09 1994
***************
*** 61,67 ****
  
  /* Either stdout or stderr:  The thing we write messages (standard msgs, not
     errors) to.  Stdout unless we're writing a pipe, in which case stderr */
! FILE *msg_file = stdout;
  
  #define	STDIN	0		/* Standard input  file descriptor */
  #define	STDOUT	1		/* Standard output file descriptor */
--- 61,67 ----
  
  /* Either stdout or stderr:  The thing we write messages (standard msgs, not
     errors) to.  Stdout unless we're writing a pipe, in which case stderr */
! FILE *msg_file;
  
  #define	STDIN	0		/* Standard input  file descriptor */
  #define	STDOUT	1		/* Standard output file descriptor */
diff -rc tar-1.11.2-fsf/configure tar-1.11.2-amiga/configure
*** tar-1.11.2-fsf/configure	Wed Feb  3 20:43:37 1993
--- tar-1.11.2-amiga/configure	Thu Feb 24 14:20:37 1994
***************
*** 89,95 ****
    srcdirdefaulted=yes
    # Try the directory containing this script, then `..'.
    prog=$0
!   confdir=`echo $prog|sed 's%/[^/][^/]*$%%'`
    test "X$confdir" = "X$prog" && confdir=.
    srcdir=$confdir
    if test ! -r $srcdir/$unique_file; then
--- 89,95 ----
    srcdirdefaulted=yes
    # Try the directory containing this script, then `..'.
    prog=$0
!   confdir=`echo $prog| sed 's|/$||' | sed 's|//|/|' | sed 's|/[^/]*$||'`
    test "X$confdir" = "X$prog" && confdir=.
    srcdir=$confdir
    if test ! -r $srcdir/$unique_file; then
***************
*** 277,283 ****
  
  echo checking for POSIXized ISC
  if test -d /etc/conf/kconfig.d &&
!   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
  then
    ISC=1 # If later tests want to check for ISC.
    DEFS="$DEFS -D_POSIX_SOURCE=1"
--- 277,283 ----
  
  echo checking for POSIXized ISC
  if test -d /etc/conf/kconfig.d &&
!   grep _POSIX_VERSION /gnu/include/sys/unistd.h >/dev/null 2>&1
  then
    ISC=1 # If later tests want to check for ISC.
    DEFS="$DEFS -D_POSIX_SOURCE=1"
***************
*** 459,473 ****
  #include <sys/socket.h>
  EOF
  err=`eval "$CPP $DEFS conftest.c 2>&1 >/dev/null"`
! if test -z "$err"; then
    PROGS="$PROGS rmt"
  fi
  rm -f conftest*
  fi
  
  echo checking for remote shell
! if test -f /usr/ucb/rsh || test -f /usr/bin/remsh || test -f /usr/bin/rsh ||
!   test -f /usr/bsd/rsh || test -f /usr/bin/nsh; then
    RTAPELIB=rtapelib.o
  else
    echo checking for netdb.h
--- 459,474 ----
  #include <sys/socket.h>
  EOF
  err=`eval "$CPP $DEFS conftest.c 2>&1 >/dev/null"`
! # Suppress building rmt, even though the above succeeds on the Amiga, the
! # link fails due to an unresolved call to setsockopt().  -fnf
! if false && test -z "$err"; then
    PROGS="$PROGS rmt"
  fi
  rm -f conftest*
  fi
  
  echo checking for remote shell
! if test -f /gnu/bin/remsh || test -f /gnu/bin/rsh || test -f /gnu/bin/nsh; then
    RTAPELIB=rtapelib.o
  else
    echo checking for netdb.h
***************
*** 475,487 ****
  #include <netdb.h>
  EOF
  err=`eval "$CPP $DEFS conftest.c 2>&1 >/dev/null"`
! if test -z "$err"; then
    DEFS="$DEFS -DHAVE_NETDB_H=1" RTAPELIB=rtapelib.o
  else
    DEFS="$DEFS -DNO_REMOTE=1"
  fi
  rm -f conftest*
- 
  fi
  
  echo checking for ANSI C header files
--- 476,489 ----
  #include <netdb.h>
  EOF
  err=`eval "$CPP $DEFS conftest.c 2>&1 >/dev/null"`
! # Suppres use of rtapelib.o since it references getservbyname() and rexec(),
! # which are unresolved at link time.
! if false && test -z "$err"; then
    DEFS="$DEFS -DHAVE_NETDB_H=1" RTAPELIB=rtapelib.o
  else
    DEFS="$DEFS -DNO_REMOTE=1"
  fi
  rm -f conftest*
  fi
  
  echo checking for ANSI C header files
***************
*** 563,568 ****
--- 565,571 ----
  # This might guess wrong, but it's not very important.
  for dev in rmt8 rmt0 rmt0h rct0 rst0 tape rct/c7d0s2
  do
+   break	# Hack - disable for AmigaDOS to prevent "dev:" requesters.  -fnf
    if test -n "`ls /dev/$dev 2>/dev/null`"; then
      DEF_AR_FILE=/dev/$dev
      break
***************
*** 571,576 ****
--- 574,581 ----
  if test -z "$DEF_AR_FILE"; then
    DEF_AR_FILE=-
  fi
+ # Hack - force default archive to be tape: for AmigaDOS.  -fnf
+ DEF_AR_FILE="tape:"
  
  for func in strstr valloc mkdir mknod rename ftruncate ftime getcwd
  do
***************
*** 671,679 ****
  fi
  
  echo checking for BSD
! ( test -f /vmunix || test -f /sdmach || test -f /../../mach ) && DEFS="$DEFS -DBSD42=1"
  echo checking for HP-UX
! test -f /hp-ux && test ! -f /vmunix && MALLOC=malloc.o
  
  echo checking for Xenix
  cat > conftest.c <<EOF
--- 676,684 ----
  fi
  
  echo checking for BSD
! #( false && test -f /vmunix || test -f /sdmach || test -f /../../mach ) && DEFS="$DEFS -DBSD42=1"
  echo checking for HP-UX
! #test -f /hp-ux && test ! -f /vmunix && MALLOC=malloc.o
  
  echo checking for Xenix
  cat > conftest.c <<EOF
diff -rc tar-1.11.2-fsf/diffarch.c tar-1.11.2-amiga/diffarch.c
*** tar-1.11.2-fsf/diffarch.c	Mon Mar 15 18:47:17 1993
--- tar-1.11.2-amiga/diffarch.c	Thu Feb 24 12:18:10 1994
***************
*** 193,199 ****
--- 193,205 ----
  	  goto quit;
  	}
  
+ #if amigados && __GNUC__
+       /* The current gcc environment doesn't deal with having O_NDELAY set.
+ 	 An ixemul.library bug?  */
+       diff_fd = open (current_file_name, O_RDONLY | O_BINARY);
+ #else
        diff_fd = open (current_file_name, O_NDELAY | O_RDONLY | O_BINARY);
+ #endif
  
        if (diff_fd < 0 && !f_absolute_paths)
  	{
diff -rc tar-1.11.2-fsf/getdate.c tar-1.11.2-amiga/getdate.c
*** tar-1.11.2-fsf/getdate.c	Mon Mar 15 16:46:07 1993
--- tar-1.11.2-amiga/getdate.c	Thu Feb 24 14:02:39 1994
***************
*** 152,157 ****
--- 152,163 ----
  } MERIDIAN;
  
  
+ /* Forward declare these since the parser generator generates usages before
+    the user supplied definitions are seen. */
+ 
+ static int yyerror();
+ static int yylex();
+ 
  /*
  **  Global variables.  We could get rid of most of these by using a good
  **  union as the yacc stack.  (This routine was originally written before
diff -rc tar-1.11.2-fsf/getdate.y tar-1.11.2-amiga/getdate.y
*** tar-1.11.2-fsf/getdate.y	Tue Feb 16 09:08:58 1993
--- tar-1.11.2-amiga/getdate.y	Thu Feb 24 14:02:24 1994
***************
*** 131,136 ****
--- 131,141 ----
      MERam, MERpm, MER24
  } MERIDIAN;
  
+ /* Forward declare these since the parser generator generates usages before
+    the user supplied definitions are seen. */
+ 
+ static int yyerror();
+ static int yylex();
  
  /*
  **  Global variables.  We could get rid of most of these by using a good
diff -rc tar-1.11.2-fsf/tar.c tar-1.11.2-amiga/tar.c
*** tar-1.11.2-fsf/tar.c	Wed Mar 17 15:30:46 1993
--- tar-1.11.2-amiga/tar.c	Thu Feb 24 12:34:16 1994
***************
*** 187,199 ****
  /*
   * Main routine for tar.
   */
! void
  main (argc, argv)
       int argc;
       char **argv;
  {
    extern char version_string[];
  
    tar = argv[0];		/* JF: was "tar" Set program name */
    filename_terminator = '\n';
    errors = 0;
--- 187,200 ----
  /*
   * Main routine for tar.
   */
! int
  main (argc, argv)
       int argc;
       char **argv;
  {
    extern char version_string[];
  
+   msg_file = stdout;
    tar = argv[0];		/* JF: was "tar" Set program name */
    filename_terminator = '\n';
    errors = 0;
diff -rc tar-1.11.2-fsf/testpad.c tar-1.11.2-amiga/testpad.c
*** tar-1.11.2-fsf/testpad.c	Fri Sep 18 18:45:58 1992
--- tar-1.11.2-amiga/testpad.c	Thu Feb 24 12:33:09 1994
***************
*** 37,43 ****
    struct inc in[5];
  };
  
! void
  main ()
  {
    struct test1 t1;
--- 37,43 ----
    struct inc in[5];
  };
  
! int
  main ()
  {
    struct test1 t1;