Hello,
Here's an update of Jed to version 0.99.18.
I'm using it daily on i386 with no issue so far.
Best regards,
-Frank.
diff -urN jed.old/Makefile jed/Makefile
--- jed.old/Makefile Wed Aug 2 01:39:08 2006
+++ jed/Makefile Thu Jun 7 18:05:53 2007
@@ -2,12 +2,16 @@
COMMENT= "text editor"
-DISTNAME= jed-0.99-16
-PKGNAME= jed-0.99.16
+DISTNAME= jed-0.99-18
+PKGNAME= jed-0.99.18
CATEGORIES= editors
-MASTER_SITES= ftp://space.mit.edu/pub/davis/jed/v0.99/ \
- ftp://ftp.ntua.gr/pub/lang/slang/jed/v0.99/ \
+MASTER_SITES= ftp://space.mit.edu/pub/davis/jed/v0.99/ \
+ http://download.gna.org/jed/v0.99/ \
ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/jed/v0.99/
+ ftp://ftp.fu-berlin.de/pub/unix/editors/jed/v0.99/ \
+ ftp://ftp.ntua.gr/pub/lang/slang/jed/v0.99/ \
+ ftp://ftp.uow.edu.au/pub/jedsoft/jed/v0.99/ \
+ ftp://ftp.gigabell.net/pub/Jed/v0.99/
HOMEPAGE= http://space.mit.edu/~davis/jed/
@@ -29,10 +33,10 @@
FLAVOR?=
.if ${FLAVOR:L} == "no_x11"
-ALL_TARGET= all getmail
+ALL_TARGET= all rgrep getmail
.else
USE_X11= Yes
-ALL_TARGET= all getmail xjed
+ALL_TARGET= all rgrep getmail xjed
WANTLIB+= X11 Xext Xft Xrender freetype
.endif
diff -urN jed.old/distinfo jed/distinfo
--- jed.old/distinfo Thu Apr 5 17:38:07 2007
+++ jed/distinfo Thu Jun 7 14:58:50 2007
@@ -1,5 +1,5 @@
-MD5 (jed-0.99-16.tar.gz) = 5Q6V2NYmRFy3ePre46KkfQ==
-RMD160 (jed-0.99-16.tar.gz) = ZkplhCpRKFwSdMOGoqRZmgJAEjY=
-SHA1 (jed-0.99-16.tar.gz) = VUdUroasffO8SwwP0pddT6eYhmc=
-SHA256 (jed-0.99-16.tar.gz) = vCO5cktVd7uvdrJ5azkxIj2RbBv7PsTqjcfMZfZ/OYI=
-SIZE (jed-0.99-16.tar.gz) = 845360
+MD5 (jed-0.99-18.tar.gz) = LTcQRgSMx70Whu5wwArUlQ==
+RMD160 (jed-0.99-18.tar.gz) = 2FMEJL9C7kHz37g85BUe6h39dE8=
+SHA1 (jed-0.99-18.tar.gz) = l0e7y8+nUmBprwo921C52TAUDFs=
+SHA256 (jed-0.99-18.tar.gz) = 2qzG9coJRHFgLchlD3bRAAMJiFTxaUn+37oAOqP1PDs=
+SIZE (jed-0.99-18.tar.gz) = 971456
diff -urN jed.old/patches/patch-configure jed/patches/patch-configure
--- jed.old/patches/patch-configure Tue Apr 19 11:41:42 2005
+++ jed/patches/patch-configure Thu Jun 7 15:26:49 2007
@@ -1,11 +1,11 @@
$OpenBSD: patch-configure,v 1.1 2005/04/19 09:41:42 espie Exp $
---- configure.orig Tue Apr 19 11:06:54 2005
-+++ configure Tue Apr 19 11:07:22 2005
-@@ -2632,6 +2632,7 @@ test "x$exec" = "xNONE" && exec="$ac_def
- test "x$exec_prefix" = "xNONE" && exec_prefix="$prefix"
- JD_Search_Dirs="$JD_Search_Dirs \
- $includedir,$libdir \
-+ $DEPBASE/include,$DEPBASE/lib \
- /usr/local/include,/usr/local/lib \
- /usr/include,/usr/lib \
- /usr/include/slang,/usr/lib \
+--- configure.orig Mon Feb 13 18:51:58 2006
++++ configure Thu Jun 7 15:05:15 2007
+@@ -6254,6 +6254,7 @@ echo "$as_me: error: --with-slanginc requres a value"
+ then
+ lib_include_dirs="\
+ $jd_prefix_incdir \
++ $DEPBASE/include,$DEPBASE/lib \
+ /usr/local/slang/include \
+ /usr/local/include/slang \
+ /usr/local/include \
diff -urN jed.old/patches/patch-lib_isearch_sl jed/patches/patch-lib_isearch_sl
--- jed.old/patches/patch-lib_isearch_sl Thu Jan 1 01:00:00 1970
+++ jed/patches/patch-lib_isearch_sl Thu Jun 7 17:45:04 2007
@@ -0,0 +1,520 @@
+$OpenBSD$
+--- lib/isearch.sl.orig Fri Feb 24 09:43:33 2006
++++ lib/isearch.sl Thu Jun 7 17:42:58 2007
+@@ -1,338 +1,243 @@
+ % Here is a new version of isearch.sl reworked by John Burnell <[EMAIL
PROTECTED]>.
+ % This one is said to be more emacs-like.
+-%
+-% %% with modifications and comments by Guenter Milde (G.Milde web.de)
+-%
+-%% Further modifications by Lloyd Zusman <[EMAIL PROTECTED]>
+-%% as well as JED to get rid of marks which were riding on the stack.
+-
+ %% isearch.sl
+ %% Routines here perform incremental forward/backward searches
++%%
++%% ESCAPE key aborts the search
++%% ENTER key finds next match
++%% DELETE key deletes last character entered and returns to previous point
+ %%
+-%% Default bindings:
+-%%
+-%% ESCAPE quits the search
+-%% ^G aborts the search (returns to starting point)
+-%% ESCAPE or ENTER as first char: switch to non incremental search
+-%% with the last isearch match as default
+-%% BACKSPACE deletes last character entered and returns to previous point
+-%% ^S finds next match (and switches to forward search)
+-%% ^R finds previous match (and switches to backward search)
+-%%
+-%% You may use the following variables to change this behaviour,
+-%% either here or (better!) in your keybinding defining file (e.g. ".jedrc")
+-%%
++%% "isearch_forward" "^FIf" setkey %(sample bindings)
++%% "isearch_backward" "^FIb" setkey
++
++variable Isearch_Last_Search = Null_String;
++
+ %% This code fragment checks to see what the isearch keys are bound to
++variable Isearch_Forward_Char = 19; %^S
++variable Isearch_Backward_Char = 18; %^R
+
+-private define get_bound_key (search_func, default)
++static define get_bound_key (search_func, default)
+ {
+- foreach (["", which_key (search_func), pop()])
++ variable n, key;
++ if (n = which_key (search_func), n)
+ {
+- variable key = ();
+- if (strlen (key) == 2)
++ key = (); n--;
++ if (strlen (key) == 2)
+ {
+- if (key [0] == '^')
++ if (key [0] == '^')
+ return (key [1] - '@');
+ }
+ }
+ return default;
+ }
+
+-custom_variable ("Isearch_Forward_Char",
+- get_bound_key ("isearch_forward", 19));
+-custom_variable ("Isearch_Backward_Char",
+- get_bound_key ("isearch_backward", 18));
+-custom_variable ("Isearch_Quit_Char", '\e' );
+-custom_variable ("Isearch_Abort_Char", 7 ); % ^G
++Isearch_Forward_Char = get_bound_key ("isearch_forward", 19);
++Isearch_Backward_Char = get_bound_key ("isearch_backward", 18);
+
+-%% Cause isearch_{forward,backward} to behave in the traditional
+-%% manner by default. Otherwise, wrap around to the start/end
+-%% of the buffer and keep going after a forward/reverse search
+-%% fails.
+-custom_variable("SEARCH_WRAP", 0);
+-
+-variable Isearch_Last_Search = "";
+-
+-private variable Last_Search_Failed = 0;
+-
+-private define isearch_simple_search (dir)
++static define isearch_simple_search (dir)
+ {
+- Last_Search_Failed = 0;
+-
++#iffalse
++ variable fun, prompt;
++
++ prompt = "Search:";
++ fun = &fsearch;
++
+ if (dir < 0)
++ {
++ prompt = "Search Backwards:";
++ fun = &bsearch;
++ }
++
++ Isearch_Last_Search = read_mini (prompt, Isearch_Last_Search, Null_String);
++
++ !if (@fun (Isearch_Last_Search))
++ error ("Not Found.");
++#else
++ if (dir < 0)
+ search_backward ();
+ else
+ search_forward ();
+ Isearch_Last_Search = LAST_SEARCH;
++#endif
+ }
+
+-private define perform_search (str, dir)
++static define perform_search (str, dir)
+ {
+ variable cs = CASE_SEARCH;
+ if (strlow (str) != str)
+ CASE_SEARCH = 1;
+-
+- if (dir > 0)
++
++ if (dir == 1)
+ dir = fsearch (str);
+ else
+ dir = bsearch (str);
+-
+- CASE_SEARCH = cs;
++
++ cs = CASE_SEARCH;
+ return dir;
+ }
+
+-private variable Position_Stack;
+-private define push_position (attached_to_char)
+-{
+- variable s = struct
+- {
+- mark, attached_to_char, next
+- };
+- s.mark = create_user_mark ();
+- s.attached_to_char = attached_to_char;
+- s.next = Position_Stack;
+- Position_Stack = s;
+-}
+
+-private define delete_position_stack ()
++static define isearch_del (str)
+ {
+- Position_Stack = NULL;
++ variable n = strlen (str);
++ if (n) str = substr (str, 1, n - 1);
++ str;
+ }
+
+-private define isearch_del (str)
+-{
+- variable attached_to_char = 1;
+
+- if (Position_Stack != NULL)
+- {
+- variable s = Position_Stack;
+- Position_Stack = s.next;
+- attached_to_char = s.attached_to_char;
+- goto_user_mark (s.mark);
+- }
+-
+- if (attached_to_char)
+- {
+- variable n = strlen (str);
+- if (n)
+- str = substr (str, 1, n-1);
+- }
+-
+- return str;
+-}
+-
+-
+ define isearch_dir (dir)
+ {
+- variable prompt, str = "";
+- variable c, first = 1;
++ variable prompt, str = Null_String;
++ variable c, m, first = 1;
+ variable len = 0;
+-
+- delete_position_stack ();
+- variable start_mark = create_user_mark ();
+-
+- EXIT_BLOCK
+- {
+- delete_position_stack ();
+- Last_Search_Failed = 0;
+- }
+- ERROR_BLOCK
+- {
+- delete_position_stack ();
+- Last_Search_Failed = 0;
+- }
+-
+- forever
+- {
+- variable prompt_prefix;
+- variable prompt_suffix;
+- variable h = is_line_hidden ();
+- set_line_hidden (0);
+-
+- if (Last_Search_Failed)
+- {
+- prompt_prefix = "Failed: i";
+- if (strlen(str) > 0)
+- prompt_suffix = ": ";
+- else
+- prompt_suffix = "";
++
++ % This is tricky. I am leaving a 1 or a 0 on the stack which indicates
++ % whether or not a character is attached to a mark. The number of ones
++ % and zeros on the stack should match the value of m.
++ % These 0s and 1s are used when unwinding the search stack
++ % Since a mark was pushed and not attached to a character, push 0
++
++ push_mark ();
++ 0;
++ m = 1;
++ ERROR_BLOCK { loop (m) { pop (); pop_mark (0);}} %make sure we pop marks
++
++ forever {
++ if (dir == 1)
++ prompt = "Isearch forward: ";
++ else
++ prompt = "Isearch Backward: ";
++ message (prompt + str);
++ push_spot ();
++ if ((dir > 0) and looking_at (str))
++ {
++ go_right (strlen (str));
++ }
++ update_sans_update_hook (0);
++ pop_spot ();
++
++ c = getkey();
++ switch (c)
++ { case 27 and first : isearch_simple_search (dir); break;}
++ { case Isearch_Forward_Char : % ^S
++ push_mark (); ++m; 0; % mark not attached to char!
++ if (dir < 0) {
++ dir = 1;
++ } else {
++ go_right_1 ();
++ !if (strlen (str))
++ {
++ str = Isearch_Last_Search;
++ len = strlen (str);
++ }
++ }
++ }
++ { case Isearch_Backward_Char : %^R
++ push_mark (); 0; ++m; % mark not attached to char!
++ if (dir > 0) {
++ dir = -1;
++ c = ' '; % use this to fool test (*) below
++ } else {
++ !if (strlen (str)) str = Isearch_Last_Search;
++ }
++ }
++ { case 127 :
++
++ if (m) {
++ if (()) {
++ if (strlen (str)) str = isearch_del (str); % delete char
++ }
++ --m; pop_mark (1); % top of stack already popped
+ }
+- else
+- {
+- prompt_prefix = "I";
+- prompt_suffix = ": ";
+- }
+- if (dir > 0)
+- prompt = prompt_prefix + "search forward" + prompt_suffix;
+- else
+- prompt = prompt_prefix + "search backward" + prompt_suffix;
+-
+- message (prompt + str);
+-
+- push_spot ();
+- if ((dir > 0) and looking_at (str))
+- go_right (strlen (str));
+- update_sans_update_hook (0);
+- pop_spot ();
+-
+- IGNORE_USER_ABORT++;
+-#ifeval _slang_version >= 20000
+- try
+- {
+-#endif
+- c = getkey();
+- }
+-#ifeval _slang_version >= 20000
+- finally
+-#endif
+- IGNORE_USER_ABORT--;
+-
+- set_line_hidden (h);
+- switch (c)
+- { case Isearch_Quit_Char and first :
+- isearch_simple_search (dir); break;
+- }
+- { case Isearch_Forward_Char : % ^S
+- push_position (0);
+- if (dir < 0)
+- {
+- % Clear 'failed' indicator if we've changed direction.
+- Last_Search_Failed = 0;
+- dir = 1;
+- }
+- else
+- {
+- go_right_1 ();
+- !if (strlen (str))
+- {
+- str = Isearch_Last_Search;
+- len = strlen (str);
+- }
+- }
+- }
+- { case Isearch_Backward_Char : %^R
+- push_position (0);
+- if (dir > 0)
+- {
+- % Clear 'failed' indicator if we've changed direction.
+- Last_Search_Failed = 0;
+- dir = -1;
+- c = ' '; % use this to fool test (*)
below
+- }
+- else
+- {
+- !if (strlen (str)) str = Isearch_Last_Search;
+- }
+- }
+- { case 127 :
+- % Clear 'failed' indicator.
+- Last_Search_Failed = 0;
+- str = isearch_del (str);
+- continue;
+- }
+- { case Isearch_Abort_Char : % ^G go back to start
+- goto_user_mark (start_mark);
+- beep ();
+- return;
+- }
+- {
+- case '\r' and first:
+- if (dir > 0) return search_forward ();
+- else return search_backward ();
+- }
+- {
+- case '\e':
+- if (input_pending (3))
+- ungetkey (c);
+- break;
+- }
+-#ifdef IBMPC_SYSTEM
+- {
+- case 0xE0:
++ continue;
++ }
++ { case 7 : % ^G go back to start
++ loop (m - 1) {pop (); pop_mark (0);} % pop marks
++ pop ();
++ pop_mark (1); % go to start of search
++ beep ();
++ return;
++ }
++ {
++ case '\r' and first:
++ loop (m)
++ {
++ pop ();
++ pop_mark (0);
++ }
++ m = 0;
++ if (dir > 0) return search_forward ();
++ else return search_backward ();
++ }
++ {
++ case '\e':
++ if (input_pending (3))
+ ungetkey (c);
+- break;
+- }
++ break;
++ }
++#ifdef IBMPC_SYSTEM
++ {
++ case 0xE0:
++ ungetkey (c);
++ break;
++ }
+ #endif
+- { c < 32 :
+- if (c != '\r') ungetkey (c);
+- break; % terminate search
+- }
++ { c < 32 :
++ if (c != '\r') ungetkey (c);
++ break; % terminate search
++ }
+
+- { str += char (c); % any other char
+- push_position (1);
+- % Clear 'failed' indicator.
+- Last_Search_Failed = 0;
+- }
++ { str += char (c); % any other char
++ 1; push_mark(); ++m; % push 1 and mark
++ }
+
+- first = 0;
++ first = 0;
+
+- if (Last_Search_Failed and (SEARCH_WRAP > 0))
+- {
+- % The _next_ C-s or C-r after a previous C-s or C-r that failed
+- % will now redo the search from either the beginning or end of
+- % the buffer, depending on whether we've been going forwards or
+- % backwards.
+- Last_Search_Failed = 0;
+- push_mark ();
+- if (dir > 0)
+- bob();
+- else
+- eob();
+- pop_mark (not (perform_search (str, dir)));
+- continue;
+- }
+-
+- % test (*), see ^R switch above
+- % NOTE: This test used to include a check to make sure that the
+- % position stack was not empty. Does it matter? --JED
+- if ((dir < 0) and looking_at (str) and (c >= ' '))
+- continue;
+-
+- if (perform_search (str, dir))
+- len = strlen (str);
+- else
+- {
+- variable msg;
+- if (c == Isearch_Forward_Char) go_left_1();
+- if (strlen(str) > 0)
+- msg = strcat (str, " not found.");
+- else
+- msg = "No search string.";
+- flush (msg);
+- % Only beep if we're not wrapping.
+- if (SEARCH_WRAP < 1)
+- beep ();
+- () = input_pending (10);
+- % str = isearch_del (str);
+- if (EXECUTING_MACRO)
+- error ("Not found.");
+- % This piece of state information needs to be set as late
+- % as possible after a failed search attempt.
+- Last_Search_Failed = 1;
+- }
+- }
+-
++% test (*), see ^R switch above
++ if ((dir < 0) and (m > 1) and looking_at (str) and (c >= ' '))
++ continue;
++
++ if (perform_search (str, dir))
++ len = strlen (str);
++ else
++ {
++ if (c == Isearch_Forward_Char) go_left_1();
++ flush (str + " not found.");
++ beep ();
++ () = input_pending (10);
++ if (() == 1) str = isearch_del (str);
++ --m; pop_mark (0); % top of stack already popped in test
++ if (EXECUTING_MACRO)
++ error ("not found.");
++ }
++ }
++
+ EXECUTE_ERROR_BLOCK;
+- if (strlen (str))
++ if (strlen (str))
+ Isearch_Last_Search = str;
+- if (dir > 0)
++ if (dir == 1)
+ go_right (strlen (str) - len);
+ message ("Done.");
++
++ %flush_input ();
+ }
+
++static variable save_abort;
++
+ define isearch_forward()
+ {
+- %variable save_abort = IGNORE_USER_ABORT;
+- %IGNORE_USER_ABORT = 1;
++ save_abort = IGNORE_USER_ABORT;
++ IGNORE_USER_ABORT = 1;
+ isearch_dir (1);
+- %IGNORE_USER_ABORT = save_abort;
++ IGNORE_USER_ABORT = save_abort;
+ }
+
+ define isearch_backward()
+ {
+- %variable save_abort = IGNORE_USER_ABORT;
+- %IGNORE_USER_ABORT = 1;
++ save_abort = IGNORE_USER_ABORT;
++ IGNORE_USER_ABORT = 1;
+ isearch_dir (-1);
+- %IGNORE_USER_ABORT = save_abort;
++ IGNORE_USER_ABORT = save_abort;
+ }
++
+
diff -urN jed.old/patches/patch-lib_jed_rc jed/patches/patch-lib_jed_rc
--- jed.old/patches/patch-lib_jed_rc Tue Apr 19 11:41:42 2005
+++ jed/patches/patch-lib_jed_rc Thu Jun 7 17:19:33 2007
@@ -1,7 +1,7 @@
$OpenBSD: patch-lib_jed_rc,v 1.3 2005/04/19 09:41:42 espie Exp $
---- lib/jed.rc.orig Sun Oct 20 08:55:30 2002
-+++ lib/jed.rc Tue Apr 19 11:04:41 2005
-@@ -152,7 +152,7 @@ CASE_SEARCH = 0; % zero turns off cas
+--- lib/jed.rc.orig Mon Feb 13 18:51:58 2006
++++ lib/jed.rc Thu Jun 7 17:19:24 2007
+@@ -149,7 +149,7 @@ WRAP_INDENTS = 0; % Non zero indents next line
after w
%---------------------------------------------------------------------------
% C-mode indentation style
%---------------------------------------------------------------------------
@@ -10,7 +10,7 @@
#ifdef IBMPC_SYSTEM
% If non-zero, treat file names as case sensitive
-@@ -240,4 +240,21 @@ define dired_hook ()
+@@ -237,4 +237,20 @@ define dired_hook ()
{
%local_unsetkey ("^K");
%local_setkey ("dired_kill_line", "^K");
@@ -28,7 +28,6 @@
+ C_BRA_NEWLINE = 0;
+ C_CONTINUED_OFFSET = 0;
+ C_Colon_Offset = 0;
-+ C_Class_Offset = 0;
+ C_Comment_Column = 0;
+ }
}
diff -urN jed.old/patches/patch-src_Makefile.in
jed/patches/patch-src_Makefile.in
--- jed.old/patches/patch-src_Makefile.in Sun Jan 11 07:20:30 2004
+++ jed/patches/patch-src_Makefile.in Thu Jan 1 01:00:00 1970
@@ -1,72 +0,0 @@
-$OpenBSD: patch-src_Makefile.in,v 1.5 2004/01/11 06:20:30 brad Exp $
---- src/Makefile.in.orig 2002-10-20 02:55:30.000000000 -0400
-+++ src/Makefile.in 2004-01-11 00:10:34.000000000 -0500
-@@ -59,7 +59,7 @@ OBJDIR = @OBJDIR@
-
- # 2. XFree86 XRENDERFONT (Anti-aliased font) support for XJED
- # Also modify "XJED_HAS_XRENDERFONT" in jed-feat.h
--#XRENDERFONTLIBS = -lXft -lXrender -lfreetype -lXext
-+XRENDERFONTLIBS = -lXft -lXrender -lfreetype -lXext
-
- #---------------------------------------------------------------------------
- # S-Lang library location
-@@ -158,7 +158,7 @@ $(OBJDIR)/xjed : $(OBJS) $(OBJDIR)/xterm
- rgrep: $(OBJDIR)/rgrep
- @echo rgrep created in $(OBJDIR)
- $(OBJDIR)/rgrep: $(OBJDIR)/vfile.o $(OBJDIR)/rgrep.o
-- cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) $(SLANG_LIB)
-lslang
-+ cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) $(TERMCAP_LIB)
$(OTHERLIBS) $(SLANG_LIB) -lslang
- #
- getmail: $(OBJDIR)/getmail
- @echo getmail created in $(OBJDIR)
-@@ -175,14 +175,14 @@ distclean: clean
- /bin/rm -rf $(OBJDIR) Makefile sysconf.h
-
- install_directories:
-+ $(MKINSDIR) $(DESTDIR)$(prefix)/info
-+ $(MKINSDIR) $(DESTDIR)$(prefix)/share/doc/jed
-+ $(MKINSDIR) $(DESTDIR)$(prefix)/share/doc/jed/txt
-+ $(MKINSDIR) $(DESTDIR)$(prefix)/share/doc/jed/manual
- $(MKINSDIR) $(DEST_BIN_DIR)
- $(MKINSDIR) $(DEST_MAN_DIR)
- $(MKINSDIR) $(DEST_JED_ROOT)
- $(MKINSDIR) $(DEST_JED_ROOT)/bin
-- $(MKINSDIR) $(DEST_JED_ROOT)/info
-- $(MKINSDIR) $(DEST_JED_ROOT)/doc
-- $(MKINSDIR) $(DEST_JED_ROOT)/doc/txt
-- $(MKINSDIR) $(DEST_JED_ROOT)/doc/manual
- $(MKINSDIR) $(DEST_JED_ROOT)/lib
- $(MKINSDIR) $(DEST_JED_ROOT)/lib/colors
- $(MKINSDIR) $(DEST_JED_ROOT)/lib/colors/Xjed
-@@ -225,23 +225,23 @@ install: all install_directories
- done
- @for i in $(JED_DOC_FILES); \
- do \
-- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/; \
-- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/; \
-+ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/; \
-+ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/; \
- done
- @for i in $(JED_DOC_TXT_FILES); \
- do \
-- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/txt; \
-- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/txt; \
-+ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/txt; \
-+ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/txt;
\
- done
- @for i in $(JED_DOC_MAN_FILES); \
- do \
-- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/manual; \
-- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/manual; \
-+ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/manual; \
-+ echo $(INSTALL_DATA) $$i
$(DESTDIR)$(prefix)/share/doc/jed/manual; \
- done
- @for i in $(JED_INFO_FILES); \
- do \
-- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/info/; \
-- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/info/; \
-+ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/info/; \
-+ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/info/; \
- done
-
- # The symlinks target is for my own private use. It simply creates the object
diff -urN jed.old/patches/patch-src_Makefile_in
jed/patches/patch-src_Makefile_in
--- jed.old/patches/patch-src_Makefile_in Thu Jan 1 01:00:00 1970
+++ jed/patches/patch-src_Makefile_in Thu Jun 7 17:17:18 2007
@@ -0,0 +1,92 @@
+$OpenBSD$
+--- src/Makefile.in.orig Thu Feb 16 04:09:50 2006
++++ src/Makefile.in Thu Jun 7 17:17:11 2007
+@@ -2,6 +2,7 @@
+
+ # C compiler and C flags
+ CC = @CC@
++CPPFLAGS = @CPPFLAGS@ -DXJED_HAS_XRENDERFONT=1
+ CFLAGS = @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@
+ LDFLAGS = @LDFLAGS@ @DYNAMIC_LINK_FLAGS@
+
+@@ -60,7 +61,7 @@ OBJDIR = @OBJDIR@
+
+ # 2. XFree86 XRENDERFONT (Anti-aliased font) support for XJED
+ # Also modify "XJED_HAS_XRENDERFONT" in jed-feat.h
+-#XRENDERFONTLIBS = -lXft -lXrender -lfreetype -lXext
++XRENDERFONTLIBS = -lXft -lXrender -lfreetype -lXext
+
+ #---------------------------------------------------------------------------
+ # S-Lang library location
+@@ -166,7 +167,7 @@ $(OBJDIR)/xjed : $(OBJS) $(OBJDIR)/xterm.o $(OBJDIR)/v
+ rgrep: $(OBJDIR)/rgrep
+ @echo rgrep created in $(OBJDIR)
+ $(OBJDIR)/rgrep: $(OBJDIR)/vfile.o $(OBJDIR)/rgrep.o
+- cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) $(RPATH)
$(SLANG_LIB) -lslang
++ cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) $(RPATH)
$(OTHERLIBS) $(SLANG_LIB) -lslang $(TERMCAP_LIB)
+ #
+ getmail: $(OBJDIR)/getmail
+ @echo getmail created in $(OBJDIR)
+@@ -187,17 +188,18 @@ install_directories:
+ $(MKINSDIR) $(DEST_MAN_DIR)
+ $(MKINSDIR) $(DEST_JED_ROOT)
+ $(MKINSDIR) $(DEST_JED_ROOT)/bin
+- $(MKINSDIR) $(DEST_JED_ROOT)/info
+- $(MKINSDIR) $(DEST_JED_ROOT)/doc
+- $(MKINSDIR) $(DEST_JED_ROOT)/doc/txt
+- $(MKINSDIR) $(DEST_JED_ROOT)/doc/hlp
+- $(MKINSDIR) $(DEST_JED_ROOT)/doc/manual
++ $(MKINSDIR) $(DESTDIR)$(prefix)/info
++ $(MKINSDIR) $(DESTDIR)$(prefix)/share/doc/jed
++ $(MKINSDIR) $(DESTDIR)$(prefix)/share/doc/jed/txt
++ $(MKINSDIR) $(DESTDIR)$(prefix)/share/doc/jed/hlp
++ $(MKINSDIR) $(DESTDIR)$(prefix)/share/doc/jed/manual
+ $(MKINSDIR) $(DEST_JED_ROOT)/lib
+ $(MKINSDIR) $(DEST_JED_ROOT)/lib/colors
+ $(MKINSDIR) $(DEST_JED_ROOT)/lib/colors/Xjed
+
+ install: all install_directories
+ $(INSTALL) $(OBJDIR)/jed $(DEST_BIN_DIR)/
++ $(INSTALL) $(OBJDIR)/rgrep $(DEST_BIN_DIR)/
+ -cd $(DEST_BIN_DIR); ln -s jed jed-script
+ -$(INSTALL) $(OBJDIR)/xjed $(DEST_BIN_DIR)/
+ -$(INSTALL) $(OBJDIR)/getmail $(DEST_JED_ROOT)/bin/
+@@ -232,28 +234,28 @@ install: all install_directories
+ done
+ @for i in $(JED_DOC_FILES); \
+ do \
+- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/; \
+- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/; \
++ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/; \
++ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/; \
+ done
+ @for i in $(JED_DOC_TXT_FILES); \
+ do \
+- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/txt; \
+- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/txt; \
++ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/txt; \
++ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/txt;
\
+ done
+ @for i in $(JED_DOC_HLP_FILES); \
+ do \
+- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/hlp; \
+- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/hlp; \
++ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/hlp; \
++ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/hlp;
\
+ done
+ @for i in $(JED_DOC_MAN_FILES); \
+ do \
+- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/manual; \
+- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/doc/manual; \
++ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/share/doc/jed/manual; \
++ echo $(INSTALL_DATA) $$i
$(DESTDIR)$(prefix)/share/doc/jed/manual; \
+ done
+ @for i in $(JED_INFO_FILES); \
+ do \
+- $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/info/; \
+- echo $(INSTALL_DATA) $$i $(DEST_JED_ROOT)/info/; \
++ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/info/; \
++ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/info/; \
+ done
+ #
+ runtests: $(OBJDIR)/jed
diff -urN jed.old/patches/patch-src_misc_c jed/patches/patch-src_misc_c
--- jed.old/patches/patch-src_misc_c Thu Jan 1 01:00:00 1970
+++ jed/patches/patch-src_misc_c Thu Jun 7 15:28:32 2007
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/misc.c.orig Sat Mar 4 08:55:05 2006
++++ src/misc.c Thu Jun 7 15:28:21 2007
+@@ -741,7 +741,7 @@ int jed_getkey_wchar (SLwchar_Type *wchp)
+
+ void jed_ungetkey_wchar (SLwchar_Type wc)
+ {
+- SLuchar_Type *b, buf[SLUTF8_MAX_MBLEN];
++ SLuchar_Type *b, buf[JED_MAX_MULTIBYTE_SIZE];
+
+ if (NULL == (b = jed_wchar_to_multibyte (wc, buf)))
+ return;
diff -urN jed.old/pkg/PLIST jed/pkg/PLIST
--- jed.old/pkg/PLIST Wed Sep 15 20:01:06 2004
+++ jed/pkg/PLIST Thu Jun 7 17:18:17 2007
@@ -1,4 +1,4 @@
[EMAIL PROTECTED] $OpenBSD: PLIST,v 1.13 2004/09/15 18:01:06 espie Exp $
[EMAIL PROTECTED] $OpenBSD$
bin/jed
bin/jed-script
bin/rgrep
@@ -30,11 +30,15 @@
lib/jed/lib/colors/
lib/jed/lib/colors/README
lib/jed/lib/colors/Xjed/
+lib/jed/lib/colors/Xjed/black4.sl
lib/jed/lib/colors/Xjed/elegant.sl
+lib/jed/lib/colors/Xjed/modern.sl
+lib/jed/lib/colors/Xjed/night.sl
lib/jed/lib/colors/Xjed/pastel0.sl
lib/jed/lib/colors/black1.sl
lib/jed/lib/colors/black2.sl
lib/jed/lib/colors/black3.sl
+lib/jed/lib/colors/black4.sl
lib/jed/lib/colors/blue1.sl
lib/jed/lib/colors/blue2.sl
lib/jed/lib/colors/blue3.sl
@@ -46,7 +50,9 @@
lib/jed/lib/compress.sl
lib/jed/lib/cpright.hlp
lib/jed/lib/ctags.sl
+lib/jed/lib/cua.hlp
lib/jed/lib/cua.sl
+lib/jed/lib/cuamisc.sl
lib/jed/lib/dabbrev.sl
lib/jed/lib/dcl.sl
lib/jed/lib/digraph.sl
@@ -67,6 +73,7 @@
lib/jed/lib/folding.sl
lib/jed/lib/fortran.sl
lib/jed/lib/generic.hlp
+lib/jed/lib/gpg.sl
lib/jed/lib/help.sl
lib/jed/lib/history.sl
lib/jed/lib/hooks.sl
@@ -96,9 +103,12 @@
lib/jed/lib/lisp.sl
lib/jed/lib/ltx-comp.dat
lib/jed/lib/ltx-math.sl
+lib/jed/lib/lua.sl
lib/jed/lib/macro.sl
lib/jed/lib/mail.sl
lib/jed/lib/mailalias.sl
+lib/jed/lib/mailedit.sl
+lib/jed/lib/mailutils.sl
lib/jed/lib/man.sl
lib/jed/lib/maple.sl
lib/jed/lib/matlab.sl
@@ -118,6 +128,7 @@
lib/jed/lib/nroff.sl
lib/jed/lib/occur.sl
lib/jed/lib/os.sl
+lib/jed/lib/paste.sl
lib/jed/lib/perl.sl
lib/jed/lib/php.sl
lib/jed/lib/pipe.sl
@@ -147,6 +158,7 @@
lib/jed/lib/sortmisc.sl
lib/jed/lib/spicemod.sl
lib/jed/lib/srchmisc.sl
+lib/jed/lib/syncproc.sl
lib/jed/lib/syntax.sl
lib/jed/lib/tabs.sl
lib/jed/lib/tclmode.sl
@@ -154,7 +166,6 @@
lib/jed/lib/texcom.sl
lib/jed/lib/textmode.sl
lib/jed/lib/tiasm.sl
-lib/jed/lib/tm/
lib/jed/lib/tmisc.sl
lib/jed/lib/tmmode.sl
lib/jed/lib/tpascal.sl
@@ -168,11 +179,15 @@
lib/jed/lib/wmenu.sl
lib/jed/lib/wordstar.hlp
lib/jed/lib/wordstar.sl
+lib/jed/lib/xformreg.sl
lib/jed/lib/yankpop.sl
@man man/man1/jed.1
@man man/man1/rgrep.1
share/doc/jed/
share/doc/jed/README
+share/doc/jed/hlp/
+share/doc/jed/hlp/jedfuns.hlp
+share/doc/jed/hlp/libfuns.hlp
share/doc/jed/manual/
share/doc/jed/manual/jed.tex
share/doc/jed/txt/
@@ -187,8 +202,6 @@
share/doc/jed/txt/hooks.txt
share/doc/jed/txt/ide-mode.txt
share/doc/jed/txt/jed_faq.txt
-share/doc/jed/txt/jedfuns.txt
-share/doc/jed/txt/libfuns.txt
share/doc/jed/txt/linux-keys.txt
share/doc/jed/txt/menus.txt
share/doc/jed/txt/mouse.txt
@@ -199,6 +212,7 @@
share/doc/jed/txt/script.txt
share/doc/jed/txt/syntax.txt
share/doc/jed/txt/undo.txt
+share/doc/jed/txt/utf8.txt
share/doc/jed/txt/wjed.txt
share/doc/jed/txt/wordstar.txt
share/doc/jed/txt/xjed.txt
