Virgin import of patch-2.5.9, the last official GPLv2 release.vendor/misc-GNU/patch/2.5.9vendor/misc-GNU/patch

As in previous imports we dropped the mkinstall and pc directories
as they are of no use to us.

Differently from previous imports, patch.1 was not renamed and
is maintained with its original name (patch.man). If we ever
merge this into the main tree, care must be taken to rename
it back.

1 files changed, 112 insertions, 49 deletions

diff --git a/Makefile.in b/Makefile.in
index c73010ad59db..6c43cc58b2fe 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,7 @@
 # Makefile for GNU patch.
-# Copyright 1993, 1997 Free Software Foundation, Inc.
+
+# Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003 Free Software
+# Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -33,11 +35,13 @@ transform = @program_transform_name@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 DEFS = @DEFS@
+EXEEXT = @EXEEXT@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
+OBJEXT = @OBJEXT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -45,7 +49,8 @@ exec_prefix = @exec_prefix@
 bindir = $(exec_prefix)/bin
 
 # Where to put the manual pages.
-man1dir = $(prefix)/man/man1
+mandir = @mandir@
+man1dir = $(mandir)/man1
 # Extension (including `.') for the manual page filenames.
 man1ext = .1
 
@@ -56,24 +61,42 @@ CONFIG_STATUS = config.status
 
 SHELL = /bin/sh
 
-LIBSRCS = getopt.c getopt1.c memchr.c rename.c
-SRCS = addext.c argmatch.c backupfile.c basename.c inp.c maketime.c \
-	partime.c patch.c pch.c quotearg.c util.c version.c $(LIBSRCS)
-OBJS = addext.o argmatch.o backupfile.o basename.o inp.o maketime.o \
-	partime.o patch.o pch.o quotearg.o util.o version.o $(LIBOBJS)
-HDRS = argmatch.h backupfile.h common.h getopt.h \
-	inp.h maketime.h partime.h pch.h quotearg.h util.h version.h
-MISC = COPYING ChangeLog INSTALL Makefile.in NEWS README \
-	acconfig.h config.hin configure configure.in \
-	install-sh mkinstalldirs patch.man
+LIBSRCS = error.c malloc.c memchr.c mkdir.c \
+	realloc.c rmdir.c strcasecmp.c strncasecmp.c
+SRCS = $(LIBSRCS) \
+	addext.c argmatch.c backupfile.c \
+	basename.c dirname.c \
+	getopt.c getopt1.c inp.c \
+	maketime.c partime.c \
+	patch.c pch.c \
+	quote.c quotearg.c quotesys.c \
+	util.c version.c xmalloc.c
+OBJS = $(LIBOBJS) \
+	addext.$(OBJEXT) argmatch.$(OBJEXT) backupfile.$(OBJEXT) \
+	basename.$(OBJEXT) dirname.$(OBJEXT) \
+	getopt.$(OBJEXT) getopt1.$(OBJEXT) inp.$(OBJEXT) \
+	maketime.$(OBJEXT) partime.$(OBJEXT) \
+	patch.$(OBJEXT) pch.$(OBJEXT) \
+	quote.$(OBJEXT) quotearg.$(OBJEXT) quotesys.$(OBJEXT) \
+	util.$(OBJEXT) version.$(OBJEXT) xmalloc.$(OBJEXT)
+HDRS = argmatch.h backupfile.h common.h dirname.h \
+	error.h getopt.h gettext.h \
+	inp.h maketime.h partime.h pch.h \
+	quote.h quotearg.h quotesys.h \
+	unlocked-io.h util.h version.h xalloc.h
+MISC = AUTHORS COPYING ChangeLog INSTALL Makefile.in NEWS README \
+	aclocal.m4 \
+	config.hin configure configure.ac \
+	install-sh mkinstalldirs patch.man stdbool.h.in
 DISTFILES = $(MISC) $(SRCS) $(HDRS)
