Attachment #173127 for bug #211469

View | Details | Raw Unified | Return to bug 211469
Collapse All | Expand All

Lines 18-23 Link Here

(-)Makefile (+2 lines)
18	BUILD_DEPENDS= icont:lang/icon	18	BUILD_DEPENDS= icont:lang/icon
19	RUN_DEPENDS= iconx:lang/icon	19	RUN_DEPENDS= iconx:lang/icon
20		20
		21	PORTSCOUT= skipv:2.11
		22
21	USES= tar:tgz	23	USES= tar:tgz
22	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src	24	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
23	INSTALL_TARGET= install-code install-man install-elisp	25	INSTALL_TARGET= install-code install-man install-elisp

Lines 1-2 Link Here

(-)distinfo (+1 lines)
		1	TIMESTAMP = 1469909017
1	SHA256 (noweb-2.11b.tgz) = c913f26c1edb37e331c747619835b4cade000b54e459bb08f4d38899ab690d82	2	SHA256 (noweb-2.11b.tgz) = c913f26c1edb37e331c747619835b4cade000b54e459bb08f4d38899ab690d82
2	SIZE (noweb-2.11b.tgz) = 738870	3	SIZE (noweb-2.11b.tgz) = 738870




--- Makefile.orig	2006-06-12 20:14:20 UTC
+++ Makefile
@@ -2,13 +2,14 @@
 # See file COPYRIGHT for more information.
 #

 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

 
 # 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)

 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:

 	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:




