- update to joe 3.5;
- cleanup from naddy@; ok naddy@, simon@, kili@, jasper@
This commit is contained in:
martynas
parent
de8493bfca
commit
dc488b85af
@ -1,13 +1,15 @@
|
||||
# $RuOBSD: Makefile,v 1.3 2002/04/10 05:14:52 form Exp $
|
||||
# $OpenBSD: Makefile,v 1.33 2006/12/07 20:07:43 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.34 2007/03/17 22:13:08 martynas Exp $
|
||||
|
||||
COMMENT= "joe's own editor"
|
||||
COMMENT= "Joe's Own Editor"
|
||||
|
||||
DISTNAME= joe-3.3
|
||||
PKGNAME= ${DISTNAME}p0
|
||||
DISTNAME= joe-3.5
|
||||
CATEGORIES= editors
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=joe-editor/}
|
||||
|
||||
HOMEPAGE= http://joe-editor.sourceforge.net/
|
||||
|
||||
# GPL
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
@ -15,6 +17,9 @@ PERMIT_DISTFILES_FTP= Yes
|
||||
WANTLIB= c ncurses m util
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
SEPARATE_BUILD= simple
|
||||
|
||||
FAKE_FLAGS= DESTDIR=${WRKINST} \
|
||||
sysconf_joedir=${PREFIX}/share/examples/joe \
|
||||
sysconf_docdir=${PREFIX}/share/doc/joe
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
MD5 (joe-3.3.tar.gz) = 02221716679c039c5da00c275d61dbf4
|
||||
RMD160 (joe-3.3.tar.gz) = f85ff66c0e00cbb85c0063601f3b41459bf2b336
|
||||
SHA1 (joe-3.3.tar.gz) = f961fe68fa7c11a8d2334b15028661fb46a2d773
|
||||
SIZE (joe-3.3.tar.gz) = 478218
|
||||
MD5 (joe-3.5.tar.gz) = 9bdffecce7ef910feaa06452d48843de
|
||||
RMD160 (joe-3.5.tar.gz) = c58d2bdd4882bf698722d5a8e840f3d7a0221fc6
|
||||
SHA1 (joe-3.5.tar.gz) = aeee6bb71ed1e9b9c9a2a64d8e078a06245957e5
|
||||
SHA256 (joe-3.5.tar.gz) = a295f1c5e0cb0f0ae0446c419a248517cb04ae1881f982964a7a7595cde9f2e6
|
||||
SIZE (joe-3.5.tar.gz) = 613815
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.2 2005/05/24 20:27:49 naddy Exp $
|
||||
--- Makefile.in.orig Wed May 18 05:21:29 2005
|
||||
+++ Makefile.in Sat May 21 22:04:12 2005
|
||||
@@ -257,7 +257,7 @@ EXTRA_DIST = COPYING LIST HACKING Change
|
||||
syntax/awk.jsf.in syntax/cobol.jsf.in syntax/sed.jsf.in syntax/ps.jsf.in \
|
||||
cygbuild setup.hint xterm-patch xterm-readme syntax/ada.jsf.in
|
||||
|
||||
-sysconf_joedir = $(sysconfdir)/joe
|
||||
+sysconf_joedir = $(prefix)/share/examples/joe
|
||||
sysconf_joe_DATA = joerc jmacsrc jstarrc rjoerc jpicorc
|
||||
MOSTLYCLEANFILES = joerc jmacsrc jstarrc rjoerc jpicorc joe.1
|
||||
sysconf_syntaxdir = $(sysconf_joedir)/syntax
|
||||
@@ -272,7 +272,7 @@ sysconf_syntax_DATA = syntax/c.jsf synta
|
||||
|
||||
sysconf_charmapsdir = $(sysconf_joedir)/charmaps
|
||||
sysconf_charmaps_DATA = charmaps/klingon
|
||||
-sysconf_docdir = $(sysconf_joedir)/doc
|
||||
+sysconf_docdir = $(prefix)/share/doc/joe
|
||||
sysconf_doc_DATA = LIST README HINTS ChangeLog HACKING NEWS
|
||||
man_MANS = joe.1
|
||||
noinst_HEADERS = b.h blocks.h bw.h cmd.h config.h hash.h help.h kbd.h \
|
||||
@@ -281,7 +281,7 @@ noinst_HEADERS = b.h blocks.h bw.h cmd.h
|
||||
ufile.h uformat.h uisrch.h umath.h undo.h usearch.h ushell.h utag.h \
|
||||
utils.h va.h vfile.h vs.h w.h utf8.h syntax.h i18n.h charmap.h mouse.h
|
||||
|
||||
-INCLUDES = -DJOERC="\"$(DESTDIR)$(sysconf_joedir)/\""
|
||||
+INCLUDES = -DJOERC="\"$(sysconfdir)/joe/\""
|
||||
joe_LDADD = -lm
|
||||
joe_SOURCES = b.c blocks.c bw.c cmd.c hash.c help.c kbd.c macro.c main.c menu.c \
|
||||
path.c poshist.c pw.c queue.c qw.c rc.c regex.c scrn.c tab.c termcap.c \
|
||||
@ -1,42 +0,0 @@
|
||||
$OpenBSD: patch-b_c,v 1.2 2005/05/24 20:27:49 naddy Exp $
|
||||
--- b.c.orig Sat May 21 21:49:04 2005
|
||||
+++ b.c Sat May 21 21:52:29 2005
|
||||
@@ -196,6 +196,7 @@ static B *bmkchn(H *chn, B *prop, long a
|
||||
else
|
||||
b->o = pdefault;
|
||||
mset(b->marks, 0, sizeof(b->marks));
|
||||
+ b->filehandle = -1;
|
||||
b->rdonly = 0;
|
||||
b->orphan = 0;
|
||||
b->oldcur = NULL;
|
||||
@@ -255,6 +256,8 @@ extern B *errbuf;
|
||||
void brm(B *b)
|
||||
{
|
||||
if (b && !--b->count) {
|
||||
+ if (b->filehandle != -1)
|
||||
+ close (b->filehandle);
|
||||
if (b->changed)
|
||||
abrerr(b->name);
|
||||
if (b->locked && !b->ignored_lock && plain_file(b))
|
||||
@@ -2119,7 +2122,7 @@ B *bload(unsigned char *s)
|
||||
B *b;
|
||||
long skip, amnt;
|
||||
unsigned char *n;
|
||||
- int nowrite = 0;
|
||||
+ int nowrite = 0, fh = -1;
|
||||
P *p;
|
||||
int x;
|
||||
long mod_time = 0;
|
||||
@@ -2172,6 +2175,12 @@ B *bload(unsigned char *s)
|
||||
setopt(b,n);
|
||||
b->rdonly = b->o.readonly;
|
||||
goto opnerr;
|
||||
+ }
|
||||
+
|
||||
+ /* Lock the file &&& ob,petef */
|
||||
+ if (fi && !nowrite) {
|
||||
+ fh = dup(fileno(fi));
|
||||
+ nowrite = (flock (fh, LOCK_EX | LOCK_NB));
|
||||
}
|
||||
|
||||
/* Skip data if we need to */
|
||||
@ -1,40 +0,0 @@
|
||||
$OpenBSD: patch-joerc_in,v 1.2 2005/05/24 20:27:49 naddy Exp $
|
||||
--- joerc.in.orig Tue May 3 20:32:39 2005
|
||||
+++ joerc.in Mon May 23 16:53:48 2005
|
||||
@@ -318,10 +318,11 @@
|
||||
|
||||
No '.' in file name? Assume it's a text file and we want wordwrap on.
|
||||
*
|
||||
--wordwrap
|
||||
+-asis
|
||||
|
||||
File name with '.'? It's probably not a text file.
|
||||
*.*
|
||||
+-asis
|
||||
|
||||
Diff
|
||||
*
|
||||
@@ -1320,9 +1321,11 @@ blksave ^K w
|
||||
bof ^K U Goto beginning of file
|
||||
bof ^K ^U
|
||||
bof ^K u
|
||||
- bol .kh Goto beginning of line
|
||||
- bol ^A
|
||||
- bol ^# SP A
|
||||
+bol .kh Goto beginning of line
|
||||
+bol ^A
|
||||
+bol ^# SP A
|
||||
+bol ^[ [ H
|
||||
+bol ^[ [ 7 ~
|
||||
home .kh
|
||||
home ^A
|
||||
center ^K A Center line
|
||||
@@ -1349,6 +1352,8 @@ eof ^K v
|
||||
eol .kH Go to end of line
|
||||
eol .@7
|
||||
eol ^E
|
||||
+eol ^[ [ F
|
||||
+eol ^[ [ 8 ~
|
||||
exsave ^K X Save and exit
|
||||
exsave ^K ^X
|
||||
exsave ^K x
|
||||
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-menu_c,v 1.1 2005/05/24 20:27:49 naddy Exp $
|
||||
--- menu.c.orig Mon Apr 25 16:11:23 2005
|
||||
+++ menu.c Mon May 23 16:40:59 2005
|
||||
@@ -147,6 +147,7 @@ static void menuresz(MENU *m, int wi, in
|
||||
|
||||
int umbol(MENU *m)
|
||||
{
|
||||
+ fprintf(stderr,"fffFmI\n");
|
||||
m->cursor -= m->cursor % m->perline;
|
||||
return 0;
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-types_h,v 1.2 2005/05/24 20:27:49 naddy Exp $
|
||||
--- types.h.orig Sat May 21 21:47:40 2005
|
||||
+++ types.h Sat May 21 21:47:52 2005
|
||||
@@ -208,6 +208,7 @@ struct buffer {
|
||||
int er; /* Error code when file was loaded */
|
||||
pid_t pid; /* Process id */
|
||||
int out; /* fd to write to process */
|
||||
+ int filehandle; /* fd to lock file */
|
||||
};
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.12 2005/05/24 20:27:49 naddy Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.13 2007/03/17 22:13:08 martynas Exp $
|
||||
bin/jmacs
|
||||
bin/joe
|
||||
bin/jpico
|
||||
@ -6,6 +6,9 @@ bin/jstar
|
||||
bin/rjoe
|
||||
bin/termidx
|
||||
@man man/man1/joe.1
|
||||
man/ru/
|
||||
man/ru/man1/
|
||||
@man man/ru/man1/joe.1
|
||||
share/doc/joe/
|
||||
share/doc/joe/ChangeLog
|
||||
share/doc/joe/HACKING
|
||||
@ -19,6 +22,10 @@ share/examples/joe/charmaps/
|
||||
@sample ${SYSCONFDIR}/joe/charmaps/
|
||||
share/examples/joe/charmaps/klingon
|
||||
@sample ${SYSCONFDIR}/joe/charmaps/klingon
|
||||
share/examples/joe/ftyperc
|
||||
@sample ${SYSCONFDIR}/joe/ftyperc
|
||||
share/examples/joe/jicerc.ru
|
||||
@sample ${SYSCONFDIR}/joe/jicerc.ru
|
||||
share/examples/joe/jmacsrc
|
||||
@sample ${SYSCONFDIR}/joe/jmacsrc
|
||||
share/examples/joe/joerc
|
||||
@ -27,6 +34,14 @@ share/examples/joe/jpicorc
|
||||
@sample ${SYSCONFDIR}/joe/jpicorc
|
||||
share/examples/joe/jstarrc
|
||||
@sample ${SYSCONFDIR}/joe/jstarrc
|
||||
share/examples/joe/lang/
|
||||
@sample ${SYSCONFDIR}/joe/lang/
|
||||
share/examples/joe/lang/de.po
|
||||
@sample ${SYSCONFDIR}/joe/lang/de.po
|
||||
share/examples/joe/lang/fr.po
|
||||
@sample ${SYSCONFDIR}/joe/lang/fr.po
|
||||
share/examples/joe/lang/ru.po
|
||||
@sample ${SYSCONFDIR}/joe/lang/ru.po
|
||||
share/examples/joe/rjoerc
|
||||
@sample ${SYSCONFDIR}/joe/rjoerc
|
||||
share/examples/joe/syntax/
|
||||
@ -53,12 +68,20 @@ share/examples/joe/syntax/diff.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/diff.jsf
|
||||
share/examples/joe/syntax/fortran.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/fortran.jsf
|
||||
share/examples/joe/syntax/haskell.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/haskell.jsf
|
||||
share/examples/joe/syntax/html.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/html.jsf
|
||||
share/examples/joe/syntax/java.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/java.jsf
|
||||
share/examples/joe/syntax/joerc.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/joerc.jsf
|
||||
share/examples/joe/syntax/lisp.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/lisp.jsf
|
||||
share/examples/joe/syntax/lua.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/lua.jsf
|
||||
share/examples/joe/syntax/m4.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/m4.jsf
|
||||
share/examples/joe/syntax/mail.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/mail.jsf
|
||||
share/examples/joe/syntax/mason.jsf
|
||||
@ -75,10 +98,16 @@ share/examples/joe/syntax/ps.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/ps.jsf
|
||||
share/examples/joe/syntax/python.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/python.jsf
|
||||
share/examples/joe/syntax/rexx.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/rexx.jsf
|
||||
share/examples/joe/syntax/ruby.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/ruby.jsf
|
||||
share/examples/joe/syntax/sed.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/sed.jsf
|
||||
share/examples/joe/syntax/sh.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/sh.jsf
|
||||
share/examples/joe/syntax/skill.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/skill.jsf
|
||||
share/examples/joe/syntax/sml.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/sml.jsf
|
||||
share/examples/joe/syntax/sql.jsf
|
||||
@ -87,6 +116,8 @@ share/examples/joe/syntax/tcl.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/tcl.jsf
|
||||
share/examples/joe/syntax/tex.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/tex.jsf
|
||||
share/examples/joe/syntax/troff.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/troff.jsf
|
||||
share/examples/joe/syntax/verilog.jsf
|
||||
@sample ${SYSCONFDIR}/joe/syntax/verilog.jsf
|
||||
share/examples/joe/syntax/vhdl.jsf
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user