13 files changed, 261 insertions, 196 deletions

diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile
index 2714af0635a8..fa3df2c99191 100644
--- a/games/xsoldier/Makefile
+++ b/games/xsoldier/Makefile
@@ -6,20 +6,28 @@
 #
 
 PORTNAME=	xsoldier
-PORTVERSION=	0.96
+PORTVERSION=	1.3
 CATEGORIES=	games
-# mastersite disappeared in December 2002
-MASTER_SITES=	# http://www.surfline.ne.jp/hachi/xsoldier/
+MASTER_SITES=	http://www.interq.or.jp/libra/oohara/xsoldier/
 
-# A new version is available at http://www.interq.or.jp/libra/oohara/xsoldier/
-# which will require a bit of porting.
-DEPRECATED=	"master site disappeared, see Makefile if you want to save this port"
-EXPIRATION_DATE=2005-08-31
+MAINTAINER=	naddy@FreeBSD.org
+COMMENT=	Space-based shoot-em up game for X11
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Shooting game for x11
+USE_XLIB=	Yes
+GNU_CONFIGURE=	Yes
+CONFIGURE_ARGS=	--localstatedir=/var
+MAKE_ARGS=	CC_OPTIMIZE="${CFLAGS}"
 
-USE_IMAKE=	yes
-USE_XPM=	yes
+MAN6=		xsoldier.6
+
+SCOREFILE=	/var/games/xsoldier.scores
+PLIST_SUB=	SCOREFILE=${SCOREFILE}
+
+post-install:
+	${CHGRP} games ${PREFIX}/bin/xsoldier
+	${CHMOD} g+s ${PREFIX}/bin/xsoldier
+	${CP} ${EXAMPLESDIR}/xsoldier.scores ${SCOREFILE}
+	${CHGRP} games ${SCOREFILE}
+	${CHMOD} 664 ${SCOREFILE}
 
 .include <bsd.port.mk>
