update to 1.1.6

change: use a 20pt font as "bigfont", avoids problems on systems
 where the original 24pt font is not found
pkgsrc change: fix the code which does font replacement in case
 a font is not found (following an idea from gentoo but done correctly)
thanks to Felix Resch for pointers and testing

1 files changed, 49 insertions, 0 deletions

diff --git a/games/xblockout/patches/patch-ac b/games/xblockout/patches/patch-ac
new file mode 100644
index 00000000000..883d9d92c42
--- /dev/null
+++ b/games/xblockout/patches/patch-ac
@@ -0,0 +1,49 @@
+$NetBSD: patch-ac,v 1.1 2009/02/19 12:36:15 drochner Exp $
+
+--- initmenu.c.orig	2005-11-07 21:40:38.000000000 +0100
++++ initmenu.c
+@@ -408,37 +408,34 @@ void inittext(struct menu *m, struct opt
+   XCharStruct overall_return ;
+ 
+   m->xfont = XLoadQueryFont( x->display , opt->thefont ) ;
+-  m->font = XLoadFont( x->display , opt->thefont ) ;
+   if ( opt->verbose )
+     {
+       fprintf(stderr,"font=%s\n", opt->thefont) ;
+     }
+-  if ( m->font==BadAlloc || m->font==BadName || m->xfont==0 )
++  if ( m->xfont==0 )
+     {
+       fprintf(stderr,"Some problems when loading a font... trying others\n") ;
+       m->xfont = XLoadQueryFont( x->display , 
+-				 "-*-*-*-*-*-*-*-*-*-*-*-*-*-*" ) ;
+-      m->font = XLoadFont( x->display , 
+-			   "-*-*-*-*-*-*-*-*-*-*-*-*-*-*" ) ;
+-      if ( m->font==BadAlloc || m->font==BadName || m->xfont==0 )
++				 "fixed" ) ;
++      if ( m->xfont==0 )
+ 	{
+-	  fprintf(stderr,"You haven't -*-*-*-*-*-*-*-*-*-*-*-*-*-*\n");
++	  fprintf(stderr,"You haven't \"fixed\"\n");
+ 	  fprintf(stderr,"Have you A font?\n");
+ 	  fprintf(stderr,"Retry with -font option\n");
+ 	  exit(1) ;
+ 	}
+     }
++  m->font = m->xfont->fid;
+   m->xfont2 = XLoadQueryFont( x->display , opt->thefont2 ) ;
+-  m->font2 = XLoadFont( x->display , opt->thefont2 ) ;
+   if ( opt->verbose )
+     {
+       fprintf(stderr,"font2=%s\n", opt->thefont2) ;
+     }
+-  if ( m->font2==BadAlloc || m->font2==BadName || m->xfont2==0 )
++  if ( m->xfont2==0 )
+     {
+-      m->font2 = m->font ;
+       m->xfont2 = m->xfont ;
+     }
++  m->font2 = m->xfont2->fid;
+ 
+   xgc.background = x->back_pixel ;
+   xgc.foreground = opt->backcolor!=7 ? x->white_pixel : x->black_pixel;