diff options
| author | fredb <fredb@pkgsrc.org> | 2002-01-04 21:40:58 +0000 |
|---|---|---|
| committer | fredb <fredb@pkgsrc.org> | 2002-01-04 21:40:58 +0000 |
| commit | 08a113970d20a6c45f9f7176fa243118059b8e1d (patch) | |
| tree | 49d9840f53b9d080c744ab80594e5a3a403baa35 /misc | |
| parent | 15db066ec86a2f13755de08ffc9b49017724ed4f (diff) | |
| download | pkgsrc-08a113970d20a6c45f9f7176fa243118059b8e1d.tar.gz | |
Use __progname, to get the name of the command right for the help message.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/parchive/distinfo | 5 | ||||
| -rw-r--r-- | misc/parchive/patches/patch-aa | 8 | ||||
| -rw-r--r-- | misc/parchive/patches/patch-ab | 45 |
3 files changed, 53 insertions, 5 deletions
diff --git a/misc/parchive/distinfo b/misc/parchive/distinfo index 1c94c1ae9dd..fd5cfca9f5b 100644 --- a/misc/parchive/distinfo +++ b/misc/parchive/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/01/04 21:02:30 fredb Exp $ +$NetBSD: distinfo,v 1.2 2002/01/04 21:40:58 fredb Exp $ SHA1 (par-v1.1.tar.gz) = acba4cdfb8a89b1542cd9ba6494d0d3461e609a1 Size (par-v1.1.tar.gz) = 40959 bytes -SHA1 (patch-aa) = 597886e49329078291a455efdd520df6d9919088 +SHA1 (patch-aa) = 847b137de8cc0ff250d1e0346fcc80fa67021135 +SHA1 (patch-ab) = fb1b68cc6e3ae4186f78d229bb237d7a62c6bff6 diff --git a/misc/parchive/patches/patch-aa b/misc/parchive/patches/patch-aa index adc63565afb..c33089540a7 100644 --- a/misc/parchive/patches/patch-aa +++ b/misc/parchive/patches/patch-aa @@ -1,9 +1,11 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/01/04 21:02:30 fredb Exp $ +$NetBSD: patch-aa,v 1.2 2002/01/04 21:40:59 fredb Exp $ --- Makefile.orig Sat Nov 17 10:39:52 2001 +++ Makefile -@@ -2,7 +2,7 @@ - CFLAGS=-g -W -Wall -Wno-unused -O2 +@@ -1,8 +1,8 @@ + +-CFLAGS=-g -W -Wall -Wno-unused -O2 ++CFLAGS=-g -W -Wall -Wno-unused -O2 -DKNOW_NAME par: backend.o checkpar.o makepar.o rwpar.o rs.o md5.o fileops.o main.o readoldpar.o interface.o ui_text.o - $(CC) -o $@ $^ diff --git a/misc/parchive/patches/patch-ab b/misc/parchive/patches/patch-ab new file mode 100644 index 00000000000..1a36b9982aa --- /dev/null +++ b/misc/parchive/patches/patch-ab @@ -0,0 +1,45 @@ +$NetBSD: patch-ab,v 1.1 2002/01/04 21:40:59 fredb Exp $ + +--- main.c.orig Sat Nov 17 13:29:48 2001 ++++ main.c +@@ -28,14 +28,20 @@ + int + usage(void) + { ++#ifdef KNOW_NAME ++ extern char *__progname; ++#else ++ char progname[] = "par"; ++#endif ++ + printf( + "Usage:\n" +-" par c(heck) [options] <par file> : Check parity archive\n" +-" par r(ecover) [options] <par file> : Restore missing volumes\n" +-" par a(dd) [options] <par file> [files] : Add files to parity archive\n" ++" %s c(heck) [options] <par file> : Check parity archive\n" ++" %s r(ecover) [options] <par file> : Restore missing volumes\n" ++" %s a(dd) [options] <par file> [files] : Add files to parity archive\n" + " Advanced:\n" +-" par m(ix) [options] : Try to restore from all parity files at once\n" +-" par i(nteractive) [<par files>] : Interactive mode (very bare-bones)\n" ++" %s m(ix) [options] : Try to restore from all parity files at once\n" ++" %s i(nteractive) [<par files>] : Interactive mode (very bare-bones)\n" + "\n" + "Options: (Can be turned off with '+')\n" + " -m : Move existing files out of the way\n" +@@ -52,8 +58,12 @@ + " -v,+v: Increase or decrease verbosity\n" + " -h,-?: Display this help\n" + " -- : Always treat following arguments as files\n" +-"\n" +- ); ++"\n", ++#ifdef KNOW_NAME ++ __progname, __progname, __progname, __progname, __progname); ++#else ++ progname, progname, progname, progname, progname); ++#endif + return 0; + } + |