Update magicpoint to 1.13a.

* Fix build error with xft2 option and graphics/freetype-lib package is
  installed.  Shoud be fix PR pkg/32656.
* Refering PR pkg/38552 adpot some of patches.
* Move PKG_OPTIONS related item to options.mk.
* More pkgsrc clean up.
* Try to reduce compile warnings.

What's new in 1.13a?

    * m17n library support enhancement
    * MacOS support enhancement
    * add new environment variable MGPRC for the path of the .mgprc file.
    * add "psfont" directive to specify the font used by mgp2ps
    * add -g option for mgp2ps to allow users to adjust line distanc
    * add -zoomonclk option for newimage
    * allow to handle gif format images by default
    * many bug fixes

      Dedication

      Magicpoint 1.13a is dedicated to the memory of Dr. Jun-ichiro
      "itojun" Hagino, who was known for his enormous contribution to
      the Internet and the Open Source Software community. He was the
      developer of Magicpoint from its infancy. Magicpoint could not
      exist without his devoted work.

What's new in 1.12a?

    * add %tsystem directive which might be more stable than %xsystem
    * add -rotate option for newimage
    * allow to use non-ASCI filename in slides (use -U to enable this feature)
    * many bug fixes


(taca)

# $NetBSD: options.mk,v 1.1 2008/09/10 13:32:47 taca Exp $

.include "../../mk/bsd.prefs.mk"

PKG_OPTIONS_VAR=	PKG_OPTIONS.magicpoint
PKG_SUPPORTED_OPTIONS=	freetype vflib xft2
PKG_SUGGESTED_OPTIONS=	xft2

.include "../../mk/bsd.options.mk"

.if !empty(PKG_OPTIONS:Mfreetype)
CONFIGURE_ARGS+=	--enable-freetype
MGP_TFONT=	% %
MGP_VFONT=	# empty
.include "../../graphics/freetype-lib/buildlink3.mk"
.else
CONFIGURE_ARGS+=	--disable-freetype
.endif

.if !empty(PKG_OPTIONS:Mvflib)
CONFIGURE_ARGS+=	--enable-vflib
MGP_TFONT=	# empty
MGP_VFONT=	% %
.include "../../print/ja-vflib-lib/buildlink3.mk"
.else
CONFIGURE_ARGS+=	--disable-vflib
.endif

.if !empty(PKG_OPTIONS:Mxft2)
CONFIGURE_ARGS+=	--enable-xft2
MGP_XFONT=	# empty
MGP_TFONT=	% %
MGP_VFONT=	% %

.include "../../x11/libXft/buildlink3.mk"
.else
CONFIGURE_ARGS+=	--disable-xft2
.endif

.include "../../graphics/imlib/buildlink3.mk"


#
# fall back defaults
#
MGP_VFONT?=	% %
MGP_TFONT?=	% %
MGP_XFONT?=	% %

$NetBSD: patch-an,v 1.1 2008/09/10 13:32:47 taca Exp $

--- ctlwords.c.orig	1999-02-15 08:02:25.000000000 +0900
+++ ctlwords.c
@@ -24,7 +24,10 @@ BEGIN {
 
 #include <stdio.h>
 #include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
 
+int
 main(int argc, char *argv[])
 {
 	char buf[1024];

$NetBSD: patch-ao,v 1.1 2008/09/10 13:32:47 taca Exp $

--- grammar.y.orig	2008-01-19 02:43:20.000000000 +0900
+++ grammar.y
@@ -130,6 +130,7 @@ gen_void(op)
 		yyerror("cannot allocate void node");
 		return ct;
 	}
+	ct->ct_type = CTRL_VOID;
 	return ct;
 }
 
@@ -145,6 +146,7 @@ gen_double_int(op, v)
 		return ct;
 	}
 	ct->ctf_value = (double)v;
+	ct->ct_type = CTRL_DOUBLE;
 	return ct;
 }
 
@@ -160,6 +162,7 @@ gen_double(op, v)
 		return ct;
 	}
 	ct->ctf_value = v;
+	ct->ct_type = CTRL_DOUBLE;
 	return ct;
 }
 
@@ -175,6 +178,7 @@ gen_int(op, v)
 		return ct;
 	}
 	ct->cti_value = v;
