Update mgl to 0.2.0a, provided by the maintainer Hiroyuki Yanai in pkg/12409.

Perhaps there's a changelog on the website, but I don't understand
enough japanese for that :(

16 files changed, 221 insertions, 161 deletions

diff --git a/graphics/mgl/Makefile b/graphics/mgl/Makefile
index e8df467cf0b..40cfb9e4420 100644
--- a/graphics/mgl/Makefile
+++ b/graphics/mgl/Makefile
@@ -1,22 +1,19 @@
-# $NetBSD: Makefile,v 1.6 2001/02/25 04:17:51 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2001/03/20 13:54:31 wiz Exp $
+#
 
-DISTNAME=       mgl2-alpha-019
-PKGNAME=        mgl-0.1.9a
+DISTNAME=       mgl2-alpha-020
+PKGNAME=        mgl-0.2.0a
 CATEGORIES=     graphics
 MASTER_SITES=   http://at.sakura.ne.jp/~suz/arc/
 
-PATCH_SITES=	http://at.sakura.ne.jp/~suz/arc/
-PATCHFILES=	mgl2-alpha-019-for-netbsd15.patch.gz
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=     fk200329@fsinet.or.jp
 HOMEPAGE=	http://www.netbsd.org/Ports/hpcmips/mgl2.html
-COMMENT=	Graphics library for NEC Mobilegear/PocketBSD,NetBSD/hpcmips
+COMMENT=	Graphics library for NEC Mobilegear/PocketBSD, NetBSD/hpcmips
 
-DEPENDS= 	jpeg-6b:../../graphics/jpeg \
-		png>=1.0.3:../../graphics/png \
-		libungif>=4.1.0:../../graphics/libungif \
-		mglfonts>=0.1:../../fonts/mglfonts
+DEPENDS+= 	jpeg-6b:../../graphics/jpeg
+DEPENDS+=	png>=1.0.3:../../graphics/png
+DEPENDS+=	libungif>=4.1.0:../../graphics/libungif
+DEPENDS+=	mglfonts>=0.1:../../fonts/mglfonts
 
 USE_GMAKE= yes
 
@@ -31,6 +28,7 @@ MGL2MEMOS=	README-1st.doc TODO.txt bench.txt draw_engine.doc emsvr.doc \
 BINDOCS=	README.doc imsoft.doc
 MGTERMDOCS=	bugs.doc mgterm.doc
 MILDOCS=	mil.doc
+NINEDOCS=	README.txt CHANGES.doc
 MGLFONTUTILS=	mgl_fontcreate.c
 MGLUTILS=	kill_mgl.sh mglcons.sh set_mgl.sh
 
@@ -78,6 +76,7 @@ post-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/memo
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/mgterm
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/mil
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/nine
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/bin
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mgl2/doc
 .for i in ${MGLDOCS}
@@ -98,5 +97,8 @@ post-install:
 .for i in ${MILDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/mil/${i} ${PREFIX}/share/doc/mgl2/mil/
 .endfor
+.for i in ${NINEDOCS}
+	@${INSTALL_DATA} ${WRKSRC}/nine/${i} ${PREFIX}/share/doc/mgl2/nine/
+.endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mgl/files/md5 b/graphics/mgl/files/md5
index 6a690c277a0..3b6409a760a 100644
--- a/graphics/mgl/files/md5
+++ b/graphics/mgl/files/md5
@@ -1,4 +1,3 @@
-$NetBSD: md5,v 1.2 2000/12/15 04:12:20 wiz Exp $
+$NetBSD: md5,v 1.3 2001/03/20 13:54:31 wiz Exp $
 
-MD5 (mgl2-alpha-019.tar.gz) = 349c75f751db1c141ea7ce00b13df950
-MD5 (mgl2-alpha-019-for-netbsd15.patch.gz) = ad212ed811233db939504fa6edb25611
+SHA1 (mgl2-alpha-020.tar.gz) = aa6be2be28749ba9952afbb359ca0525cad3717f
diff --git a/graphics/mgl/files/patch-sum b/graphics/mgl/files/patch-sum
index 95d05a62aa5..33c7fd66690 100644
--- a/graphics/mgl/files/patch-sum
+++ b/graphics/mgl/files/patch-sum
@@ -1,12 +1,14 @@
-$NetBSD: patch-sum,v 1.3 2001/03/05 09:20:54 skrll Exp $
+$NetBSD: patch-sum,v 1.4 2001/03/20 13:54:31 wiz Exp $
 
-MD5 (patch-aa) = bd185aa82d90f0352998895e2b3faa4e
-MD5 (patch-ab) = 1d739194ec89cc45f159c32bb3564c29
-MD5 (patch-ac) = f0cc3aa6ab2f695e494462b13087c225
-MD5 (patch-ad) = a9d33a12eee4fb1f63ed9d27adf918fc
-MD5 (patch-ae) = 4fcd0efe9e621b4d40bf1855ba58452c
-MD5 (patch-af) = 3ecec22e87bc414bf469c4b827b98437
-MD5 (patch-ag) = 3c2eb8da5eeca9f499ec011320d720c8
-MD5 (patch-ah) = 45ca383512ad3b919937d60d3fc49ac4
-MD5 (patch-ai) = a10964ca09fbb816a86093ae7361b02e
-MD5 (patch-aj) = aa1ee6651e0c833a29ca8bdcfa22d97d
+SHA1 (patch-aa) = 65104bb4030f3bd393f08d6b81382dc87913f5c7
+SHA1 (patch-ab) = 57bb2b1879c5a8ee9f0022ccd74fc8ec2daeef8f
+SHA1 (patch-ac) = b928439dcf815ffab8ec9bb15782ff34ad18006f
+SHA1 (patch-ad) = 8d333d48b897758754d781339a85b78edfd44541
+SHA1 (patch-ae) = 24af530113c82652479f6a34ec0c7773201e6994
+SHA1 (patch-af) = 9265534267b9aa67a9e5db520de0bfc12a601671
+SHA1 (patch-ag) = 4bfe05671d580b2a991e6a6990587d5669a24f5f
+SHA1 (patch-ah) = 1706347380fe3d00295c4f5dc590c22c3f9edf75
+SHA1 (patch-ai) = e24879156f9810fd748f53f9d1e69fcec5ecbe34
+SHA1 (patch-aj) = 8d2537a705a864ce5e570bc82a69014144a6c703
+SHA1 (patch-ak) = 013036c3bf4303af9c72446af5259923f7d7b227
+SHA1 (patch-al) = 85a4ce2a9779bd4fd3f2a37192a5250824fc9271
diff --git a/graphics/mgl/patches/patch-aa b/graphics/mgl/patches/patch-aa
index 7efaa8055b2..6331f808641 100644
--- a/graphics/mgl/patches/patch-aa
+++ b/graphics/mgl/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2001/03/05 09:20:55 skrll Exp $
+$NetBSD: patch-aa,v 1.3 2001/03/20 13:54:31 wiz Exp $
 
---- conf/NetBSD.mk.orig	Thu Aug 31 13:06:52 2000
-+++ conf/NetBSD.mk
-@@ -1,6 +1,6 @@
+--- conf/NetBSD.mk.orig	Sun Dec 10 02:49:29 2000
++++ conf/NetBSD.mk	Wed Mar 14 06:37:28 2001
+@@ -1,40 +1,30 @@
  INSTALL=install
  MAKEDEPEND=sh ../conf/mkdep.sh
 -INCS_X11= -I/usr/X11R6/include
@@ -10,26 +10,34 @@ $NetBSD: patch-aa,v 1.2 2001/03/05 09:20:55 skrll Exp $
  
  # set ELFENV in config.mk
  # a.out env. -> 0
-@@ -9,29 +9,16 @@
+ # ELF env.   -> 1
+-ifndef ELFENV
++#HF#
++#HF# Force -Wl,-rpath even on a.out
++#HF#ifndef ELFENV
  ELFENV=1
- endif
+-endif
++#HF# endif
  
 -ifeq (${ELFENV},1)
 -LIBS_X11= -L/usr/X11R6/lib -Wl,-rpath,/usr/X11R6/lib -lX11
 -else
 -LIBS_X11= -L/usr/X11R6/lib -lX11
 -endif
--
++LIBS_X11= -L${X11BASE}/lib -Wl,-rpath,${X11BASE}/lib -lX11
+ ifeq (${SUPPORT_X_KEYMOUSE},y)
+ LIBS_X11 += -lXtst -lXext
+ endif
+ 
 -INCS_CONS= -I/usr/pkg/include
 -ifeq (${ELFENV},1)
 -    LIBS_CONS= -L/usr/pkg/lib -Wl,-rpath /usr/pkg/lib
 -else
 -    LIBS_CONS= -L/usr/pkg/lib
 -endif
-+LIBS_X11= -L${X11BASE}/lib -Wl,-rpath,${X11BASE}/lib -lX11
- 
 +INCS_CONS= -I${PREFIX}/include
 +LIBS_CONS= -L${PREFIX}/lib -Wl,-rpath ${PREFIX}/lib
+ 
  ifndef LIBS_IM
 -INCS_IM = -I/usr/pkg/include
 -    ifeq (${ELFENV},1)
@@ -38,7 +46,7 @@ $NetBSD: patch-aa,v 1.2 2001/03/05 09:20:55 skrll Exp $
 -    LIBS_IM = -L/usr/pkg/lib -lcanna
 -    endif
 +INCS_IM = -I${PREFIX}/include
-+    LIBS_IM = -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib -lcanna
++LIBS_IM = -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib -lcanna
  endif
  
 -SHLIB_CFLAGS=-fpic -DPIC
@@ -46,7 +54,7 @@ $NetBSD: patch-aa,v 1.2 2001/03/05 09:20:55 skrll Exp $
  ifeq (${ELFENV},1)
      SHLIB_LDFLAGS = -shared
      SHLIB_LD=${CC}
-@@ -62,17 +49,13 @@
+@@ -65,18 +55,10 @@
  
  ifdef MGL_INSTALLED
  	INCS_MGL = -I${MGL_HEADER_DIR}
@@ -55,15 +63,15 @@ $NetBSD: patch-aa,v 1.2 2001/03/05 09:20:55 skrll Exp $
 -	else
 -	LIBS_MGL = -L${MGL_LIB_DIR} -L/usr/X11R6/lib -L/usr/pkg/lib  -lmgl2	
 -	endif
-+	LIBS_MGL = -L${MGL_LIB_DIR} -L/usr/X11R6/lib -Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib  -lmgl2
++	LIBS_MGL = -L${MGL_LIB_DIR} -L${X11BASE}/lib -Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib  -lmgl2
  else
  	INCS_MGL = -I${SRCDIR}
- 	ifeq (${ELFENV},1)
--	LIBS_MGL = -L${SRCDIR} -rdynamic -L/usr/X11R6/lib -Wl,-rpath,/usr/pkg/lib -L/usr/pkg/lib -lmgl2 
-+	LIBS_MGL = -L${SRCDIR} -rdynamic -L/usr/X11R6/lib -Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib -lmgl2 
- 	else
+-	ifeq (${ELFENV},1)
+-	LIBS_MGL = -L${SRCDIR} -rdynamic -Wl,-rpath,/usr/X11R6/lib -L/usr/X11R6/lib -Wl,-rpath,/usr/pkg/lib -L/usr/pkg/lib -lmgl2 
+-	else
 -	LIBS_MGL = -L${SRCDIR} -L/usr/X11R6/lib -L/usr/pkg/lib -lmgl2 
-+	LIBS_MGL = -L${SRCDIR} -L/usr/X11R6/lib -L${PREFIX}/lib -lmgl2 
- 	endif
+-	endif
++	LIBS_MGL = -L${SRCDIR} -rdynamic -Wl,-rpath,${X11BASE}/lib -L${X11BASE}/lib -Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib -lmgl2 
  endif
  
+ ifneq (${ELFENV},1)
diff --git a/graphics/mgl/patches/patch-ab b/graphics/mgl/patches/patch-ab
index 762532d9b23..867137c47e4 100644
--- a/graphics/mgl/patches/patch-ab
+++ b/graphics/mgl/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/11/01 16:25:09 hubertf Exp $
+$NetBSD: patch-ab,v 1.2 2001/03/20 13:54:31 wiz Exp $
 
---- conf/config.mk-netbsd-i386-x.orig	Thu Aug 31 21:06:52 2000
-+++ conf/config.mk-netbsd-i386-x	Sun Sep 24 06:15:44 2000
+--- conf/config.mk-netbsd-i386-x.orig	Sun Dec 10 02:49:30 2000
++++ conf/config.mk-netbsd-i386-x	Wed Mar 14 06:41:48 2001
 @@ -1,15 +1,15 @@
  # MGLDIR : mgl direcory (headers,libs,shared objects,fonts ..)
 -MGLDIR=/usr/local/lib/mgl2
@@ -23,7 +23,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/01 16:25:09 hubertf Exp $
  
  ifndef MGL_HEADER_DIR
  MGL_HEADER_DIR = ${MGLDIR}
-@@ -35,7 +35,7 @@
+@@ -36,7 +36,7 @@
  SUPPORT_CLIENT=y
  
  # server option
@@ -32,12 +32,16 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/01 16:25:09 hubertf Exp $
  OBJS_X11=emx11.o
  #SERVER_CONS = mglsvrcons
  #OBJS_CONS=emcons.o
-@@ -57,22 +57,22 @@
+@@ -58,22 +58,26 @@
  # im option input-method
  #IM_STATIC=y
  IM_DYNAMIC=y
 -IM_PROG=imcanna.so
 +#IM_PROG=imcanna.so
++
++# nine
++GP_DYNAMIC=y
++PATCH_YY_BUF_SIZE=y
  
  # mil options 
  USE_JPEG   = -DUSE_JPEG
@@ -55,11 +59,12 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/11/01 16:25:09 hubertf Exp $
  GIFLIB    = -lungif
  
 -#USE_PNG   = -DUSE_PNG
--PNGINCDIR = -I/usr/pkg/include
--PNGLIBDIR = -L/usr/pkg/lib
-+USE_PNG   = -DUSE_PNG   
-+PNGINCDIR = -I${PREFIX}/include        
-+PNGLIBDIR = -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib 
- PNGLIB    = -lpng
+-#PNGINCDIR = -I/usr/pkg/include
+-#PNGLIBDIR = -L/usr/pkg/lib
+-#PNGLIB    = -lpng
++USE_PNG   = -DUSE_PNG
++PNGINCDIR = -I${PREFIX}/include
++PNGLIBDIR = -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib
++PNGLIB    = -lpng
  
  OSTYPE=NetBSD
diff --git a/graphics/mgl/patches/patch-ac b/graphics/mgl/patches/patch-ac
index 7f2fb434ee4..c58f495055b 100644
--- a/graphics/mgl/patches/patch-ac
+++ b/graphics/mgl/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/11/01 16:25:09 hubertf Exp $
+$NetBSD: patch-ac,v 1.2 2001/03/20 13:54:31 wiz Exp $
 
---- conf/config.mk-hpcmips.orig	Thu Aug 31 21:06:52 2000
-+++ conf/config.mk-hpcmips	Sun Sep 24 06:16:34 2000
+--- conf/config.mk-hpcmips.orig	Sun Dec 10 02:49:29 2000
++++ conf/config.mk-hpcmips	Wed Mar 14 06:44:01 2001
 @@ -1,15 +1,15 @@
  # MGLDIR : mgl direcory (headers,libs,shared objects,fonts ..)
 -MGLDIR=/usr/pkg/lib/mgl2
@@ -23,12 +23,16 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/11/01 16:25:09 hubertf Exp $
  
  ifndef MGL_HEADER_DIR
  MGL_HEADER_DIR = ${MGLDIR}
-@@ -64,22 +64,22 @@
+@@ -65,22 +65,26 @@
  # im option input-method
  #IM_STATIC=y
  IM_DYNAMIC=y
 -IM_PROG=imcanna.so
 +#IM_PROG=imcanna.so
++
++# nine
++GP_DYNAMIC=y
++PATCH_YY_BUF_SIZE=y
  
  # mil options 
  USE_JPEG   = -DUSE_JPEG
@@ -46,11 +50,12 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/11/01 16:25:09 hubertf Exp $
  GIFLIB    = -lungif
  
 -#USE_PNG   = -DUSE_PNG
--PNGINCDIR = -I/usr/pkg/include
--PNGLIBDIR = -L/usr/pkg/lib
+-#PNGINCDIR = -I/usr/pkg/include
+-#PNGLIBDIR = -L/usr/pkg/lib
+-#PNGLIB    = -lpng
 +USE_PNG   = -DUSE_PNG
 +PNGINCDIR = -I${PREFIX}/include
 +PNGLIBDIR = -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib
- PNGLIB    = -lpng
++PNGLIB    = -lpng
  
  OSTYPE=NetBSD
diff --git a/graphics/mgl/patches/patch-ad b/graphics/mgl/patches/patch-ad
index 76b8b9f7c27..09457cfaff1 100644
--- a/graphics/mgl/patches/patch-ad
+++ b/graphics/mgl/patches/patch-ad
@@ -1,17 +1,22 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/11/01 16:25:09 hubertf Exp $
+$NetBSD: patch-ad,v 1.2 2001/03/20 13:54:31 wiz Exp $
 
---- mgterm/mgterm.c.orig	Mon Mar  6 17:11:11 2000
-+++ mgterm/mgterm.c	Wed Jul 19 03:13:05 2000
-@@ -250,6 +250,12 @@
- 		if (!load_font("k12x10.fnt",12,10)) {
- 			font_size = 12;
- 		}
-+	} else if (font_size == 9) {
-+		if (!load_font("k10x10.fnt",10,10)) {
-+			font_size = 12;
-+		} else {
-+			font_size = 10;
-+		}
- 	} else if (font_size == 8) {
- 		if (!load_font("k10x8.fnt",10,8)) {
- 			font_size = 12;
+--- bin/Makefile.orig	Sun Dec 10 02:49:28 2000
++++ bin/Makefile	Wed Mar 14 06:47:24 2001
+@@ -61,12 +61,12 @@
+ ifdef SERVER_X11
+ 	$(INSTALL) -c -s ${PRIV_BIN} ${SERVER_X11} ${MGL_BIN_DIR}
+ endif
+-ifdef IM_DYNAMIC
+-	${INSTALL} -c -s ${PRIV_BIN} ${IM_PROG} ${MGLDIR}
+-endif
++#ifdef IM_DYNAMIC
++#	${INSTALL} -c -s ${PRIV_BIN} ${IM_PROG} ${MGLDIR}
++#endif
+ 	${INSTALL} -c -s ${PRIV_BIN} imsoft.so ${MGLDIR}
+-	${INSTALL} -c -s ${PRIV_BIN} mgl_fontinfo ${MGL_BIN_DIR}
+-	${INSTALL} -c -s ${PRIV_BIN} bdftomgl ${MGL_BIN_DIR}
++#	${INSTALL} -c -s ${PRIV_BIN} mgl_fontinfo ${MGL_BIN_DIR}
++#	${INSTALL} -c -s ${PRIV_BIN} bdftomgl ${MGL_BIN_DIR}
+ ifdef CALIB_PROGS
+ 	${INSTALL} -c -s ${PRIV_BIN} ${CALIB_PROGS} ${MGL_SBIN_DIR}
+ ifdef INSTALL_update_tool
diff --git a/graphics/mgl/patches/patch-ae b/graphics/mgl/patches/patch-ae
index 9a49d4e633d..928dc49c520 100644
--- a/graphics/mgl/patches/patch-ae
+++ b/graphics/mgl/patches/patch-ae
@@ -1,22 +1,13 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/11/01 16:25:09 hubertf Exp $
+$NetBSD: patch-ae,v 1.2 2001/03/20 13:54:31 wiz Exp $
 
---- bin/Makefile.orig	Fri Sep  1 15:04:11 2000
-+++ bin/Makefile	Fri Sep  1 15:22:18 2000
-@@ -58,12 +58,12 @@
- ifdef SERVER_X11
- 	$(INSTALL) -c -s ${PRIV_BIN} ${SERVER_X11} ${MGL_BIN_DIR}
- endif
--ifdef IM_DYNAMIC
--	${INSTALL} -c -s ${PRIV_BIN} ${IM_PROG} ${MGLDIR}
--endif
-+#ifdef IM_DYNAMIC
-+#	${INSTALL} -c -s ${PRIV_BIN} ${IM_PROG} ${MGLDIR}
-+#endif
- 	${INSTALL} -c -s ${PRIV_BIN} imsoft.so ${MGLDIR}
--	${INSTALL} -c -s ${PRIV_BIN} mgl_fontinfo ${MGL_BIN_DIR}
--	${INSTALL} -c -s ${PRIV_BIN} bdftomgl ${MGL_BIN_DIR}
-+#	${INSTALL} -c -s ${PRIV_BIN} mgl_fontinfo ${MGL_BIN_DIR}
-+#	${INSTALL} -c -s ${PRIV_BIN} bdftomgl ${MGL_BIN_DIR}
- ifdef CALIB_PROGS
- 	${INSTALL} -c -s ${PRIV_BIN} ${CALIB_PROGS} ${MGL_SBIN_DIR}
- 	${INSTALL} -c  ${PRIV_BIN} calibdata-update ${MGL_SBIN_DIR}
+--- utils/mglcons.sh.orig	Sun Dec 10 02:49:40 2000
++++ utils/mglcons.sh	Thu Mar  8 16:27:25 2001
+@@ -6,7 +6,7 @@
+ export MGL_DISPLAY
+ # export PLATFORM=MC-R300
+ 
+-/usr/pkg/sbin/mglsvrcons $1 < $TTY > $TTY &
++/usr/pkg/sbin/mglsvrcons $* < $TTY > $TTY &
+ sleep 1
+ mgterm -i
+ reset
diff --git a/graphics/mgl/patches/patch-af b/graphics/mgl/patches/patch-af
index ef7581add3e..b5e083925e4 100644
--- a/graphics/mgl/patches/patch-af
+++ b/graphics/mgl/patches/patch-af
@@ -1,13 +1,10 @@
-$NetBSD: patch-af,v 1.1.1.1 2000/11/01 16:25:09 hubertf Exp $
+$NetBSD: patch-af,v 1.2 2001/03/20 13:54:31 wiz Exp $
 
---- utils/mglcons.sh.orig	Fri Mar  3 01:07:43 2000
-+++ utils/mglcons.sh	Wed Jul 19 14:17:09 2000
-@@ -6,7 +6,7 @@
- export MGL_DISPLAY
- # export PLATFORM=MC-R300
+--- utils/kill_mgl.sh.orig	Sat Sep  9 12:01:06 2000
++++ utils/kill_mgl.sh	Thu Mar  8 16:29:40 2001
+@@ -1,4 +1,4 @@
+-PID=`ps ax |grep mglsvr |grep -v grep |awk '{print $1}'`
++PID=`ps ax |grep mglsvrcons |grep -v grep |awk '{print $1}'`
  
--/usr/pkg/sbin/mglsvrcons $1 < $TTY > $TTY &
-+/usr/pkg/sbin/mglsvrcons $* < $TTY > $TTY &
- sleep 1
- mgterm -i
+ kill  -HUP $PID
  
diff --git a/graphics/mgl/patches/patch-ag b/graphics/mgl/patches/patch-ag
index b765e62aa96..58dabcc4259 100644
--- a/graphics/mgl/patches/patch-ag
+++ b/graphics/mgl/patches/patch-ag
@@ -1,10 +1,13 @@
-$NetBSD: patch-ag,v 1.1.1.1 2000/11/01 16:25:09 hubertf Exp $
+$NetBSD: patch-ag,v 1.2 2001/03/20 13:54:31 wiz Exp $
 
---- utils/kill_mgl.sh.orig	Thu Aug 31 21:06:51 2000
-+++ utils/kill_mgl.sh	Wed Nov  1 14:44:50 2000
-@@ -1,4 +1,4 @@
--PID=`ps ax |grep mglsvr |grep -v grep |awk '{print $1}'`
-+PID=`ps ax |grep mglsvrcons |grep -v grep |awk '{print $1}'`
+--- utils/mglx.sh.orig	Sun Dec 10 02:49:40 2000
++++ utils/mglx.sh	Thu Mar  8 16:30:51 2001
+@@ -5,7 +5,7 @@
+ MGL_DISPLAY=`basename $TTY`
+ export MGL_DISPLAY
  
- kill  -HUP $PID
+-mglsvrx $1 < $TTY > $TTY &
++mglsvrcons $1 < $TTY > $TTY &
+ sleep 1
+ mgterm -i
  
diff --git a/graphics/mgl/patches/patch-ah b/graphics/mgl/patches/patch-ah
index e41e45f255c..d3cceed7e8d 100644
--- a/graphics/mgl/patches/patch-ah
+++ b/graphics/mgl/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1.1.1 2000/11/01 16:25:09 hubertf Exp $
+$NetBSD: patch-ah,v 1.2 2001/03/20 13:54:31 wiz Exp $
 
---- utils/set_mgl.sh.orig	Thu Aug 31 21:06:51 2000
-+++ utils/set_mgl.sh	Wed Nov  1 14:51:53 2000
+--- utils/set_mgl.sh.orig	Sat Sep  9 01:00:29 2000
++++ utils/set_mgl.sh	Thu Mar  8 16:31:50 2001
 @@ -1,4 +1,4 @@
 -MGL_DISPLAY=`ps ax |grep emsvr |grep -v grep |awk '{print "tty" $2}'`
 +MGL_DISPLAY=`ps ax |grep mglsvrcons |grep -v grep |awk '{print "tty" $2}'`
diff --git a/graphics/mgl/patches/patch-ai b/graphics/mgl/patches/patch-ai
index 2f43a29d196..7a456ac3927 100644
--- a/graphics/mgl/patches/patch-ai
+++ b/graphics/mgl/patches/patch-ai
@@ -1,17 +1,11 @@
-$NetBSD: patch-ai,v 1.1 2000/12/15 04:12:20 wiz Exp $
+$NetBSD: patch-ai,v 1.2 2001/03/20 13:54:31 wiz Exp $
 
---- mgterm/mdate.c.orig	Thu Aug 31 14:06:47 2000
-+++ mgterm/mdate.c
-@@ -633,9 +633,10 @@
- #include <sys/swap.h>
- #include <sys/param.h>
- #include <sys/sysctl.h>
--#include <vm/vm_param.h>
--#ifdef UVM
-+#if __NetBSD_Version__ > 105009900
- #include <uvm/uvm_extern.h>
-+#else
-+#include <vm/vm_param.h>
- #endif
- #include <errno.h>
+--- utils/start.sh.orig	Sun Dec 10 02:49:40 2000
++++ utils/start.sh	Thu Mar  8 16:33:55 2001
+@@ -3,5 +3,5 @@
+ MGL_DISPLAY=`basename $TTY`
+ export MGL_DISPLAY
  
+-mglsvrx $1 < $TTY > $TTY &
++mglsvrcons $* < $TTY > $TTY &
+ mgterm -i &
diff --git a/graphics/mgl/patches/patch-aj b/graphics/mgl/patches/patch-aj
index fb672b93039..11df844172f 100644
--- a/graphics/mgl/patches/patch-aj
+++ b/graphics/mgl/patches/patch-aj
@@ -1,31 +1,26 @@
-$NetBSD: patch-aj,v 1.1 2001/03/05 09:20:55 skrll Exp $
+$NetBSD: patch-aj,v 1.2 2001/03/20 13:54:32 wiz Exp $
 
---- lib/Makefile.orig	Thu Aug 31 13:06:50 2000
-+++ lib/Makefile
-@@ -31,6 +31,8 @@
- include ../conf/config.mk
- include ../conf/${OSTYPE}.mk
+--- nine/Makefile.orig	Fri Mar  9 20:05:20 2001
++++ nine/Makefile	Tue Mar 13 15:19:47 2001
+@@ -28,7 +28,7 @@
+ endif
  
-+MAJ=2
-+MIN=0
- VER=2.0
+ gesture.h: form.def genform.sh
+-	./genform.sh > gesture.h
++	sh ./genform.sh > gesture.h
  
- all: libmgl2.so.${VER}
-@@ -132,11 +134,17 @@
+ lex.yy.c : pattern.l
+ 	flex -l pattern.l
+@@ -37,10 +37,10 @@
+ endif
  
- libmgl2.so.${VER} : ${SOBJS}
- 	${MGLPIC_LD} ${MGLPIC_LDFLAGS} -o libmgl2.so.${VER} ${SOBJS} ${DEFAULT_LIBS}
-+ifeq (${ELFENV}, 1)
- 	ln -sf libmgl2.so.${VER} libmgl2.so
-+	ln -sf libmgl2.so.${VER} libmgl2.so.${MAJ}
-+endif
+ pattern.l : form.def genform.sh genpattern.sh
+-	./genform.sh -l | \
++	sh ./genform.sh -l | \
+ 	sed -e 's/\(return KEYCODE_[^;][^;]*;\)/YY_FLUSH_BUFFER ;\1/g' \
+ 	 > pattern.txt
+-	./genpattern.sh > pattern.l
++	sh ./genpattern.sh > pattern.l
  
- install: mgl2.h mglcol.h libmgl2.so.${VER}  ${MGL_LIB_DIR} ${MGL_HEADER_DIR} ${MGLDIR}
- 	${INSTALL} -c -s ${PRIV_BIN} libmgl2.so.${VER} ${MGL_LIB_DIR}
-+ifeq (${ELFENV}, 1)
- 	(cd ${MGL_LIB_DIR}; ln -sf libmgl2.so.${VER} libmgl2.so)
-+	(cd ${MGL_LIB_DIR}; ln -sf libmgl2.so.${VER} libmgl2.so.${MAJ})
-+endif
- 	${INSTALL} -c ${PRIV_FILE} mgl2.h ${MGL_HEADER_DIR}
- 	${INSTALL} -c ${PRIV_FILE} mglcol.h ${MGL_HEADER_DIR}
- #ifdef SERVER_CONS
+ gpnine.so: ${OBJS}
+ 	$(SHLIB_LD) $(SHLIB_LDFLAGS) -o gpnine.so ${OBJS} $(LDFLAGS)
diff --git a/graphics/mgl/patches/patch-ak b/graphics/mgl/patches/patch-ak
new file mode 100644
index 00000000000..926d1ae12ec
--- /dev/null
+++ b/graphics/mgl/patches/patch-ak
@@ -0,0 +1,17 @@
+$NetBSD: patch-ak,v 1.1 2001/03/20 13:54:32 wiz Exp $
+
+--- mgterm/mdate.c.orig	Fri Mar  9 20:05:20 2001
++++ mgterm/mdate.c	Wed Mar 14 06:52:19 2001
+@@ -670,9 +670,10 @@
+ #include <sys/swap.h>
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+-#include <vm/vm_param.h>
+-#ifdef UVM
++#if __NetBSD_Version__ > 105009900
+ #include <uvm/uvm_extern.h>
++#else
++#include <vm/vm_param.h>
+ #endif
+ #include <errno.h>
+ 
diff --git a/graphics/mgl/patches/patch-al b/graphics/mgl/patches/patch-al
new file mode 100644
index 00000000000..b66e2b12f0e
--- /dev/null
+++ b/graphics/mgl/patches/patch-al
@@ -0,0 +1,31 @@
+$NetBSD: patch-al,v 1.1 2001/03/20 13:54:32 wiz Exp $
+
+--- lib/Makefile.orig	Wed Mar  7 20:50:44 2001
++++ lib/Makefile	Wed Mar 14 07:10:19 2001
+@@ -28,6 +28,8 @@
+ 
+ SHELL=/bin/sh
+ SRCDIR=.
++MAJ=2
++MIN=0
+ VER=2.0
+ REVISION=19.3
+ include ../conf/config.mk
+@@ -141,11 +143,17 @@
+ libmgl2.so.${VER} : ${SOBJS}
+ 	${MGLPIC_LD} ${MGLPIC_LDFLAGS} -o libmgl2.so.${VER}.${REVISION} ${SOBJS} ${DEFAULT_LIBS}
+ 	ln -sf libmgl2.so.${VER}.${REVISION} libmgl2.so.${VER} 
++ifeq (${ELFENV}, 1)
+ 	ln -sf libmgl2.so.${VER} libmgl2.so
++	ln -sf libmgl2.so.${VER} libmgl2.so.${MAJ}
++endif
+ 
+ install: mgl2.h mglcol.h mglkey.h libmgl2.so.${VER}  ${MGL_LIB_DIR} ${MGL_HEADER_DIR} ${MGLDIR}
+ 	${INSTALL} -c -s ${PRIV_BIN} libmgl2.so.${VER} ${MGL_LIB_DIR}
++ifeq (${ELFENV}, 1)
+ 	(cd ${MGL_LIB_DIR}; ln -sf libmgl2.so.${VER} libmgl2.so)
++	(cd ${MGL_LIB_DIR}; ln -sf libmgl2.so.${VER} libmgl2.so.${MAJ})
++endif
+ 	${INSTALL} -c ${PRIV_FILE} mgl2.h ${MGL_HEADER_DIR}
+ 	${INSTALL} -c ${PRIV_FILE} mglcol.h ${MGL_HEADER_DIR}
+ 	${INSTALL} -c ${PRIV_FILE} mglkey.h ${MGL_HEADER_DIR}
diff --git a/graphics/mgl/pkg/PLIST b/graphics/mgl/pkg/PLIST
index 71d98e41b90..90166c0cd9a 100644
--- a/graphics/mgl/pkg/PLIST
+++ b/graphics/mgl/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:41 agc Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/03/20 13:54:32 wiz Exp $
 bin/kill_mgl.sh
 bin/mcalc
 bin/mdate
@@ -7,10 +7,12 @@ bin/mgterm
 bin/mil
 bin/mini_mil
 bin/msame
+bin/ninetraining
 bin/set_mgl.sh
 bin/start_mgl.sh
 include/mgl2.h
 include/mglcol.h
+include/mglkey.h
 lib/libmgl2.so
 lib/libmgl2.so.2
 lib/libmgl2.so.2.0
@@ -20,6 +22,7 @@ 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
@@ -62,9 +65,12 @@ 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/mgl2/mgl_fontcreate.c
 @unexec rm -f %D/etc/calibdata
 @dirrm share/mgl2
+@dirrm share/doc/mgl2/nine
 @dirrm share/doc/mgl2/mil
 @dirrm share/doc/mgl2/mgterm
 @dirrm share/doc/mgl2/memo