summaryrefslogtreecommitdiff
path: root/plan9
diff options
context:
space:
mode:
authoragc <agc>1997-10-09 15:19:19 +0000
committeragc <agc>1997-10-09 15:19:19 +0000
commit60c44678417892141a6b2dfd374c220e0aa8dbde (patch)
tree470bcbcec1369cc2cc749ba429b61de7a8a41da2 /plan9
parentf7010c69d9b7f70c35deb1236313b495c240c669 (diff)
downloadpkgsrc-60c44678417892141a6b2dfd374c220e0aa8dbde.tar.gz
Make this compile on NetBSD - modify the #ifdef FreeBSD's to
the usual 4.4-lite BSD definition test.
Diffstat (limited to 'plan9')
-rw-r--r--plan9/rc/patches/patch-aa52
1 files changed, 40 insertions, 12 deletions
diff --git a/plan9/rc/patches/patch-aa b/plan9/rc/patches/patch-aa
index 8d0ff6190e1..809ac1455f2 100644
--- a/plan9/rc/patches/patch-aa
+++ b/plan9/rc/patches/patch-aa
@@ -1,5 +1,5 @@
-*** Makefile.orig Sun Mar 6 21:32:46 1994
---- Makefile Fri Aug 11 16:00:41 1995
+*** Makefile.orig Mon Mar 7 03:32:46 1994
+--- Makefile Wed Aug 20 15:19:15 1997
***************
*** 16,23 ****
#ADDON=addon.o
@@ -20,11 +20,12 @@
# You may substitute "bison -y" for yacc. (You want to choose the one that
***************
-*** 29,34 ****
---- 29,47 ----
+*** 28,33 ****
+--- 28,46 ----
+ glob.o glom.o hash.o heredoc.o input.o lex.o list.o main.o match.o \
nalloc.o open.o print.o redir.o sigmsgs.o signal.o status.o tree.o \
utils.o var.o version.o wait.o walk.o which.o y.tab.o
-
++
+ all: rc history
+
+ install:
@@ -37,12 +38,11 @@
+ strip $(PREFIX)/bin/history
+ gzip -9nf $(PREFIX)/man/man1/rc.1
+ gzip -9nf $(PREFIX)/man/man1/history.1
-+
+
# If rc is compiled with READLINE defined, you must supply the correct
# arguments to ld on this line. Typically this would be something like:
- #
-*** builtins.c.orig Sun Mar 6 21:32:49 1994
---- builtins.c Mon Jul 31 12:27:12 1995
+*** builtins.c.orig Mon Mar 7 03:32:49 1994
+--- builtins.c Wed Aug 20 15:22:52 1997
***************
*** 466,477 ****
@@ -57,12 +57,14 @@
getrlimit(limit->flag, &rlim);
if (hard)
lim = rlim.rlim_max;
---- 466,481 ----
+--- 466,483 ----
#ifndef SYSVR4
extern int getrlimit(int, struct rlimit *);
+
-+ #ifndef __FreeBSD__
++ /* #ifndef __FreeBSD__ */
++ #include <sys/param.h>
++ #if !(defined(BSD) && BSD >= 199306)
extern int setrlimit(int, struct rlimit *);
#endif
@@ -83,7 +85,7 @@
char *t;
int len = strlen(s);
long lim = 1;
---- 494,500 ----
+--- 496,502 ----
}
}
@@ -91,3 +93,29 @@
char *t;
int len = strlen(s);
long lim = 1;
+*** utils.c.orig Wed Aug 20 15:26:52 1997
+--- utils.c Wed Aug 20 15:28:11 1997
+***************
+*** 5,10 ****
+--- 5,12 ----
+ #include "rc.h"
+ #include "jbwrap.h"
+
++ #include <sys/param.h>
++
+ /* print error with line number on noninteractive shells (i.e., scripts) */
+
+ extern void pr_error(char *s) {
+***************
+*** 19,26 ****
+--- 21,30 ----
+ /* our perror */
+
+ extern void uerror(char *s) {
++ #if !(defined(BSD) && BSD >= 199306)
+ extern int sys_nerr;
+ extern char *sys_errlist[];
++ #endif
+ if (errno > sys_nerr)
+ return;
+ if (s != NULL)