pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/editors/joe Changes 3.1:
details: https://anonhg.NetBSD.org/pkgsrc/rev/0a336d813fdd
branches: trunk
changeset: 476088:0a336d813fdd
user: adam <adam%pkgsrc.org@localhost>
date: Thu Jun 03 08:52:23 2004 +0000
description:
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 <tab> <tab> 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 <XXXX> 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.
diffstat:
editors/joe/Makefile | 26 +++------
editors/joe/PLIST | 43 +++++++++++++---
editors/joe/distinfo | 15 +----
editors/joe/patches/patch-aa | 83 -------------------------------
editors/joe/patches/patch-ab | 112 -------------------------------------------
editors/joe/patches/patch-ac | 12 ----
editors/joe/patches/patch-ad | 57 ---------------------
editors/joe/patches/patch-ae | 17 ------
editors/joe/patches/patch-af | 16 ------
editors/joe/patches/patch-ag | 24 ---------
editors/joe/patches/patch-ah | 16 ------
editors/joe/patches/patch-ai | 12 ----
12 files changed, 46 insertions(+), 387 deletions(-)
diffs (truncated from 493 to 300 lines):
diff -r ef3e87dba700 -r 0a336d813fdd editors/joe/Makefile
--- a/editors/joe/Makefile Wed Jun 02 23:20:55 2004 +0000
+++ b/editors/joe/Makefile Thu Jun 03 08:52:23 2004 +0000
@@ -1,25 +1,17 @@
-# $NetBSD: Makefile,v 1.18 2004/06/02 20:22:54 reed Exp $
-#
+# $NetBSD: Makefile,v 1.19 2004/06/03 08:52:23 adam Exp $
-DISTNAME= joe2.8
-PKGNAME= joe-2.8
-PKGREVISION= 2
+DISTNAME= joe-3.1
CATEGORIES= editors
-MASTER_SITES= ftp://ftp.std.com/src/editors/
-EXTRACT_SUFX= .tar.Z
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=joe-editor/}
MAINTAINER= tech-pkg%NetBSD.org@localhost
+HOMEPAGE= http://joe-editor.sourceforge.net/
COMMENT= Joe's own editor
-WRKSRC= ${WRKDIR}/joe
-ALL_TARGET= joe
-
-CFLAGS+= -DTERMINFO
+USE_BUILDLINK3= yes
+USE_PKGINSTALL= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --sysconfdir="${PREFIX}/share/examples"
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Interix"
-CPPFLAGS+= -Dsetpgrp=setpgid
-.endif
-
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r ef3e87dba700 -r 0a336d813fdd editors/joe/PLIST
--- a/editors/joe/PLIST Wed Jun 02 23:20:55 2004 +0000
+++ b/editors/joe/PLIST Thu Jun 03 08:52:23 2004 +0000
@@ -1,12 +1,37 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:22:55 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/06/03 08:52:23 adam Exp $
+bin/jmacs
bin/joe
-bin/jmacs
+bin/jpico
bin/jstar
bin/rjoe
-bin/jpico
-lib/joerc
-lib/jmacsrc
-lib/jstarrc
-lib/rjoerc
-lib/jpicorc
-man/man1/joe.1.gz
+bin/termidx
+man/man1/joe.1
+share/examples/joe/charmaps/klingon
+share/examples/joe/jmacsrc
+share/examples/joe/joerc
+share/examples/joe/jpicorc
+share/examples/joe/jstarrc
+share/examples/joe/rjoerc
+share/examples/joe/syntax/asm.jsf
+share/examples/joe/syntax/c.jsf
+share/examples/joe/syntax/conf.jsf
+share/examples/joe/syntax/csh.jsf
+share/examples/joe/syntax/diff.jsf
+share/examples/joe/syntax/fortran.jsf
+share/examples/joe/syntax/html.jsf
+share/examples/joe/syntax/java.jsf
+share/examples/joe/syntax/lisp.jsf
+share/examples/joe/syntax/mail.jsf
+share/examples/joe/syntax/mason.jsf
+share/examples/joe/syntax/pascal.jsf
+share/examples/joe/syntax/perl.jsf
+share/examples/joe/syntax/php.jsf
+share/examples/joe/syntax/python.jsf
+share/examples/joe/syntax/sh.jsf
+share/examples/joe/syntax/tcl.jsf
+share/examples/joe/syntax/verilog.jsf
+share/examples/joe/syntax/vhdl.jsf
+share/examples/joe/syntax/xml.jsf
+@dirrm share/examples/joe/syntax
+@dirrm share/examples/joe/charmaps
+@dirrm share/examples/joe
diff -r ef3e87dba700 -r 0a336d813fdd editors/joe/distinfo
--- a/editors/joe/distinfo Wed Jun 02 23:20:55 2004 +0000
+++ b/editors/joe/distinfo Thu Jun 03 08:52:23 2004 +0000
@@ -1,13 +1,4 @@
-$NetBSD: distinfo,v 1.6 2003/06/10 05:08:47 jmc Exp $
+$NetBSD: distinfo,v 1.7 2004/06/03 08:52:23 adam Exp $
-SHA1 (joe2.8.tar.Z) = b2846ac8469fbdbfc7428cc0baf3f874d564959c
-Size (joe2.8.tar.Z) = 322108 bytes
-SHA1 (patch-aa) = 074c82a60e917a1b87dce7a53a62e6a9d1bf37e1
-SHA1 (patch-ab) = 0070f64c6d8c0ac26d6dce2032618265f7629931
-SHA1 (patch-ac) = c1ec2cea32a459b97362e429f35ff43a6b36cd48
-SHA1 (patch-ad) = 6269254fad1f54ecc9f6af4c0b32df53588f5564
-SHA1 (patch-ae) = d50e73849a2416d7300f9e410e40aa9bcf2e39c1
-SHA1 (patch-af) = ed937b1d648f629fbc23d33994fff8e16b3d4ee4
-SHA1 (patch-ag) = 675d5de283a8d38342e417839a1ee9dc43848f60
-SHA1 (patch-ah) = 30f8ac2d487bc42960e8b5c677b67c0da21ae1c5
-SHA1 (patch-ai) = 1aeb485fc1a1c2347f8c3db288adcbd7f468b426
+SHA1 (joe-3.1.tar.gz) = 52b8ce32e94b2269c7723a80892f8adf6b653017
+Size (joe-3.1.tar.gz) = 381201 bytes
diff -r ef3e87dba700 -r 0a336d813fdd editors/joe/patches/patch-aa
--- a/editors/joe/patches/patch-aa Wed Jun 02 23:20:55 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2003/06/08 15:20:41 abs Exp $
-
---- Makefile.orig Mon Jan 23 06:01:28 1995
-+++ Makefile
-@@ -9,9 +9,9 @@
- # to go and where you want the man page
- # to go:
-
--WHEREJOE = /usr/local/bin
--WHERERC = /usr/local/lib
--WHEREMAN = /usr/man/man1
-+WHEREJOE = ${PREFIX}/bin
-+WHERERC = ${PREFIX}/lib
-+WHEREMAN = ${PREFIX}/man/man1
-
- # If you want to use TERMINFO, you have to set
- # the following variable to 1. Also you have to
-@@ -27,11 +27,11 @@ TERMINFO = 0
-
- # C compiler options: make's built-in rules use this variable
-
--CFLAGS = -O
-+# CFLAGS = -O
-
- # C compiler to use: make's built-in rules use this variable
-
--CC = cc
-+CC ?= cc
-
- # You may have to include some extra libraries
- # for some systems
-@@ -45,7 +45,7 @@ CC = cc
- # add '-ltinfo', '-lcurses' or '-ltermlib',
- # depending on the system.
-
--EXTRALIBS =
-+EXTRALIBS = -ltermcap
-
- # Object files
-
-@@ -84,17 +84,17 @@ termidx: termidx.o
-
- # Install proceedure
-
--install: joe termidx
-+install: joe # termidx
- strip joe
-- strip termidx
-+# strip termidx
- if [ ! -d $(WHEREJOE) ]; then mkdir $(WHEREJOE); chmod a+rx $(WHEREJOE); fi
-- rm -f $(WHEREJOE)/joe $(WHEREJOE)/jmacs $(WHEREJOE)/jstar $(WHEREJOE)/jpico $(WHEREJOE)/rjoe $(WHEREJOE)/termidx
-+ rm -f $(WHEREJOE)/joe $(WHEREJOE)/jmacs $(WHEREJOE)/jstar $(WHEREJOE)/jpico $(WHEREJOE)/rjoe # $(WHEREJOE)/termidx
- mv joe $(WHEREJOE)
- ln $(WHEREJOE)/joe $(WHEREJOE)/jmacs
- ln $(WHEREJOE)/joe $(WHEREJOE)/jstar
- ln $(WHEREJOE)/joe $(WHEREJOE)/rjoe
- ln $(WHEREJOE)/joe $(WHEREJOE)/jpico
-- mv termidx $(WHEREJOE)
-+# mv termidx $(WHEREJOE)
- if [ ! -d $(WHERERC) ]; then mkdir $(WHERERC); chmod a+rx $(WHERERC); fi
- rm -f $(WHERERC)/joerc $(WHERERC)/jmacsrc $(WHERERC)/jstarrc $(WHERERC)/jpicorc $(WHERERC)/rjoerc $(WHEREMAN)/joe.1
- cp joerc $(WHERERC)
-@@ -114,13 +114,13 @@ install: joe termidx
- chmod a+r $(WHERERC)/rjoerc
- chmod a+r $(WHERERC)/jpicorc
- chmod a+r $(WHEREMAN)/joe.1
-- chmod a+x $(WHEREJOE)/termidx
-- rm -f $(WHERERC)/termcap
-- cp termcap $(WHERERC)/termcap
-- chmod a+r $(WHERERC)/termcap
-- rm -f $(WHERERC)/terminfo
-- cp terminfo $(WHERERC)/terminfo
-- chmod a+r $(WHERERC)/terminfo
-+# chmod a+x $(WHEREJOE)/termidx
-+# rm -f $(WHERERC)/termcap
-+# cp termcap $(WHERERC)/termcap
-+# chmod a+r $(WHERERC)/termcap
-+# rm -f $(WHERERC)/terminfo
-+# cp terminfo $(WHERERC)/terminfo
-+# chmod a+r $(WHERERC)/terminfo
-
- # Cleanup proceedure
-
diff -r ef3e87dba700 -r 0a336d813fdd editors/joe/patches/patch-ab
--- a/editors/joe/patches/patch-ab Wed Jun 02 23:20:55 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2003/04/27 17:45:31 cjep Exp $
-
---- b.c.orig 1995-01-20 08:38:25.000000000 +0000
-+++ b.c
-@@ -21,6 +21,9 @@ JOE; see the file COPYING. If not, writ
- #include <pwd.h>
- #endif
- #include <errno.h>
-+#include <sys/file.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-
- #include "config.h"
- #include "blocks.h"
-@@ -201,6 +204,7 @@ long amnt, nlines;
- if(prop) b->o=prop->o;
- else b->o=pdefault;
- mset(b->marks,0,sizeof(b->marks));
-+ b->filehandle = -1; /* initialize filehandle &&& ob */
- b->rdonly=0;
- b->orphan=0;
- b->oldcur=0;
-@@ -255,6 +259,10 @@ B *b;
- {
- if(b && !--b->count)
- {
-+ if (b->filehandle != -1) {
-+ /* close filehandle, free lock &&& ob */
-+ close (b->filehandle);
-+ }
- if(b->changed) abrerr(b->name);
- if(b==errbuf) errbuf=0;
- if(b->undo) undorm(b->undo);
-@@ -1671,7 +1679,8 @@ char *s;
- B *b;
- long skip,amnt;
- char *n;
-- int nowrite=0;
-+ struct stat sb;
-+ int nowrite=0,fh=-1;
-
- if(!s || !s[0])
- {
-@@ -1704,6 +1713,28 @@ char *s;
- else fclose(fi);
- fi=fopen(n,"r");
- if(!fi) nowrite=0;
-+/*printf ("nowrite open=%i\n", nowrite); */
-+
-+ /* check file mod, if no write flags set,
-+ joe in read only mode. &&& ob */
-+
-+ if (!nowrite) {
-+ nowrite = (!stat (n, &sb)) && (!(sb.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH)));
-+ }
-+/*printf ("nowrite stat=%i\n", nowrite); */
-+
-+ /* lock the file if writable, or go into read only mode if
-+ already locked, */
-+
-+ if ((fi) && (!nowrite)) {
-+ fh = dup( fileno(fi) );
-+ nowrite = (flock (fh, LOCK_EX | LOCK_NB));
-+ }
-+/*printf ("nowrite flock=%i\n", nowrite); */
-+
-+/*nowrite = 1; */ /* for test purpose */
-+/*printf ("nowrite=%i\n", nowrite); */
-+
- }
- joesep(n);
-
-@@ -1761,6 +1792,7 @@ char *s;
- vsrm(n);
-
- b->er=error;
-+ if( fh != -1 ) b->filehandle = fh;
- return b;
- }
-
-@@ -1928,7 +1960,7 @@ long size;
- if(s[0]=='!') pclose(f);
- else
- #endif
-- if(zcmp(s,"-")) fclose(f);
-+ if(zcmp(s,"-")) { if (fclose(f)) return error = -5; }
- else fflush(f);
-
- opnerr:;
-@@ -1988,9 +2020,20 @@ extern char *ctime();
-
- void ttsig(sig)
- {
-- long tim=time(0);
-+ time_t tim=time(0);
- B *b;
-- FILE *f=fopen("DEADJOE","a");
-+ FILE *f;
-+ struct stat sb;
-+ if ((lstat("DEADJOE", &sb) == 0) && (((sb.st_mode & S_IFLNK) && (sb.st_uid != getuid())) || (sb.st_nlink > 1)))
-+ {
Home |
Main Index |
Thread Index |
Old Index