From f9d86cf02fe33bf6a8478d6bdcb7706d5cb877db Mon Sep 17 00:00:00 2001
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Mon, 28 Jul 2014 22:14:07 +0000
Subject: Rename the rather surprising number of japanese/ patch-xy patches to
 reflect the files they modify.

---
 japanese/jed/files/patch-aa              | 32 --------------------------------
 japanese/jed/files/patch-ab              | 22 ----------------------
 japanese/jed/files/patch-ac              | 17 -----------------
 japanese/jed/files/patch-ad              | 13 -------------
 japanese/jed/files/patch-ae              | 29 -----------------------------
 japanese/jed/files/patch-af              | 15 ---------------
 japanese/jed/files/patch-ag              | 22 ----------------------
 japanese/jed/files/patch-configure       | 32 ++++++++++++++++++++++++++++++++
 japanese/jed/files/patch-info_jed.info   | 13 +++++++++++++
 japanese/jed/files/patch-lib_abbrev.sl   | 22 ++++++++++++++++++++++
 japanese/jed/files/patch-lib_canna.sl    | 17 +++++++++++++++++
 japanese/jed/files/patch-lib_japanese.sl | 15 +++++++++++++++
 japanese/jed/files/patch-lib_jed.rc      | 22 ++++++++++++++++++++++
 japanese/jed/files/patch-src_Makefile.in | 29 +++++++++++++++++++++++++++++
 14 files changed, 150 insertions(+), 150 deletions(-)
 delete mode 100644 japanese/jed/files/patch-aa
 delete mode 100644 japanese/jed/files/patch-ab
 delete mode 100644 japanese/jed/files/patch-ac
 delete mode 100644 japanese/jed/files/patch-ad
 delete mode 100644 japanese/jed/files/patch-ae
 delete mode 100644 japanese/jed/files/patch-af
 delete mode 100644 japanese/jed/files/patch-ag
 create mode 100644 japanese/jed/files/patch-configure
 create mode 100644 japanese/jed/files/patch-info_jed.info
 create mode 100644 japanese/jed/files/patch-lib_abbrev.sl
 create mode 100644 japanese/jed/files/patch-lib_canna.sl
 create mode 100644 japanese/jed/files/patch-lib_japanese.sl
 create mode 100644 japanese/jed/files/patch-lib_jed.rc
 create mode 100644 japanese/jed/files/patch-src_Makefile.in

(limited to 'japanese/jed')

