From d763e6001caecbd7884d5acfbd77b4d143b456fe Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Fri, 20 Mar 2009 23:01:05 +0000 Subject: - Update to version 1.1.6 PR: 132747 Submitted by: Ports Fury --- games/xbl/files/patch-aa | 76 ---------------------------------------- games/xbl/files/patch-bl.c | 20 ----------- games/xbl/files/patch-configure | 13 ------- games/xbl/files/patch-initmenu.c | 47 +++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 109 deletions(-) delete mode 100644 games/xbl/files/patch-aa delete mode 100644 games/xbl/files/patch-bl.c delete mode 100644 games/xbl/files/patch-configure create mode 100644 games/xbl/files/patch-initmenu.c (limited to 'games/xbl/files') diff --git a/games/xbl/files/patch-aa b/games/xbl/files/patch-aa deleted file mode 100644 index 72697f992f35..000000000000 --- a/games/xbl/files/patch-aa +++ /dev/null @@ -1,76 +0,0 @@ ---- Makefile.in.old Mon Nov 7 19:50:05 2005 -+++ Makefile.in Thu Dec 15 19:25:55 2005 -@@ -83,7 +83,7 @@ - - # For linking (configure script will modify this line) - # xmkmf et imake informations are take into account. --LIBS = @LIBS@ -lm -+LIBS = @LIBS@ -lm -lX11 -lcompat - - all:demo - -@@ -124,29 +124,21 @@ - @echo "Executable go in $(BINDIR)" - @echo "Scores go in $(SCOREDIR)" - @echo "Defaults go in $(RESOURCEDIR)/Xbl" -- @echo "Man pages go in $(MANPATH)/mann or man1" -+ @echo "Man pages go in $(MANPATH)/man1" - @-if [ "" != "$(USE_SETGID)" ] ; then \ - echo "You use GID=$(GROUP_GID) protection" ; \ - fi -- @echo "Type to continue installation" -- @echo "Type NO to stop installation" -- @read LINE && test "" = "$$LINE" - # - # Remove old score file - # - @-if [ -d "$(SCOREDIR)" ] ; \ - then \ -- echo "The scoring method and speeds of Xbl had change" ; \ -- echo "If your version is older than 0.2e, destroy score." ; \ -- echo "Type to destroy old score files" ; \ -- echo "Type NO to hold old score files" ; \ -- read LINE && test "" = "$$LINE" && rm $(SCOREDIR)/[1-9]* ; \ -- exit 0 ; \ -+ rm $(SCOREDIR)/[1-9]* ; \ - fi - # - # Install executable - # -- $(CP) bl $(BINDIR)/xbl -+ $(BSD_INSTALL_PROGRAM) bl $(BINDIR)/xbl - -if [ "" = "$(USE_SETGID)" ] ; then \ - chmod 755 $(BINDIR)/xbl ;\ - else \ -@@ -160,30 +152,20 @@ - -mkdir $(SCOREDIR) 2>/dev/null - $(CP) Xbl.ad $(RESOURCEDIR)/Xbl ; chmod 644 $(RESOURCEDIR)/Xbl - $(CP) Xbl.ad $(SCOREDIR)/Xbl ; chmod 644 $(SCOREDIR)/Xbl -- $(CP) COPYING $(SCOREDIR) ; chmod 444 $(SCOREDIR)/COPYING - -if [ "" = "$(USE_SETGID)" ] ; then \ - chmod 777 $(SCOREDIR) ;\ - chmod 666 $(SCOREDIR)/[1-9]* ;\ - else \ - chmod 775 $(SCOREDIR) ;\ -- chmod 664 $(SCOREDIR)/[1-9]* ;\ -- chown root $(SCOREDIR) $(SCOREDIR)/[1-9]* ;\ -- chgrp $(GROUP_GID) $(SCOREDIR) $(SCOREDIR)/[1-9]* ;\ - fi - # - # Install manual pages - # -- -if [ -d $(MANPATH)/mann ] ; \ -- then \ -- $(CP) xbl.man $(MANPATH)/mann/xbl.n ;\ -- chmod 444 $(MANPATH)/mann/xbl.n ; \ -- else \ - $(CP) xbl.man $(MANPATH)/man1/xbl.1 ;\ - chmod 444 $(MANPATH)/man1/xbl.1 ; \ -- fi - cp *.gif *.html $(SCOREDIR) - # -- -ls -lsa $(SCOREDIR) $(BINDIR)/xbl $(MANPATH)/man[1n]/xbl.[1n] -+ -ls -lsa $(SCOREDIR) $(BINDIR)/xbl $(MANPATH)/man1/xbl.1 - @echo "Type xbl to play" - - bl:$(OBJ) diff --git a/games/xbl/files/patch-bl.c b/games/xbl/files/patch-bl.c deleted file mode 100644 index 467ebd2cac42..000000000000 --- a/games/xbl/files/patch-bl.c +++ /dev/null @@ -1,20 +0,0 @@ ---- bl.c.orig Sat Feb 4 20:13:23 2006 -+++ bl.c Tue Jun 27 02:07:43 2006 -@@ -452,6 +452,8 @@ - int i ; - XEvent event ; - -+ double fps; -+ - fprintf(stderr,"THIS TEST WILL TAKE SOME TIME\n") ; - - blo->opt.wx = blo->opt.wy = blo->opt.wz = 6 ; -@@ -485,7 +487,7 @@ - } - gettimeofday(¤ttime, &tz) ; - -- double fps = (1000000. * i ) -+ fps = (1000000. * i ) - / ( (currenttime.tv_sec - starttime.tv_sec)*1000000 - + currenttime.tv_usec - starttime.tv_usec ) ; - printf("%.2f frames/sec buffering=%d %s clearline=%d\n", diff --git a/games/xbl/files/patch-configure b/games/xbl/files/patch-configure deleted file mode 100644 index 9b2711510847..000000000000 --- a/games/xbl/files/patch-configure +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- configure.orig Thu Jun 19 03:05:17 2003 -+++ configure Thu Jun 19 03:05:31 2003 -@@ -774,7 +774,6 @@ - @echo LN=\"LN=$(LN)\" - @echo COMPRESS=\"COMPRESS=$(COMPRESS)\" - @echo MANPATH=\"MANPATH=$(MANPATH)\" -- @echo CC=\"$(CC)\" - @echo LDOPTIONS=\"$(LDOPTIONS)\" - @echo LINT=\"LINT=$(LINT)\" - @echo LINTFLAGS=\"LINTFLAGS=$(LINTFLAGS)\" diff --git a/games/xbl/files/patch-initmenu.c b/games/xbl/files/patch-initmenu.c new file mode 100644 index 000000000000..4a3b08687420 --- /dev/null +++ b/games/xbl/files/patch-initmenu.c @@ -0,0 +1,47 @@ +--- initmenu.c.orig 2005-11-08 05:40:38.000000000 +0900 ++++ initmenu.c 2009-03-17 00:01:26.000000000 +0900 +@@ -408,37 +408,34 @@ + 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; -- cgit v1.2.3