DESTDIR support. Fix getline issues.

3 files changed, 111 insertions, 0 deletions

diff --git a/lang/p2c/patches/patch-ac b/lang/p2c/patches/patch-ac
new file mode 100644
index 00000000000..06ab5bde23f
--- /dev/null
+++ b/lang/p2c/patches/patch-ac
@@ -0,0 +1,85 @@
+$NetBSD: patch-ac,v 1.1 2009/09/03 13:14:10 joerg Exp $
+
+--- lex.c.orig	1991-04-24 22:30:40.000000000 +0200
++++ lex.c
+@@ -969,7 +969,7 @@ void progress()
+ 
+ 
+ 
+-void getline()
++void my_getline()
+ {
+     char *cp, *cp2;
+ 
+@@ -995,7 +995,7 @@ void getline()
+ 			infname = stralloc(cp);
+ 			infname[cp2 - cp] = 0;
+ 		    }
+-		    getline();
++		    my_getline();
+ 		    return;
+ 		}
+ 		if (copysource && *inbuf) {
+@@ -1012,7 +1012,7 @@ void getline()
+                     fprintf(stderr, "\n");
+                 if (inputkind == INP_INCFILE) {
+                     pop_input();
+-                    getline();
++                    my_getline();
+                 } else
+                     strcpy(inbuf, "\001");
+             }
+@@ -1103,7 +1103,7 @@ char *fname;
+         infname = fname;
+         inf_lnum = 0;
+     } else
+-        inf_lnum--;     /* adjust for extra getline() */
++        inf_lnum--;     /* adjust for extra my_getline() */
+     *inbuf = 0;
+     inbufptr = inbuf;
+     gettok();
+@@ -2206,7 +2206,7 @@ int starparen;    /* 0={ }, 1=(* *), 2=C
+ 		else
+ 		    commentline(CMT_POST);
+ 		trailing = 0;
+-                getline();
++                my_getline();
+ 		i = 0;
+ 		for (;;) {
+ 		    if (*inbufptr == ' ') {
+@@ -2258,7 +2258,7 @@ char *getinlinepart()
+         if (isspace(*inbufptr)) {
+             inbufptr++;
+         } else if (!*inbufptr) {
+-            getline();
++            my_getline();
+         } else if (*inbufptr == '{') {
+             inbufptr++;
+             comment(0);
+@@ -2352,7 +2352,7 @@ void leadingcomments()
+         switch (*inbufptr++) {
+ 
+             case 0:
+-                getline();
++                my_getline();
+                 break;
+ 
+             case ' ':
+@@ -2559,7 +2559,7 @@ void gettok()
+             case 0:
+ 	        if (commenting_flag)
+ 		    saveinputcomment(inbufptr-1);
+-                getline();
++                my_getline();
+ 		cp = curtokbuf;
+ 		for (;;) {
+ 		    inbufindent = 0;
+@@ -2576,7 +2576,7 @@ void gettok()
+ 		    }
+ 		    if (!*inbufptr && !commenting_flag) {   /* blank line */
+ 			*cp++ = '\001';
+-			getline();
++			my_getline();
+ 		    } else
+ 			break;
+ 		}
diff --git a/lang/p2c/patches/patch-ad b/lang/p2c/patches/patch-ad
new file mode 100644
index 00000000000..2aef62fd83b
--- /dev/null
+++ b/lang/p2c/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2009/09/03 13:14:10 joerg Exp $
+
+--- p2c.hdrs.orig	2009-09-03 14:57:47.000000000 +0200
++++ p2c.hdrs
+@@ -163,7 +163,7 @@ extern Symbol  *findsymbol_opt     PP( (
+ extern Symbol  *findsymbol         PP( (char *name) );
+ extern void     clearprogress      PV();
+ extern void     progress           PV();
+-extern void     getline            PV();
++extern void     my_getline         PV();
+ extern void     push_input_file    PP( (FILE *fp, char *fname, int isinclude) );
+ extern void     include_as_import  PV();
+ extern void     push_input_strlist PP( (Strlist *sp, char *fname) );
diff --git a/lang/p2c/patches/patch-ae b/lang/p2c/patches/patch-ae
new file mode 100644
index 00000000000..e0a0308ba96
--- /dev/null
+++ b/lang/p2c/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2009/09/03 13:14:10 joerg Exp $
+
+--- parse.c.orig	2009-09-03 14:57:44.000000000 +0200
++++ parse.c
+@@ -3769,7 +3769,7 @@ Token blkind;
+ 	out_include(fname, 1);
+     outsection(majorspace);
+     pop_input();
+-    getline();
++    my_getline();
+     gettok();
+ }
+