MGL2 - Mobilegear Graphic Library Version 2 is the Graphic Library

and Window Manager toolkit for tiny machine.

Submitted in PR 11241 by Jun Ebihara <jun@soum.co.jp>

8 files changed, 265 insertions, 0 deletions

diff --git a/graphics/mgl/patches/patch-aa b/graphics/mgl/patches/patch-aa
new file mode 100644
index 00000000000..8f062385752
--- /dev/null
+++ b/graphics/mgl/patches/patch-aa
@@ -0,0 +1,72 @@
+$NetBSD: patch-aa,v 1.1.1.1 2000/11/01 16:25:09 hubertf Exp $
+
+--- conf/NetBSD.mk.orig	Thu Aug 31 14:06:52 2000
++++ conf/NetBSD.mk
+@@ -1,33 +1,35 @@
+ INSTALL=install
+ MAKEDEPEND=sh ../conf/mkdep.sh
+-INCS_X11= -I/usr/X11R6/include
++INCS_X11= -I${X11BASE}/include
+ 
+ # set ELFENV in config.mk
+ # a.out env. -> 0
+ # ELF env.   -> 1
+-ifndef ELFENV
++#HF#
++#HF# Force -Wl,-rpath even on a.out
++#HF#ifndef ELFENV
+ ELFENV=1
+-endif
++#HF#endif
+ 
+ ifeq (${ELFENV},1)
+-LIBS_X11= -L/usr/X11R6/lib -Wl,-rpath,/usr/X11R6/lib -lX11
++LIBS_X11= -L${X11BASE}/lib -Wl,-rpath,${X11BASE}/lib -lX11
+ else
+-LIBS_X11= -L/usr/X11R6/lib -lX11
++LIBS_X11= -L${X11BASE}/lib -lX11
+ endif
+ 
+-INCS_CONS= -I/usr/pkg/include
++INCS_CONS= -I${PREFIX}/include
+ ifeq (${ELFENV},1)
+-    LIBS_CONS= -L/usr/pkg/lib -Wl,-rpath /usr/pkg/lib
++    LIBS_CONS= -L${PREFIX}/lib -Wl,-rpath ${PREFIX}/lib
+ else
+-    LIBS_CONS= -L/usr/pkg/lib
++    LIBS_CONS= -L${PREFIX}/lib
+ endif
+ 
+ ifndef LIBS_IM
+-INCS_IM = -I/usr/pkg/include
++INCS_IM = -I${PREFIX}/include
+     ifeq (${ELFENV},1)
+-    LIBS_IM = -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib -lcanna
++    LIBS_IM = -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib -lcanna
+     else
+-    LIBS_IM = -L/usr/pkg/lib -lcanna
++    LIBS_IM = -L${PREFIX}/lib -lcanna
+     endif
+ endif
+ 
+@@ -63,16 +65,16 @@
+ ifdef MGL_INSTALLED
+ 	INCS_MGL = -I${MGL_HEADER_DIR}
+ 	ifeq (${ELFENV},1)
+-	LIBS_MGL = -L${MGL_LIB_DIR} -L/usr/X11R6/lib -Wl,-rpath,/usr/pkg/lib -L/usr/pkg/lib  -lmgl2
++	LIBS_MGL = -L${MGL_LIB_DIR} -L${X11BASE}/lib -Wl,-rpath,${X11BASE}/lib -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib -lmgl2
+ 	else
+-	LIBS_MGL = -L${MGL_LIB_DIR} -L/usr/X11R6/lib -L/usr/pkg/lib  -lmgl2	
++	LIBS_MGL = -L${MGL_LIB_DIR} -L${X11BASE}/lib -L${PREFIX}/lib  -lmgl2	
+ 	endif
+ 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${X11BASE}/lib -Wl,-rpath,${X11BASE}/lib -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib -lmgl2 
+ 	else
+-	LIBS_MGL = -L${SRCDIR} -L/usr/X11R6/lib -L/usr/pkg/lib -lmgl2 
++	LIBS_MGL = -L${SRCDIR} -L${X11BASE}/lib -L${PREFIX}/lib -lmgl2 
+ 	endif
+ endif
+ 
diff --git a/graphics/mgl/patches/patch-ab b/graphics/mgl/patches/patch-ab
new file mode 100644
index 00000000000..762532d9b23
--- /dev/null
+++ b/graphics/mgl/patches/patch-ab
@@ -0,0 +1,65 @@
+$NetBSD: patch-ab,v 1.1.1.1 2000/11/01 16:25:09 hubertf 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
+@@ -1,15 +1,15 @@
+ # MGLDIR : mgl direcory (headers,libs,shared objects,fonts ..)
+-MGLDIR=/usr/local/lib/mgl2
++MGLDIR=${PREFIX}/lib/mgl2
+ 
+ # MGL_SBIN_DIR mgl server directory 
+-MGL_SBIN_DIR=/usr/local/sbin
+-MGL_BIN_DIR=/usr/local/bin
++MGL_SBIN_DIR=${PREFIX}/sbin
++MGL_BIN_DIR=${PREFIX}/bin
+ 
+ # set MGL_HEADER_DIR to specify header direcotry  
+-MGL_HEADER_DIR=/usr/local/include
++MGL_HEADER_DIR=${PREFIX}/include
+ 
+ # set MGL_LIB_DIR to specify library direcotry  
+-MGL_LIB_DIR=/usr/local/lib
++MGL_LIB_DIR=${PREFIX}/lib
+ 
+ ifndef MGL_HEADER_DIR
+ MGL_HEADER_DIR = ${MGLDIR}
+@@ -35,7 +35,7 @@
+ SUPPORT_CLIENT=y
+ 
+ # server option
+-SERVER_X11 = mglsvrx
++SERVER_X11 = mglsvrcons
+ OBJS_X11=emx11.o
+ #SERVER_CONS = mglsvrcons
+ #OBJS_CONS=emcons.o
+@@ -57,22 +57,22 @@
+ # im option input-method
+ #IM_STATIC=y
+ IM_DYNAMIC=y
+-IM_PROG=imcanna.so
++#IM_PROG=imcanna.so
+ 
+ # mil options 
+ USE_JPEG   = -DUSE_JPEG
+-JPEGINCDIR = -I/usr/pkg/include
+-JPEGLIBDIR = -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib
++JPEGINCDIR = -I${PREFIX}/include
++JPEGLIBDIR = -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib
+ JPEGLIB    = -ljpeg
+ 
+ USE_GIF   = -DUSE_GIF
+-GIFINCDIR = -I/usr/pkg/include
+-GIFLIBDIR = -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib
++GIFINCDIR = -I${PREFIX}/include
++GIFLIBDIR = -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib
+ 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
+ 
+ OSTYPE=NetBSD
diff --git a/graphics/mgl/patches/patch-ac b/graphics/mgl/patches/patch-ac
new file mode 100644
index 00000000000..7f2fb434ee4
--- /dev/null
+++ b/graphics/mgl/patches/patch-ac
@@ -0,0 +1,56 @@
+$NetBSD: patch-ac,v 1.1.1.1 2000/11/01 16:25:09 hubertf Exp $
+
+--- conf/config.mk-hpcmips.orig	Thu Aug 31 21:06:52 2000
++++ conf/config.mk-hpcmips	Sun Sep 24 06:16:34 2000
+@@ -1,15 +1,15 @@
+ # MGLDIR : mgl direcory (headers,libs,shared objects,fonts ..)
+-MGLDIR=/usr/pkg/lib/mgl2
++MGLDIR=${PREFIX}/lib/mgl2
+ 
+ # MGL_SBIN_DIR mgl server directory 
+-MGL_SBIN_DIR=/usr/pkg/sbin
+-MGL_BIN_DIR=/usr/pkg/bin
++MGL_SBIN_DIR=${PREFIX}/sbin
++MGL_BIN_DIR=${PREFIX}/bin
+ 
+ # set MGL_HEADER_DIR to specify header direcotry  
+-MGL_HEADER_DIR=/usr/pkg/include
++MGL_HEADER_DIR=${PREFIX}/include
+ 
+ # set MGL_LIB_DIR to specify library direcotry  
+-MGL_LIB_DIR=/usr/pkg/lib
++MGL_LIB_DIR=${PREFIX}/lib
+ 
+ ifndef MGL_HEADER_DIR
+ MGL_HEADER_DIR = ${MGLDIR}
+@@ -64,22 +64,22 @@
+ # im option input-method
+ #IM_STATIC=y
+ IM_DYNAMIC=y
+-IM_PROG=imcanna.so
++#IM_PROG=imcanna.so
+ 
+ # mil options 
+ USE_JPEG   = -DUSE_JPEG
+-JPEGINCDIR = -I/usr/pkg/include
+-JPEGLIBDIR = -L/usr/pkg/lib
++JPEGINCDIR = -I${PREFIX}/include
++JPEGLIBDIR = -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib
+ JPEGLIB    = -ljpeg
+ 
+ USE_GIF   = -DUSE_GIF
+-GIFINCDIR = -I/usr/pkg/include
+-GIFLIBDIR = -L/usr/pkg/lib
++GIFINCDIR = -I${PREFIX}/include
++GIFLIBDIR = -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib
+ 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
+ 
+ OSTYPE=NetBSD
diff --git a/graphics/mgl/patches/patch-ad b/graphics/mgl/patches/patch-ad
new file mode 100644
index 00000000000..76b8b9f7c27
--- /dev/null
+++ b/graphics/mgl/patches/patch-ad
@@ -0,0 +1,17 @@
+$NetBSD: patch-ad,v 1.1.1.1 2000/11/01 16:25:09 hubertf 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;
diff --git a/graphics/mgl/patches/patch-ae b/graphics/mgl/patches/patch-ae
new file mode 100644
index 00000000000..9a49d4e633d
--- /dev/null
+++ b/graphics/mgl/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1.1.1 2000/11/01 16:25:09 hubertf 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}
diff --git a/graphics/mgl/patches/patch-af b/graphics/mgl/patches/patch-af
new file mode 100644
index 00000000000..ef7581add3e
--- /dev/null
+++ b/graphics/mgl/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2000/11/01 16:25:09 hubertf 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
+ 
+-/usr/pkg/sbin/mglsvrcons $1 < $TTY > $TTY &
++/usr/pkg/sbin/mglsvrcons $* < $TTY > $TTY &
+ sleep 1
+ mgterm -i
+ 
diff --git a/graphics/mgl/patches/patch-ag b/graphics/mgl/patches/patch-ag
new file mode 100644
index 00000000000..b765e62aa96
--- /dev/null
+++ b/graphics/mgl/patches/patch-ag
@@ -0,0 +1,10 @@
+$NetBSD: patch-ag,v 1.1.1.1 2000/11/01 16:25:09 hubertf 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}'`
+ 
+ kill  -HUP $PID
+ 
diff --git a/graphics/mgl/patches/patch-ah b/graphics/mgl/patches/patch-ah
new file mode 100644
index 00000000000..e41e45f255c
--- /dev/null
+++ b/graphics/mgl/patches/patch-ah
@@ -0,0 +1,10 @@
+$NetBSD: patch-ah,v 1.1.1.1 2000/11/01 16:25:09 hubertf Exp $
+
+--- utils/set_mgl.sh.orig	Thu Aug 31 21:06:51 2000
++++ utils/set_mgl.sh	Wed Nov  1 14:51:53 2000
+@@ -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}'`
+ 
+ echo "MGL_DISPLAY="$MGL_DISPLAY
+