diff --git a/games/xsoldier/distinfo b/games/xsoldier/distinfo
index 015634bb19ff..186ca46dbb7d 100644
--- a/games/xsoldier/distinfo
+++ b/games/xsoldier/distinfo
@@ -1,2 +1,2 @@
-MD5 (xsoldier-0.96.tar.gz) = 63f7ef2cd4de43524486b48c0f097553
-SIZE (xsoldier-0.96.tar.gz) = 82413
+MD5 (xsoldier-1.3.tar.gz) = 0b96ea5aa2ae74fbee17277d9dac1e59
+SIZE (xsoldier-1.3.tar.gz) = 134878
diff --git a/games/xsoldier/files/patch-Makefile.in b/games/xsoldier/files/patch-Makefile.in
new file mode 100644
index 000000000000..2c40b27cf92f
--- /dev/null
+++ b/games/xsoldier/files/patch-Makefile.in
@@ -0,0 +1,25 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig
++++ Makefile.in
+@@ -451,14 +451,13 @@
+ 
+ install-exec-local:
+ # install pixmap
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)/games/xsoldier/
++	$(mkinstalldirs) $(DESTDIR)$(datadir)/xsoldier/
+ 	$(INSTALL_DATA) pixmap/*.xpm \
+-  $(DESTDIR)$(datadir)/games/xsoldier/
++  $(DESTDIR)$(datadir)/xsoldier/
+ # install score file
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/games/xsoldier/
+-	test -e $(DESTDIR)$(localstatedir)/games/xsoldier/xsoldier.scores \
+-  || $(INSTALL_DATA) scorefile.txt \
+-  $(DESTDIR)$(localstatedir)/games/xsoldier/xsoldier.scores
++	$(mkinstalldirs) $(DESTDIR)$(datadir)/examples/xsoldier/
++	$(INSTALL_DATA) scorefile.txt \
++  $(DESTDIR)$(datadir)/examples/xsoldier/xsoldier.scores
+ 
+ uninstall-local:
+ # uninstall pixmap
diff --git a/games/xsoldier/files/patch-aa b/games/xsoldier/files/patch-aa
deleted file mode 100644
index 21d8f9cce190..000000000000
--- a/games/xsoldier/files/patch-aa
+++ /dev/null
@@ -1,107 +0,0 @@
---- Imakefile.orig	Sat Mar  1 00:48:57 1997
-+++ Imakefile	Wed Nov  1 12:11:15 2000
-@@ -6,58 +6,58 @@
- 
- 
- /* ----------------------------------------------------------------------- */
--/* -------------------- その1 インストール先の設定 ----------------------- */
-+/* ---------------------- PART1 INSTALL DIRECTORY ------------------------ */
- /* ----------------------------------------------------------------------- */
- 
--/* インストールディレクトリ						   */
--/* 書き込み権限が無いとインストール出来ません．=> 遊べない．(^^;           */
--PIXMAPDIR	= /usr/local/games/lib/xsoldier
--SCOREDIR	= /usr/local/games/lib/xsoldier
--BINDIR		= /usr/local/games
-+/* Install Directory                                                       */
-+/* You can't install without write permission of these. => Unplayable. (^^;*/
-+PIXMAPDIR	= $(LIBDIR)/xsoldier
-+SCOREDIR	= $(LIBDIR)/xsoldier
-+/* BINDIR		= /usr/local/games */
- 
--/* スコアファイル名．SCOREDIR 以下に置かれます．			   */
-+/* Score File Name. It's under SCOREDIR.                                   */
- SCOREFILE	= .scorefile
- 
- 
- /* ----------------------------------------------------------------------- */
--/* --------------------- その2 コンパイルの設定 -------------------------- */
-+/* ------------------- PART2 COMPILE CONFIGURATION ----------------------- */
- /* ----------------------------------------------------------------------- */
- 
--/* xmkmf の Makefile で cc になっちゃう場合				   */
-+/* What compiler do you want to use?                                       */
- /* CC		= gcc */
- 
--/* xpmがXと異なるディレクトリにインストールされている場合		   */
-+/* If you have xpm not in the X directory.                                 */
- /* XPMINCDIR	= /usr/X11R6/include */
- /* XPMLIBDIR	= /usr/X11R6/lib */
--/* 			  ココに path を書いて				   */
-+/*                        Write path name here and .....                   */
- /* XPMINCFLAGS	= -I$(XPMINCDIR) */
- /* XPMLIBFLAGS	= -L$(XPMLIBDIR) */
--/* 上の2つのコメントを解除してください					   */
-+/* Uncomment the upper 2 lines.                                            */
- 
--/* ゲームのウエイト							   */
-+/* Game Wait                                                               */
- WAIT		= 35000
- 
--/* その他コンパイルオプション						   */
--/*     -DDUPSCORE … 同一人物がハイスコアに複数エントリ出来る              */
--/*     -DSYSV     … SystemV 系などで random 関数が無い場合，		   */
--/*                   かわりに srand48 と lrand48 関数を使用します	   */
-+/* The other compile options                                               */
-+/*     -DDUPSCORE -> Allow multiple entry in the high score                */
-+/*     -DSYSV     -> Specify when not have random functions(SystemV etc.)  */
-+/*                   Use srand48 and lrand48 instead.                      */
- LOCAL_DEF	= 
- 
--/* ジョイスティックを使う場合						   */
-+/* When you use the joystick                                               */
- /* #define JOYSTICK */
- 
- 
- /* ----------------------------------------------------------------------- */
--/* ------------------ その3 インストールコマンドの設定 ------------------- */
-+/* ------------------ PART3 INSTALL COMMAND CONFIGURATION ---------------- */
- /* ----------------------------------------------------------------------- */
- 
--/* Solarisでopenwinを使用してコンパイルするときに必要			   */
-+/* You need this when you use openwin on Solaris.                          */
- /* INSTALL		= /usr/ucb/install */
- 
- 
- /* ----------------------------------------------------------------------- */
- /*									   */
--/* 		 基本的にここから下はいぢらなくて済むハズ		   */
-+/*               Basically, you don't need change below.                   */
- /*									   */
- /* ----------------------------------------------------------------------- */
- 
-@@ -85,7 +85,7 @@
- 
- OBJS = $(SRCS:.c=.o)
- 
--ComplexProgramTarget(xsoldier)
-+ComplexProgramTargetNoMan(xsoldier)
- 
- install:: install.pixmap install.score install.bin
- 
-@@ -95,7 +95,7 @@
- install.score::
- 	@if [ -d $(SCOREDIR) ]; then chmod 755 $(SCOREDIR); \
-         else $(MKDIRHIER) $(SCOREDIR); chmod 755 $(SCOREDIR); fi
--	$(INSTALL) -c -m 600 scorefile.txt $(SCOREDIR)/$(SCOREFILE)
-+	$(INSTALL) -c -g games -m 660 scorefile.txt $(SCOREDIR)/$(SCOREFILE)
- 	@echo "install score . done"
- 
- install.pixmap::
-@@ -109,5 +109,5 @@
- install.bin::
- 	@if [ -d $(BINDIR) ]; then set +x; \
-         else (set -x; $(MKDIRHIER) $(BINDIR)); fi
--	$(INSTALL) -c -m 4755 $(PROGRAM) $(BINDIR)/$(PROGRAM)
-+	$(INSTALL) -c -g games -m 2755 $(PROGRAM) $(BINDIR)/$(PROGRAM)
- 	@echo "install bin . done"
diff --git a/games/xsoldier/files/patch-ab b/games/xsoldier/files/patch-ab
index 35b3c4db950b..05ec1ea0388d 100644
--- a/games/xsoldier/files/patch-ab
+++ b/games/xsoldier/files/patch-ab
@@ -1,10 +1,22 @@
---- manage.c.orig	Mon Jun  9 19:41:29 1997
-+++ manage.c	Mon Jun  9 19:41:41 1997
-@@ -9,7 +9,6 @@
+
+$FreeBSD$
+
+--- manage.c.orig
++++ manage.c
+@@ -17,7 +17,6 @@
  
  #include <stdio.h>
  #include <stdlib.h>
 -#include <malloc.h>
