Import GnuWin32 patch for Windows 2.5.9-7

WinMerge · May 30, 2015 · a44c7a2 · a44c7a2
1 parent 038354b
commit a44c7a2
Show file tree

Hide file tree

Showing 49 changed files with 9,616 additions and 17,942 deletions.
diff --git a/manifest/patch-2.5.9-6-src.mft b/manifest/patch-2.5.9-6-src.mft
diff --git a/manifest/patch-2.5.9-7-src.mft b/manifest/patch-2.5.9-7-src.mft
@@ -0,0 +1,148 @@
+manifest/patch-2.5.9-7-src.mft
+manifest/patch-2.5.9-7-src.ver
+src/
+src/patch/
+src/patch/2.5.9/
+src/patch/2.5.9/patch-2.5.9-src/
+src/patch/2.5.9/patch-2.5.9-src/aclocal.m4
+src/patch/2.5.9/patch-2.5.9-src/addext.c
+src/patch/2.5.9/patch-2.5.9-src/argmatch.c
+src/patch/2.5.9/patch-2.5.9-src/argmatch.h
+src/patch/2.5.9/patch-2.5.9-src/AUTHORS
+src/patch/2.5.9/patch-2.5.9-src/autom4te.cache/
+src/patch/2.5.9/patch-2.5.9-src/autom4te.cache/output.0
+src/patch/2.5.9/patch-2.5.9-src/autom4te.cache/requests
+src/patch/2.5.9/patch-2.5.9-src/autom4te.cache/traces.0
+src/patch/2.5.9/patch-2.5.9-src/backupfile.c
+src/patch/2.5.9/patch-2.5.9-src/backupfile.h
+src/patch/2.5.9/patch-2.5.9-src/basename.c
+src/patch/2.5.9/patch-2.5.9-src/ChangeLog
+src/patch/2.5.9/patch-2.5.9-src/common.h
+src/patch/2.5.9/patch-2.5.9-src/config.hin
+src/patch/2.5.9/patch-2.5.9-src/configure
+src/patch/2.5.9/patch-2.5.9-src/configure.ac
+src/patch/2.5.9/patch-2.5.9-src/COPYING
+src/patch/2.5.9/patch-2.5.9-src/dirname.c
+src/patch/2.5.9/patch-2.5.9-src/dirname.h
+src/patch/2.5.9/patch-2.5.9-src/error.c
+src/patch/2.5.9/patch-2.5.9-src/error.h
+src/patch/2.5.9/patch-2.5.9-src/getopt.c
+src/patch/2.5.9/patch-2.5.9-src/getopt.h
+src/patch/2.5.9/patch-2.5.9-src/getopt1.c
+src/patch/2.5.9/patch-2.5.9-src/gettext.h
+src/patch/2.5.9/patch-2.5.9-src/hash.c
+src/patch/2.5.9/patch-2.5.9-src/hash.h
+src/patch/2.5.9/patch-2.5.9-src/inp.c
+src/patch/2.5.9/patch-2.5.9-src/inp.h
+src/patch/2.5.9/patch-2.5.9-src/INSTALL
+src/patch/2.5.9/patch-2.5.9-src/install-sh
+src/patch/2.5.9/patch-2.5.9-src/m4/
+src/patch/2.5.9/patch-2.5.9-src/m4/backupfile.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/d-ino.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/dirname.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/dos.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/error.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/getopt.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/hash.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/malloc.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/mbrtowc.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/mbstate_t.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/memchr.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/mkdir.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/nanosecond_stat.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/onceonly.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/quote.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/quotearg.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/realloc.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/rmdir.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/setmode.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/stdbool.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/unlocked-io.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/utimbuf.m4
+src/patch/2.5.9/patch-2.5.9-src/m4/xalloc.m4
+src/patch/2.5.9/patch-2.5.9-src/Makefile.in
+src/patch/2.5.9/patch-2.5.9-src/maketime.c
+src/patch/2.5.9/patch-2.5.9-src/maketime.h
+src/patch/2.5.9/patch-2.5.9-src/malloc.c
+src/patch/2.5.9/patch-2.5.9-src/memchr.c
+src/patch/2.5.9/patch-2.5.9-src/mkdir.c
+src/patch/2.5.9/patch-2.5.9-src/mkinstalldirs
+src/patch/2.5.9/patch-2.5.9-src/NEWS
+src/patch/2.5.9/patch-2.5.9-src/nonposix.c
+src/patch/2.5.9/patch-2.5.9-src/nonposix.h
+src/patch/2.5.9/patch-2.5.9-src/partime.c
+src/patch/2.5.9/patch-2.5.9-src/partime.h
+src/patch/2.5.9/patch-2.5.9-src/patch.c
+src/patch/2.5.9/patch-2.5.9-src/patch.man
+src/patch/2.5.9/patch-2.5.9-src/pc/
+src/patch/2.5.9/patch-2.5.9-src/pc/chdirsaf.c
+src/patch/2.5.9/patch-2.5.9-src/pc/djgpp/
+src/patch/2.5.9/patch-2.5.9-src/pc/djgpp/config.sed
+src/patch/2.5.9/patch-2.5.9-src/pc/djgpp/configure.bat
+src/patch/2.5.9/patch-2.5.9-src/pc/djgpp/configure.sed
+src/patch/2.5.9/patch-2.5.9-src/pc/djgpp/README
+src/patch/2.5.9/patch-2.5.9-src/pc/pc_quote.c
+src/patch/2.5.9/patch-2.5.9-src/pch.c
+src/patch/2.5.9/patch-2.5.9-src/pch.h
+src/patch/2.5.9/patch-2.5.9-src/quote.c
+src/patch/2.5.9/patch-2.5.9-src/quote.h
+src/patch/2.5.9/patch-2.5.9-src/quotearg.c
+src/patch/2.5.9/patch-2.5.9-src/quotearg.h
+src/patch/2.5.9/patch-2.5.9-src/quotesys.c
+src/patch/2.5.9/patch-2.5.9-src/quotesys.h
+src/patch/2.5.9/patch-2.5.9-src/README
+src/patch/2.5.9/patch-2.5.9-src/realloc.c
+src/patch/2.5.9/patch-2.5.9-src/rmdir.c
+src/patch/2.5.9/patch-2.5.9-src/stdbool.h.in
+src/patch/2.5.9/patch-2.5.9-src/strcasecmp.c
+src/patch/2.5.9/patch-2.5.9-src/strncasecmp.c
+src/patch/2.5.9/patch-2.5.9-src/unlocked-io.h
+src/patch/2.5.9/patch-2.5.9-src/util.c
+src/patch/2.5.9/patch-2.5.9-src/util.h
+src/patch/2.5.9/patch-2.5.9-src/version.c
+src/patch/2.5.9/patch-2.5.9-src/version.h
+src/patch/2.5.9/patch-2.5.9-src/xalloc.h
+src/patch/2.5.9/patch-2.5.9-src/xmalloc.c
+src/patch/2.5.9/patch-2.5.9/
+src/patch/2.5.9/patch-2.5.9/config.h
+src/patch/2.5.9/patch-2.5.9/config.log
+src/patch/2.5.9/patch-2.5.9/config.status
+src/patch/2.5.9/patch-2.5.9/configure_help.txt
+src/patch/2.5.9/patch-2.5.9/libtool00.sed
+src/patch/2.5.9/patch-2.5.9/Makefile
+src/patch/2.5.9/patch-2.5.9/Makefile.mingw
+src/patch/2.5.9/patch-2.5.9/patches/
+src/patch/2.5.9/patch-2.5.9/patches/djgppdiffs
+src/patch/2.5.9/patch-2.5.9/patches/djgppdiffs.log
+src/patch/2.5.9/patch-2.5.9/patches/global-reject-file.diff
+src/patch/2.5.9/patch-2.5.9/patches/global-reject-file.diff.log
+src/patch/2.5.9/patch-2.5.9/patches/if_else_endif_comments.diff
+src/patch/2.5.9/patch-2.5.9/patches/if_else_endif_comments.diff.log
+src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-cat_if_device.diff
+src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-cat_if_device.diff.log
+src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src.diff
+src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/
+src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/autom4te.cache/
+src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/autom4te.cache/output.0
+src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/autom4te.cache/requests
+src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/autom4te.cache/traces.0
+src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/hash.c
+src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/hash.h
+src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/m4/
+src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/m4/hash.m4
+src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/m4/nanosecond_stat.m4
+src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/nonposix.c
+src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/nonposix.h
+src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/pc/
+src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/pc/pc_quote.c
+src/patch/2.5.9/patch-2.5.9/patches/patch-man-unified-reject.diff
+src/patch/2.5.9/patch-2.5.9/patches/patch-man-unified-reject.diff.log
+src/patch/2.5.9/patch-2.5.9/patches/remember-backup-files.diff
+src/patch/2.5.9/patch-2.5.9/patches/remember-backup-files.diff.log
+src/patch/2.5.9/patch-2.5.9/patches/trailing-cr-fix.diff
+src/patch/2.5.9/patch-2.5.9/patches/trailing-cr-fix.diff.log
+src/patch/2.5.9/patch-2.5.9/patches/unified-reject-files.diff
+src/patch/2.5.9/patch-2.5.9/patches/unified-reject-files.diff.log
+src/patch/2.5.9/patch-2.5.9/resource/
+src/patch/2.5.9/patch-2.5.9/resource/gnu.ico
+src/patch/2.5.9/patch-2.5.9/resource/patch-res.rc
diff --git a/manifest/patch-2.5.9-6-src.ver → manifest/patch-2.5.9-7-src.ver b/manifest/patch-2.5.9-6-src.ver → manifest/patch-2.5.9-7-src.ver
diff --git a/src/patch/2.5.9/patch-2.5.9-src/Makefile.in b/src/patch/2.5.9/patch-2.5.9-src/Makefile.in
@@ -21,7 +21,7 @@
 #### Start of system configuration section. ####
 
 srcdir = @srcdir@