+	ct->ct_type = CTRL_INT;
 	return ct;
 }
 
@@ -192,6 +196,7 @@ gen_int2(op, v1, v2)
        }
        ct->cti2_value1 = v1;
        ct->cti2_value2 = v2;
+       ct->ct_type = CTRL_INT2;
        return ct;
 }
 
@@ -210,7 +215,8 @@ gen_int3(op, v1, v2, v3)
        }
        ct->cti3_value1 = v1;
        ct->cti3_value2 = v2;
-       ct->cti3_value3 = v3;   
+       ct->cti3_value3 = v3;
+       ct->ct_type = CTRL_INT3;
        return ct;
 }
 
@@ -226,6 +232,7 @@ gen_str(op, str)
 		return ct;
 	}
 	ct->ctc_value = strdup(str);
+	ct->ct_type = CTRL_CHAR;
 	return ct;
 }
 
@@ -243,6 +250,7 @@ gen_str2(op, str1, str2)
 	}
 	ct->ctc2_value1 = strdup(str1);
 	ct->ctc2_value2 = strdup(str2);
+	ct->ct_type = CTRL_CHAR2;
 	return ct;
 }
 
@@ -259,6 +267,7 @@ gen_color(op, color)
 	}
 	if (get_color(color, &ct->ctl_value) < 0)
 		yyerror("cannot allocate color \"%s\"", color);
+	ct->ct_type = CTRL_LONG;
 	return ct;
 }
 
@@ -284,6 +293,7 @@ gen_bgrad(w, h, colors, dir, zoomflg, ex
 	ct->ctd_numcolor = colors;
 	ct->ctd_dir = dir;
 	ct->ctd_zoomflag = zoomflg;
+	ct->ct_type = CTRL_GRAD;
 
 	/* process color list. */
 	siz = ct->ctd_g_colors = 0;
@@ -353,6 +363,7 @@ gen_newimage(arg)
 	}
 
 	/* default setting */
+	ct->ct_type = CTRL_IMAGE;
 	ct->ctm_ximagesize = 100;
 	ct->ctm_yimagesize = 100;
 	ct->ctm_zoomflag = Z_NORMAL | (Z_NORMAL << Z_YSHIFT);
@@ -463,6 +474,7 @@ gen_image(op, fname, colors, xsiz, ysiz,
 		yyerror("cannot allocate node (op=IMAGE)");
 		return ct;
 	}
+	ct->ct_type = CTRL_IMAGE;
 	ct->ctm_fname = embed_fname(fname);
 	ct->ctm_numcolor = colors;
 	ct->ctm_ximagesize = xsiz;
@@ -511,6 +523,7 @@ gen_bar(color, thick, start, len)
 	}
 	if (get_color(color, &ct->ctb_color) < 0)
 		yyerror("cannot allocate color %s", color);
+	ct->ct_type = CTRL_BAR;
 	ct->ctb_width = thick;
 	ct->ctb_start = start;
 	ct->ctb_length = len;
@@ -542,6 +555,7 @@ gen_icon(n, color, siz)
 		yyerror("cannot allocate node (op=ICON)");
 		return ct;
 	}
+	ct->ct_type = CTRL_ICON;
 	ct->ctic_value = n;
 	if (get_color(color, &ct->ctic_color) < 0)
 		yyerror("cannot allocate color %s", color);
@@ -562,6 +576,7 @@ gen_pcache(flag, mode, effect, value)
 		yyerror("cannot allocate node (op=PCACHE)");
 		return ct;
 	}
+	ct->ct_type = CTRL_PCACHE;
 	ct->ctch_flag = flag;
 	ct->ctch_mode = mode;
 	ct->ctch_effect = effect;
@@ -580,6 +595,7 @@ gen_valign(align)
 		yyerror("cannot allocate node (op=VALIGN)");
 		return ct;
 	}
+	ct->ct_type = CTRL_INT;
 	if (!strcmp(align, "center")) 
 		ct->cti_value = VL_CENTER;
 	else { 
@@ -629,6 +645,7 @@ gen_area(width, height, xoff, yoff)
 	ct->ctar_height = height;
 	ct->ctar_xoff = xoff;
 	ct->ctar_yoff = yoff;
+	ct->ct_type = CTRL_AREA;
 	return ct;
 }
 