+ /*
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
+@@ -393,7 +392,7 @@
  
+     New = (PlayerData *)malloc(sizeof(PlayerData));
+ 
+-    sprintf(New->Rec[0].name,name);
++    snprintf(New->Rec[0].name, sizeof(New->Rec[0].name), name);
+     New->Rec[0].score = 0;
+     New->Rec[0].stage = 0;
+     New->Rec[0].loop = 0;
diff --git a/games/xsoldier/files/patch-ac b/games/xsoldier/files/patch-ac
index 292382939991..23c46a399602 100644
--- a/games/xsoldier/files/patch-ac
+++ b/games/xsoldier/files/patch-ac
@@ -1,19 +1,22 @@
---- main.c	Fri Feb 28 08:50:07 1997
-+++ main.c.new	Wed Dec 15 19:35:37 1999
-@@ -129,14 +129,14 @@
-         argv0++;
-     else
-         argv0 = argv[0];
--    strcpy(command,argv0); /*** コマンド名取得とコピー ***/
-+    strlcpy(command,argv0,sizeof(command)); /*** コマンド名取得とコピー ***/
+
+$FreeBSD$
+
+--- main.c.orig
++++ main.c
+@@ -33,7 +33,6 @@
+ /* DeleteAllStar */
+ #include "star.h"
+ #include "score.h"
+-#include "wait.h"
+ #include "graphic.h"
+ #include "input.h"
  
