diff options
author | Stefan Eßer <se@FreeBSD.org> | 2002-06-14 18:14:16 +0000 |
---|---|---|
committer | Stefan Eßer <se@FreeBSD.org> | 2002-06-14 18:14:16 +0000 |
commit | 014bd4330f816fc3eed9b384b7ee1ca283e9c315 (patch) | |
tree | dcc140f834c512dafd23f3e7b869a065ae644673 /misc/mmv/files/patch-aa | |
parent | Get the IGNORE warning working. ${DISTFILES} cannot be referenced in (diff) |
Fix build on -current: initialization of FILE* outfile = stdout failed.
Testing the port revealed, that the SHAR archives could not be retrieved,
but a TAR archive is available from wuarchive, so I converted the port
to use it. This simplified the Makefile considerably as a side effect.
Approved by: me@FreeBSD.org (port maintainer)
Notes
Notes:
svn path=/head/; revision=61270
Diffstat (limited to 'misc/mmv/files/patch-aa')
-rw-r--r-- | misc/mmv/files/patch-aa | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/misc/mmv/files/patch-aa b/misc/mmv/files/patch-aa index 1d668147100a..e521e9c107bb 100644 --- a/misc/mmv/files/patch-aa +++ b/misc/mmv/files/patch-aa @@ -1,5 +1,5 @@ *** mmv.c.old Wed Mar 1 05:23:56 1995 ---- mmv.c Thu Mar 2 05:43:37 1995 +--- mmv.c Thu Jun 13 13:34:25 2002 *************** *** 88,94 **** #endif @@ -58,6 +58,33 @@ static int rename(/* char *from, char *to */); --- 386,391 ---- *************** +*** 410,416 **** + static SLICER slicer[2] = {{NULL, NULL, 0}, {NULL, NULL, 0}}; + + static int badreps = 0, paterr = 0, direrr, failed = 0, gotsig = 0, repbad; +! static FILE *outfile = stdout; + + static char IDF[] = "$$mmvdid."; + static char TEMP[] = "$$mmvtmp."; +--- 406,412 ---- + static SLICER slicer[2] = {{NULL, NULL, 0}, {NULL, NULL, 0}}; + + static int badreps = 0, paterr = 0, direrr, failed = 0, gotsig = 0, repbad; +! static FILE *outfile; + + static char IDF[] = "$$mmvdid."; + static char TEMP[] = "$$mmvtmp."; +*************** +*** 471,476 **** +--- 467,473 ---- + { + char *frompat, *topat; + ++ outfile = stdout; + init(); + procargs(argc, argv, &frompat, &topat); + domatch(frompat, topat); +*************** *** 2550,2559 **** } @@ -69,7 +96,7 @@ } ---- 2546,2554 ---- +--- 2547,2555 ---- } @@ -88,7 +115,7 @@ static void memmove(to, from, k) char *to, *from; unsigned k; ---- 2827,2833 ---- +--- 2828,2834 ---- } |