@@ -663,6 +680,7 @@ gen_argsfromnid(op, nid)
 		siz++;
 	}
 	ct->cta_argv[siz] = NULL;
+	ct->ct_type = CTRL_ARGS;
 
 	if (nid)
 		ctlfree(nid);
@@ -712,6 +730,7 @@ gen_argsfromstr(op, str, flag)
 		}
 	}
 	ct->cta_argv[ct->cta_argc] = NULL;
+	ct->ct_type = CTRL_ARGS;
 
 	return ct;
 }

$NetBSD: patch-ap,v 1.1 2008/09/10 13:32:48 taca Exp $

--- contrib/xwintoppm/dsimple.h.orig	1998-02-13 16:48:30.000000000 +0900
+++ contrib/xwintoppm/dsimple.h
@@ -41,25 +41,25 @@ from the X Consortium.
 
     /* Global variables used by routines in just_display.c */
 
-char *program_name = "unknown_program";       /* Name of this program */
-Display *dpy;                                 /* The current display */
-int screen;                                   /* The current screen */
+extern char *program_name;
+extern Display *dpy;
+extern int screen;
 
 #define INIT_NAME program_name=argv[0]        /* use this in main to setup
                                                  program_name */
 
     /* Declaritions for functions in just_display.c */
 
-void Fatal_Error();
-char *Malloc();
-char *Realloc();
-char *Get_Display_Name();
-Display *Open_Display();
-void Setup_Display_And_Screen();
-XFontStruct *Open_Font();
-Pixmap ReadBitmapFile();
-void WriteBitmapFile();
-Window Select_Window_Args();
+void Fatal_Error(char *msg, ...);
+char *Malloc(unsigned int);
+char *Realloc(char *, int);
+char *Get_Display_Name(int *, char **);
+Display *Open_Display(char *);
+void Setup_Display_And_Screen(int *, char **);
+XFontStruct *Open_Font(char *);
+Pixmap ReadBitmapFile(Drawable, char *, int*, int*, int*, int*);
+void WriteBitmapFile(char *, Pixmap, int, int, int, int);
+Window Select_Window_Args(int *, char **);
 
 #define X_USAGE "[host:display]"              /* X arguments handled by
 						 Get_Display_Name */
@@ -73,9 +73,10 @@ Window Select_Window_Args();
  * Send bugs, etc. to chariot@athena.mit.edu.
  */
 
-unsigned long Resolve_Color();
-Pixmap Bitmap_To_Pixmap();
-Window Select_Window();
-void out();
-void blip();
-Window Window_With_Name();
+unsigned long Resolve_Color(Window, char *);
+Pixmap Bitmap_To_Pixmap(Display *, Drawable, GC, Pixmap, int, int);
+Window Select_Window(Display *);
+void blip(void);
+Window Window_With_Name(Display *, Window, char *);
+void outl(char *, ...);
+void usage(void);

$NetBSD: patch-aq,v 1.1 2008/09/10 13:32:48 taca Exp $

--- contrib/xwintoppm/dsimple.c.orig	1998-02-13 16:48:29.000000000 +0900
+++ contrib/xwintoppm/dsimple.c
@@ -35,6 +35,8 @@ from the X Consortium.
 #include <X11/Xutil.h>
 #include <X11/cursorfont.h>
 #include <stdio.h>
+#include <stdarg.h>
+
 /*
  * Other_stuff.h: Definitions of routines in other_stuff.
  *
@@ -47,14 +49,9 @@ char *malloc(), realloc();
 #include <stdlib.h>
 #endif
 
+#include "dsimple.h"
+
 extern Bool silent;
-unsigned long Resolve_Color();
-Pixmap Bitmap_To_Pixmap();
-Window Select_Window();
-void out();
-void blip();
-Window Window_With_Name();
-void Fatal_Error();
 
 /*
  * Just_display: A group of routines designed to make the writting of simple
@@ -68,16 +65,16 @@ void Fatal_Error();
 
 
 /* This stuff is defined in the calling program by just_display.h */