+DISTFILES_M4 = $(ACINCLUDE_INPUTS)
 DISTFILES_PC = pc/chdirsaf.c
 DISTFILES_PC_DJGPP = pc/djgpp/README pc/djgpp/config.sed \
 	pc/djgpp/configure.bat pc/djgpp/configure.sed
 
 patch_name = `echo patch | sed '$(transform)'`
 
-all:: patch
+all:: patch$(EXEEXT)
 
 info::
 check::
@@ -82,14 +105,14 @@ installcheck::
 COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) -Ded_PROGRAM=\"$(ed_PROGRAM)\" \
 	-I. -I$(srcdir) $(CFLAGS)
 
-.c.o:
+.c.$(OBJEXT):
 	$(COMPILE) $<
 
-patch: $(OBJS)
+patch$(EXEEXT): $(OBJS)
 	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
 
 install:: all installdirs
-	$(INSTALL_PROGRAM) patch $(bindir)/$(patch_name)
+	$(INSTALL_PROGRAM) patch$(EXEEXT) $(bindir)/$(patch_name)$(EXEEXT)
 	-$(INSTALL_DATA) $(srcdir)/patch.man $(man1dir)/$(patch_name)$(man1ext)
 
 installdirs::
@@ -99,31 +122,59 @@ install-strip::
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
 uninstall::
-	rm -f $(bindir)/$(patch_name) $(man1dir)/$(patch_name)$(man1ext)
+	rm -f $(bindir)/$(patch_name)$(EXEEXT)
+	rm -f $(man1dir)/$(patch_name)$(man1ext)
 
 Makefile: Makefile.in $(CONFIG_STATUS)
 	$(SHELL) $(CONFIG_STATUS)
 config.status: configure
 	$(SHELL) $(CONFIG_STATUS) --recheck
-configure: configure.in
+configure: configure.ac $(srcdir)/aclocal.m4
 	cd $(srcdir) && autoconf
-config.hin: configure.in acconfig.h
+config.hin: configure.ac $(srcdir)/aclocal.m4
 	cd $(srcdir) && rm -f config.hin && autoheader
-
-patchlevel.h: Makefile
-	echo '#define PATCH_VERSION "$(VERSION)"' >patchlevel.h
-
-TAGS: $(HDRS) patchlevel.h $(SRCS)
-	etags $(HDRS) patchlevel.h $(SRCS)
-
-clean::
-	rm -f patch core* *core *.o
-
-mostlyclean:: clean
+stdbool.h: stdbool.h.in
+	sed -e 's/@''HAVE__BOOL''@/@HAVE__BOOL@/g' \
+	  <$(srcdir)/stdbool.h.in >stdbool.h
+
+M4DIR = $(srcdir)/m4
+ACINCLUDE_INPUTS = \
+  $(M4DIR)/backupfile.m4 \
+  $(M4DIR)/d-ino.m4 \
+  $(M4DIR)/dirname.m4 \
+  $(M4DIR)/dos.m4 \
+  $(M4DIR)/error.m4 \
+  $(M4DIR)/getopt.m4 \
+  $(M4DIR)/malloc.m4 \
+  $(M4DIR)/mbrtowc.m4 \
+  $(M4DIR)/mbstate_t.m4 \
+  $(M4DIR)/memchr.m4 \
+  $(M4DIR)/mkdir.m4 \
+  $(M4DIR)/onceonly.m4 \
+  $(M4DIR)/quote.m4 \
+  $(M4DIR)/quotearg.m4 \
+  $(M4DIR)/realloc.m4 \
+  $(M4DIR)/rmdir.m4 \
+  $(M4DIR)/setmode.m4 \
+  $(M4DIR)/stdbool.m4 \
+  $(M4DIR)/unlocked-io.m4 \
+  $(M4DIR)/utimbuf.m4 \
+  $(M4DIR)/xalloc.m4
+
+$(srcdir)/aclocal.m4: $(ACINCLUDE_INPUTS)
+	cat $(ACINCLUDE_INPUTS) >$(srcdir)/aclocal.m4
+
+TAGS: $(HDRS) $(SRCS)
+	etags $(HDRS) $(SRCS)
+
+mostlyclean::
+	rm -f core* *core *.$(OBJEXT) *_.c stdbool.h
+
+clean:: mostlyclean
+	rm -f patch$(EXEEXT)
 
 distclean:: clean
 	rm -f Makefile config.cache config.log config.status config.h
