Skip to content

Commit a44c7a2

Browse files
committed
Import GnuWin32 patch for Windows 2.5.9-7
1 parent 038354b commit a44c7a2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+9616
-17942
lines changed

manifest/patch-2.5.9-6-src.mft

Whitespace-only changes.

manifest/patch-2.5.9-7-src.mft

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
manifest/patch-2.5.9-7-src.mft
2+
manifest/patch-2.5.9-7-src.ver
3+
src/
4+
src/patch/
5+
src/patch/2.5.9/
6+
src/patch/2.5.9/patch-2.5.9-src/
7+
src/patch/2.5.9/patch-2.5.9-src/aclocal.m4
8+
src/patch/2.5.9/patch-2.5.9-src/addext.c
9+
src/patch/2.5.9/patch-2.5.9-src/argmatch.c
10+
src/patch/2.5.9/patch-2.5.9-src/argmatch.h
11+
src/patch/2.5.9/patch-2.5.9-src/AUTHORS
12+
src/patch/2.5.9/patch-2.5.9-src/autom4te.cache/
13+
src/patch/2.5.9/patch-2.5.9-src/autom4te.cache/output.0
14+
src/patch/2.5.9/patch-2.5.9-src/autom4te.cache/requests
15+
src/patch/2.5.9/patch-2.5.9-src/autom4te.cache/traces.0
16+
src/patch/2.5.9/patch-2.5.9-src/backupfile.c
17+
src/patch/2.5.9/patch-2.5.9-src/backupfile.h
18+
src/patch/2.5.9/patch-2.5.9-src/basename.c
19+
src/patch/2.5.9/patch-2.5.9-src/ChangeLog
20+
src/patch/2.5.9/patch-2.5.9-src/common.h
21+
src/patch/2.5.9/patch-2.5.9-src/config.hin
22+
src/patch/2.5.9/patch-2.5.9-src/configure
23+
src/patch/2.5.9/patch-2.5.9-src/configure.ac
24+
src/patch/2.5.9/patch-2.5.9-src/COPYING
25+
src/patch/2.5.9/patch-2.5.9-src/dirname.c
26+
src/patch/2.5.9/patch-2.5.9-src/dirname.h
27+
src/patch/2.5.9/patch-2.5.9-src/error.c
28+
src/patch/2.5.9/patch-2.5.9-src/error.h
29+
src/patch/2.5.9/patch-2.5.9-src/getopt.c
30+
src/patch/2.5.9/patch-2.5.9-src/getopt.h
31+
src/patch/2.5.9/patch-2.5.9-src/getopt1.c
32+
src/patch/2.5.9/patch-2.5.9-src/gettext.h
33+
src/patch/2.5.9/patch-2.5.9-src/hash.c
34+
src/patch/2.5.9/patch-2.5.9-src/hash.h
35+
src/patch/2.5.9/patch-2.5.9-src/inp.c
36+
src/patch/2.5.9/patch-2.5.9-src/inp.h
37+
src/patch/2.5.9/patch-2.5.9-src/INSTALL
38+
src/patch/2.5.9/patch-2.5.9-src/install-sh
39+
src/patch/2.5.9/patch-2.5.9-src/m4/
40+
src/patch/2.5.9/patch-2.5.9-src/m4/backupfile.m4
41+
src/patch/2.5.9/patch-2.5.9-src/m4/d-ino.m4
42+
src/patch/2.5.9/patch-2.5.9-src/m4/dirname.m4
43+
src/patch/2.5.9/patch-2.5.9-src/m4/dos.m4
44+
src/patch/2.5.9/patch-2.5.9-src/m4/error.m4
45+
src/patch/2.5.9/patch-2.5.9-src/m4/getopt.m4
46+
src/patch/2.5.9/patch-2.5.9-src/m4/hash.m4
47+
src/patch/2.5.9/patch-2.5.9-src/m4/malloc.m4
48+
src/patch/2.5.9/patch-2.5.9-src/m4/mbrtowc.m4
49+
src/patch/2.5.9/patch-2.5.9-src/m4/mbstate_t.m4
50+
src/patch/2.5.9/patch-2.5.9-src/m4/memchr.m4
51+
src/patch/2.5.9/patch-2.5.9-src/m4/mkdir.m4
52+
src/patch/2.5.9/patch-2.5.9-src/m4/nanosecond_stat.m4
53+
src/patch/2.5.9/patch-2.5.9-src/m4/onceonly.m4
54+
src/patch/2.5.9/patch-2.5.9-src/m4/quote.m4
55+
src/patch/2.5.9/patch-2.5.9-src/m4/quotearg.m4
56+
src/patch/2.5.9/patch-2.5.9-src/m4/realloc.m4
57+
src/patch/2.5.9/patch-2.5.9-src/m4/rmdir.m4
58+
src/patch/2.5.9/patch-2.5.9-src/m4/setmode.m4
59+
src/patch/2.5.9/patch-2.5.9-src/m4/stdbool.m4
60+
src/patch/2.5.9/patch-2.5.9-src/m4/unlocked-io.m4
61+
src/patch/2.5.9/patch-2.5.9-src/m4/utimbuf.m4
62+
src/patch/2.5.9/patch-2.5.9-src/m4/xalloc.m4
63+
src/patch/2.5.9/patch-2.5.9-src/Makefile.in
64+
src/patch/2.5.9/patch-2.5.9-src/maketime.c
65+
src/patch/2.5.9/patch-2.5.9-src/maketime.h
66+
src/patch/2.5.9/patch-2.5.9-src/malloc.c
67+
src/patch/2.5.9/patch-2.5.9-src/memchr.c
68+
src/patch/2.5.9/patch-2.5.9-src/mkdir.c
69+
src/patch/2.5.9/patch-2.5.9-src/mkinstalldirs
70+
src/patch/2.5.9/patch-2.5.9-src/NEWS
71+
src/patch/2.5.9/patch-2.5.9-src/nonposix.c
72+
src/patch/2.5.9/patch-2.5.9-src/nonposix.h
73+
src/patch/2.5.9/patch-2.5.9-src/partime.c
74+
src/patch/2.5.9/patch-2.5.9-src/partime.h
75+
src/patch/2.5.9/patch-2.5.9-src/patch.c
76+
src/patch/2.5.9/patch-2.5.9-src/patch.man
77+
src/patch/2.5.9/patch-2.5.9-src/pc/
78+
src/patch/2.5.9/patch-2.5.9-src/pc/chdirsaf.c
79+
src/patch/2.5.9/patch-2.5.9-src/pc/djgpp/
80+
src/patch/2.5.9/patch-2.5.9-src/pc/djgpp/config.sed
81+
src/patch/2.5.9/patch-2.5.9-src/pc/djgpp/configure.bat
82+
src/patch/2.5.9/patch-2.5.9-src/pc/djgpp/configure.sed
83+
src/patch/2.5.9/patch-2.5.9-src/pc/djgpp/README
84+
src/patch/2.5.9/patch-2.5.9-src/pc/pc_quote.c
85+
src/patch/2.5.9/patch-2.5.9-src/pch.c
86+
src/patch/2.5.9/patch-2.5.9-src/pch.h
87+
src/patch/2.5.9/patch-2.5.9-src/quote.c
88+
src/patch/2.5.9/patch-2.5.9-src/quote.h
89+
src/patch/2.5.9/patch-2.5.9-src/quotearg.c
90+
src/patch/2.5.9/patch-2.5.9-src/quotearg.h
91+
src/patch/2.5.9/patch-2.5.9-src/quotesys.c
92+
src/patch/2.5.9/patch-2.5.9-src/quotesys.h
93+
src/patch/2.5.9/patch-2.5.9-src/README
94+
src/patch/2.5.9/patch-2.5.9-src/realloc.c
95+
src/patch/2.5.9/patch-2.5.9-src/rmdir.c
96+
src/patch/2.5.9/patch-2.5.9-src/stdbool.h.in
97+
src/patch/2.5.9/patch-2.5.9-src/strcasecmp.c
98+
src/patch/2.5.9/patch-2.5.9-src/strncasecmp.c
99+
src/patch/2.5.9/patch-2.5.9-src/unlocked-io.h
100+
src/patch/2.5.9/patch-2.5.9-src/util.c
101+
src/patch/2.5.9/patch-2.5.9-src/util.h
102+
src/patch/2.5.9/patch-2.5.9-src/version.c
103+
src/patch/2.5.9/patch-2.5.9-src/version.h
104+
src/patch/2.5.9/patch-2.5.9-src/xalloc.h
105+
src/patch/2.5.9/patch-2.5.9-src/xmalloc.c
106+
src/patch/2.5.9/patch-2.5.9/
107+
src/patch/2.5.9/patch-2.5.9/config.h
108+
src/patch/2.5.9/patch-2.5.9/config.log
109+
src/patch/2.5.9/patch-2.5.9/config.status
110+
src/patch/2.5.9/patch-2.5.9/configure_help.txt
111+
src/patch/2.5.9/patch-2.5.9/libtool00.sed
112+
src/patch/2.5.9/patch-2.5.9/Makefile
113+
src/patch/2.5.9/patch-2.5.9/Makefile.mingw
114+
src/patch/2.5.9/patch-2.5.9/patches/
115+
src/patch/2.5.9/patch-2.5.9/patches/djgppdiffs
116+
src/patch/2.5.9/patch-2.5.9/patches/djgppdiffs.log
117+
src/patch/2.5.9/patch-2.5.9/patches/global-reject-file.diff
118+
src/patch/2.5.9/patch-2.5.9/patches/global-reject-file.diff.log
119+
src/patch/2.5.9/patch-2.5.9/patches/if_else_endif_comments.diff
120+
src/patch/2.5.9/patch-2.5.9/patches/if_else_endif_comments.diff.log
121+
src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-cat_if_device.diff
122+
src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-cat_if_device.diff.log
123+
src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src.diff
124+
src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/
125+
src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/autom4te.cache/
126+
src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/autom4te.cache/output.0
127+
src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/autom4te.cache/requests
128+
src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/autom4te.cache/traces.0
129+
src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/hash.c
130+
src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/hash.h
131+
src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/m4/
132+
src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/m4/hash.m4
133+
src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/m4/nanosecond_stat.m4
134+
src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/nonposix.c
135+
src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/nonposix.h
136+
src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/pc/
137+
src/patch/2.5.9/patch-2.5.9/patches/patch-2.5.9-src/pc/pc_quote.c
138+
src/patch/2.5.9/patch-2.5.9/patches/patch-man-unified-reject.diff
139+
src/patch/2.5.9/patch-2.5.9/patches/patch-man-unified-reject.diff.log
140+
src/patch/2.5.9/patch-2.5.9/patches/remember-backup-files.diff
141+
src/patch/2.5.9/patch-2.5.9/patches/remember-backup-files.diff.log
142+
src/patch/2.5.9/patch-2.5.9/patches/trailing-cr-fix.diff
143+
src/patch/2.5.9/patch-2.5.9/patches/trailing-cr-fix.diff.log
144+
src/patch/2.5.9/patch-2.5.9/patches/unified-reject-files.diff
145+
src/patch/2.5.9/patch-2.5.9/patches/unified-reject-files.diff.log
146+
src/patch/2.5.9/patch-2.5.9/resource/
147+
src/patch/2.5.9/patch-2.5.9/resource/gnu.ico
148+
src/patch/2.5.9/patch-2.5.9/resource/patch-res.rc
File renamed without changes.