-resdir = @top_builddir@res
+resdir = @top_builddir@/resource
 VPATH = @srcdir@ @srcdir@/pc $(resdir)
 
 @SET_MAKE@
@@ -35,9 +35,9 @@ transform = @program_transform_name@
 
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
-DEFS = -DINSTALLDIR=\"$(prefix)\"  -DINSTALLDIR=\"$(prefix)\"  -DINSTALLDIR=\"$(prefix)\"  -DINSTALLDIR=\"$(prefix)\"  @DEFS@
+DEFS = -DINSTALLDIR=\"$(prefix)\"  @DEFS@
 EXEEXT = @EXEEXT@
-LDFLAGS = @LDFLAGS@	-Wl,--major-image-version=$(MAJOR) -Wl,--minor-image-version=$(MINOR)
+LDFLAGS = @LDFLAGS@ $(VERSADD)
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 OBJEXT = @OBJEXT@
@@ -46,12 +46,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 VERSION = $(PACKAGE_VERSION)
 MAJOR=$(shell echo $(VERSION) | sed -e "s/\..*$$//")
 MINOR=$(shell echo $(VERSION) | sed -e "s/^[^\.]*\.0*\([^.]*\).*$$/\1/")
-MAJOR=$(shell echo $(VERSION) | sed -e "s/\..*$$//")
-MINOR=$(shell echo $(VERSION) | sed -e "s/^[^\.]*\.0*\([^.]*\).*$$/\1/")
-MAJOR=$(shell echo $(VERSION) | sed -e "s/\..*$$//")
-MINOR=$(shell echo $(VERSION) | sed -e "s/^[^\.]*\.0*\([^.]*\).*$$/\1/")
-MAJOR=$(shell echo $(VERSION) | sed -e "s/\\..*$$//")
-MINOR=$(shell echo $(VERSION) | sed -e "s/^[^\\.]*\\.0*\\([^.]*\\).*$$/\\1/")
+VERSADD = -Wl,--major-image-version=$(MAJOR) -Wl,--minor-image-version=$(MINOR)
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -88,8 +83,8 @@ OBJS = patch-res.o $(LIBOBJS) \
 	maketime.$(OBJEXT) partime.$(OBJEXT) \
 	patch.$(OBJEXT) pch.$(OBJEXT) \
 	quote.$(OBJEXT) quotearg.$(OBJEXT) quotesys.$(OBJEXT) \
-	util.$(OBJEXT) version.$(OBJEXT) xmalloc.$(OBJEXT) hash.$(OBJEXT) \
-	pc_quote.$(OBJEXT) rename.$(OBJEXT)
+	util.$(OBJEXT) version.$(OBJEXT) xmalloc.$(OBJEXT) \
+	hash.$(OBJEXT) pc_quote.$(OBJEXT) nonposix.$(OBJEXT)
 HDRS = argmatch.h backupfile.h common.h dirname.h \
 	error.h getopt.h gettext.h \
 	inp.h maketime.h partime.h pch.h \