-extern char *program_name;
-extern Display *dpy;
-extern int screen;
+char *program_name = "unknown_program";       /* Name of this program */
+Display *dpy;                                 /* The current display */
+int screen;                                   /* The current screen */
 
 
 /*
  * Malloc: like malloc but handles out of memory using Fatal_Error.
  */
 char *Malloc(size)
-     unsigned size;
+     unsigned int size;
 {
 	char *data;
 
@@ -401,7 +398,7 @@ Pixmap Bitmap_To_Pixmap(dpy, d, gc, bitm
 /*
  * blip: a debugging routine.  Prints Blip! on stderr with flushing. 
  */
-void blip()
+void blip(void)
 {
   outl("blip!");
 }
@@ -495,12 +492,15 @@ Window Window_With_Name(dpy, top, name)
  *       printf with up to 7 arguments.
  */
 /* VARARGS1 */
-outl(msg, arg0,arg1,arg2,arg3,arg4,arg5,arg6)
-     char *msg;
-     char *arg0, *arg1, *arg2, *arg3, *arg4, *arg5, *arg6;
+void
+outl(char *msg, ...)
 {
+	va_list ap;
+
+	va_start(ap, msg);
 	fflush(stdout);
-	fprintf(stderr, msg, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+	fprintf(stderr, msg, ap);
+	va_end(ap);
 	fprintf(stderr, "\n");
 	fflush(stderr);
 }
@@ -511,14 +511,16 @@ outl(msg, arg0,arg1,arg2,arg3,arg4,arg5,
  * Does not require dpy or screen defined.
  */
 /* VARARGS1 */
-void Fatal_Error(msg, arg0,arg1,arg2,arg3,arg4,arg5,arg6)
-char *msg;
-char *arg0, *arg1, *arg2, *arg3, *arg4, *arg5, *arg6;
+void Fatal_Error(char *msg, ...)
 {
+	va_list ap;
+
+	va_start(ap, msg);
 	fflush(stdout);
 	fflush(stderr);
 	fprintf(stderr, "%s: error: ", program_name);
-	fprintf(stderr, msg, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+	vfprintf(stderr, msg, ap);
+	va_end(ap);
 	fprintf(stderr, "\n");
 	exit(1);
 }

$NetBSD: patch-ar,v 1.1 2008/09/10 13:32:48 taca Exp $

--- contrib/xwintoppm/xwintoppm.c.orig	1998-08-26 14:30:16.000000000 +0900
+++ contrib/xwintoppm/xwintoppm.c
@@ -136,8 +136,10 @@ Bool silent = False;
 Bool use_installed = False;
 long add_pixel_value = 0;
 
-extern int (*_XErrorFunction)();
-extern int _XDefaultError();
+void Error(char *);
+void Window_Dump(Window, FILE *);
+int Image_Size(XImage *);
+int Get_XColors(XWindowAttributes *, XColor **);
 
 static long parse_long (s)
     char *s;
@@ -155,11 +157,12 @@ static long parse_long (s)
     return (thesign * retval);
 }
 
+int
 main(argc, argv)
     int argc;
     char **argv;
 {
-    register i;
+    register int i;
     Window target_win;
     FILE *out_file = stdout;
     Bool frame_only = False;
@@ -280,7 +283,7 @@ XColor **colors ;
  * Window_Dump: dump a window to a file which must already be open for
  *              writting.
  */
-
+void
 Window_Dump(window, out)
      Window window;
      FILE *out;
@@ -609,6 +612,7 @@ Window_Dump(window, out)
 /*
  * Report the syntax for calling xwd.
  */
+void
 usage()
 {
     fprintf (stderr,
@@ -622,7 +626,7 @@ usage()
 /*
  * Error - Fatal xwd error.
  */
-
+void
 Error(string)
 	char *string;	/* Error description string. */
 {
@@ -716,6 +720,7 @@ int Get_XColors(win_info, colors)
     return ncolors ;
 }
 
+void
 _swapshort (bp, n)
     register char *bp;
     register unsigned n;
@@ -731,6 +736,7 @@ _swapshort (bp, n)
     }
 }
 
+void
 _swaplong (bp, n)
     register char *bp;
     register unsigned n;

$NetBSD: patch-as,v 1.1 2008/09/10 13:32:48 taca Exp $

--- image/bright.c.orig	1998-12-28 17:22:53.000000000 +0900
+++ image/bright.c
@@ -248,6 +248,7 @@ Image *normalize(image, verbose)
 
 void gray(image, verbose)
      Image *image;
+     int verbose;
 { int a;
   unsigned int size;
   Intensity intensity, red, green, blue;

$NetBSD: patch-at,v 1.1 2008/09/10 13:32:48 taca Exp $

--- image/faces.c.orig	2001-08-31 02:10:30.000000000 +0900
+++ image/faces.c
@@ -86,6 +86,7 @@ static int nextInt(zf, len)
 
 Image *facesLoad(fullname, name, verbose)
      char *fullname, *name;
+     int verbose;
 { ZFILE        *zf;
   Image        *image;
   char          fname[BUFSIZ];

$NetBSD: patch-au,v 1.1 2008/09/10 13:32:48 taca Exp $

--- image/rlelib.c.orig	2007-05-18 01:47:33.000000000 +0900
+++ image/rlelib.c
@@ -428,6 +428,7 @@ register struct sv_globals * globals;
  */
 void
 RunSkipBlankLines(nblank, globals)
+int nblank;
 register struct sv_globals * globals;
 {
 }
@@ -439,6 +440,7 @@ register struct sv_globals * globals;
  */
 void
 RunSetColor(c, globals)
+int c;
 register struct sv_globals * globals;
 {
 }
@@ -451,6 +453,7 @@ register struct sv_globals * globals;
 /* ARGSUSED */
 void
 RunSkipPixels(nskip, last, wasrun, globals)
+int nskip, last, wasrun;
 register struct sv_globals * globals;
 {
 }
@@ -462,6 +465,7 @@ register struct sv_globals * globals;
  */
 void
 RunNewScanLine(flag, globals)
+int flag;
 register struct sv_globals * globals;
 {
 }
@@ -473,6 +477,7 @@ register struct sv_globals * globals;
 void
 Runputdata(buf, n, globals)
 rle_pixel * buf;
+int n;
 register struct sv_globals * globals;
 {
 }
@@ -485,6 +490,7 @@ register struct sv_globals * globals;
 /* ARGSUSED */
 void
 Runputrun(color, n, last, globals)
+int color, n, last;
 register struct sv_globals * globals;
 {
 }
@@ -1391,6 +1397,7 @@ int dith_size = 16;
  */
 void
 dithermap(levels, gamma, rgbmap, divN, modN, magic)
+int levels;
 double gamma;
 int rgbmap[][3];
 int divN[256];
@@ -1451,6 +1458,7 @@ int magic[16][16];
  */
 void
 bwdithermap(levels, gamma, bwmap, divN, modN, magic)
+int levels;
 double gamma;
 int bwmap[];
 int divN[256];
@@ -1677,6 +1685,7 @@ int gammamap[256];
  */
 int
 dithergb(x, y, r, g, b, levels, divN, modN, magic)
+int x, y, r, g, b, levels;
 int divN[256];
 int modN[256];
 int magic[16][16];
@@ -1708,6 +1717,7 @@ int magic[16][16];
  */
 int
 ditherbw(x, y, val, divN, modN, magic)
+int x, y, val;
 int divN[256];
 int modN[256];
 int magic[16][16];

$NetBSD: patch-av,v 1.1 2008/09/10 13:32:48 taca Exp $

--- image/rotate.c.orig	2003-08-23 15:22:09.000000000 +0900
+++ image/rotate.c
@@ -40,6 +40,7 @@ int *new_pos;				/* Destination bit posi
 Image *rotate(simage, degrees, verbose)
 Image *simage;				/* Image to rotate             */
 int    degrees;				/* Number of degrees to rotate */
+int    verbose;
 { 
   char buf[BUFSIZ];			/* New title                   */
   Image    *image1;			/* Source image                */

$NetBSD: patch-aw,v 1.1 2008/09/10 13:32:48 taca Exp $

--- image/smooth.c.orig	1998-02-13 16:49:04.000000000 +0900
+++ image/smooth.c
@@ -74,6 +74,7 @@ static Image *doSmooth(image)
 
 Image *smooth(image, iterations, verbose)
      Image *image;
+     int    iterations;
      int    verbose;
 { int a;
   Image *old, *new;

$NetBSD: patch-ax,v 1.1 2008/09/10 13:32:48 taca Exp $

--- image/window.c.orig	2004-07-29 00:47:31.000000000 +0900
+++ image/window.c
@@ -16,7 +16,7 @@
 #include <signal.h>
 #include <errno.h>
 #include <sys/types.h>
-#ifdef SYSV
+#if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #if TIME_WITH_SYS_TIME
@@ -224,7 +224,7 @@ void setViewportColormap(disp, scrn, vis
      int scrn;
      Visual *visual;
 { XSetWindowAttributes swa;
-  static cmap_atom= None;
+  static int cmap_atom= None;
   Window cmap_windows[2];
 
   if (cmap_atom == None)

$NetBSD: patch-ay,v 1.1 2008/09/10 13:32:48 taca Exp $

--- image/zio.c.orig	2004-07-29 00:47:31.000000000 +0900
+++ image/zio.c
@@ -134,11 +134,7 @@ void zreset(filename)
   }
 }
 
-#ifdef __APPLE__
 ZFILE *zzopen(name)
-#else
-ZFILE *zopen(name)
-#endif
      char *name;
 { int    a;
   ZFILE *zf;

$NetBSD: patch-az,v 1.1 2008/09/10 13:32:48 taca Exp $

--- image/zoom.c.orig	2003-08-23 15:22:09.000000000 +0900
+++ image/zoom.c
@@ -39,6 +39,7 @@ static unsigned int *buildIndex(width, z
 Image *zoom(oimage, xzoom, yzoom, verbose)
      Image        *oimage;
      float        xzoom, yzoom;
+     int	  verbose;
 { char          buf[BUFSIZ];
   Image        *image=NULL;
   unsigned int *xindex, *yindex;

$NetBSD: patch-ba,v 1.1 2008/09/10 13:32:48 taca Exp $

--- sample/default.mgp.orig	2001-08-11 01:40:54.000000000 +0900
+++ sample/default.mgp
@@ -1,20 +1,24 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
-%% This default.mgp is "TrueType fonts" oriented.
-%% First, you should create "~/.mgprc" whose contents are:
-%%	tfdir "/path/to/truetype/fonts"
-%%
-%% To visualize English, install "standard.ttf", "thick.ttf", and 
-%% "typewriter.ttf" into the "tfdir" directory above:
-%%	ftp://ftp.mew.org/pub/mgp/ttf-us.tar.gz
-%%
-%% To visualize Japanese, install "kochi-mincho.ttf" and "goth.ttf"
-%% 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"
+%% Default font settings for xft2.
+%%
+%@MGP_XFONT@deffont "standard"   xfont "serif" "iso8859-1", xfont "serif" "jisx0208.1983"
+%@MGP_XFONT@deffont "thick"      xfont "sans-serif" "iso8859-1", xfont "sans-serif" "jisx0208.1983"
+%% %ddeffont "typewriter" xfont "sans-serif" "iso8859-1", xfont "sans-serif" "jisx0208.1983"
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Default font settings for vflib.
+%%
+%@MGP_VFONT@deffont "standard"   vfont "min"
+%@MGP_VFONT@deffont "thick"      vfont "goth"
+%@MGP_VFONT@deffont "typewriter" vfont "goth"
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Default font settings for freetype.
+%%
+%@MGP_TFONT@deffont "standard"   tfont "standard.ttf",   tmfont "kochi-mincho.ttf"
+%@MGP_TFONT@deffont "thick"      tfont "thick.ttf",      tmfont "goth.ttf"
+%@MGP_TFONT@deffont "typewriter" tfont "typewriter.ttf", tmfont "goth.ttf"
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
 %% Default settings per each line numbers.

$NetBSD: patch-bb,v 1.1 2008/09/10 13:32:48 taca Exp $

--- x11.c.orig	2008-01-25 00:43:17.000000000 +0900
+++ x11.c
@@ -355,7 +355,7 @@ init_win3()
 void
 toggle_fullscreen()
 {
-	static fullscreen = 0;
+	static int fullscreen = 0;
 	XClientMessageEvent  xev;
 
 	fullscreen = ++fullscreen % 2;