- fix patch names, no binary change
- add missing rcs ids
This commit is contained in:
parent
caabccecac
commit
e930168a83
@ -1,5 +1,6 @@
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.1 2011/07/08 09:52:50 jasper Exp $
|
||||
--- CMakeLists.txt.orig Fri Jul 23 16:31:18 2010
|
||||
+++ CMakeLists.txt Sun Jul 25 12:18:36 2010
|
||||
+++ CMakeLists.txt Fri Jul 8 11:45:43 2011
|
||||
@@ -8,7 +8,7 @@ set(CMAKE_BUILD_TYPE Release)
|
||||
find_package(PkgConfig)
|
||||
|
@ -1,15 +1,16 @@
|
||||
--- Makefile.orig Wed Sep 16 15:56:29 1998
|
||||
+++ Makefile Tue Sep 29 18:40:22 1998
|
||||
$OpenBSD: patch-Makefile,v 1.2 2011/07/08 09:52:50 jasper Exp $
|
||||
--- Makefile.orig Wed Sep 16 21:56:29 1998
|
||||
+++ Makefile Fri Jul 8 11:46:48 2011
|
||||
@@ -1,7 +1,7 @@
|
||||
-all: idiff
|
||||
+CFLAGS += -g
|
||||
+
|
||||
+PROG = idiff
|
||||
|
||||
-idiff: idiff.c
|
||||
- $(CC) idiff.c -o idiff
|
||||
+all: idiff
|
||||
+PROG = idiff
|
||||
|
||||
-clean:
|
||||
- rm -f *.o a.out
|
||||
+all: idiff
|
||||
+
|
||||
+.include <bsd.prog.mk>
|
||||
|
@ -1,5 +1,6 @@
|
||||
--- idiff.1.orig Wed Sep 20 13:25:31 2000
|
||||
+++ idiff.1 Wed Sep 20 13:34:03 2000
|
||||
$OpenBSD: patch-idiff_1,v 1.1 2011/07/08 09:52:50 jasper Exp $
|
||||
--- idiff.1.orig Fri Jul 8 11:46:48 2011
|
||||
+++ idiff.1 Fri Jul 8 11:46:48 2011
|
||||
@@ -0,0 +1,79 @@
|
||||
+.TH IDIFF Local
|
||||
+.SH NAME
|
@ -1,5 +1,6 @@
|
||||
--- idiff.c.orig Wed Sep 16 15:58:16 1998
|
||||
+++ idiff.c Wed Sep 20 13:12:40 2000
|
||||
$OpenBSD: patch-idiff_c,v 1.1 2011/07/08 09:52:50 jasper Exp $
|
||||
--- idiff.c.orig Wed Sep 16 21:58:16 1998
|
||||
+++ idiff.c Fri Jul 8 11:46:48 2011
|
||||
@@ -1,45 +1,109 @@
|
||||
/* idiff: interactive diff */
|
||||
|
||||
@ -14,7 +15,10 @@
|
||||
+#include <assert.h>
|
||||
+#include <sys/stat.h>
|
||||
+#include <err.h>
|
||||
+
|
||||
|
||||
-main(argc, argv)
|
||||
- int argc;
|
||||
- char *argv[];
|
||||
+#define HUGE 1000000L
|
||||
+
|
||||
+char *progname; /* for error messages */
|
||||
@ -28,17 +32,13 @@
|
||||
+void parse(char *s, int* pfrom1, int* pto1, int* pcmd, int* pfrom2, int* pto2);
|
||||
+void nskip(FILE *fin, int n);
|
||||
+void ncopy(FILE *fin, int n, FILE *fout);
|
||||
|
||||
-main(argc, argv)
|
||||
- int argc;
|
||||
- char *argv[];
|
||||
-{
|
||||
+
|
||||
+int
|
||||
+main(int argc, char *argv[])
|
||||
{
|
||||
- FILE *fin, *fout, *f1, *f2, *efopen();
|
||||
- char buf[BUFSIZ], *mktemp();
|
||||
- char *diffout = "idiff.XXXXXX";
|
||||
+int
|
||||
+main(int argc, char *argv[])
|
||||
+{
|
||||
+ FILE *fin, *fout, *f1, *f2;
|
||||
+ char cmdBuf[1024], *inname1, *inname2;
|
||||
+ int c, errflg = 0;
|
||||
@ -133,7 +133,7 @@
|
||||
nf1 = nf2 = 0;
|
||||
while (fgets(buf, sizeof buf, fin) != NULL) {
|
||||
parse(buf, &from1, &to1, &cmd, &from2, &to2);
|
||||
@@ -52,13 +116,13 @@
|
||||
@@ -52,13 +116,13 @@ idiff(f1, f2, fin, fout) /* process diffs */
|
||||
from2++;
|
||||
printf("%s", buf);
|
||||
while (n-- > 0) {
|
||||
@ -150,7 +150,7 @@
|
||||
switch (buf[0]) {
|
||||
case '>':
|
||||
nskip(f1, to1-nf1);
|
||||
@@ -75,34 +139,57 @@
|
||||
@@ -75,34 +139,57 @@ idiff(f1, f2, fin, fout) /* process diffs */
|
||||
ncopy(f1, to1+1-from1, ft);
|
||||
fprintf(ft, "---\n");
|
||||
ncopy(f2, to2+1-from2, ft);
|
||||
@ -221,7 +221,7 @@
|
||||
|
||||
*pfrom1 = *pto1 = *pfrom2 = *pto2 = 0;
|
||||
a2i(*pfrom1);
|
||||
@@ -120,20 +207,25 @@
|
||||
@@ -120,20 +207,25 @@ parse(s, pfrom1, pto1, pcmd, pfrom2, pto2)
|
||||
*pto2 = *pfrom2;
|
||||
}
|
||||
|
||||
@ -252,7 +252,7 @@
|
||||
while (n-- > 0) {
|
||||
if (fgets(buf, sizeof buf, fin) == NULL)
|
||||
return;
|
||||
@@ -141,4 +233,24 @@
|
||||
@@ -141,4 +233,24 @@ ncopy(fin, n, fout) /* copy n lines from fin to fout *
|
||||
}
|
||||
}
|
||||
|
@ -1,3 +1,4 @@
|
||||
$OpenBSD: patch-testdata1,v 1.2 2011/07/08 09:52:50 jasper Exp $
|
||||
--- s1.orig Tue Sep 29 17:38:18 1998
|
||||
+++ s1 Tue Sep 29 17:39:00 1998
|
||||
@@ -0,0 +1,4 @@
|
||||
|
@ -1,3 +1,4 @@
|
||||
$OpenBSD: patch-testdata2,v 1.2 2011/07/08 09:52:50 jasper Exp $
|
||||
--- s2.orig Tue Sep 29 17:38:18 1998
|
||||
+++ s2 Tue Sep 29 17:39:31 1998
|
||||
@@ -0,0 +1,4 @@
|
||||
|
@ -1,6 +1,7 @@
|
||||
--- Makefile.orig Mon Jan 21 13:33:37 2002
|
||||
+++ Makefile Mon Jan 21 13:34:11 2002
|
||||
@@ -486,7 +486,7 @@
|
||||
$OpenBSD: patch-Makefile,v 1.3 2011/07/08 09:52:50 jasper Exp $
|
||||
--- Makefile.orig Wed Jul 25 23:51:45 2001
|
||||
+++ Makefile Fri Jul 8 11:47:35 2011
|
||||
@@ -486,7 +486,7 @@ local.h:
|
||||
set +e; \
|
||||
[ -r local.h ] || (cp local.h.samp local.h; chmod u+w local.h)
|
||||
|
||||
@ -9,7 +10,7 @@
|
||||
@. ./config.sh; \
|
||||
set $(SHELLDEBUG); \
|
||||
set +e; \
|
||||
@@ -501,8 +501,6 @@
|
||||
@@ -501,8 +501,6 @@ msgs.h: config.sh FRC
|
||||
set -x; \
|
||||
rm -f msgs.h; ln $$msgs msgs.h || cp $$msgs msgs.h; \
|
||||
fi
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- languages/english/english.2.orig Mon Jan 21 13:40:13 2002
|
||||
+++ languages/english/english.2 Mon Jan 21 13:42:31 2002
|
||||
@@ -1866,7 +1866,7 @@
|
||||
auxotroph
|
||||
auxotrophic
|
||||
auxotrophy
|
||||
-avaliable
|
||||
+available
|
||||
avast
|
||||
avatar
|
||||
avaunt
|
@ -1,18 +0,0 @@
|
||||
--- languages/english/english.3.orig Mon Jan 21 13:43:00 2002
|
||||
+++ languages/english/english.3 Mon Jan 21 13:44:40 2002
|
||||
@@ -5200,6 +5200,7 @@
|
||||
dirndl
|
||||
disaccredit
|
||||
disafforest
|
||||
+disappear
|
||||
disbranch
|
||||
disbud
|
||||
discalced
|
||||
@@ -5234,7 +5235,6 @@
|
||||
dispersoid
|
||||
displayable
|
||||
disproven
|
||||
-dissappear
|
||||
disseminule
|
||||
dissentious
|
||||
dissepiment
|
12
textproc/ispell/patches/patch-languages_english_english_2
Normal file
12
textproc/ispell/patches/patch-languages_english_english_2
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-languages_english_english_2,v 1.1 2011/07/08 09:52:50 jasper Exp $
|
||||
--- languages/english/english.2.orig Thu Jun 7 01:49:16 2001
|
||||
+++ languages/english/english.2 Fri Jul 8 11:47:35 2011
|
||||
@@ -1866,7 +1866,7 @@ auxinically
|
||||
auxotroph
|
||||
auxotrophic
|
||||
auxotrophy
|
||||
-avaliable
|
||||
+available
|
||||
avast
|
||||
avatar
|
||||
avaunt
|
19
textproc/ispell/patches/patch-languages_english_english_3
Normal file
19
textproc/ispell/patches/patch-languages_english_english_3
Normal file
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-languages_english_english_3,v 1.1 2011/07/08 09:52:50 jasper Exp $
|
||||
--- languages/english/english.3.orig Thu Jun 7 01:49:16 2001
|
||||
+++ languages/english/english.3 Fri Jul 8 11:47:35 2011
|
||||
@@ -5200,6 +5200,7 @@ dirk
|
||||
dirndl
|
||||
disaccredit
|
||||
disafforest
|
||||
+disappear
|
||||
disbranch
|
||||
disbud
|
||||
discalced
|
||||
@@ -5234,7 +5235,6 @@ dispersity
|
||||
dispersoid
|
||||
displayable
|
||||
disproven
|
||||
-dissappear
|
||||
disseminule
|
||||
dissentious
|
||||
dissepiment
|
@ -1,5 +1,6 @@
|
||||
--- local.h.samp.orig Mon Jan 21 11:54:21 2002
|
||||
+++ local.h.samp Mon Jan 21 13:27:15 2002
|
||||
$OpenBSD: patch-local_h_samp,v 1.1 2011/07/08 09:52:50 jasper Exp $
|
||||
--- local.h.samp.orig Wed Jul 25 23:51:47 2001
|
||||
+++ local.h.samp Fri Jul 8 11:47:35 2011
|
||||
@@ -105,7 +105,7 @@
|
||||
*/
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-Makefile.in,v 1.20 2010/11/15 09:54:11 jasper Exp $
|
||||
--- Makefile.in.orig Fri Nov 12 14:59:03 2010
|
||||
+++ Makefile.in Fri Nov 12 15:00:32 2010
|
||||
$OpenBSD: patch-Makefile_in,v 1.1 2011/07/08 09:52:50 jasper Exp $
|
||||
--- Makefile.in.orig Thu Nov 4 18:28:16 2010
|
||||
+++ Makefile.in Fri Jul 8 11:50:23 2011
|
||||
@@ -713,7 +713,7 @@ pkgconfig_DATA = libxml-2.0.pc
|
||||
# Install the tests program sources as examples
|
||||
#
|
@ -1,5 +1,6 @@
|
||||
$OpenBSD: patch-texi2html_pl,v 1.1 2011/07/08 09:52:50 jasper Exp $
|
||||
--- texi2html.pl.orig Mon Jan 5 20:14:05 2009
|
||||
+++ texi2html.pl Sat Jun 19 12:19:54 2010
|
||||
+++ texi2html.pl Fri Jul 8 11:50:44 2011
|
||||
@@ -1,7 +1,5 @@
|
||||
#! @PERL@ --
|
||||
# perl
|
Loading…
Reference in New Issue
Block a user