diff -r -c3 patch-2.5.4.bak/aclocal.m4 patch-2.5.4/aclocal.m4
*** patch-2.5.4.bak/aclocal.m4	Sun Aug 29 15:09:30 1999
--- patch-2.5.4/aclocal.m4	Sat Oct  5 23:03:37 2002
***************
*** 259,265 ****
         [Define to make fseeko etc. visible, on some hosts.],
         [case "$host_os" in
  	# HP-UX 10.20 and later
! 	hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
  	  ac_cv_sys_largefile_source=1 ;;
  	esac])
       AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES,
--- 259,265 ----
         [Define to make fseeko etc. visible, on some hosts.],
         [case "$host_os" in
  	# HP-UX 10.20 and later
! 	hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]* | freebsd*-gnu*)
  	  ac_cv_sys_largefile_source=1 ;;
  	esac])
       AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES,
diff -r -c3 patch-2.5.4.bak/argmatch.c patch-2.5.4/argmatch.c
*** patch-2.5.4.bak/argmatch.c	Tue Aug 10 01:09:13 1999
--- patch-2.5.4/argmatch.c	Sat Oct  5 22:51:37 2002
***************
*** 21,26 ****
--- 21,27 ----
  #include "argmatch.h"
  
  #include <stdio.h>
+ #include <stdlib.h>
  #ifdef STDC_HEADERS
  # include <string.h>
  #endif
diff -r -c3 patch-2.5.4.bak/config.guess patch-2.5.4/config.guess
*** patch-2.5.4.bak/config.guess	Thu Aug  5 14:55:17 1999
--- patch-2.5.4/config.guess	Sat Oct  5 23:08:28 2002
***************
*** 579,591 ****
  	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
  	exit 0 ;;
      *:FreeBSD:*:*)
! 	if test -x /usr/bin/objformat; then
! 	    if test "elf" = "`/usr/bin/objformat`"; then
! 		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
! 		exit 0
! 	    fi
! 	fi
! 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
  	exit 0 ;;
      *:NetBSD:*:*)
  	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
--- 579,596 ----
  	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
  	exit 0 ;;
      *:FreeBSD:*:*)
! 	# Determine whether the default compiler uses glibc.
! 	sed 's/^	//' << EOF >$dummy.c
! 	#include <features.h>
! 	#if __GLIBC__ >= 2
! 	LIBC=gnu
! 	#else
! 	LIBC=
! 	#endif
! EOF
! 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
! 	rm -f $dummy.c
! 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
  	exit 0 ;;
      *:NetBSD:*:*)
  	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
diff -r -c3 patch-2.5.4.bak/config.sub patch-2.5.4/config.sub
*** patch-2.5.4.bak/config.sub	Thu Aug  5 14:55:20 1999
--- patch-2.5.4/config.sub	Sat Oct  5 23:06:33 2002
***************
*** 68,74 ****
  # Here we must recognize all the valid KERNEL-OS combinations.
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
!   linux-gnu*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
      ;;
--- 68,74 ----
  # Here we must recognize all the valid KERNEL-OS combinations.
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
!   linux-gnu* | freebsd*-gnu*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
      ;;
diff -r -c3 patch-2.5.4.bak/configure patch-2.5.4/configure
*** patch-2.5.4.bak/configure	Mon Aug 30 08:44:34 1999
--- patch-2.5.4/configure	Sat Oct  5 23:03:39 2002
***************
*** 1233,1239 ****
    ac_cv_sys_largefile_source=no
        case "$host_os" in
  	# HP-UX 10.20 and later
! 	hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
  	  ac_cv_sys_largefile_source=1 ;;
  	esac
        for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do
--- 1233,1239 ----
    ac_cv_sys_largefile_source=no
        case "$host_os" in
  	# HP-UX 10.20 and later
! 	hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]* | freebsd*-gnu*)
  	  ac_cv_sys_largefile_source=1 ;;
  	esac
        for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do
diff -r -c3 patch-2.5.4.bak/m4/largefile.m4 patch-2.5.4/m4/largefile.m4
*** patch-2.5.4.bak/m4/largefile.m4	Tue Aug 17 21:56:44 1999
--- patch-2.5.4/m4/largefile.m4	Sat Oct  5 23:01:50 2002
***************
*** 100,106 ****
         [Define to make fseeko etc. visible, on some hosts.],
         [case "$host_os" in
  	# HP-UX 10.20 and later
! 	hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
  	  ac_cv_sys_largefile_source=1 ;;
  	esac])
       AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES,
--- 100,106 ----
         [Define to make fseeko etc. visible, on some hosts.],
         [case "$host_os" in
  	# HP-UX 10.20 and later
! 	hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]* | freebsd*-gnu*)
  	  ac_cv_sys_largefile_source=1 ;;
  	esac])
       AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES,
diff -r -c3 patch-2.5.4.bak/patch.c patch-2.5.4/patch.c
*** patch-2.5.4.bak/patch.c	Mon Aug 30 08:20:08 1999
--- patch-2.5.4/patch.c	Sat Oct  5 22:48:01 2002
***************
*** 145,152 ****
  		 : posixly_correct - 1);
  
      val = getenv ("SIMPLE_BACKUP_SUFFIX");
!     if (val && *val)
!       simple_backup_suffix = val;
  
      if ((version_control = getenv ("PATCH_VERSION_CONTROL")))
        version_control_context = "$PATCH_VERSION_CONTROL";
--- 145,151 ----
  		 : posixly_correct - 1);
  
      val = getenv ("SIMPLE_BACKUP_SUFFIX");
!     simple_backup_suffix = val && *val ? val : ".orig";
  
      if ((version_control = getenv ("PATCH_VERSION_CONTROL")))
        version_control_context = "$PATCH_VERSION_CONTROL";
diff -r -c3 patch-2.5.4.bak/quotearg.c patch-2.5.4/quotearg.c
*** patch-2.5.4.bak/quotearg.c	Mon Aug 23 11:55:55 1999
--- patch-2.5.4/quotearg.c	Sat Oct  5 22:51:24 2002
***************
*** 56,64 ****
  # define UCHAR_MAX ((unsigned char) -1)
  #endif
  
- #if HAVE_STDLIB_H
  # include <stdlib.h>
- #endif
  
  #if HAVE_STRING_H
  # include <string.h>
--- 56,62 ----