diff --git a/japanese/jed/files/patch-aa b/japanese/jed/files/patch-aa
deleted file mode 100644
index 5e4a0932496f..000000000000
--- a/japanese/jed/files/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
---- configure.orig	Tue Jul 20 20:22:45 1999
-+++ configure	Sat Feb  5 23:49:47 2000
-@@ -2580,7 +2580,8 @@
- # the other directories may have a better chance of containing a more recent
- # version.
- 
--JD_Search_Dirs="$JD_Search_Dirs \
-+JD_Search_Dirs="${prefix}/include/slang,${prefix}/lib \
-+                $JD_Search_Dirs \
-                 $includedir,$libdir \
-                 /usr/local/include,/usr/local/lib \
- 		/usr/include,/usr/lib \
-@@ -3176,12 +3177,17 @@
- 	cd \$(OBJDIR); \$(COMPILE_CMD) \$(SRCDIR)/vterm.c
- "
- 
--
-+if test "$ac_cv_xlocale" = yes; then
- PROGRAM_OBJECT_RULES="$PROGRAM_OBJECT_RULES
- \$(OBJDIR)/xterm.o : \$(SRCDIR)/xterm.c \$(DOT_O_DEPS) \$("xterm"_O_DEP)
- 	cd \$(OBJDIR); \$(COMPILE_CMD) -DX_LOCALE \$(SRCDIR)/xterm.c
- "
--
-+else
-+PROGRAM_OBJECT_RULES="$PROGRAM_OBJECT_RULES
-+\$(OBJDIR)/xterm.o : \$(SRCDIR)/xterm.c \$(DOT_O_DEPS) \$("xterm"_O_DEP)
-+	cd \$(OBJDIR); \$(COMPILE_CMD) \$(SRCDIR)/xterm.c
-+"
-+fi
- 
- PROGRAM_OBJECT_RULES="$PROGRAM_OBJECT_RULES
- \$(OBJDIR)/gpmmouse.o : \$(SRCDIR)/gpmmouse.c \$(DOT_O_DEPS) \$("gpmmouse"_O_DEP)
diff --git a/japanese/jed/files/patch-ab b/japanese/jed/files/patch-ab
deleted file mode 100644
index 504e48a70333..000000000000
--- a/japanese/jed/files/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib/jed.rc~	Tue Jul 20 20:22:46 1999
-+++ lib/jed.rc	Thu Feb  3 19:15:23 2000
-@@ -166,6 +166,19 @@
-                         % that are continued onto the next line.
- %---------------------------------------------------------------------------
- 
-+%---------------------------------------------------------------------------
-+% Ruby-mode
-+%---------------------------------------------------------------------------
-+
-+% amount of space to indent within block.
-+variable ruby_indent_level = 2;
-+
-+% Load ruby mode when openning .rb' files.
-+autoload("ruby_mode", "ruby");
-+add_mode_for_extension ("ruby", "rb");
-+
-+%---------------------------------------------------------------------------
-+
- #ifdef MSDOS XWINDOWS MSWINDOWS
- % Alt-key handling.  Setting this variable controls how the
- % Alt key is handled.  By default it is set to 27 (Ascii ESCAPE).  This means
diff --git a/japanese/jed/files/patch-ac b/japanese/jed/files/patch-ac
deleted file mode 100644
index 386553f67bd4..000000000000
--- a/japanese/jed/files/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
---- lib/canna.sl~	Sat Aug 14 13:03:12 1999
-+++ lib/canna.sl	Sat Aug 14 13:02:35 1999
-@@ -348,9 +348,10 @@
- 	 message("Canna can not be used in any more buffer. Sorry...");
- 	 return -1;
-       }
--      create_blocal_var("canna_buf_id", 'i');
-+%      create_blocal_var("canna_buf_id", 'i');
-       canna_buf_number++;
--      set_blocal_var(canna_buf_number, "canna_buf_id");
-+ %     set_blocal_var(canna_buf_number, "canna_buf_id");
-+      define_blocal_var("canna_buf_id", canna_buf_number);
-       return canna_buf_number;
-    }
-    return get_blocal_var("canna_buf_id");
-
-
diff --git a/japanese/jed/files/patch-ad b/japanese/jed/files/patch-ad
deleted file mode 100644
index 6a384c6f1713..000000000000
--- a/japanese/jed/files/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- info/jed.info~	Wed Jul 14 06:01:25 1999
-+++ info/jed.info	Fri Feb  4 02:11:19 2000
-@@ -1,6 +1,10 @@
- This is Info file jed.info, produced by Makeinfo-1.55 from the input
- file jed.ti.
- 
-+START-INFO-DIR-ENTRY
-+* JED: (jed).			JED editor documentation.
-+END-INFO-DIR-ENTRY
-+
- 
- Indirect:
- jed.1in: 83
diff --git a/japanese/jed/files/patch-ae b/japanese/jed/files/patch-ae
deleted file mode 100644
index ff6401154b16..000000000000
--- a/japanese/jed/files/patch-ae
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/Makefile.in.orig	Tue Jul 20 20:55:47 1999
-+++ src/Makefile.in	Sun Feb  6 00:02:49 2000
-@@ -104,7 +104,7 @@
- all: jed rgrep
- 
- 
--jed: $(OBJDIR) $(CONFIG_H) slangversion $(OBJDIR)/jed
-+jed: $(OBJDIR) $(CONFIG_H) $(OBJDIR)/jed
- 	@echo jed created in $(OBJDIR)
- $(OBJDIR)/jed: $(OBJS) $(OBJDIR)/display.o $(OBJGPMMOUSEO)
- 	cd $(OBJDIR); $(CC) $(OFILES) display.o $(GPMMOUSEO) \
-@@ -132,7 +132,7 @@
- $(SRCDIR)/syntax.c: $(SRCDIR)/dfasyntx.c
- 	touch $(SRCDIR)/syntax.c
- #
--xjed : $(OBJDIR) $(CONFIG_H) slangversion $(OBJDIR)/xjed
-+xjed : $(OBJDIR) $(CONFIG_H) $(OBJDIR)/xjed
- 	@echo xjed created in $(OBJDIR)
- $(OBJDIR)/xjed : $(OBJS) $(OBJDIR)/xterm.o $(OBJDIR)/vterm.o
- 	cd $(OBJDIR); \
-@@ -142,7 +142,7 @@
- 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 -lm
-+	cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) $(SLANG_LIB) -lslang -lcurses -lm
- #
- getmail: $(OBJDIR)/getmail
- 	@echo getmail created in $(OBJDIR)
diff --git a/japanese/jed/files/patch-af b/japanese/jed/files/patch-af
deleted file mode 100644
index 2a2475324b82..000000000000
--- a/japanese/jed/files/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
---- lib/japanese.sl~	Tue Feb  8 16:17:10 2000
-+++ lib/japanese.sl	Tue Feb  8 16:17:49 2000
-@@ -5,8 +5,10 @@
- %
- 
- 
--define	TRUE()	{ -1;}
--define	FALSE()	{ 0;}
-+!if (is_defined("TRUE")) {
-+	eval("define	TRUE()	{ -1;}");
-+	eval("define	FALSE()	{ 0;}");
-+}
- 
- % If your slang-j's version in jed-j is after 0.3.2,
- % you can use KANJI function name.
diff --git a/japanese/jed/files/patch-ag b/japanese/jed/files/patch-ag
deleted file mode 100644
index f5f5b29b6dd2..000000000000
--- a/japanese/jed/files/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib/abbrev.sl	2000/10/01 17:41:08	1.1
-+++ lib/abbrev.sl	2000/10/01 17:41:46
-@@ -32,16 +32,16 @@
- define set_abbrev_mode (val)
- {
-    getbuf_info ();
--   if (val) () | 0x800; else () & ~(0x800);
-+   if (val) () | 0x1000; else () & ~(0x1000);
-    setbuf_info(());
- }
- 
- define abbrev_mode ()
- {
--   variable flags = getbuf_info() xor 0x800;
-+   variable flags = getbuf_info() xor 0x1000;
-    variable msg = "Abbrev mode OFF";
-    setbuf_info(flags);
--   if (flags & 0x800) msg = "Abbrev mode ON";
-+   if (flags & 0x1000) msg = "Abbrev mode ON";
-    message (msg);
- }
- 
diff --git a/japanese/jed/files/patch-configure b/japanese/jed/files/patch-configure
new file mode 100644
index 000000000000..5e4a0932496f
--- /dev/null
+++ b/japanese/jed/files/patch-configure
@@ -0,0 +1,32 @@
+--- configure.orig	Tue Jul 20 20:22:45 1999
++++ configure	Sat Feb  5 23:49:47 2000
+@@ -2580,7 +2580,8 @@
+ # the other directories may have a better chance of containing a more recent
+ # version.
+ 
+-JD_Search_Dirs="$JD_Search_Dirs \
++JD_Search_Dirs="${prefix}/include/slang,${prefix}/lib \
++                $JD_Search_Dirs \
+                 $includedir,$libdir \
+                 /usr/local/include,/usr/local/lib \
+ 		/usr/include,/usr/lib \
+@@ -3176,12 +3177,17 @@
+ 	cd \$(OBJDIR); \$(COMPILE_CMD) \$(SRCDIR)/vterm.c
+ "
+ 
+-
++if test "$ac_cv_xlocale" = yes; then
+ PROGRAM_OBJECT_RULES="$PROGRAM_OBJECT_RULES
+ \$(OBJDIR)/xterm.o : \$(SRCDIR)/xterm.c \$(DOT_O_DEPS) \$("xterm"_O_DEP)
+ 	cd \$(OBJDIR); \$(COMPILE_CMD) -DX_LOCALE \$(SRCDIR)/xterm.c
+ "
+-
++else
++PROGRAM_OBJECT_RULES="$PROGRAM_OBJECT_RULES
++\$(OBJDIR)/xterm.o : \$(SRCDIR)/xterm.c \$(DOT_O_DEPS) \$("xterm"_O_DEP)
++	cd \$(OBJDIR); \$(COMPILE_CMD) \$(SRCDIR)/xterm.c
++"
++fi
+ 
+ PROGRAM_OBJECT_RULES="$PROGRAM_OBJECT_RULES
+ \$(OBJDIR)/gpmmouse.o : \$(SRCDIR)/gpmmouse.c \$(DOT_O_DEPS) \$("gpmmouse"_O_DEP)
diff --git a/japanese/jed/files/patch-info_jed.info b/japanese/jed/files/patch-info_jed.info
new file mode 100644
index 000000000000..6a384c6f1713
--- /dev/null
+++ b/japanese/jed/files/patch-info_jed.info
@@ -0,0 +1,13 @@
+--- info/jed.info~	Wed Jul 14 06:01:25 1999
++++ info/jed.info	Fri Feb  4 02:11:19 2000
+@@ -1,6 +1,10 @@
+ This is Info file jed.info, produced by Makeinfo-1.55 from the input
+ file jed.ti.
+ 
++START-INFO-DIR-ENTRY
++* JED: (jed).			JED editor documentation.
++END-INFO-DIR-ENTRY
++
+ 
+ Indirect:
+ jed.1in: 83
diff --git a/japanese/jed/files/patch-lib_abbrev.sl b/japanese/jed/files/patch-lib_abbrev.sl
new file mode 100644
index 000000000000..f5f5b29b6dd2
--- /dev/null
+++ b/japanese/jed/files/patch-lib_abbrev.sl
@@ -0,0 +1,22 @@
+--- lib/abbrev.sl	2000/10/01 17:41:08	1.1
++++ lib/abbrev.sl	2000/10/01 17:41:46
+@@ -32,16 +32,16 @@
+ define set_abbrev_mode (val)
+ {
+    getbuf_info ();
+-   if (val) () | 0x800; else () & ~(0x800);
++   if (val) () | 0x1000; else () & ~(0x1000);
+    setbuf_info(());
+ }
+ 
+ define abbrev_mode ()
+ {
+-   variable flags = getbuf_info() xor 0x800;
++   variable flags = getbuf_info() xor 0x1000;
+    variable msg = "Abbrev mode OFF";
+    setbuf_info(flags);
+-   if (flags & 0x800) msg = "Abbrev mode ON";
++   if (flags & 0x1000) msg = "Abbrev mode ON";
+    message (msg);
+ }
+ 
diff --git a/japanese/jed/files/patch-lib_canna.sl b/japanese/jed/files/patch-lib_canna.sl
new file mode 100644
index 000000000000..386553f67bd4
--- /dev/null
+++ b/japanese/jed/files/patch-lib_canna.sl
@@ -0,0 +1,17 @@
+--- lib/canna.sl~	Sat Aug 14 13:03:12 1999
++++ lib/canna.sl	Sat Aug 14 13:02:35 1999
+@@ -348,9 +348,10 @@
+ 	 message("Canna can not be used in any more buffer. Sorry...");
+ 	 return -1;
+       }
+-      create_blocal_var("canna_buf_id", 'i');
++%      create_blocal_var("canna_buf_id", 'i');
+       canna_buf_number++;
+-      set_blocal_var(canna_buf_number, "canna_buf_id");
++ %     set_blocal_var(canna_buf_number, "canna_buf_id");
++      define_blocal_var("canna_buf_id", canna_buf_number);
+       return canna_buf_number;
+    }
+    return get_blocal_var("canna_buf_id");
+
+
diff --git a/japanese/jed/files/patch-lib_japanese.sl b/japanese/jed/files/patch-lib_japanese.sl
new file mode 100644
index 000000000000..2a2475324b82
--- /dev/null
+++ b/japanese/jed/files/patch-lib_japanese.sl
@@ -0,0 +1,15 @@
+--- lib/japanese.sl~	Tue Feb  8 16:17:10 2000
++++ lib/japanese.sl	Tue Feb  8 16:17:49 2000
+@@ -5,8 +5,10 @@
+ %
+ 
+ 
+-define	TRUE()	{ -1;}
+-define	FALSE()	{ 0;}
++!if (is_defined("TRUE")) {
++	eval("define	TRUE()	{ -1;}");
++	eval("define	FALSE()	{ 0;}");
++}
+ 
+ % If your slang-j's version in jed-j is after 0.3.2,
+ % you can use KANJI function name.
diff --git a/japanese/jed/files/patch-lib_jed.rc b/japanese/jed/files/patch-lib_jed.rc
new file mode 100644
index 000000000000..504e48a70333
--- /dev/null
+++ b/japanese/jed/files/patch-lib_jed.rc
@@ -0,0 +1,22 @@
+--- lib/jed.rc~	Tue Jul 20 20:22:46 1999
++++ lib/jed.rc	Thu Feb  3 19:15:23 2000
+@@ -166,6 +166,19 @@
+                         % that are continued onto the next line.
+ %---------------------------------------------------------------------------
+ 
++%---------------------------------------------------------------------------
++% Ruby-mode
++%---------------------------------------------------------------------------
++
++% amount of space to indent within block.
++variable ruby_indent_level = 2;
++
++% Load ruby mode when openning .rb' files.
++autoload("ruby_mode", "ruby");
++add_mode_for_extension ("ruby", "rb");
++
++%---------------------------------------------------------------------------
++
+ #ifdef MSDOS XWINDOWS MSWINDOWS
+ % Alt-key handling.  Setting this variable controls how the
+ % Alt key is handled.  By default it is set to 27 (Ascii ESCAPE).  This means
diff --git a/japanese/jed/files/patch-src_Makefile.in b/japanese/jed/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..ff6401154b16
--- /dev/null
+++ b/japanese/jed/files/patch-src_Makefile.in
@@ -0,0 +1,29 @@
+--- src/Makefile.in.orig	Tue Jul 20 20:55:47 1999
++++ src/Makefile.in	Sun Feb  6 00:02:49 2000
+@@ -104,7 +104,7 @@
+ all: jed rgrep
+ 
+ 
+-jed: $(OBJDIR) $(CONFIG_H) slangversion $(OBJDIR)/jed
++jed: $(OBJDIR) $(CONFIG_H) $(OBJDIR)/jed
+ 	@echo jed created in $(OBJDIR)
+ $(OBJDIR)/jed: $(OBJS) $(OBJDIR)/display.o $(OBJGPMMOUSEO)
+ 	cd $(OBJDIR); $(CC) $(OFILES) display.o $(GPMMOUSEO) \
+@@ -132,7 +132,7 @@
+ $(SRCDIR)/syntax.c: $(SRCDIR)/dfasyntx.c
+ 	touch $(SRCDIR)/syntax.c
+ #
+-xjed : $(OBJDIR) $(CONFIG_H) slangversion $(OBJDIR)/xjed
++xjed : $(OBJDIR) $(CONFIG_H) $(OBJDIR)/xjed
+ 	@echo xjed created in $(OBJDIR)
+ $(OBJDIR)/xjed : $(OBJS) $(OBJDIR)/xterm.o $(OBJDIR)/vterm.o
+ 	cd $(OBJDIR); \
+@@ -142,7 +142,7 @@
+ 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 -lm
++	cd $(OBJDIR); $(CC) vfile.o rgrep.o -o rgrep $(LDFLAGS) $(SLANG_LIB) -lslang -lcurses -lm
+ #
+ getmail: $(OBJDIR)/getmail
+ 	@echo getmail created in $(OBJDIR)
-- 
cgit v1.2.3