Remove japanese/magicpoint and merge Japanese character support

into misc/magicpoint.  The Japanese support is now based on
FreeType library, not VFlib, as the non-Japanese vector font support is.

Approved by:	dinoex (maintainer)

3 files changed, 51 insertions, 0 deletions

diff --git a/misc/magicpoint/files/patch-contrib-xmindpath-Makefile.in b/misc/magicpoint/files/patch-contrib-xmindpath-Makefile.in
new file mode 100644
index 000000000000..7d11756affe5
--- /dev/null
+++ b/misc/magicpoint/files/patch-contrib-xmindpath-Makefile.in
@@ -0,0 +1,25 @@
+--- contrib/xmindpath/Makefile.in.orig	2000-01-31 14:04:30.000000000 +0900
++++ contrib/xmindpath/Makefile.in	2008-11-06 23:57:53.000000000 +0900
+@@ -16,16 +16,19 @@
+ bindir=	@bindir@
+ mandir=	@mandir@
+ 
+-all:	$(TARGET)
++all:	$(TARGET) $(TARGET).1
+ $(TARGET):	$(OBJS)
+ 	$(CC) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBS) 
+ 
++$(TARGET).1.gz:	$(TARGET).1
++	gzip $(TARGET).1
++
+ main.o:	$(srcdir)/main.c
+ uucplock.o:	$(srcdir)/uucplock.c
+ 
+-install::
++install:: $(TARGET) $(TARGET).1.gz
+ 	$(INSTALL) -s -o uucp -g bin -m 4755 $(TARGET) $(bindir)
+-	$(INSTALL) -o bin -g bin -m 444 $(TARGET).1 $(mandir)/man1
++	$(INSTALL) -o bin -g bin -m 444 $(TARGET).1.gz $(mandir)/man1
+ 
+ includes::
+ 
diff --git a/misc/magicpoint/files/patch-image-rlelib.c b/misc/magicpoint/files/patch-image-rlelib.c
new file mode 100644
index 000000000000..9fdb508e98fa
--- /dev/null
+++ b/misc/magicpoint/files/patch-image-rlelib.c
@@ -0,0 +1,11 @@
+--- image/rlelib.c.bak	2007-05-18 01:47:33.000000000 +0900
++++ image/rlelib.c	2008-11-06 23:38:04.000000000 +0900
+@@ -13,7 +13,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #if 0
+-#include <varargs.h>
++#include <stdarg.h>
+ #endif
+ #include <ctype.h>
+ 
diff --git a/misc/magicpoint/files/patch-sample::default.mgp b/misc/magicpoint/files/patch-sample::default.mgp
new file mode 100644
index 000000000000..fb6b46a28a99
--- /dev/null
+++ b/misc/magicpoint/files/patch-sample::default.mgp
@@ -0,0 +1,15 @@
+--- sample/default.mgp.orig	Sat Aug 11 01:40:54 2001
++++ sample/default.mgp	Tue Jan 25 13:56:12 2005
+@@ -12,9 +12,9 @@
+ %% into the "tfdir" directory above:
+ %%	ftp://ftp.mew.org/pub/mgp/ttf-jp.tar.gz
+ %%
+-%deffont "standard"   tfont "standard.ttf",   tmfont "kochi-mincho.ttf"
+-%deffont "thick"      tfont "thick.ttf",      tmfont "goth.ttf"
+-%deffont "typewriter" tfont "typewriter.ttf", tmfont "goth.ttf"
++%deffont "standard"   xfont "Times",     xfont "IPAMincho" "jisx0208.1983-*"
++%deffont "thick"      xfont "Helvetica", xfont "IPAGothic" "jisx0208.1983-*"
++%deffont "typewriter" xfont "Courier",   xfont "IPAGothic" "jisx0208.1983-*"
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ %%
+ %% Default settings per each line numbers.