- USE_X11 (duh!). Should fix the breakage as seen in the latest hubertf's

  bulk-build.
- Make it compile with gcc3.
- Sort PLIST.

13 files changed, 1316 insertions, 9 deletions

diff --git a/graphics/mgl/Makefile b/graphics/mgl/Makefile
index 6c99d5bc73e..282302d05c0 100644
--- a/graphics/mgl/Makefile
+++ b/graphics/mgl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/10/05 07:39:14 hamajima Exp $
+# $NetBSD: Makefile,v 1.14 2003/10/14 16:22:21 salo Exp $
 #
 
 DISTNAME=       mgl2-alpha-020
@@ -15,6 +15,7 @@ DEPENDS+=	mglfonts>=0.1:../../fonts/mglfonts
 
 USE_GMAKE=	yes
 USE_BUILDLINK2=	yes
+USE_X11=	yes
 
 MGLDOCS=	im.doc mgl1.doc shlib.doc
 MGL2DOCS=	AppConvert.doc Build.doc CALIBRATE.doc CHANGES.doc \
diff --git a/graphics/mgl/PLIST b/graphics/mgl/PLIST
index b3f32f7f070..d2b2c068df2 100644
--- a/graphics/mgl/PLIST
+++ b/graphics/mgl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:44 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/10/14 16:22:21 salo Exp $
 bin/kill_mgl.sh
 bin/mcalc
 bin/mdate
@@ -16,13 +16,13 @@ include/mglkey.h
 lib/libmgl2.so
 lib/libmgl2.so.2
 lib/libmgl2.so.2.0
+lib/mgl2/gpnine.so
 lib/mgl2/imsoft.so
 lib/mgl2/instcap.sh
 lib/mgl2/mcalc.so
 lib/mgl2/mgterm.cap
 lib/mgl2/mini_mil.so
 lib/mgl2/msame.so
-lib/mgl2/gpnine.so
 sbin/calibconf
 sbin/calibdata-update
 sbin/mglcalibrate
@@ -65,8 +65,8 @@ share/doc/mgl2/memo/taskbar.doc
 share/doc/mgl2/mgterm/bugs.doc
 share/doc/mgl2/mgterm/mgterm.doc
 share/doc/mgl2/mil/mil.doc
-share/doc/mgl2/nine/README.txt
 share/doc/mgl2/nine/CHANGES.doc
+share/doc/mgl2/nine/README.txt
 share/mgl2/mgl_fontcreate.c
 @unexec ${RM} -f %D/etc/calibdata
 @dirrm share/mgl2
diff --git a/graphics/mgl/distinfo b/graphics/mgl/distinfo
index 000d21125ae..9b4c188b755 100644
--- a/graphics/mgl/distinfo
+++ b/graphics/mgl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/06/07 15:04:21 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2003/10/14 16:22:21 salo Exp $
 
 SHA1 (mgl2-alpha-020.tar.gz) = aa6be2be28749ba9952afbb359ca0525cad3717f
 Size (mgl2-alpha-020.tar.gz) = 341420 bytes
@@ -12,5 +12,14 @@ SHA1 (patch-ag) = 4bfe05671d580b2a991e6a6990587d5669a24f5f
 SHA1 (patch-ah) = 1706347380fe3d00295c4f5dc590c22c3f9edf75
 SHA1 (patch-ai) = e24879156f9810fd748f53f9d1e69fcec5ecbe34
 SHA1 (patch-aj) = 8d2537a705a864ce5e570bc82a69014144a6c703
-SHA1 (patch-ak) = 013036c3bf4303af9c72446af5259923f7d7b227
+SHA1 (patch-ak) = 3c8c077f2a3ad67e68814f8ddba6f8d876538c24
 SHA1 (patch-al) = 85a4ce2a9779bd4fd3f2a37192a5250824fc9271
+SHA1 (patch-am) = a0b8c7b4c37f5bad8ff5fa3d23d72e918595b72f
+SHA1 (patch-an) = 958eea3832f726950357f0b6856d2d6347943dfa
+SHA1 (patch-ao) = a8baeadfb048e397409d027ac5c53b49e4cbd6b9
+SHA1 (patch-ap) = 850e6515a78d3bbf8716a70b2b6f3f88c1a06b6f
+SHA1 (patch-ar) = 680c2f40e37f8f71d305c8f46460a1fbdc0f0242
+SHA1 (patch-as) = fceb87ac6fb9644bd7a640dcc81cf29ca0f824e5
+SHA1 (patch-at) = 263b09454b9900d383e3447bc5b3da2e37b495cf
+SHA1 (patch-au) = 8450ac4c190d08430583b36c5b8b767601a5aab3
+SHA1 (patch-av) = a8ad4b5e4043bfdf8a77ba1f8017fca697f02cab
diff --git a/graphics/mgl/patches/patch-ak b/graphics/mgl/patches/patch-ak
index 926d1ae12ec..bebb72add9a 100644
--- a/graphics/mgl/patches/patch-ak
+++ b/graphics/mgl/patches/patch-ak
@@ -1,7 +1,48 @@
-$NetBSD: patch-ak,v 1.1 2001/03/20 13:54:32 wiz Exp $
+$NetBSD: patch-ak,v 1.2 2003/10/14 16:22:21 salo Exp $
 