-     for (i=1; i<argc; i++)
-     {
- 	if ((strcmp(argv[i],"-display")==0) || (strcmp(argv[i],"-d")==0))
- 	{
- 	    if (i < argc-1)
--		strcpy(display,argv[i+1]);
-+		strlcpy(display,argv[i+1],sizeof(display));
- 	}
-         else if ((strcmp(argv[i],"-wait")==0) || (strcmp(argv[i],"-w")==0))
- 	{
+@@ -175,7 +174,7 @@
+                         i + 1);
+                 display[sizeof(display) - 1] = '\0';
+                 fprintf(stderr, "truncated to %d chars\n",
+-                        sizeof(display) - 1);
++                        (int)sizeof(display) - 1);
+               }
+               i++;
+             }
diff --git a/games/xsoldier/files/patch-enemyshot.c b/games/xsoldier/files/patch-enemyshot.c
new file mode 100644
index 000000000000..1f7fd6ac070c
--- /dev/null
+++ b/games/xsoldier/files/patch-enemyshot.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- enemyshot.c.orig
++++ enemyshot.c
+@@ -11,6 +11,7 @@
+ #include <X11/xpm.h>
+ */
+ 
++#include <stdlib.h>
+ #include "image.h"
+ #include "xsoldier.h"
+ #include "manage.h"
diff --git a/games/xsoldier/files/patch-game.c b/games/xsoldier/files/patch-game.c
new file mode 100644
index 000000000000..44f9699665eb
--- /dev/null
+++ b/games/xsoldier/files/patch-game.c
@@ -0,0 +1,66 @@
+
+$FreeBSD$
+
+--- game.c.orig
++++ game.c
+@@ -275,24 +275,24 @@
+               /* shoot down bonus message */
+               if (manage->BossTime >= 1)
+               {
+-		sprintf(Percent,"shoot down %02d%%",player->Percent);
++		snprintf(Percent, sizeof(Percent), "shoot down %02d%%",player->Percent);
+                 draw_string(210, 370, Percent, strlen(Percent));
+ 
+ 
+-		sprintf(Bonus,"Bonus %d pts", shoot_down_bonus(player->Percent, manage->Loop, manage->Stage));
++		snprintf(Bonus, sizeof(Bonus), "Bonus %d pts", shoot_down_bonus(player->Percent, manage->Loop, manage->Stage));
+                 draw_string(260 + manage->Appear*3 , 400,
+                             Bonus, strlen(Bonus));
+ 
+ 		if (player->Percent >= 100)
+ 		{
+-		    sprintf(Perfect,"Perfect!!");
++		    snprintf(Perfect, sizeof(Perfect), "Perfect!!");
+                     draw_string(170 - manage->Appear*3 , 420,
+                                 Perfect, strlen(Perfect));
+ 		}
+               }
+               else
+               {
+-                snprintf(Percent, 32, "the boss escaped");
++                snprintf(Percent, sizeof(Percent), "the boss escaped");
+                 draw_string(200 ,370 ,Percent, strlen(Percent));
+               }
+               
+@@ -335,19 +335,19 @@
+     
+     int i;
+ 
+-    sprintf(Score,"Score % 8d",player->Rec[0].score);
+-    sprintf(Stage,"Stage %2d",manage->Stage);
+-    sprintf(Ships,"Ships %3d",player->Ships);
++    snprintf(Score, sizeof(Score), "Score % 8d",player->Rec[0].score);
++    snprintf(Stage, sizeof(Stage), "Stage %2d",manage->Stage);
++    snprintf(Ships, sizeof(Ships), "Ships %3d",player->Ships);
+ #ifdef DEBUG
+-    sprintf(ObjectE,"Enemy Object %3d",manage->EnemyNum);
+-    sprintf(ObjectP,"Player Object %3d",manage->PlayerNum);
+-    sprintf(Loop,"Loop %2d",manage->Loop);
+-    sprintf(Level,"Level %3d",manage->Level);
+-    sprintf(Weapon,"Weapon %d",manage->player[0]->Data.Cnt[5]);
+-    sprintf(Pow,"Pow %2d",manage->player[0]->Data.Cnt[6]);
+-    sprintf(Speed,"Speed %2d",manage->player[0]->Data.Speed);
+-    sprintf(Enemy,"Enemy %3d",manage->StageEnemy);
+-    sprintf(EnemyKill,"EnemyKill %3d",manage->StageShotDown);
++    snprintf(ObjectE, sizeof(ObjectE), "Enemy Object %3d",manage->EnemyNum);
++    snprintf(ObjectP, sizeof(ObjectP), "Player Object %3d",manage->PlayerNum);
++    snprintf(Loop, sizeof(Loop), "Loop %2d",manage->Loop);
++    snprintf(Level, sizeof(Level), "Level %3d",manage->Level);
++    snprintf(Weapon, sizeof(Weapon), "Weapon %d",manage->player[0]->Data.Cnt[5]);
++    snprintf(Pow, sizeof(Pow), "Pow %2d",manage->player[0]->Data.Cnt[6]);
++    snprintf(Speed, sizeof(Speed), "Speed %2d",manage->player[0]->Data.Speed);
++    snprintf(Enemy, sizeof(Enemy), "Enemy %3d",manage->StageEnemy);
++    snprintf(EnemyKill, sizeof(EnemyKill), "EnemyKill %3d",manage->StageShotDown);
+ #endif
+ 
+     draw_string(10, 20, Score, strlen(Score));
diff --git a/games/xsoldier/files/patch-joystick.c b/games/xsoldier/files/patch-joystick.c
new file mode 100644
index 000000000000..d61f835d5b6f
--- /dev/null
+++ b/games/xsoldier/files/patch-joystick.c
@@ -0,0 +1,20 @@
+
+$FreeBSD$
+
+--- joystick.c.orig
++++ joystick.c
+@@ -8,6 +8,8 @@
+ 
+ #include <config.h>
+ 
++#ifdef JSTK
++
+ /* read */
+ #include <unistd.h>
+ /* exit */
+@@ -95,3 +97,5 @@
+ 	if (js.y >  150) joymask |= Down; /* Was 1000 */
+     }
+ }
++
++#endif	/* JSTK */
diff --git a/games/xsoldier/files/patch-opening.c b/games/xsoldier/files/patch-opening.c
new file mode 100644
index 000000000000..cd6b93161bec
--- /dev/null
+++ b/games/xsoldier/files/patch-opening.c
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- opening.c.orig
++++ opening.c
+@@ -95,10 +95,10 @@
+ 	    {
+ 		draw_string(120, 330+i*25, player->Rec[i].name,
+                             strlen(player->Rec[i].name));
+-		sprintf(buff,"%2d-%2d",player->Rec[i].loop,
++		snprintf(buff, sizeof(buff), "%2d-%2d",player->Rec[i].loop,
+                         player->Rec[i].stage);
+ 		draw_string(270, 330+i*25, buff, strlen(buff));
+-		sprintf(buff,"%8d",player->Rec[i].score);
++		snprintf(buff, sizeof(buff), "%8d",player->Rec[i].score);
+ 		draw_string(350, 330+i*25, buff, strlen(buff));
+ 	    }
+ 	}
diff --git a/games/xsoldier/files/patch-xsoldier.h b/games/xsoldier/files/patch-xsoldier.h
new file mode 100644
index 000000000000..0ccdc9d8bded
--- /dev/null
+++ b/games/xsoldier/files/patch-xsoldier.h
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- xsoldier.h.orig
++++ xsoldier.h
+@@ -33,8 +33,8 @@
+ #define WAIT 35000
+ #endif /* WAIT */
+ 
+-#define PIXMAP DATADIR "/games/xsoldier/"
+-#define SCORE LOCALSTATEDIR "/games/xsoldier/"
++#define PIXMAP DATADIR "/xsoldier/"
++#define SCORE LOCALSTATEDIR "/games/"
+ #define SCOREFILE "xsoldier.scores"
+ 
+ #define MaxStage 8
diff --git a/games/xsoldier/pkg-descr b/games/xsoldier/pkg-descr
index 32e3df6909d7..e93b19667fd7 100644
--- a/games/xsoldier/pkg-descr
+++ b/games/xsoldier/pkg-descr
@@ -1,24 +1,5 @@
-Xsoldier is a shooting game for x11.  This is adapted from the man page:
-OPTIONS:
-	-display <displayname>	Specify display.
-	-wait <unsigned int n>	Specify wait. To change this will let
-			 	your highscore unregistered.
-	-cmap			Use default colormap.
-				Without this option, xsoldier use pri-
-				vate colormap.
-	-score			Show 10 highscores.
-	-help			Show usage message.
-	You can use the first character of an option instead.
-PLAY:
-	- Start game with [space]
-	- Cursor keys to move, [left-shift] to shot
-	- Defeat enemies and you sometimes find [Weapon] or [Power]
-	- You can change your speed with [a] and [s]
-	- [p] to pause the game and [q] to return to the title
-	- [q] at the title to quit game
-	- Boss at the last of a stage to defeat for the next stage
-	- You can get bonus points along defeat average  at  clear
-	  stage
-	- 1UP per 100,000 points
-	- 8 stages all and try to clear!
-Author: hachi@surfline.ne.jp
+Xsoldier is a space-based shoot'em up game.  You fly around and try
+to kill everything that moves...  and everything that doesn't move...
+You get the idea.
+
+WWW: http://www.interq.or.jp/libra/oohara/xsoldier/
diff --git a/games/xsoldier/pkg-plist b/games/xsoldier/pkg-plist
index 79da94a55c20..b75711050b06 100644
--- a/games/xsoldier/pkg-plist
+++ b/games/xsoldier/pkg-plist
@@ -1,32 +1,42 @@
+@comment $FreeBSD$
 bin/xsoldier
