head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.8 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.6 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.4 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.2 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.7.0.2 pkgsrc-2011Q1-base:1.7 pkgsrc-2009Q4:1.6.0.42 pkgsrc-2009Q4-base:1.6 pkgsrc-2008Q4:1.6.0.40 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.38 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.36 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.34 pkgsrc-2008Q2-base:1.6 pkgsrc-2008Q1:1.6.0.32 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.30 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.6.0.28 pkgsrc-2007Q3-base:1.6 pkgsrc-2007Q2:1.6.0.26 pkgsrc-2007Q2-base:1.6 pkgsrc-2007Q1:1.6.0.24 pkgsrc-2007Q1-base:1.6 pkgsrc-2006Q4:1.6.0.22 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.6.0.20 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.18 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.16 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.14 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.12 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.10 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.8 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.6 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.4 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.2 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.5.0.4 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.4.0.6 netbsd-1-6-1-base:1.4 netbsd-1-6:1.4.0.8 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.4 pkgviews-base:1.4 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2 netbsd-1-4-PATCH002:1.2; locks; strict; comment @# @; 1.8 date 2011.04.11.21.16.10; author roy; state dead; branches; next 1.7; 1.7 date 2011.03.29.21.38.26; author roy; state Exp; branches 1.7.2.1; next 1.6; 1.6 date 2004.06.03.08.52.23; author adam; state dead; branches; next 1.5; 1.5 date 2003.04.27.17.45.31; author cjep; state Exp; branches; next 1.4; 1.4 date 2001.05.22.12.23.28; author wiz; state Exp; branches; next 1.3; 1.3 date 2001.05.22.11.37.16; author wiz; state Exp; branches; next 1.2; 1.2 date 99.12.28.05.35.55; author wiz; state Exp; branches; next 1.1; 1.1 date 99.11.25.17.03.20; author is; state Exp; branches; next ; 1.7.2.1 date 2011.04.13.19.58.50; author tron; state dead; branches; next ; desc @@ 1.8 log @Remove patch-ac as it was incorrect. @ text @$NetBSD: patch-ac,v 1.7 2011/03/29 21:38:26 roy Exp $ --- termcap.c 2011-03-29 22:25:48.000000000 +0100 +++ termcap.c 2011-03-29 22:30:35.000000000 +0100 @@@@ -8,16 +8,9 @@@@ #include "types.h" #ifdef TERMINFO - -#ifdef HAVE_CURSES_H -#include -#endif -/* curses has to come before term.h on SGI */ -#ifdef HAVE_TERM_H -/* term.h is a disaster: it #defines 'tab' */ -#include -#endif - +/* Even though we may configure and test for terminfo and curses + * we actually only use termcap */ +#include #endif int dopadding = 0; @ 1.7 log @joe only uses termcap so...... Depend on termcap instead of ncurses Replace curses.h and term.h includes with termcap.h Fixes PR lib/43941 @ text @d1 1 a1 1 $NetBSD$ @ 1.7.2.1 log @Pullup ticket #3414 - requested by roy pkgsrc/editors/joe: build fix Revisions pulled up: - editors/joe/distinfo 1.18 - editors/joe/patches/patch-ac deleted --- Module Name: pkgsrc Committed By: roy Date: Mon Apr 11 21:16:10 UTC 2011 Modified Files: pkgsrc/editors/joe: distinfo Removed Files: pkgsrc/editors/joe/patches: patch-ac Log Message: Remove patch-ac as it was incorrect. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.7 2011/03/29 21:38:26 roy Exp $ @ 1.6 log @Changes 3.1: * Regex and incremental search (jmacs ^S) now work for UTF-8 * More and improved syntax highlighting files, including Mason * Use ^T E to set character set of file (hit at the prompt for a list of available character sets). * Can install custom "i18n" style byte oriented character set definition files. * No longer depends on iconv() (easier to compile) * Fix bug where right arrow was not doing right thing on last line * Fix UTF-8 codes between 0x10000 - 0x1FFFF * Now prints for unicode control characters * Improved smart home, indent, etc. * TAB completion is now more "bash"-like * When multiple files are given on command line, they end up in same order on the screen in JOE (before they were shuffled). * Menu size is now variable (40% of window size or smaller if it's not filled). * Added -icase option for case insensitive search by default. * Added -wrap option, which makes searches wrap * Added status line sequence %x: shows current context (function name if you're editing C). * Added tab completion at search prompts and ESC-Enter for tab completion within text windows. * Warn if file changed on save. * Added Ctrl-space block selection method * Added Ctrl-arrow key block selection method * ^K E asks if you want to load original version of the file * jmacs bugs fixes: upperase word, transpose words, ^X ^C is more emacs-like., ^X k and ^X ^V more like emacs. * Much improved compile system ^[ c * Much improved jpico * aspell support. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.5 2003/04/27 17:45:31 cjep Exp $ d3 4 a6 8 --- b.h.orig 1994-12-21 12:04:46.000000000 +0000 +++ b.h @@@@ -60,6 +60,7 @@@@ struct buffer int rdonly; /* Set for read-only */ int internal; /* Set for internal buffers */ int er; /* Error code when file was loaded */ + int filehandle; /* File handle for locking */ }; d8 17 a24 1 extern int force; /* Set to have final '\n' added to file */ @ 1.5 log @Use time_t rather than guess int or long. Fixes build on NetBSD/shark et al. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Add one patch from OpenBSD to not use ./.joerc, and two from FreeBSD, one against a symlink attack on 'DEADJOE', and one to use vi-style file locking. Bump version to 2.8nb1. @ text @d3 8 a10 3 --- main.c.orig Sun Jan 22 01:21:08 1995 +++ main.c @@@@ -18,6 +18,10 @@@@ d12 1 a12 51 #include #include +#if defined(__FreeBSD__) || defined(__NetBSD__) +#include +#include +#endif #include "config.h" #include "w.h" #include "tty.h" @@@@ -187,6 +191,20 @@@@ run=namprt(argv[0]); #endif +#if defined(__FreeBSD__) || defined(__NetBSD__) + setlocale(LC_ALL, ""); + for(c=0;c<256;c++) + { int a=0; + if(iscntrl(c)) + a|=UNDERLINE; + if((c&0x80)&&!isprint(c)) + a|=INVERSE; + xlata[c]=a; + if(isprint(c)) + xlatc[c]=c; + } +#endif + if(s=getenv("LINES")) sscanf(s,"%d",&lines); if(s=getenv("COLUMNS")) sscanf(s,"%d",&columns); if(s=getenv("BAUD")) sscanf(s,"%u",&Baud); @@@@ -233,20 +251,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"); @ 1.3 log @Standardize patches (no functional change) @ text @d16 1 a16 2 @@@@ -186,6 +190,20 @@@@ #else d19 1 a19 1 + d33 1 a33 1 d36 22 @ 1.2 log @RCS tag added @ text @d2 4 a5 9 --- ../../work/joe/b.c Fri Jan 20 09:38:25 1995 +++ b.c Thu Nov 25 18:17:59 1999 @@@@ -1928,7 +1928,7 @@@@ if(s[0]=='!') pclose(f); else #endif - if(zcmp(s,"-")) fclose(f); + if(zcmp(s,"-")) { if (fclose(f)) return error = -5; } else fflush(f); d7 27 a33 10 opnerr:; --- ../../work/joe/ufile.c Fri Jan 13 18:13:16 1995 +++ ufile.c Thu Nov 25 17:25:47 1999 @@@@ -135,7 +135,7 @@@@ int cp(from,to) char *from, *to; { - int f, g, amnt; + int f, g, amnt, rc; struct stat sbuf; d35 2 a36 12 #ifdef HAVEUTIME @@@@ -157,8 +157,8 @@@@ } while((amnt=read(f,stdbuf,stdsiz))>0) if(amnt!=write(g,stdbuf,amnt)) break; - close(f); close(g); - if(amnt) return -1; + close(f); rc = close(g); + if(amnt || rc) return -1; #ifdef HAVEUTIME #ifdef NeXT @ 1.1 log @Check return code of close()/fclose() in a few places. Without this, joe doesn't notice that you exceeded your filesystem quota, and happily creates a zero length file (throwing away all your changes). @ text @d1 1 @