diff options
author | hasso <hasso@pkgsrc.org> | 2009-04-07 18:45:04 +0000 |
---|---|---|
committer | hasso <hasso@pkgsrc.org> | 2009-04-07 18:45:04 +0000 |
commit | cc61a0c793707ab855e606c879e6498f0e1cb968 (patch) | |
tree | fa3aedc3e832da567248249f755cd8ab426b0245 /ham/7plus | |
parent | beddaabfca8cc0e2ae63ca191c8ed6541f8e39c8 (diff) | |
download | pkgsrc-cc61a0c793707ab855e606c879e6498f0e1cb968.tar.gz |
Rename fls to cfls to avoid conflicts with fls function on FreeBSD and
DragonFly.
Diffstat (limited to 'ham/7plus')
-rw-r--r-- | ham/7plus/distinfo | 7 | ||||
-rw-r--r-- | ham/7plus/patches/patch-ab | 24 | ||||
-rw-r--r-- | ham/7plus/patches/patch-ae | 13 | ||||
-rw-r--r-- | ham/7plus/patches/patch-af | 13 | ||||
-rw-r--r-- | ham/7plus/patches/patch-ag | 22 |
5 files changed, 74 insertions, 5 deletions
diff --git a/ham/7plus/distinfo b/ham/7plus/distinfo index 307713159bb..f9669ddd4e1 100644 --- a/ham/7plus/distinfo +++ b/ham/7plus/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2008/06/12 02:14:32 joerg Exp $ +$NetBSD: distinfo,v 1.7 2009/04/07 18:45:04 hasso Exp $ SHA1 (7pl225sr.tgz) = 9c393e8f6968d24ec469fbca45ade65a5c6d52fc RMD160 (7pl225sr.tgz) = 23fe71c10ab4e006c49c7b0e7fbf96d498b2ccf7 @@ -7,6 +7,9 @@ SHA1 (7pl210mg.tgz) = 7acc708cabf8d166f74bd398940fb71aac2c7495 RMD160 (7pl210mg.tgz) = ffaf7b5dd4c55fb847a6b5fd87cdfaecf904e53e Size (7pl210mg.tgz) = 31095 bytes SHA1 (patch-aa) = 62fa52455c8225cbd4465bbd5e1565e7eaae3421 -SHA1 (patch-ab) = 818828c9c0303d8efbd519b857f8d162f6496985 +SHA1 (patch-ab) = 4bf37d21aceced7b8faaeb67dffb8280b220fc16 SHA1 (patch-ac) = 286a5f9f8bf7066948735e646e8138e820f84a68 SHA1 (patch-ad) = b55e4b7d5f416f4363f8457f244ce21a0e19e1eb +SHA1 (patch-ae) = d52190c471cebd4c4fc5debb33a342aa3e852928 +SHA1 (patch-af) = 499fd3c8d56bec7c5e52c4e131eadadb837506d9 +SHA1 (patch-ag) = cb02b04427d655de882fcc6932c89cfd94a85429 diff --git a/ham/7plus/patches/patch-ab b/ham/7plus/patches/patch-ab index d3856c762b4..42fd088bb10 100644 --- a/ham/7plus/patches/patch-ab +++ b/ham/7plus/patches/patch-ab @@ -1,7 +1,16 @@ -$NetBSD: patch-ab,v 1.1 2006/01/09 20:02:02 joerg Exp $ +$NetBSD: patch-ab,v 1.2 2009/04/07 18:45:04 hasso Exp $ ---- 7plus.c.orig 2006-01-09 19:56:29.000000000 +0000 -+++ 7plus.c +--- 7plus.c.orig 2000-03-20 16:35:56 +0200 ++++ 7plus.c 2009-04-06 11:37:24 +0300 +@@ -118,7 +118,7 @@ const char nomem[] = "\007Argh error: + "Can't continue.....\n"; + int noquery = 0; + int force = 0; +-int fls = 0; ++int cfls = 0; + int autokill = 0; + int simulate = 0; + int sysop = 0; @@ -264,7 +264,7 @@ const char *help[] = { #define EXMPL "dh0:/pr/" #endif @@ -11,3 +20,12 @@ $NetBSD: patch-ab,v 1.1 2006/01/09 20:02:02 joerg Exp $ #undef EXMPL #define EXMPL "/pr/" #endif +@@ -634,7 +634,7 @@ int go_at_it (int argc, char **argv) + } + + if (!stricmp (argv[i], "-#")) /* Create 7PLUS.FLS. Contents e.g.: */ +- fls = 1; /* 10 TEST */ ++ cfls = 1; /* 10 TEST */ + /* for TEST.EXE encoded into 10 parts */ + + if (!stricmp (argv[i], "-C")) /* Use 7PLUS-file as a correction file */ diff --git a/ham/7plus/patches/patch-ae b/ham/7plus/patches/patch-ae new file mode 100644 index 00000000000..45aff8415e8 --- /dev/null +++ b/ham/7plus/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2009/04/07 18:45:04 hasso Exp $ + +--- globals.h.orig 2009-04-06 11:37:54 +0300 ++++ globals.h 2009-04-06 11:38:05 +0300 +@@ -22,7 +22,7 @@ extern char notsame[]; + extern char def_format[]; + extern int noquery; + extern int force; +-extern int fls; ++extern int cfls; + extern int autokill; + extern int sysop; + extern int simulate; diff --git a/ham/7plus/patches/patch-af b/ham/7plus/patches/patch-af new file mode 100644 index 00000000000..c34743aaab2 --- /dev/null +++ b/ham/7plus/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2009/04/07 18:45:04 hasso Exp $ + +--- decode.c.orig 2009-04-06 11:38:47 +0300 ++++ decode.c 2009-04-06 11:38:57 +0300 +@@ -44,7 +44,7 @@ int control_decode (char *name) + + /* write 7plus.fls (for server use) */ + sprintf (filename, "%s"_7PLUS_FLS, genpath); +- if (!i && fls) ++ if (!i && cfls) + { + if ((out = fopen (filename, OPEN_WRITE_TEXT)) == NULLFP) + return (14); diff --git a/ham/7plus/patches/patch-ag b/ham/7plus/patches/patch-ag new file mode 100644 index 00000000000..69963f98b44 --- /dev/null +++ b/ham/7plus/patches/patch-ag @@ -0,0 +1,22 @@ +$NetBSD: patch-ag,v 1.1 2009/04/07 18:45:04 hasso Exp $ + +--- encode.c.orig 2009-04-06 11:39:05 +0300 ++++ encode.c 2009-04-06 11:39:26 +0300 +@@ -37,7 +37,7 @@ int encode_file (char *name, long blocks + tune = 0; + #endif + +- if (fls) ++ if (cfls) + if (!test_exist (_7PLUS_FLS)) + unlink (_7PLUS_FLS); + +@@ -738,7 +738,7 @@ int encode_file (char *name, long blocks + } + + fprintf (o, "\n\nEncoding successful!\n"); +- if (fls) ++ if (cfls) + { + if (!*altname) + sprintf (filename, "%s%s", searchbin?searchbin:"", _7PLUS_FLS); |