-lib/X11/xsoldier/.scorefile
-lib/X11/xsoldier/Boss1.xpm
-lib/X11/xsoldier/Boss2.xpm
-lib/X11/xsoldier/Boss3.xpm
-lib/X11/xsoldier/Boss4.xpm
-lib/X11/xsoldier/Boss5.xpm
-lib/X11/xsoldier/Boss6.xpm
-lib/X11/xsoldier/Boss7.xpm
-lib/X11/xsoldier/Enemy1.xpm
-lib/X11/xsoldier/Enemy2.xpm
-lib/X11/xsoldier/Enemy3.xpm
-lib/X11/xsoldier/Enemy4.xpm
-lib/X11/xsoldier/Enemy5.xpm
-lib/X11/xsoldier/Enemy6.xpm
-lib/X11/xsoldier/Enemy7.xpm
-lib/X11/xsoldier/EnemyBound.xpm
-lib/X11/xsoldier/EnemyLaser.xpm
-lib/X11/xsoldier/EnemyMiss.xpm
-lib/X11/xsoldier/EnemyRing.xpm
-lib/X11/xsoldier/EnemyShot.xpm
-lib/X11/xsoldier/ExpLarge.xpm
-lib/X11/xsoldier/ExpSmall.xpm
-lib/X11/xsoldier/Item.xpm
-lib/X11/xsoldier/Player.xpm
-lib/X11/xsoldier/PlayerShot1.xpm
-lib/X11/xsoldier/PlayerShot2.xpm
-lib/X11/xsoldier/PlayerShot3.xpm
-lib/X11/xsoldier/Star1.xpm
-lib/X11/xsoldier/Star2.xpm
-lib/X11/xsoldier/Title.xpm
-@dirrm lib/X11/xsoldier
+share/examples/xsoldier/xsoldier.scores
+@exec cp %D/share/examples/xsoldier/xsoldier.scores %%SCOREFILE%% && chgrp games %%SCOREFILE%% && chmod 664 %%SCOREFILE%%
+@unexec rm -f %%SCOREFILE%%
+share/xsoldier/Boss1.xpm
+share/xsoldier/Boss2.xpm
+share/xsoldier/Boss3.xpm
+share/xsoldier/Boss4.xpm
+share/xsoldier/Boss5.xpm
+share/xsoldier/Boss6.xpm
+share/xsoldier/Boss7.xpm
+share/xsoldier/Enemy1.xpm
+share/xsoldier/Enemy2.xpm
+share/xsoldier/Enemy3.xpm
+share/xsoldier/Enemy4.xpm
+share/xsoldier/Enemy5.xpm
+share/xsoldier/Enemy6.xpm
+share/xsoldier/Enemy7.xpm
+share/xsoldier/EnemyBound.xpm
+share/xsoldier/EnemyLaser.xpm
+share/xsoldier/EnemyMiss.xpm
+share/xsoldier/EnemyRing.xpm
+share/xsoldier/EnemyShot.xpm
+share/xsoldier/ExpLarge.xpm
+share/xsoldier/ExpSmall.xpm
+share/xsoldier/Item.xpm
+share/xsoldier/Player.xpm
+share/xsoldier/PlayerShot1.xpm
+share/xsoldier/PlayerShot2.xpm
+share/xsoldier/PlayerShot3.xpm
+share/xsoldier/Star1.xpm
+share/xsoldier/Star2.xpm
+share/xsoldier/Title.xpm
+share/xsoldier/font1.xpm
+share/xsoldier/font2.xpm
+share/xsoldier/font3.xpm
+share/xsoldier/font4.xpm
+share/xsoldier/font5.xpm
+share/xsoldier/font6.xpm
+@dirrm share/examples/xsoldier
+@dirrm share/xsoldier