summaryrefslogtreecommitdiff
path: root/devel/noweb/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/noweb/files')
-rw-r--r--devel/noweb/files/patch-Makefile67
-rw-r--r--devel/noweb/files/patch-c_finduses.c29
-rw-r--r--devel/noweb/files/patch-c_getline.c25
-rw-r--r--devel/noweb/files/patch-c_getline.h11
-rw-r--r--devel/noweb/files/patch-c_markmain.c11
-rw-r--r--devel/noweb/files/patch-c_modules.c109
-rw-r--r--devel/noweb/files/patch-c_modules.nw21
-rw-r--r--devel/noweb/files/patch-c_notangle.c42
-rw-r--r--devel/noweb/files/patch-lib_Makefile11
9 files changed, 0 insertions, 326 deletions
diff --git a/devel/noweb/files/patch-Makefile b/devel/noweb/files/patch-Makefile
deleted file mode 100644
index bfdc45648b04..000000000000
--- a/devel/noweb/files/patch-Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
---- Makefile.orig 2006-06-12 20:14:20 UTC
-+++ Makefile
-@@ -2,13 +2,14 @@
- # See file COPYRIGHT for more information.
- #
- # Adjust these two lines for your ANSI C compiler
--CC=gcc -ansi -pedantic
--CFLAGS=
-+#CC=gcc -ansi -pedantic
-+#CFLAGS=
- # If you have Icon, you should use the Icon versions of the noweb pipeline.
- # Set LIBSRC=icon
--LIBSRC=awk
-+LIBSRC=icon
-+#LIBSRC=awk
- # If you have no Icon compiler, but do have icont, make ICONC=icont
--ICONC=iconc
-+ICONC=icont
- ICONT=icont
-
- # BIN is where the commands (notangle, noweave, nountangle, noroots) land
-@@ -18,13 +19,13 @@ ICONT=icont
- # MAN7EXT is the extension for the nowebstyle man page (usually 7)
- # TEXINPUTS is the directory for TeX macro files
- # ELISP is the directory for emacs lisp files, or /dev/null not to install
--BIN=/usr/local/noweb
--LIB=/usr/local/noweb/lib
--MAN=/usr/local/noweb/man
-+BIN=${INSTALL_PREFIX}/bin
-+LIB=${INSTALL_PREFIX}/share/noweb
-+MAN=${INSTALL_PREFIX}/man
- MANEXT=1
- MAN7EXT=7
--TEXINPUTS=/usr/local/tex/inputs
--ELISP=/dev/null
-+TEXINPUTS=${LIB}/tex
-+ELISP=${INSTALL_PREFIX}/share/emacs/site-lisp
-
- # change WEAVE if you want a different version of noweave to be installed
- WEAVE=noweave
-@@ -37,7 +38,7 @@ MANDIR=$(MAN)/man$(MANEXT)
- MAN7DIR=$(MAN)/man$(MAN7EXT)
- CATDIR=$(MAN)/cat$(MANEXT)
- CAT7DIR=$(MAN)/cat$(MAN7EXT)
--LIBNAME=$(LIB)
-+LIBNAME=${PREFIX}/share/noweb
- TEXNAME=$(TEXINPUTS)
-
- all:
-@@ -179,7 +180,7 @@ install-preformat-man:
- rm -f $(CATDIR)/nountangle.$(MANEXT).gz
- (cd $(CATDIR); ln notangle.$(MANEXT).gz nountangle.$(MANEXT).gz)
- install-tex:
-- -mkdir $(TEXINPUTS) 2>/dev/null
-+ -${MKDIR} $(TEXINPUTS) 2>/dev/null
- cp tex/nwmac.tex tex/noweb.sty $(TEXINPUTS)
- -texhash || echo "Program texhash not found or failed"
-
-@@ -187,7 +188,7 @@ uninstall-tex:
- rm -f $(TEXINPUTS)/nwmac.tex $(TEXINPUTS)/noweb.sty
-
- install-elisp:
-- -mkdir $(ELISP) 2>/dev/null
-+ -${MKDIR} $(ELISP) 2>/dev/null
- cp elisp/noweb-mode.el $(ELISP)
-
- uninstall-elisp:
diff --git a/devel/noweb/files/patch-c_finduses.c b/devel/noweb/files/patch-c_finduses.c
deleted file mode 100644
index dbcd5e0bd8b0..000000000000
--- a/devel/noweb/files/patch-c_finduses.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- c/finduses.c.orig 2006-06-12 21:16:23 UTC
-+++ c/finduses.c
-@@ -49,7 +49,7 @@ main(int argc, char **argv) {
- #line 155 "finduses.nw"
- errormsg(Fatal, "%s: couldn't open temporary file\n", progname);
- #line 78 "finduses.nw"
-- while ((line = getline(stdin)) != NULL) {
-+ while ((line = get_line(stdin)) != NULL) {
- if (fputs(line, tmp) == EOF)
- #line 157 "finduses.nw"
- errormsg(Fatal, "%s: error writing temporary file\n", progname);
-@@ -89,7 +89,7 @@ for (; i < argc; i++)
- #line 66 "finduses.nw"
- static void read_ids(FILE *in) {
- char *line;
-- while ((line = getline(in)) != NULL) {
-+ while ((line = get_line(in)) != NULL) {
- if (line[strlen(line)-1] == '\n') line[strlen(line)-1] = 0;
- add_ident(nwindex, line);
- }
-@@ -100,7 +100,7 @@ static void add_use_markers(FILE *in, FI
- int incode = 0;
- LineOut info; info.line = (char *)0; info.out = out;
-
-- while ((line = getline(in)) != NULL) {
-+ while ((line = get_line(in)) != NULL) {
- if (is_begin(line, "code") || showquotes && is_keyword(line, "quote"))
- incode = 1;
- else if (is_end(line, "code") || is_keyword(line, "endquote"))
diff --git a/devel/noweb/files/patch-c_getline.c b/devel/noweb/files/patch-c_getline.c
deleted file mode 100644
index a2692eba7cc0..000000000000
--- a/devel/noweb/files/patch-c_getline.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- c/getline.c.orig 2006-06-12 21:16:23 UTC
-+++ c/getline.c
-@@ -19,7 +19,7 @@ void new_buffers(void) {
- checkptr(buf2 = (char *) realloc(buf2, buf_size));
- }
- #line 47 "getline.nw"
--char *getline (FILE *fp) {
-+char *get_line (FILE *fp) {
-
-
- #line 82 "getline.nw"
-@@ -40,11 +40,11 @@ if (buf1==NULL) {
- return buf1;
- }
- #line 62 "getline.nw"
--char *getline_expand (FILE *fp) {
-+char *get_line_expand (FILE *fp) {
- char *s, *t;
- int width;
-
-- if (getline(fp)==NULL) return NULL;
-+ if (get_line(fp)==NULL) return NULL;
-
- #line 87 "getline.nw"
- if (columnwidth(buf1) > buf_size - 1) {
diff --git a/devel/noweb/files/patch-c_getline.h b/devel/noweb/files/patch-c_getline.h
deleted file mode 100644
index dc3d97949a3d..000000000000
--- a/devel/noweb/files/patch-c_getline.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- c/getline.h.orig 2006-06-12 21:16:23 UTC
-+++ c/getline.h
-@@ -1,6 +1,6 @@
--char *getline_expand (FILE *fp);
-+char *get_line_expand (FILE *fp);
- /* grab a line in buffer, return new buffer or NULL for eof
- tabs in line are expanded according to tabsize */
--char *getline (FILE *fp);
-+char *get_line (FILE *fp);
- /* grab a line in the buffer, return a new buffer or NULL for eof
- no expansion of tabs */
diff --git a/devel/noweb/files/patch-c_markmain.c b/devel/noweb/files/patch-c_markmain.c
deleted file mode 100644
index b0f949808ea4..000000000000
--- a/devel/noweb/files/patch-c_markmain.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- c/markmain.c.orig 2006-06-12 21:16:23 UTC
-+++ c/markmain.c
-@@ -62,7 +62,7 @@ void markup (FILE* in, FILE *out, char *
- #line 121 "markmain.nw"
- print_pair(out, "file", filename);
- print_state(out, Begin, state, count);
--while ((line = getline_expand(in)) != NULL) {
-+while ((line = get_line_expand(in)) != NULL) {
- lineno++;
-
- #line 172 "markmain.nw"
diff --git a/devel/noweb/files/patch-c_modules.c b/devel/noweb/files/patch-c_modules.c
deleted file mode 100644
index bc5277ca6412..000000000000
--- a/devel/noweb/files/patch-c_modules.c
+++ /dev/null
@@ -1,109 +0,0 @@
---- c/modules.c.orig 2006-06-12 21:16:23 UTC
-+++ c/modules.c
-@@ -17,7 +17,7 @@ newmodpart(int type, char *s, Location *
-
- static
- void append(Module mp, struct modpart *p);
--#line 227 "modules.nw"
-+#line 233 "modules.nw"
- static int seekcycle(Module mp, Parent parent);
- #line 132 "modules.nw"
- static char *lastfilename = 0;
-@@ -81,12 +81,12 @@ int expand (Module mp, int indent, int p
- struct parent thismodule; /* the value only matters when we're expanding a module */
-
-
--#line 219 "modules.nw"
-+#line 225 "modules.nw"
- thismodule.this = mp;
- thismodule.parent = parent;
- #line 153 "modules.nw"
-
--#line 222 "modules.nw"
-+#line 228 "modules.nw"
- if (seekcycle(mp, parent)) {
- errormsg(Error, "<<%s>>", mp->name);
- return Error;
-@@ -111,11 +111,12 @@ if (*(p->contents) != '\0') {
- #line 157 "modules.nw"
- ; break;
- case MODULE:
--#line 201 "modules.nw"
-+#line 206 "modules.nw"
- newmod = lookup(p->contents);
- if (newmod==NULL) {
-- errormsg (Error, "undefined chunk name: <<%s>>", p->contents);
-+ errormsg (Error, "ignoring undefined chunk name: <<%s>>", p->contents);
- error=Error;
-+ printf("<<%s>>",p->contents);
- } else {
- int retcode;
- if (*locformat == 0 && partial_distance == 0) {
-@@ -142,7 +143,7 @@ lastlineno++;
- }
- return error;
- }
--#line 229 "modules.nw"
-+#line 235 "modules.nw"
- static int seekcycle(Module mp, Parent parent) {
- if (parent == NULL) {
- return 0;
-@@ -155,14 +156,14 @@ static int seekcycle(Module mp, Parent p
- return 0;
- }
- }
--#line 251 "modules.nw"
-+#line 257 "modules.nw"
- int printloc(FILE *fp, char *fmt, Location loc, int partial) {
- char *p;
- if (*fmt
- && (loc.filename!=lastfilename || lastlineno != loc.lineno)) {
- if (partial) putc('\n',fp);
-
--#line 263 "modules.nw"
-+#line 269 "modules.nw"
- for (p = fmt; *p; p++) {
- if (*p == '%') {
- switch (*++p) {
-@@ -177,35 +178,35 @@ for (p = fmt; *p; p++) {
- p += 2;
- } else
-
--#line 283 "modules.nw"
-+#line 289 "modules.nw"
- { static int complained = 0;
- if (!complained) {
- errormsg(Error,"Bad format sequence ``%%%c'' in -L%s",*p,fmt);
- complained = 1;
- }
- }
--#line 277 "modules.nw"
-+#line 283 "modules.nw"
- break;
- default:
--#line 283 "modules.nw"
-+#line 289 "modules.nw"
- { static int complained = 0;
- if (!complained) {
- errormsg(Error,"Bad format sequence ``%%%c'' in -L%s",*p,fmt);
- complained = 1;
- }
- }
--#line 278 "modules.nw"
-+#line 284 "modules.nw"
- break;
- }
- } else putc(*p, fp);
- }
--#line 257 "modules.nw"
-+#line 263 "modules.nw"
- lastfilename = loc.filename;
- lastlineno = loc.lineno;
- return 1;
- } else return 0;
- }
--#line 309 "modules.nw"
-+#line 315 "modules.nw"
- void remove_final_newline (Module mp) {
- /* remove trailing newline that must be in module */
- if (mp->tail==NULL) /* module has no text */
diff --git a/devel/noweb/files/patch-c_modules.nw b/devel/noweb/files/patch-c_modules.nw
deleted file mode 100644
index 801659417a00..000000000000
--- a/devel/noweb/files/patch-c_modules.nw
+++ /dev/null
@@ -1,21 +0,0 @@
---- c/modules.nw.orig 2006-06-12 21:03:54 UTC
-+++ c/modules.nw
-@@ -197,11 +197,17 @@ would be done above for a string of leng
- out as a special case.
- This change probably blows the case where the module being expanded is
- empty.
-+
-+If the lookup fails then the module (or chunk) is an undefined name.
-+We complain about it but want to output the original source.
-+We just wrap it in the bogus chunk name in the angle brackets
-+that it must have had in the input and output it. (Tim Daly Nov 13, 2002)
- <<expand a module>>=
- newmod = lookup(p->contents);
- if (newmod==NULL) {
-- errormsg (Error, "undefined chunk name: @<<%s@>>", p->contents);
-+ errormsg (Error, "ignoring undefined chunk name: @<<%s@>>", p->contents);
- error=Error;
-+ printf("@<<%s@>>",p->contents);
- } else {
- int retcode;
- if (*locformat == 0 && partial_distance == 0) {
diff --git a/devel/noweb/files/patch-c_notangle.c b/devel/noweb/files/patch-c_notangle.c
deleted file mode 100644
index f0d5b65036cf..000000000000
--- a/devel/noweb/files/patch-c_notangle.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- c/notangle.c.orig 2006-06-12 21:16:23 UTC
-+++ c/notangle.c
-@@ -44,7 +44,7 @@ void read_defs(FILE *in) {
- char *line = NULL; /* buffer for input */
- Location loc;
-
-- while ((line = getline(in)) != NULL) {
-+ while ((line = get_line(in)) != NULL) {
- if (is_keyword(line, "fatal")) exit(1);
-
- #line 101 "notangle.nw"
-@@ -90,7 +90,7 @@ if (!is_begin(line, "code"))
- #line 66 "notangle.nw"
-
- #line 97 "notangle.nw"
--do { line = getline(in);
-+do { line = get_line(in);
- } while (line != NULL && !is_keyword(line,"defn") && !is_keyword(line,"text"));
- #line 67 "notangle.nw"
- insist(line,"defn","code chunk had no definition line");
-@@ -102,10 +102,10 @@ modname[strlen(modname)-1]='\0';
- warn_dots(modname); /* names ending in ... aren't like web */
- modptr = insert(modname); /* find or add module in table */
-
-- line = getline(in);
-+ line = get_line(in);
- insist(line,"nl","definition line not followed by newline");
- loc.lineno++;
-- line = getline(in);
-+ line = get_line(in);
- while (line != NULL && !is_end(line,"code")) {
- if (is_keyword(line,"nl")) {
- addnewline(modptr);
-@@ -157,7 +157,7 @@ modname[strlen(modname)-1]='\0';
- #line 182 "notangle.nw"
- errorat(loc.filename, loc.lineno, Error, "botched code chunk `%s'", line);
- #line 90 "notangle.nw"
-- line = getline(in);
-+ line = get_line(in);
- }
-
- #line 176 "notangle.nw"
diff --git a/devel/noweb/files/patch-lib_Makefile b/devel/noweb/files/patch-lib_Makefile
deleted file mode 100644
index 814eec6d18e8..000000000000
--- a/devel/noweb/files/patch-lib_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Makefile.orig 2000-06-16 20:25:51 UTC
-+++ lib/Makefile
-@@ -12,7 +12,7 @@ all: toascii
-
- install: all
- cp unmarkup emptydefn toascii nwmtime h2a btdefn $(LIB)
-- sed 's@|LIBDIR|@$(LIB)@g' pipedocs > $(LIB)/pipedocs
-+ sed 's@|LIBDIR|@$(LIBNAME)@g' pipedocs > $(LIB)/pipedocs
- chmod +x $(LIB)/pipedocs
-
- checkin:
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-31 01:11:59 +0000