--- 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);

 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 */
 
     

 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:  

 } else {
     int retcode;
     if (*locformat == 0 && partial_distance == 0) {
@@ -142,7 +143,7 @@ lastlineno++;
     }
     return error;
 }

 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;
     }
 }

 for (p = fmt; *p; p++) {
     if (*p == '%') {
         switch (*++p) {
@@ -177,35 +178,35 @@ for (p = fmt; *p; p++) {
                           p += 2;
                         } else
                           

Lines 1-6 Link Here

(-)files/patch-c_modules.nw (-3 / +3 lines)
1	--- c/modules.nw.orig Wed Mar 28 14:44:00 2001	1	--- c/modules.nw.orig 2006-06-12 21:03:54 UTC
2	+++ c/modules.nw Mon Nov 10 09:25:05 2003	2	+++ c/modules.nw
3	@@ -197,11 +197,17 @@	3	@@ -197,11 +197,17 @@ would be done above for a string of leng
4	out as a special case.	4	out as a special case.
5	This change probably blows the case where the module being expanded is	5	This change probably blows the case where the module being expanded is
6	empty.	6	empty.

Lines 1-6 Link Here

(-)files/patch-lib_Makefile (-3 / +3 lines)
1	--- lib/Makefile.orig 2000-06-17 00:25:51.000000000 +0400	1	--- lib/Makefile.orig 2000-06-16 20:25:51 UTC
2	+++ lib/Makefile 2015-02-26 03:38:28.000000000 +0300	2	+++ lib/Makefile
3	@@ -12,7 +12,7 @@	3	@@ -12,7 +12,7 @@ all: toascii
4		4
5	install: all	5	install: all
6	cp unmarkup emptydefn toascii nwmtime h2a btdefn $(LIB)	6	cp unmarkup emptydefn toascii nwmtime h2a btdefn $(LIB)

Return to bug 211469

Lines 1-5 Link Here

(-)files/patch-Makefile (-6 / +6 lines)
1	--- Makefile.orig 2006-06-12 20:14:20.000000000 +0000	1	--- Makefile.orig 2006-06-12 20:14:20 UTC
2	+++ Makefile 2014-08-21 23:22:20.000000000 +0000	2	+++ Makefile
3	@@ -2,13 +2,14 @@	3	@@ -2,13 +2,14 @@
4	# See file COPYRIGHT for more information.	4	# See file COPYRIGHT for more information.
5	#	5	#
Lines 19-25 Link Here
19	ICONT=icont	19	ICONT=icont
20		20
21	# BIN is where the commands (notangle, noweave, nountangle, noroots) land	21	# BIN is where the commands (notangle, noweave, nountangle, noroots) land
22	@@ -18,13 +19,13 @@	22	@@ -18,13 +19,13 @@ ICONT=icont
23	# MAN7EXT is the extension for the nowebstyle man page (usually 7)	23	# MAN7EXT is the extension for the nowebstyle man page (usually 7)
24	# TEXINPUTS is the directory for TeX macro files	24	# TEXINPUTS is the directory for TeX macro files
25	# ELISP is the directory for emacs lisp files, or /dev/null not to install	25	# ELISP is the directory for emacs lisp files, or /dev/null not to install
Lines 38-44 Link Here
38		38
39	# change WEAVE if you want a different version of noweave to be installed	39	# change WEAVE if you want a different version of noweave to be installed
40	WEAVE=noweave	40	WEAVE=noweave
41	@@ -37,7 +38,7 @@	41	@@ -37,7 +38,7 @@ MANDIR=$(MAN)/man$(MANEXT)
42	MAN7DIR=$(MAN)/man$(MAN7EXT)	42	MAN7DIR=$(MAN)/man$(MAN7EXT)
43	CATDIR=$(MAN)/cat$(MANEXT)	43	CATDIR=$(MAN)/cat$(MANEXT)
44	CAT7DIR=$(MAN)/cat$(MAN7EXT)	44	CAT7DIR=$(MAN)/cat$(MAN7EXT)
Lines 47-53 Link Here
47	TEXNAME=$(TEXINPUTS)	47	TEXNAME=$(TEXINPUTS)
48		48
49	all:	49	all:
50	@@ -179,7 +180,7 @@	50	@@ -179,7 +180,7 @@ install-preformat-man:
51	rm -f $(CATDIR)/nountangle.$(MANEXT).gz	51	rm -f $(CATDIR)/nountangle.$(MANEXT).gz
52	(cd $(CATDIR); ln notangle.$(MANEXT).gz nountangle.$(MANEXT).gz)	52	(cd $(CATDIR); ln notangle.$(MANEXT).gz nountangle.$(MANEXT).gz)
53	install-tex:	53	install-tex:
Lines 56-62 Link Here
56	cp tex/nwmac.tex tex/noweb.sty $(TEXINPUTS)	56	cp tex/nwmac.tex tex/noweb.sty $(TEXINPUTS)
57	-texhash \|\| echo "Program texhash not found or failed"	57	-texhash \|\| echo "Program texhash not found or failed"
58		58
59	@@ -187,7 +188,7 @@	59	@@ -187,7 +188,7 @@ uninstall-tex:
60	rm -f $(TEXINPUTS)/nwmac.tex $(TEXINPUTS)/noweb.sty	60	rm -f $(TEXINPUTS)/nwmac.tex $(TEXINPUTS)/noweb.sty
61		61
62	install-elisp:	62	install-elisp:

Lines 1-6 Link Here

(-)files/patch-c_modules.c (-8 / +8 lines)
1	--- c/modules.c.orig Wed Mar 28 14:49:00 2001	1	--- c/modules.c.orig 2006-06-12 21:16:23 UTC
2	+++ c/modules.c Thu Nov 13 20:15:53 2003	2	+++ c/modules.c
3	@@ -17,7 +17,7 @@	3	@@ -17,7 +17,7 @@ newmodpart(int type, char s, Location
4		4
5	static	5	static
6	void append(Module mp, struct modpart *p);	6	void append(Module mp, struct modpart *p);
Lines 9-15 Link Here
9	static int seekcycle(Module mp, Parent parent);	9	static int seekcycle(Module mp, Parent parent);
10	#line 132 "modules.nw"	10	#line 132 "modules.nw"
11	static char *lastfilename = 0;	11	static char *lastfilename = 0;
12	@@ -81,12 +81,12 @@	12	@@ -81,12 +81,12 @@ int expand (Module mp, int indent, int p
13	struct parent thismodule; /* the value only matters when we're expanding a module */	13	struct parent thismodule; /* the value only matters when we're expanding a module */
14		14
15		15
Lines 24-30 Link Here
24	if (seekcycle(mp, parent)) {	24	if (seekcycle(mp, parent)) {
25	errormsg(Error, "<<%s>>", mp->name);	25	errormsg(Error, "<<%s>>", mp->name);
26	return Error;	26	return Error;
27	@@ -111,11 +111,12 @@	27	@@ -111,11 +111,12 @@ if (*(p->contents) != '\0') {
28	#line 157 "modules.nw"	28	#line 157 "modules.nw"
29	; break;	29	; break;
30	case MODULE:	30	case MODULE:
Lines 39-45 Link Here
39	} else {	39	} else {
40	int retcode;	40	int retcode;
41	if (*locformat == 0 && partial_distance == 0) {	41	if (*locformat == 0 && partial_distance == 0) {
42	@@ -142,7 +143,7 @@	42	@@ -142,7 +143,7 @@ lastlineno++;
43	}	43	}
44	return error;	44	return error;
45	}	45	}
Lines 48-54 Link Here
48	static int seekcycle(Module mp, Parent parent) {	48	static int seekcycle(Module mp, Parent parent) {
49	if (parent == NULL) {	49	if (parent == NULL) {
50	return 0;	50	return 0;
51	@@ -155,14 +156,14 @@	51	@@ -155,14 +156,14 @@ static int seekcycle(Module mp, Parent p
52	return 0;	52	return 0;
53	}	53	}
54	}	54	}
Lines 65-71 Link Here
65	for (p = fmt; *p; p++) {	65	for (p = fmt; *p; p++) {
66	if (*p == '%') {	66	if (*p == '%') {
67	switch (*++p) {	67	switch (*++p) {
68	@@ -177,35 +178,35 @@	68	@@ -177,35 +178,35 @@ for (p = fmt; *p; p++) {
69	p += 2;	69	p += 2;
70	} else	70	} else
71		71