---- mgterm/mdate.c.orig	Fri Mar  9 20:05:20 2001
-+++ mgterm/mdate.c	Wed Mar 14 06:52:19 2001
+--- mgterm/mdate.c.orig	2001-03-09 12:05:20.000000000 +0100
++++ mgterm/mdate.c	2003-10-14 17:47:28.000000000 +0200
+@@ -66,23 +66,23 @@
+ void mdate();
+ 
+ static char *icon_mdate="\
+-#MGR000200160016
+-++++++++++++++++
+-+@@@@@@@@@@@@@++
+-+@...........@++
+-+@...........@++
+-+@.@.@.@.@.@.@++
+-+@.@.@.@.@.@.@++
+-+@...........@++
+-+@.@.@.@.@.@.@++
+-+@...........@++
+-+@.@.@.@.@.@.@++
+-+@...........@++
+-+@.@.@.@.@.@.@++
+-+@...........@++
+-+@@@@@@@@@@@@@++
+-++++++++++++++++
+-++++++++++++++++
++#MGR000200160016\
++++++++++++++++++\
+++@@@@@@@@@@@@@++\
+++@...........@++\
+++@...........@++\
+++@.@.@.@.@.@.@++\
+++@.@.@.@.@.@.@++\
+++@...........@++\
+++@.@.@.@.@.@.@++\
+++@...........@++\
+++@.@.@.@.@.@.@++\
+++@...........@++\
+++@.@.@.@.@.@.@++\
+++@...........@++\
+++@@@@@@@@@@@@@++\
++++++++++++++++++\
++++++++++++++++++\
+ ";
+ main() {
+ 	int c;
 @@ -670,9 +670,10 @@
  #include <sys/swap.h>
  #include <sys/param.h>
diff --git a/graphics/mgl/patches/patch-am b/graphics/mgl/patches/patch-am
new file mode 100644
index 00000000000..b62b2b5a08e
--- /dev/null
+++ b/graphics/mgl/patches/patch-am
@@ -0,0 +1,267 @@
+$NetBSD: patch-am,v 1.1 2003/10/14 16:22:21 salo Exp $
+
+--- lib/emsvr.c.orig	2001-03-07 12:50:44.000000000 +0100
++++ lib/emsvr.c	2003-10-14 17:06:27.000000000 +0200
+@@ -274,143 +274,143 @@
+ #endif
+ #endif
+ char *icon_mini="\
+-#MGR000200160016
+-++++++++++++++++
+-+++WWWWWWWWW++++
+-++WXXXXXXXXXW+++
+-+WXXXXXXXXXXXW++
+-WXXXXXXXXXXXXXW+
+-WXXXXXXXXXXXXXW+
+-WXXXXXXXXXXXXXW+
+-WXXXXXXXXXXXXXW+
+-WXXXXXXXXXXXXXW+
+-WXXXXXXXXXXXXXW+
+-WXXXXXXXXXXXXXW+
+-WXXXXXXXXXXXXXW+
+-+WXXXXXXXXXXXW++
+-++WXXXXXXXXXW+++
+-+++WWWWWWWWW++++
+-++++++++++++++++
++#MGR000200160016\
++++++++++++++++++\
+++++WWWWWWWWW++++\
++++WXXXXXXXXXW+++\
+++WXXXXXXXXXXXW++\
++WXXXXXXXXXXXXXW+\
++WXXXXXXXXXXXXXW+\
++WXXXXXXXXXXXXXW+\
++WXXXXXXXXXXXXXW+\
++WXXXXXXXXXXXXXW+\
++WXXXXXXXXXXXXXW+\
++WXXXXXXXXXXXXXW+\
++WXXXXXXXXXXXXXW+\
+++WXXXXXXXXXXXW++\
++++WXXXXXXXXXW+++\
+++++WWWWWWWWW++++\
++++++++++++++++++\
+ ";
+ 
+ char *icon_main="\
+-#MGR000200160016
+-++++++++++++++++
+-WWWWWWWWWWWWWWW+
+-WjjjjjjjjjjjjjW+
+-WjjjjjjjjjjjjjW+
+-WjjjjjjjjjjjjjW+
+-WjjjjjjjjjjjjjW+
+-WjjjjjjjjjjjjjW+
+-WjjjjjjjjjjjjjW+
+-WjjjjjjjjjjjjjW+
+-WjjjjjjjjjjjjjW+
+-WjjjjjjjjjjjjjW+
+-WjjjjjjjjjjjjjW+
+-WjjjjjjjjjjjjjW+
+-WjjjjjjjjjjjjjW+
+-WWWWWWWWWWWWWWW+
+-++++++++++++++++
++#MGR000200160016\
++++++++++++++++++\
++WWWWWWWWWWWWWWW+\
++WjjjjjjjjjjjjjW+\
++WjjjjjjjjjjjjjW+\
++WjjjjjjjjjjjjjW+\
++WjjjjjjjjjjjjjW+\
++WjjjjjjjjjjjjjW+\
++WjjjjjjjjjjjjjW+\
++WjjjjjjjjjjjjjW+\
++WjjjjjjjjjjjjjW+\
++WjjjjjjjjjjjjjW+\
++WjjjjjjjjjjjjjW+\
++WjjjjjjjjjjjjjW+\
++WjjjjjjjjjjjjjW+\
++WWWWWWWWWWWWWWW+\
++++++++++++++++++\
+ ";
+ 
+ char *icon_ac="\
+-#MGR000200160016
+-++++++++++++++++
+-++++++++++++++++
+-++++++++++++++++
+-++++++++++++++++
+-+++++++@@@@@++++
+-++++++@@@@@@++++
+-+++++@@@@@@@@@@+
+-+++++@@@@@@@++++
+-@@@@@@@@@@@@++++
+-+++++@@@@@@@++++
+-+++++@@@@@@@@@@+
+-++++++@@@@@@++++
+-+++++++@@@@@++++
+-++++++++++++++++
+-++++++++++++++++
+-++++++++++++++++
++#MGR000200160016\
++++++++++++++++++\
++++++++++++++++++\
++++++++++++++++++\
++++++++++++++++++\
+++++++++@@@@@++++\
++++++++@@@@@@++++\
+++++++@@@@@@@@@@+\
+++++++@@@@@@@++++\
++@@@@@@@@@@@@++++\
+++++++@@@@@@@++++\
+++++++@@@@@@@@@@+\
++++++++@@@@@@++++\
+++++++++@@@@@++++\
++++++++++++++++++\
++++++++++++++++++\
++++++++++++++++++\
+ ";
+ 
+ char *icon_batt="\
+-#MGR000200160016
+-++++++++++++++++
+-++++++++++++++++
+-++++++++++++++++
+-++++++++++++++++
+-@@@@@@@@@@@@@@++
+-@GGGGGGGGGGGG@++
+-@GGGGGGGGGGGG@++
+-@GGGGGGGGGGGG@@@
+-@GGGGGGGGGGGG@@@
+-@GGGGGGGGGGGG@@@
+-@GGGGGGGGGGGG@++
+-@GGGGGGGGGGGG@++
+-@@@@@@@@@@@@@@++
+-++++++++++++++++
+-++++++++++++++++
+-++++++++++++++++
++#MGR000200160016\
++++++++++++++++++\
++++++++++++++++++\
++++++++++++++++++\
++++++++++++++++++\
++@@@@@@@@@@@@@@++\
++@GGGGGGGGGGGG@++\
++@GGGGGGGGGGGG@++\
++@GGGGGGGGGGGG@@@\
++@GGGGGGGGGGGG@@@\
++@GGGGGGGGGGGG@@@\
++@GGGGGGGGGGGG@++\
++@GGGGGGGGGGGG@++\
++@@@@@@@@@@@@@@++\
++++++++++++++++++\
++++++++++++++++++\
++++++++++++++++++\
+ ";
+ 
+ char *icon_im="\
+-#MGR000200160016
+-++++++++++++++++
+-+++++++@++++++++
+-++++++@r@+++++++
+-+++++@rrr@++++++
+-++++@rrrrr@+++++
+-+++@rrrrrrr@++++
+-++@rrrrrrrrr@+++
+-+@rrrrrrrrrrr@++
+-+@@@@@rrr@@@@@++
+-+++++@rrr@++++++
+-+++++@rrr@++++++
+-+++++@rrr@++++++
+-+++++@rrr@++++++
+-+++++@rrr@++++++
+-+++++@rrr@++++++
+-+++++@@@@@++++++
++#MGR000200160016\
++++++++++++++++++\
+++++++++@++++++++\
++++++++@r@+++++++\
+++++++@rrr@++++++\
++++++@rrrrr@+++++\
+++++@rrrrrrr@++++\
++++@rrrrrrrrr@+++\
+++@rrrrrrrrrrr@++\
+++@@@@@rrr@@@@@++\
+++++++@rrr@++++++\
+++++++@rrr@++++++\
+++++++@rrr@++++++\
+++++++@rrr@++++++\
+++++++@rrr@++++++\
+++++++@rrr@++++++\
+++++++@@@@@++++++\
+ ";
+ 
+ char *icon_nine="\
+-#MGR000200160016
+-++++++++++++++++
+-++++ggggggg+++++
+-+++gkkkkkkkg++++
+-++gkkkkkgkkkg+++
+-+gkkkkkggkkkkg++
+-+gkkkkggkkkkkg++
+-+gkkkggkkkkkkg++
+-+gkkggkkkkkkkg++
+-+gkgggggggggkg++
+-+gkkkkkkggkkkg++
+-+gkkkkgggkkkkg++
+-+gkkkggkkkkkkg++
+-++gkkgkkkkkkg+++
+-+++gkkkkkkkg++++
+-++++ggggggg+++++
+-++++++++++++++++
++#MGR000200160016\
++++++++++++++++++\
++++++ggggggg+++++\
+++++gkkkkkkkg++++\
++++gkkkkkgkkkg+++\
+++gkkkkkggkkkkg++\
+++gkkkkggkkkkkg++\
+++gkkkggkkkkkkg++\
+++gkkggkkkkkkkg++\
+++gkgggggggggkg++\
+++gkkkkkkggkkkg++\
+++gkkkkgggkkkkg++\
+++gkkkggkkkkkkg++\
++++gkkgkkkkkkg+++\
+++++gkkkkkkkg++++\
++++++ggggggg+++++\
++++++++++++++++++\
+ ";
+ 
+ char *icon_nine_num="\
+-#MGR000200160016
+-++++++++++++++++
+-++++ggggggg+++++
+-+++gkkkkkkkg++++
+-++gkkkkkkkkkg+++
+-+gkkggkkkggkkg++
+-+gkkgggkkggkkg++
+-+gkkgggkkggkkg++
+-+gkkggkgkggkkg++
+-+gkkggkgkggkkg++
+-+gkkggkkgggkkg++
+-+gkkggkkgggkkg++
+-+gkkggkkkggkkg++
+-++gkkkkkkkkgg+++
+-+++gkkkkkkkg++++
+-++++ggggggg+++++
+-++++++++++++++++
++#MGR000200160016\
++++++++++++++++++\
++++++ggggggg+++++\
+++++gkkkkkkkg++++\
++++gkkkkkkkkkg+++\
+++gkkggkkkggkkg++\
+++gkkgggkkggkkg++\
+++gkkgggkkggkkg++\
+++gkkggkgkggkkg++\
+++gkkggkgkggkkg++\
+++gkkggkkgggkkg++\
+++gkkggkkgggkkg++\
+++gkkggkkkggkkg++\
++++gkkkkkkkkgg+++\
+++++gkkkkkkkg++++\
++++++ggggggg+++++\
++++++++++++++++++\
+ ";
+ 
+ #define SWS_INITIALIZING	1
diff --git a/graphics/mgl/patches/patch-an b/graphics/mgl/patches/patch-an
new file mode 100644
index 00000000000..4a8b928da84
--- /dev/null
+++ b/graphics/mgl/patches/patch-an
@@ -0,0 +1,95 @@
+$NetBSD: patch-an,v 1.1 2003/10/14 16:22:21 salo Exp $
+
+--- bin/imsoft.c.orig	2000-09-09 05:07:08.000000000 +0200
++++ bin/imsoft.c	2003-10-14 17:43:50.000000000 +0200
+@@ -58,51 +58,51 @@
+ 
+ 
+ static char *kb_layout1="\
+------------------------------------------------+
+-                                               |
+------------------------------------------------+
+-Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | BS|
+----+---+---+---+---+---+---+---+---+---+---+---+
+-Tab| q | w | e | r | t | y | u | i | o | p |Ent|
+----+---+---+---+---+---+---+---+---+---+---+-  |
+-Caps| a | s | d | f | g | h | j | k | l | ; |er|
+-----+---+---+---+---+---+---+---+---+---+---+--|
+-Shift| z | x | c | v | b | n | m | , | . |¢¬|@ |
+------+---+---+---+---+---+---+---+---+---+--+--+
+-Ctrl |Alt  |Hide |             |Kanji |¢«|¢­|¢ª|
+------+-----+-----+-------------+-----------+---+
++-----------------------------------------------+\
++                                               |\
++-----------------------------------------------+\
++Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | BS|\
++---+---+---+---+---+---+---+---+---+---+---+---+\
++Tab| q | w | e | r | t | y | u | i | o | p |Ent|\
++---+---+---+---+---+---+---+---+---+---+---+-  |\
++Caps| a | s | d | f | g | h | j | k | l | ; |er|\
++----+---+---+---+---+---+---+---+---+---+---+--|\
++Shift| z | x | c | v | b | n | m | , | . |¢¬|@ |\
++-----+---+---+---+---+---+---+---+---+---+--+--+\
++Ctrl |Alt  |Hide |             |Kanji |¢«|¢­|¢ª|\
++-----+-----+-----+-------------+-----------+---+\
+ ";
+ 
+ static char *kb_layout2="\
+------------------------------------------------+
+-                                               |
+------------------------------------------------+
+-Esc| ! | \" | # | $ | % | & | ' | ( | ) | ~ | BS|
+----+---+---+---+---+---+---+---+---+---+---+---+
+-Tab| Q | W | E | R | T | Y | U | I | O | P |Ent|
+----+---+---+---+---+---+---+---+---+---+---+-  |
+-Caps| A | S | D | F | G | H | J | K | L | + |er|
+-----+---+---+---+---+---+---+---+---+---+---+--|
+-Shift| Z | X | C | V | B | N | M | < | > |¢¬|` |
+------+---+---+---+---+---+---+---+---+---+--+--+
+-Ctrl |Alt  |Hide |             |Kanji |¢«|¢­|¢ª|
+------+-----+-----+-------------+-----------+---+
++-----------------------------------------------+\
++                                               |\
++-----------------------------------------------+\
++Esc| ! | \" | # | $ | % | & | ' | ( | ) | ~ | BS|\
++---+---+---+---+---+---+---+---+---+---+---+---+\
++Tab| Q | W | E | R | T | Y | U | I | O | P |Ent|\
++---+---+---+---+---+---+---+---+---+---+---+-  |\
++Caps| A | S | D | F | G | H | J | K | L | + |er|\
++----+---+---+---+---+---+---+---+---+---+---+--|\
++Shift| Z | X | C | V | B | N | M | < | > |¢¬|` |\
++-----+---+---+---+---+---+---+---+---+---+--+--+\
++Ctrl |Alt  |Hide |             |Kanji |¢«|¢­|¢ª|\
++-----+-----+-----+-------------+-----------+---+\
+ ";
+ 
+ static char *kb_layout3="\
+------------------------------------------------+
+-                                               |
+------------------------------------------------+
+-Esc|                                       | BS|
+----+---+---+---+---+---+---+---+---+---+---+---+
+-Han| q | w | e | r | t | y | u | i | o | p |Ent|
+----+---+---+---+---+---+---+---+---+---+---+-  |
+-Zen | a | s | d | f | g | h | j | k | l | ; |er|
+-----+---+---+---+---+---+---+---+---+---+---+--|
+-Kata | z | x | c | v | b | n | m | , | . |¢¬|/ |
+------+---+---+---+---+---+---+---+---+---+--+--+
+-Dic | \\ | @ | - | = |          |Alpha |¢«|¢­|¢ª|
+------+-----+-----+-------------+-----------+---+
++-----------------------------------------------+\
++                                               |\
++-----------------------------------------------+\
++Esc|                                       | BS|\
++---+---+---+---+---+---+---+---+---+---+---+---+\
++Han| q | w | e | r | t | y | u | i | o | p |Ent|\
++---+---+---+---+---+---+---+---+---+---+---+-  |\
++Zen | a | s | d | f | g | h | j | k | l | ; |er|\
++----+---+---+---+---+---+---+---+---+---+---+--|\
++Kata | z | x | c | v | b | n | m | , | . |¢¬|/ |\
++-----+---+---+---+---+---+---+---+---+---+--+--+\
++Dic | \\ | @ | - | = |          |Alpha |¢«|¢­|¢ª|\
++-----+-----+-----+-------------+-----------+---+\
+ ";
+ 
+ #define MK_CAPS		MK_V1
diff --git a/graphics/mgl/patches/patch-ao b/graphics/mgl/patches/patch-ao
new file mode 100644
index 00000000000..454c9871ddb
--- /dev/null
+++ b/graphics/mgl/patches/patch-ao
@@ -0,0 +1,45 @@
+$NetBSD: patch-ao,v 1.1 2003/10/14 16:22:21 salo Exp $
+
+--- mgterm/mgterm.c.orig	2001-03-09 12:05:20.000000000 +0100
++++ mgterm/mgterm.c	2003-10-14 17:49:36.000000000 +0200
+@@ -27,23 +27,23 @@
+  */
+ #ifndef MGL1
+ char *icon_mgterm="\
+-#MGR000200160016
+-+.............++
+-...............+
+-...*********...+
+-..*VVVVVVVVV*..+
+-..*VjjVVVjjV*..+
+-..*VjVjVjVjV*..+
+-..*VjVVjVVjV*..+
+-..*VjVVVVVjV*..+
+-..*VVVVVVVVV*..+
+-.*************.+
+-.*8.8.8.8.8.8*.+
+-.*.8.8.8.8.8.*.+
+-.*************.+
+-...............+
+-+.............++
+-++++++++++++++++
++#MGR000200160016\
+++.............++\
++...............+\
++...*********...+\
++..*VVVVVVVVV*..+\
++..*VjjVVVjjV*..+\
++..*VjVjVjVjV*..+\
++..*VjVVjVVjV*..+\
++..*VjVVVVVjV*..+\
++..*VVVVVVVVV*..+\
++.*************.+\
++.*8.8.8.8.8.8*.+\
++.*.8.8.8.8.8.*.+\
++.*************.+\
++...............+\
+++.............++\
++++++++++++++++++\
+ ";
+ #endif
+ 
diff --git a/graphics/mgl/patches/patch-ap b/graphics/mgl/patches/patch-ap
new file mode 100644
index 00000000000..66afd5fa684
--- /dev/null
+++ b/graphics/mgl/patches/patch-ap
@@ -0,0 +1,220 @@
+$NetBSD: patch-ap,v 1.1 2003/10/14 16:22:21 salo Exp $
+
+--- mgterm/msame.c.orig	2000-09-09 05:35:24.000000000 +0200
++++ mgterm/msame.c	2003-10-14 17:52:19.000000000 +0200
+@@ -33,113 +33,113 @@
+ 
+ char *picts[6] ={
+ "\
+-#MGR000200160016
+-++++++++++++++++
+-+++++++@@+++++++
+-+++++@@BB@@@++++
+-+++@@BBBBBBB@+++
+-++@~@@B@B@B@@@++
+-+@~~~~@~@~@~~~@+
+-++@~+~~~+~~+~~@+
+-++@~~~~~~~~~~@++
+-++@~~+~~+~~+~@++
+-+++@~~~~~~~~~@++
+-+++@~~+~~~~~@+++
+-++++@~~~~+~@++++
+-+++++@~~+~~@++++
+-++++++@~~~@+++++
+-+++++++@@@++++++
+-++++++++++++++++
++#MGR000200160016\
++++++++++++++++++\
+++++++++@@+++++++\
+++++++@@BB@@@++++\
+++++@@BBBBBBB@+++\
++++@~@@B@B@B@@@++\
+++@~~~~@~@~@~~~@+\
++++@~+~~~+~~+~~@+\
++++@~~~~~~~~~~@++\
++++@~~+~~+~~+~@++\
+++++@~~~~~~~~~@++\
+++++@~~+~~~~~@+++\
++++++@~~~~+~@++++\
+++++++@~~+~~@++++\
++++++++@~~~@+++++\
+++++++++@@@++++++\
++++++++++++++++++\
+ ","\
+-#MGR000200160016
+-++++++++++++++++
+-++++++++++++@@++
+-++++++++++++@@++
+-++@@@@++++++@@++
+-+@@::@@+++@@+@++
+-+@::::@@@@@++@++
+-+@::::@++++++@++
+-+@@:::@+++++@@++
+-++@:::@++++@@+++
+-+++@@@@@@@@@++++
+-++++++@:::@@++++
+-+++++@@::::@++++
+-+++++@@::::@++++
+-++++++@:::@@++++
+-+++++++@@@@+++++
+-++++++++++++++++
++#MGR000200160016\
++++++++++++++++++\
++++++++++++++@@++\
++++++++++++++@@++\
++++@@@@++++++@@++\
+++@@::@@+++@@+@++\
+++@::::@@@@@++@++\
+++@::::@++++++@++\
+++@@:::@+++++@@++\
++++@:::@++++@@+++\
+++++@@@@@@@@@++++\
++++++++@:::@@++++\
+++++++@@::::@++++\
+++++++@@::::@++++\
++++++++@:::@@++++\
+++++++++@@@@+++++\
++++++++++++++++++\
+ ","\
+-#MGR000200160016
+-++++++++++++++++
+-++++++++++++++++
+-++++@@@@@@@@++++
+-+++@CCCBCBCB@+++
+-++@CCCBBCBCBB@++
+-+@BCCBBCCBBCBB@+
+-+@BCCBBCCBBCBB@+
+-+@BCCBBCCBBCBB@+
+-+@BCCBBCCBBCCB@+
+-+@BBCBBCCBBCCB@+
+-+@BBCBBCCBBCBB@+
+-++@BCBBCCCBCB@++
+-+++@BCBCCBBB@+++
+-++++@@@@@@@@++++
+-++++++++++++++++
+-++++++++++++++++
++#MGR000200160016\
++++++++++++++++++\
++++++++++++++++++\
++++++@@@@@@@@++++\
+++++@CCCBCBCB@+++\
++++@CCCBBCBCBB@++\
+++@BCCBBCCBBCBB@+\
+++@BCCBBCCBBCBB@+\
+++@BCCBBCCBBCBB@+\
+++@BCCBBCCBBCCB@+\
+++@BBCBBCCBBCCB@+\
+++@BBCBBCCBBCBB@+\
++++@BCBBCCCBCB@++\
+++++@BCBCCBBB@+++\
++++++@@@@@@@@++++\
++++++++++++++++++\
++++++++++++++++++\
+ ","\
+-#MGR000200160016
+-++++++++++++++++
+-++++++++++++++++
+-++++++++++++@@++
+-+++++@@@@+++@@++
+-++++@YYY@+++@@++
+-++++@YYY@++@@@++
+-++++@@@Y@@@@@+++
+-+++@YYY@YYY@++++
+-+++@YYY@YYY@++++
+-+++@YYY@YY@@@+++
+-++@@@Y@@@@YYY@++
+-+@YYY@YYY@YYY@++
+-+@YYY@YYY@YYY@++
+-+@YYY@YYY@@@@+++
+-++@@@+@@@+++++++
+-++++++++++++++++
++#MGR000200160016\
++++++++++++++++++\
++++++++++++++++++\
++++++++++++++@@++\
+++++++@@@@+++@@++\
++++++@YYY@+++@@++\
++++++@YYY@++@@@++\
++++++@@@Y@@@@@+++\
+++++@YYY@YYY@++++\
+++++@YYY@YYY@++++\
+++++@YYY@YY@@@+++\
++++@@@Y@@@@YYY@++\
+++@YYY@YYY@YYY@++\
+++@YYY@YYY@YYY@++\
+++@YYY@YYY@@@@+++\
++++@@@+@@@+++++++\
++++++++++++++++++\
+ ","\
+-#MGR000200160016
+-++++++++++++++++
+-+++++++@@@++++++
+-+++++@@BBB@+++++
+-++++@l@BBB@@++++
+-+++@lll@@@ll@+++
+-++@ljlljlllll@++
+-+@llllllllljll@+
+-+@lljlljlllllj@+
+-+@jlllllllllll@+
+-+@llljllllljll@+
+-+@ljllllljllll@+
+-++@lljllllljl@++
+-+++@llljllll@+++
+-++++@@@@@@@@++++
+-++++++++++++++++
+-++++++++++++++++
++#MGR000200160016\
++++++++++++++++++\
+++++++++@@@++++++\
+++++++@@BBB@+++++\
++++++@l@BBB@@++++\
+++++@lll@@@ll@+++\
++++@ljlljlllll@++\
+++@llllllllljll@+\
+++@lljlljlllllj@+\
+++@jlllllllllll@+\
+++@llljllllljll@+\
+++@ljllllljllll@+\
++++@lljllllljl@++\
+++++@llljllll@+++\
++++++@@@@@@@@++++\
++++++++++++++++++\
++++++++++++++++++\
+ ","\
+-#MGR000200160016
+-++++++++++++++++
+-++++++++@+++++++
+-+++++@@@@@@@++++
+-+++@@ee@eeee@+++
+-++@eeee@eeeee@++
+-++@ee@eeee@eee@+
+-+@eeee@@@@eeee@+
+-+@eeeeeeeeeeee@+
+-+@eeeeeeeeeeee@+
+-+@eeeeeeeeeeee@+
+-+@eeeeeeeeeeee@+
+-++@eeeeeeeeee@++
+-++@eeeeeeeeee@++
+-+++@eeeeeeee@+++
+-++++@@@@@@@@++++
+-++++++++++++++++
++#MGR000200160016\
++++++++++++++++++\
++++++++++@+++++++\
+++++++@@@@@@@++++\
+++++@@ee@eeee@+++\
++++@eeee@eeeee@++\
++++@ee@eeee@eee@+\
+++@eeee@@@@eeee@+\
+++@eeeeeeeeeeee@+\
+++@eeeeeeeeeeee@+\
+++@eeeeeeeeeeee@+\
+++@eeeeeeeeeeee@+\
++++@eeeeeeeeee@++\
++++@eeeeeeeeee@++\
+++++@eeeeeeee@+++\
++++++@@@@@@@@++++\
++++++++++++++++++\
+ "};
+ static int vk_attached=0;
+ static struct virtual_key *vk_canvas;
diff --git a/graphics/mgl/patches/patch-ar b/graphics/mgl/patches/patch-ar
new file mode 100644
index 00000000000..9a9405dd7df
--- /dev/null
+++ b/graphics/mgl/patches/patch-ar
@@ -0,0 +1,45 @@
+$NetBSD: patch-ar,v 1.1 2003/10/14 16:22:21 salo Exp $
+
+--- mgterm/mcalc.c.orig	2001-03-09 12:05:20.000000000 +0100
++++ mgterm/mcalc.c	2003-10-14 17:58:13.000000000 +0200
+@@ -258,23 +258,23 @@
+ void mcalc();
+ 
+ static char *icon_calc="\
+-#MGR000200160016
+-++++++++++++++++
+-++@@@@@@@@@@@@++
+-++@..........@++
+-++@.********.@++
+-++@.********.@++
+-++@.********.@++
+-++@..........@++
+-++@.@@.@@.@@.@++
+-++@.@@.@@.@@.@++
+-++@..........@++
+-++@.@@.@@.@@.@++
+-++@.@@.@@.@@.@++
+-++@..........@++
+-++@@@@@@@@@@@@++
+-++++++++++++++++
+-++++++++++++++++
++#MGR000200160016\
++++++++++++++++++\
++++@@@@@@@@@@@@++\
++++@..........@++\
++++@.********.@++\
++++@.********.@++\
++++@.********.@++\
++++@..........@++\
++++@.@@.@@.@@.@++\
++++@.@@.@@.@@.@++\
++++@..........@++\
++++@.@@.@@.@@.@++\
++++@.@@.@@.@@.@++\
++++@..........@++\
++++@@@@@@@@@@@@++\
++++++++++++++++++\
++++++++++++++++++\
+ ";
+ 
+ main(int argc, char *argv[]) {
diff --git a/graphics/mgl/patches/patch-as b/graphics/mgl/patches/patch-as
new file mode 100644
index 00000000000..3398413aa2a
--- /dev/null
+++ b/graphics/mgl/patches/patch-as
@@ -0,0 +1,45 @@
+$NetBSD: patch-as,v 1.1 2003/10/14 16:22:21 salo Exp $
+
+--- mil/mil.c.orig	2000-09-09 05:40:44.000000000 +0200
++++ mil/mil.c	2003-10-14 18:01:34.000000000 +0200
+@@ -28,23 +28,23 @@
+  */
+ 
+ char *icon_mil ="\
+-#MGR000200160016
+-+ooooooooooooo++
+-ooooooooooooooo+
+-ooEEEoooooooooo+
+-oooooEEoooooooo+
+-ooooooooooooooo+
+-ooEEEoooooooooo+
+-oooooEEoooooooo+
+-ooooooooEoEoooo+
+-ooEEEoooEoEoooo+
+-oooooEEoEoEoooo+
+-ooooooooEoEooEo+
+-oooooooEEoEoEoo+
+-ooooooEoooEEooo+
+-ooooooooooooooo+
+-+ooooooooooooo++
+-++++++++++++++++
++#MGR000200160016\
+++ooooooooooooo++\
++ooooooooooooooo+\
++ooEEEoooooooooo+\
++oooooEEoooooooo+\
++ooooooooooooooo+\
++ooEEEoooooooooo+\
++oooooEEoooooooo+\
++ooooooooEoEoooo+\
++ooEEEoooEoEoooo+\
++oooooEEoEoEoooo+\
++ooooooooEoEooEo+\
++oooooooEEoEoEoo+\
++ooooooEoooEEooo+\
++ooooooooooooooo+\
+++ooooooooooooo++\
++++++++++++++++++\
+ ";
+ 
+ #include <stdio.h>
diff --git a/graphics/mgl/patches/patch-at b/graphics/mgl/patches/patch-at
new file mode 100644
index 00000000000..4501ea139e6
--- /dev/null
+++ b/graphics/mgl/patches/patch-at
@@ -0,0 +1,411 @@
+$NetBSD: patch-at,v 1.1 2003/10/14 16:22:21 salo Exp $
+
+--- demos/iconedit.c.orig	2000-09-10 12:02:05.000000000 +0200
++++ demos/iconedit.c	2003-10-14 18:07:01.000000000 +0200
+@@ -92,219 +92,219 @@
+ char load_name[256]="icon_c.mgr";
+ 
+ char *icon_edit ="\
+-#MGR000200160016
+-++++++++++++++++
+-++iiiiiiiiiii+++
+-+iiiiiiii@iiii++
+-+iiiiiii@B@iii++
+-+iiiiii@BBB@ii++
+-+iiiii@BBBBB@i++
+-+iiii@BBBBB@ii++
+-+iii@BBBBB@iii++
+-+ii@k@BBB@iiii++
+-+ii@kk@B@iiiii++
+-+ii@@kk@iiiiii++
+-+ii@@@@iiiiiii++
+-+iiiiiiiiiiiii++
+-++iiiiiiiiiii+++
+-++++++++++++++++
+-++++++++++++++++
++#MGR000200160016\
++++++++++++++++++\
++++iiiiiiiiiii+++\
+++iiiiiiii@iiii++\
+++iiiiiii@B@iii++\
+++iiiiii@BBB@ii++\
+++iiiii@BBBBB@i++\
+++iiii@BBBBB@ii++\
+++iii@BBBBB@iii++\
+++ii@k@BBB@iiii++\
+++ii@kk@B@iiiii++\
+++ii@@kk@iiiiii++\
+++ii@@@@iiiiiii++\
+++iiiiiiiiiiiii++\
++++iiiiiiiiiii+++\
++++++++++++++++++\
++++++++++++++++++\
+ ";
+ 
+ char *icon_pen ="\
+-#MGR000200160016
+-+iiiiiiiiiii++++
+-iiiiiiii@iiii+++
+-iiiiiii@B@iii+++
+-iiiiii@BBB@ii+++
+-iiiii@BBBBB@i+++
+-iiii@BBBBB@ii+++
+-iii@BBBBB@iii+++
+-ii@k@BBB@iiii+++
+-ii@kk@B@iiiii+++
+-ii@@kk@iiiiii+++
+-ii@@@@iiiiiii+++
+-iiiiiiiiiiiii+++
+-+iiiiiiiiiii++++
+-++++++++++++++++
+-++++++++++++++++
+-++++++++++++++++
++#MGR000200160016\
+++iiiiiiiiiii++++\
++iiiiiiii@iiii+++\
++iiiiiii@B@iii+++\
++iiiiii@BBB@ii+++\
++iiiii@BBBBB@i+++\
++iiii@BBBBB@ii+++\
++iii@BBBBB@iii+++\
++ii@k@BBB@iiii+++\
++ii@kk@B@iiiii+++\
++ii@@kk@iiiiii+++\
++ii@@@@iiiiiii+++\
++iiiiiiiiiiiii+++\
+++iiiiiiiiiii++++\
++++++++++++++++++\
++++++++++++++++++\
++++++++++++++++++\
+ ";
+ 
+ char *icon_brush="\
+-#MGR000200160016
+-+iiiiiiiiiii++++
+-iiii@@@@@iiii+++
+-iiii@jjj@iiii+++
+-iiii@jjj@iiii+++
+-i@@@@jjj@@@@i+++
+-i@jjjjjjjjj@i+++
+-i@jjjjjjjjj@i+++
+-i@@@@@@@@@@@i+++
+-iiEBEBEBEBEii+++
+-iiEBEBEBEBEii+++
+-iiEBEBEBEBEii+++
+-iEBEBEBEBEiii+++
+-+iiiiiiiiiii++++
+-++++++++++++++++
+-++++++++++++++++
+-++++++++++++++++
++#MGR000200160016\
+++iiiiiiiiiii++++\
++iiii@@@@@iiii+++\
++iiii@jjj@iiii+++\
++iiii@jjj@iiii+++\
++i@@@@jjj@@@@i+++\
++i@jjjjjjjjj@i+++\
++i@jjjjjjjjj@i+++\
++i@@@@@@@@@@@i+++\
++iiEBEBEBEBEii+++\
++iiEBEBEBEBEii+++\
++iiEBEBEBEBEii+++\
++iEBEBEBEBEiii+++\
+++iiiiiiiiiii++++\
++++++++++++++++++\
++++++++++++++++++\
++++++++++++++++++\
+ ";
+ 
+ char *icon_pickup="\
+-#MGR000200160016
+-+iiiiiiiiiii++++
+-ii@@@iiiiiiii+++
+-ii@@@iiiiiiii+++
+-i@@@@@@@@@@@i+++
+-i@+++@@@+++@i+++
+-i@++@SSS@++@i+++
+-i@+@SSSSS@+@i+++
+-i@+@SSSSS@+@i+++
+-i@++@SSS@++@i+++
+-i@+++@@@+++@i+++
+-i@@@@@@@@@@@i+++
+-iiiiiiiiiiiii+++
+-+iiiiiiiiiii++++
+-++++++++++++++++
+-++++++++++++++++
+-++++++++++++++++
++#MGR000200160016\
+++iiiiiiiiiii++++\
++ii@@@iiiiiiii+++\
++ii@@@iiiiiiii+++\
++i@@@@@@@@@@@i+++\
++i@+++@@@+++@i+++\
++i@++@SSS@++@i+++\
++i@+@SSSSS@+@i+++\
++i@+@SSSSS@+@i+++\
++i@++@SSS@++@i+++\
++i@+++@@@+++@i+++\
++i@@@@@@@@@@@i+++\
++iiiiiiiiiiiii+++\
+++iiiiiiiiiii++++\
++++++++++++++++++\
++++++++++++++++++\
++++++++++++++++++\
+ ";
+ char *icon_load ="\
+-#MGR000200160016
+-+iiiiiiiiiii++++
+-i@@@@@@@@@iii+++
+-i@=@==;;@=@ii+++
+-i@=@==;;@==@i+++
+-i@=@==;;@==@i+++
+-i@=@@@@@@==@i+++
+-i@==r======@i+++
+-i@==r======@i+++
+-i@==r======@i+++
+-i@==r======@i+++
+-i@==rrrrr==@i+++
+-i@@@@@@@@@@@i+++
+-+iiiiiiiiiii++++
+-++++++++++++++++
+-++++++++++++++++
+-++++++++++++++++
++#MGR000200160016\
+++iiiiiiiiiii++++\
++i@@@@@@@@@iii+++\
++i@=@==;;@=@ii+++\
++i@=@==;;@==@i+++\
++i@=@==;;@==@i+++\
++i@=@@@@@@==@i+++\
++i@==r======@i+++\
++i@==r======@i+++\
++i@==r======@i+++\
++i@==r======@i+++\
++i@==rrrrr==@i+++\
++i@@@@@@@@@@@i+++\
+++iiiiiiiiiii++++\
++++++++++++++++++\
++++++++++++++++++\
++++++++++++++++++\
+ ";
+ 
+ char *icon_save ="\
+-#MGR000200160016
+-+iiiiiiiiiii++++
+-i@@@@@@@@@iii+++
+-i@=@==;;@=@ii+++
+-i@=@==;;@==@i+++
+-i@=@==;;@==@i+++
+-i@=@@@@@@==@i+++
+-i@===rrrr==@i+++
+-i@==r======@i+++
+-i@===rr====@i+++
+-i@=====r===@i+++
+-i@=rrrr====@i+++
+-i@@@@@@@@@@@i+++
+-+iiiiiiiiiii++++
+-++++++++++++++++
+-++++++++++++++++
+-++++++++++++++++
++#MGR000200160016\
+++iiiiiiiiiii++++\
++i@@@@@@@@@iii+++\
++i@=@==;;@=@ii+++\
++i@=@==;;@==@i+++\
++i@=@==;;@==@i+++\
++i@=@@@@@@==@i+++\
++i@===rrrr==@i+++\
++i@==r======@i+++\
++i@===rr====@i+++\
++i@=====r===@i+++\
++i@=rrrr====@i+++\
++i@@@@@@@@@@@i+++\
+++iiiiiiiiiii++++\
++++++++++++++++++\
++++++++++++++++++\
++++++++++++++++++\
+ ";
+ 
+ char *icon_down ="\
+-#MGR000200160016
+-+iiiiiiiiiii++++
+-iiii@@@@@iiii+++
+-iiii@TTT@iiii+++
+-iiii@TTT@iiii+++
+-iiii@TTT@iiii+++
+-i@@@@TTT@@@@i+++
+-i@TTTTTTTTT@i+++
+-ii@TTTTTTT@ii+++
+-iii@TTTTT@iii+++
+-iiii@TTT@iiii+++
+-iiiii@T@iiiii+++
+-iiiiii@iiiiii+++
+-+iiiiiiiiiii++++
+-++++++++++++++++
+-++++++++++++++++
+-++++++++++++++++
++#MGR000200160016\
+++iiiiiiiiiii++++\
++iiii@@@@@iiii+++\
++iiii@TTT@iiii+++\
++iiii@TTT@iiii+++\
++iiii@TTT@iiii+++\
++i@@@@TTT@@@@i+++\
++i@TTTTTTTTT@i+++\
++ii@TTTTTTT@ii+++\
++iii@TTTTT@iii+++\
++iiii@TTT@iiii+++\
++iiiii@T@iiiii+++\
++iiiiii@iiiiii+++\
+++iiiiiiiiiii++++\
++++++++++++++++++\
++++++++++++++++++\
++++++++++++++++++\
+ ";
+ char *icon_up ="\
+-#MGR000200160016
+-+iiiiiiiiiii++++
+-iiiiii@iiiiii+++
+-iiiii@T@iiiii+++
+-iiii@TTT@iiii+++
+-iii@TTTTT@iii+++
+-ii@TTTTTTT@ii+++
+-i@TTTTTTTTT@i+++
+-i@@@@TTT@@@@i+++
+-iiii@TTT@iiii+++
+-iiii@TTT@iiii+++
+-iiii@TTT@iiii+++
+-iiii@@@@@iiii+++
+-+iiiiiiiiiii++++
+-++++++++++++++++
+-++++++++++++++++
+-++++++++++++++++
++#MGR000200160016\
+++iiiiiiiiiii++++\
++iiiiii@iiiiii+++\
++iiiii@T@iiiii+++\
++iiii@TTT@iiii+++\
++iii@TTTTT@iii+++\
++ii@TTTTTTT@ii+++\
++i@TTTTTTTTT@i+++\
++i@@@@TTT@@@@i+++\
++iiii@TTT@iiii+++\
++iiii@TTT@iiii+++\
++iiii@TTT@iiii+++\
++iiii@@@@@iiii+++\
+++iiiiiiiiiii++++\
++++++++++++++++++\
++++++++++++++++++\
++++++++++++++++++\
+ ";
+ char *icon_left ="\
+-#MGR000200160016
+-+iiiiiiiiiii++++
+-iiiiii@@iiiii+++
+-iiiii@T@iiiii+++
+-iiii@TT@iiiii+++
+-iii@TTT@@@@@i+++
+-ii@TTTTTTTT@i+++
+-i@TTTTTTTTT@i+++
+-ii@TTTTTTTT@i+++
+-iii@TTT@@@@@i+++
+-iiii@TT@iiiii+++
+-iiiii@T@iiiii+++
+-iiiiii@@iiiii+++
+-+iiiiiiiiiii++++
+-++++++++++++++++
+-++++++++++++++++
+-++++++++++++++++
++#MGR000200160016\
+++iiiiiiiiiii++++\
++iiiiii@@iiiii+++\
++iiiii@T@iiiii+++\
++iiii@TT@iiiii+++\
++iii@TTT@@@@@i+++\
++ii@TTTTTTTT@i+++\
++i@TTTTTTTTT@i+++\
++ii@TTTTTTTT@i+++\
++iii@TTT@@@@@i+++\
++iiii@TT@iiiii+++\
++iiiii@T@iiiii+++\
++iiiiii@@iiiii+++\
+++iiiiiiiiiii++++\
++++++++++++++++++\
++++++++++++++++++\
++++++++++++++++++\
+ ";
+ char *icon_right ="\
+-#MGR000200160016
+-+iiiiiiiiiii++++
+-iiiii@@iiiiii+++
+-iiiii@T@iiiii+++
+-iiiii@TT@iiii+++
+-i@@@@@TTT@iii+++
+-i@TTTTTTTT@ii+++
+-i@TTTTTTTTT@i+++
+-i@TTTTTTTT@ii+++
+-i@@@@@TTT@iii+++
+-iiiii@TT@iiii+++
+-iiiii@T@iiiii+++
+-iiiii@@iiiiii+++
+-+iiiiiiiiiii++++
+-++++++++++++++++
+-++++++++++++++++
+-++++++++++++++++
++#MGR000200160016\
+++iiiiiiiiiii++++\
++iiiii@@iiiiii+++\
++iiiii@T@iiiii+++\
++iiiii@TT@iiii+++\
++i@@@@@TTT@iii+++\
++i@TTTTTTTT@ii+++\
++i@TTTTTTTTT@i+++\
++i@TTTTTTTT@ii+++\
++i@@@@@TTT@iii+++\
++iiiii@TT@iiii+++\
++iiiii@T@iiiii+++\
++iiiii@@iiiiii+++\
+++iiiiiiiiiii++++\
++++++++++++++++++\
++++++++++++++++++\
++++++++++++++++++\
+ ";
+ 
+ char *icon_gray ="\
+-#MGR000200160016
+-+iiiiiiiiiii++++
+-i@@@@@@@@@@@i+++
+-i@@@@@@****@i+++
+-i@@@@@@****@i+++
+-i@@@@@@****@i+++
+-i@@@@@@****@i+++
+-i@@@@@@@@@@@i+++
+-i@++++@....@i+++
+-i@++++@....@i+++
+-i@++++@....@i+++
+-i@++++@....@i+++
+-i@@@@@@@@@@@i+++
+-+iiiiiiiiiii++++
+-++++++++++++++++
+-++++++++++++++++
+-++++++++++++++++
++#MGR000200160016\
+++iiiiiiiiiii++++\
++i@@@@@@@@@@@i+++\
++i@@@@@@****@i+++\
++i@@@@@@****@i+++\
++i@@@@@@****@i+++\
++i@@@@@@****@i+++\
++i@@@@@@@@@@@i+++\
++i@++++@....@i+++\
++i@++++@....@i+++\
++i@++++@....@i+++\
++i@++++@....@i+++\
++i@@@@@@@@@@@i+++\
+++iiiiiiiiiii++++\
++++++++++++++++++\
++++++++++++++++++\
++++++++++++++++++\
+ ";
+ 
+ #ifndef NULL
diff --git a/graphics/mgl/patches/patch-au b/graphics/mgl/patches/patch-au
new file mode 100644
index 00000000000..bba4f9e4c5a
--- /dev/null
+++ b/graphics/mgl/patches/patch-au
@@ -0,0 +1,45 @@
+$NetBSD: patch-au,v 1.1 2003/10/14 16:22:21 salo Exp $
+
+--- demos/mgldialog.c.orig	2000-09-09 04:45:13.000000000 +0200
++++ demos/mgldialog.c	2003-10-14 18:10:43.000000000 +0200
+@@ -6,23 +6,23 @@
+ #endif
+ 
+ char *icon_warn ="\
+-#MGR000200160016
+-++++++++++++++++
+-++++++fff+++++++
+-+++++ff@ff++++++
+-++++ff@@@ff+++++
+-+++ff@ppp@ff++++
+-++ff@@ppp@@ff+++
+-+ff@@@ppp@@@ff++
+-+f@@@@ppp@@@@f++
+-+ff@@@@p@@@@ff++
+-++ff@@@@@@@ff+++
+-+++ff@ppp@ff++++
+-++++ffpppff+++++
+-+++++ff@ff++++++
+-++++++fff+++++++
+-++++++++++++++++
+-++++++++++++++++
++#MGR000200160016\
++++++++++++++++++\
++++++++fff+++++++\
+++++++ff@ff++++++\
++++++ff@@@ff+++++\
+++++ff@ppp@ff++++\
++++ff@@ppp@@ff+++\
+++ff@@@ppp@@@ff++\
+++f@@@@ppp@@@@f++\
+++ff@@@@p@@@@ff++\
++++ff@@@@@@@ff+++\
+++++ff@ppp@ff++++\
++++++ffpppff+++++\
+++++++ff@ff++++++\
++++++++fff+++++++\
++++++++++++++++++\
++++++++++++++++++\
+ ";
+ 
+ main(int argc,char *argv[]) {
diff --git a/graphics/mgl/patches/patch-av b/graphics/mgl/patches/patch-av
new file mode 100644
index 00000000000..115f6240e8c
--- /dev/null
+++ b/graphics/mgl/patches/patch-av
@@ -0,0 +1,83 @@
+$NetBSD: patch-av,v 1.1 2003/10/14 16:22:21 salo Exp $
+
+--- demos/vkdemo.c.orig	2000-09-09 05:07:10.000000000 +0200
++++ demos/vkdemo.c	2003-10-14 18:12:40.000000000 +0200
+@@ -56,45 +56,45 @@
+ 
+ 
+ char *kb_layout1="\
+------------------------------------------------+
+-Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | BS|
+----+---+---+---+---+---+---+---+---+---+---+---+
+-Tab| q | w | e | r | t | y | u | i | o | p |Ent|
+----+---+---+---+---+---+---+---+---+---+---+-  |
+-Caps| a | s | d | f | g | h | j | k | l | ; |er|
+-----+---+---+---+---+---+---+---+---+---+---+--|
+-Shift| z | x | c | v | b | n | m | , | . |¢¬|@ |
+------+---+---+---+---+---+---+---+---+---+--+--+
+-Ctrl |Alt  |Hide |             |Kanji |¢«|¢­|¢ª|
+------+-----+-----+-------------+-----------+---+
++-----------------------------------------------+\
++Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | BS|\
++---+---+---+---+---+---+---+---+---+---+---+---+\
++Tab| q | w | e | r | t | y | u | i | o | p |Ent|\
++---+---+---+---+---+---+---+---+---+---+---+-  |\
++Caps| a | s | d | f | g | h | j | k | l | ; |er|\
++----+---+---+---+---+---+---+---+---+---+---+--|\
++Shift| z | x | c | v | b | n | m | , | . |¢¬|@ |\
++-----+---+---+---+---+---+---+---+---+---+--+--+\
++Ctrl |Alt  |Hide |             |Kanji |¢«|¢­|¢ª|\
++-----+-----+-----+-------------+-----------+---+\
+ ";
+ 
+ char *kb_layout2="\
+------------------------------------------------+
+-Esc| ! | \" | # | $ | % | & | ' | ( | ) | ~ | BS|
+----+---+---+---+---+---+---+---+---+---+---+---+
+-Tab| Q | W | E | R | T | Y | U | I | O | P |Ent|
+----+---+---+---+---+---+---+---+---+---+---+-  |
+-Caps| A | S | D | F | G | H | J | K | L | + |er|
+-----+---+---+---+---+---+---+---+---+---+---+--|
+-Shift| Z | X | C | V | B | N | M | < | > |¢¬|` |
+------+---+---+---+---+---+---+---+---+---+--+--+
+-Ctrl |Alt  |Hide |             |Kanji |¢«|¢­|¢ª|
+------+-----+-----+-------------+-----------+---+
++-----------------------------------------------+\
++Esc| ! | \" | # | $ | % | & | ' | ( | ) | ~ | BS|\
++---+---+---+---+---+---+---+---+---+---+---+---+\
++Tab| Q | W | E | R | T | Y | U | I | O | P |Ent|\
++---+---+---+---+---+---+---+---+---+---+---+-  |\
++Caps| A | S | D | F | G | H | J | K | L | + |er|\
++----+---+---+---+---+---+---+---+---+---+---+--|\
++Shift| Z | X | C | V | B | N | M | < | > |¢¬|` |\
++-----+---+---+---+---+---+---+---+---+---+--+--+\
++Ctrl |Alt  |Hide |             |Kanji |¢«|¢­|¢ª|\
++-----+-----+-----+-------------+-----------+---+\
+ ";
+ 
+ char *kb_layout3="\
+------------------------------------------------+
+-Esc|                                       | BS|
+----+---+---+---+---+---+---+---+---+---+---+---+
+-Han| q | w | e | r | t | y | u | i | o | p |Ent|
+----+---+---+---+---+---+---+---+---+---+---+-  |
+-Zen | a | s | d | f | g | h | j | k | l | ; |er|
+-----+---+---+---+---+---+---+---+---+---+---+--|
+-Kata | z | x | c | v | b | n | m | , | . |¢¬|/ |
+------+---+---+---+---+---+---+---+---+---+--+--+
+-Dic | \\ | @ | - | = |          |Alpha |¢«|¢­|¢ª|
+------+-----+-----+-------------+-----------+---+
++-----------------------------------------------+\
++Esc|                                       | BS|\
++---+---+---+---+---+---+---+---+---+---+---+---+\
++Han| q | w | e | r | t | y | u | i | o | p |Ent|\
++---+---+---+---+---+---+---+---+---+---+---+-  |\
++Zen | a | s | d | f | g | h | j | k | l | ; |er|\
++----+---+---+---+---+---+---+---+---+---+---+--|\
++Kata | z | x | c | v | b | n | m | , | . |¢¬|/ |\
++-----+---+---+---+---+---+---+---+---+---+--+--+\
++Dic | \\ | @ | - | = |          |Alpha |¢«|¢­|¢ª|\
++-----+-----+-----+-------------+-----------+---+\
+ ";
+ 
+ struct {