-	rm -f patchlevel.h
 
 maintainer-clean::
 	@echo "This command is intended for maintainers to use;"
@@ -131,28 +182,40 @@ maintainer-clean::
 	$(MAKE) distclean
 	rm -f TAGS
 
-PV = $(PACKAGE)-$(VERSION)
+PV = $(PACKAGE_NAME)-$(PACKAGE_VERSION)
 
-dist:: $(DISTFILES) $(DISTFILES_PC) $(DISTFILES_PC_DJGPP)
+dist:: $(DISTFILES) $(DISTFILES_M4) $(DISTFILES_PC) $(DISTFILES_PC_DJGPP)
 	rm -rf $(PV)
-	mkdir $(PV) $(PV)/pc $(PV)/pc/djgpp
+	mkdir $(PV) $(PV)/m4 $(PV)/pc $(PV)/pc/djgpp
 	cp -p $(DISTFILES) $(PV)
+	cp -p $(DISTFILES_M4) $(PV)/m4
 	cp -p $(DISTFILES_PC) $(PV)/pc
 	cp -p $(DISTFILES_PC_DJGPP) $(PV)/pc/djgpp
 	tar -chf - $(PV) | gzip -9 >$(PV).tar.gz
 	rm -rf $(PV)
 
 $(OBJS): config.h
-addext.o: backupfile.h
-argmatch.o: argmatch.h
-backupfile.o: argmatch.h backupfile.h
-basename.o: backupfile.h
-getopt.o getopt1.o: getopt.h
-maketime.o: maketime.h partime.h
-inp.o: backupfile.h common.h inp.h pch.h util.h
-partime.o: partime.h
-patch.o: argmatch.h backupfile.h common.h getopt.h inp.h pch.h util.h version.h
-pch.o: common.h inp.h pch.h util.h
-quotearg.o: quotearg.h
-util.o: backupfile.h common.h maketime.h partime.h quotearg.h util.h version.h
-version.o: common.h patchlevel.h util.h version.h
+COMMON = common.h @STDBOOL_H@
+addext.$(OBJEXT): backupfile.h dirname.h
+argmatch.$(OBJEXT): argmatch.h gettext.h error.h \
+	quote.h quotearg.h unlocked-io.h
+backupfile.$(OBJEXT): argmatch.h backupfile.h dirname.h
+basename.$(OBJEXT): dirname.h
+dirname.$(OBJEXT): dirname.h xalloc.h
+error.$(OBJEXT): error.h gettext.h unlocked-io.h
+getopt.$(OBJEXT) getopt1.$(OBJEXT): getopt.h
+inp.$(OBJEXT): backupfile.h $(COMMON) inp.h pch.h quotearg.h util.h xalloc.h
+maketime.$(OBJEXT): maketime.h partime.h
+mkdir.$(OBJEXT): dirname.h xalloc.h
+partime.$(OBJEXT): partime.h
+patch.$(OBJEXT): argmatch.h backupfile.h $(COMMON) getopt.h inp.h \
+	pch.h quotearg.h util.h version.h xalloc.h
+pch.$(OBJEXT): backupfile.h $(COMMON) dirname.h inp.h pch.h quotearg.h util.h
+quote.$(OBJECT): quote.h quotearg.h
+quotearg.$(OBJEXT): gettext.h quotearg.h xalloc.h
+quotesys.$(OBJEXT): quotesys.h
+strncasecmp.$(OBJEXT): strcasecmp.c
+util.$(OBJEXT): backupfile.h $(COMMON) dirname.h maketime.h \
+	partime.h quotearg.h quotesys.h util.h version.h xalloc.h
+version.$(OBJEXT): $(COMMON) version.h
+xmalloc.$(OBJEXT): error.h gettext.h xalloc.h