diff options
author | Chris D. Faulhaber <jedgar@FreeBSD.org> | 2001-03-01 00:03:17 +0000 |
---|---|---|
committer | Chris D. Faulhaber <jedgar@FreeBSD.org> | 2001-03-01 00:03:17 +0000 |
commit | 00df5c7d52d882a11e04be6a60d436d98aec107c (patch) | |
tree | b79be63a6e23727c8b6d73708a8e5925190f111c /editors/joe2 | |
parent | Official fix for substr search in "multi" mode (diff) |
Remove ./.joerc from the default startup file search patch
Bump PORTREVISION
Submitted by: brad@comstyle.com
Obtained from: OpenBSD
Notes
Notes:
svn path=/head/; revision=38909
Diffstat (limited to 'editors/joe2')
-rw-r--r-- | editors/joe2/Makefile | 2 | ||||
-rw-r--r-- | editors/joe2/files/patch-ab | 37 |
2 files changed, 33 insertions, 6 deletions
diff --git a/editors/joe2/Makefile b/editors/joe2/Makefile index bda5ba0dfd74..5101d893f094 100644 --- a/editors/joe2/Makefile +++ b/editors/joe2/Makefile @@ -7,7 +7,7 @@ PORTNAME= joe PORTVERSION= 2.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors MASTER_SITES= ftp://ftp.std.com/src/editors/ DISTNAME= ${PORTNAME}${PORTVERSION} diff --git a/editors/joe2/files/patch-ab b/editors/joe2/files/patch-ab index 7d9fed0e9226..1624db3df769 100644 --- a/editors/joe2/files/patch-ab +++ b/editors/joe2/files/patch-ab @@ -1,6 +1,7 @@ ---- main.c.orig Sun Jan 22 01:21:08 1995 -+++ main.c Tue Dec 7 13:57:42 1999 -@@ -19,4 +19,8 @@ +--- main.c.orig Sat Jan 21 19:21:08 1995 ++++ main.c Wed Feb 28 18:52:17 2001 +@@ -18,6 +18,10 @@ + #include <stdio.h> #include <fcntl.h> +#ifdef __FreeBSD__ @@ -9,7 +10,9 @@ +#endif #include "config.h" #include "w.h" -@@ -188,4 +192,18 @@ + #include "tty.h" +@@ -187,6 +191,20 @@ + run=namprt(argv[0]); #endif +#ifdef __FreeBSD__ @@ -28,10 +31,34 @@ + if(s=getenv("LINES")) sscanf(s,"%d",&lines); if(s=getenv("COLUMNS")) sscanf(s,"%d",&columns); -@@ -366,5 +384,5 @@ + if(s=getenv("BAUD")) sscanf(s,"%u",&Baud); +@@ -234,20 +252,6 @@ + + #else + +- s=vsncpy(NULL,0,sc(".")); +- s=vsncpy(sv(s),sv(run)); +- s=vsncpy(sv(s),sc("rc")); +- c=procrc(cap,s); +- if(c==0) goto donerc; +- if(c==1) +- { +- char buf[8]; +- fprintf(stderr,"There were errors in '%s'. Use it anyway?",s); +- fflush(stderr); +- fgets(buf,8,stdin); +- if(buf[0]=='y' || buf[0]=='Y') goto donerc; +- } +- + vsrm(s); + s=getenv("HOME"); + if(s) +@@ -365,7 +369,7 @@ + maint->curwin=maint->topwin; if(help) helpon(maint); if(!nonotice) - msgnw(lastw(maint)->object,"\\i** Joe's Own Editor v2.8 ** Copyright (C) 1995 Joseph H. Allen **\\i"); + msgnw(lastw(maint)->object,"\\i** Joe's Own Editor v2.8l ** Copyright (C) 1995 Joseph H. Allen **\\i"); edloop(0); vclose(vmem); + nclose(n); |