src/patch/2.5.9/patch-2.5.9-src/Makefile.in

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#### Start of system configuration section. ####
2222

2323
srcdir = @srcdir@
24-
resdir = @top_builddir@res
24+
resdir = @top_builddir@/resource
2525
VPATH = @srcdir@ @srcdir@/pc $(resdir)
2626

2727
@SET_MAKE@
@@ -35,9 +35,9 @@ transform = @program_transform_name@
3535

3636
CFLAGS = @CFLAGS@
3737
CPPFLAGS = @CPPFLAGS@
38-
DEFS = -DINSTALLDIR=\"$(prefix)\" -DINSTALLDIR=\"$(prefix)\" -DINSTALLDIR=\"$(prefix)\" -DINSTALLDIR=\"$(prefix)\" @DEFS@
38+
DEFS = -DINSTALLDIR=\"$(prefix)\" @DEFS@
3939
EXEEXT = @EXEEXT@
40-
LDFLAGS = @LDFLAGS@ -Wl,--major-image-version=$(MAJOR) -Wl,--minor-image-version=$(MINOR)
40+
LDFLAGS = @LDFLAGS@ $(VERSADD)
4141
LIBOBJS = @LIBOBJS@
4242
LIBS = @LIBS@
4343
OBJEXT = @OBJEXT@
@@ -46,12 +46,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
4646
VERSION = $(PACKAGE_VERSION)
4747
MAJOR=$(shell echo $(VERSION) | sed -e "s/\..*$$//")
4848
MINOR=$(shell echo $(VERSION) | sed -e "s/^[^\.]*\.0*\([^.]*\).*$$/\1/")
49-
MAJOR=$(shell echo $(VERSION) | sed -e "s/\..*$$//")
50-
MINOR=$(shell echo $(VERSION) | sed -e "s/^[^\.]*\.0*\([^.]*\).*$$/\1/")
51-
MAJOR=$(shell echo $(VERSION) | sed -e "s/\..*$$//")
52-
MINOR=$(shell echo $(VERSION) | sed -e "s/^[^\.]*\.0*\([^.]*\).*$$/\1/")
53-
MAJOR=$(shell echo $(VERSION) | sed -e "s/\\..*$$//")
54-
MINOR=$(shell echo $(VERSION) | sed -e "s/^[^\\.]*\\.0*\\([^.]*\\).*$$/\\1/")
49+
VERSADD = -Wl,--major-image-version=$(MAJOR) -Wl,--minor-image-version=$(MINOR)
5550

5651
prefix = @prefix@
5752
exec_prefix = @exec_prefix@
@@ -88,8 +83,8 @@ OBJS = patch-res.o $(LIBOBJS) \
8883
maketime.$(OBJEXT) partime.$(OBJEXT) \
8984
patch.$(OBJEXT) pch.$(OBJEXT) \
9085
quote.$(OBJEXT) quotearg.$(OBJEXT) quotesys.$(OBJEXT) \
91-
util.$(OBJEXT) version.$(OBJEXT) xmalloc.$(OBJEXT) hash.$(OBJEXT) \
92-
pc_quote.$(OBJEXT) rename.$(OBJEXT)
86+
util.$(OBJEXT) version.$(OBJEXT) xmalloc.$(OBJEXT) \
87+
hash.$(OBJEXT) pc_quote.$(OBJEXT) nonposix.$(OBJEXT)
9388
HDRS = argmatch.h backupfile.h common.h dirname.h \
9489
error.h getopt.h gettext.h \
9590
inp.h maketime.h partime.h pch.h \

0 commit comments

Comments
 (0)