honor CFLAGS, update DESCR, polishing; ok maintainer

games/xsoldier/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2005/10/22 16:12:53 naddy Exp $
+# $OpenBSD: Makefile,v 1.20 2005/10/23 18:23:25 naddy Exp $
 
 COMMENT=	"space-based shoot'em up game for X11"
 
 DISTNAME=	xsoldier-1.3
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	games x11
 
 HOMEPAGE=	http://www.interq.or.jp/libra/oohara/xsoldier/
@@ -22,6 +22,7 @@ MASTER_SITES=	${HOMEPAGE}
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	--localstatedir=/var
+MAKE_FLAGS=	CC_OPTIMIZE="${CFLAGS}"
 
 USE_X11=	Yes
 NO_REGRESS=	Yes

games/xsoldier/patches/patch-Makefile_in

@@ -1,24 +1,6 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2005/10/22 16:12:53 naddy Exp $
+$OpenBSD: patch-Makefile_in,v 1.3 2005/10/23 18:23:25 naddy Exp $
 --- Makefile.in.orig	Sun May 26 10:37:48 2002
 +++ Makefile.in	Sat Oct 22 17:58:52 2005
-@@ -72,7 +72,7 @@ SDL_CFLAGS = @SDL_CFLAGS@
- VERSION = @VERSION@
- 
- bin_PROGRAMS = xsoldier
--xsoldier_SOURCES = boss.c   callback.c   common.c   ending.c   enemy.c   enemyshot.c   game.c   graphic.c   image.c   input.c   joystick.c   main.c   manage.c   opening.c   player.c   score.c   sin.c   star.c   boss.h   callback.h   common.h   ending.h   enemy.h   enemyshot.h   extern.h   game.h   graphic.h   image.h   input.h   joystick.h   key.h   manage.h   opening.h   player.h   score.h   sin.h   star.h   version.h   xsoldier.h
-+xsoldier_SOURCES = boss.c   callback.c   common.c   ending.c   enemy.c   enemyshot.c   game.c   graphic.c   image.c   input.c   main.c   manage.c   opening.c   player.c   score.c   sin.c   star.c   boss.h   callback.h   common.h   ending.h   enemy.h   enemyshot.h   extern.h   game.h   graphic.h   image.h   input.h   key.h   manage.h   opening.h   player.h   score.h   sin.h   star.h   version.h   xsoldier.h
- 
- 
- man_MANS = xsoldier.6
-@@ -102,7 +102,7 @@ X_LIBS = @X_LIBS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
- xsoldier_OBJECTS =  boss.o callback.o common.o ending.o enemy.o \
--enemyshot.o game.o graphic.o image.o input.o joystick.o main.o manage.o \
-+enemyshot.o game.o graphic.o image.o input.o main.o manage.o \
- opening.o player.o score.o sin.o star.o
- xsoldier_LDADD = $(LDADD)
- xsoldier_DEPENDENCIES = 
 @@ -451,9 +451,9 @@ maintainer-clean-generic clean mostlycle
  
  install-exec-local:

games/xsoldier/patches/patch-configure

@@ -1,14 +0,0 @@
-$OpenBSD: patch-configure,v 1.1 2005/10/21 20:07:05 naddy Exp $
---- configure.orig	Wed Oct 19 21:10:17 2005
-+++ configure	Wed Oct 19 21:10:27 2005
-@@ -4098,10 +4098,6 @@ done
- if test "${enable_joystick+set}" = set; then
-   enableval="$enable_joystick"
- 
--cat >>confdefs.h <<\EOF
--#define JSTK
--EOF
--
- fi;
- # debug
- # Check whether --enable-debug or --disable-debug was given.

games/xsoldier/patches/patch-joystick_c

@@ -0,0 +1,18 @@
+$OpenBSD: patch-joystick_c,v 1.1 2005/10/23 18:23:25 naddy Exp $
+--- joystick.c.orig	Sat Oct 22 20:48:10 2005
++++ joystick.c	Sat Oct 22 20:48:31 2005
+@@ -8,6 +8,8 @@
+ 
+ #include <config.h>
+ 
++#ifdef JSTK
++
+ /* read */
+ #include <unistd.h>
+ /* exit */
+@@ -95,3 +97,5 @@ void readJS(void)
+ 	if (js.y >  150) joymask |= Down; /* Was 1000 */
+     }
+ }
++
++#endif	/* JSTK */

games/xsoldier/pkg/DESCR

@@ -1,17 +1,3 @@
-Xsoldier is a space-based shoot'em up game for X11.
-
-PLAY:
-
-$ xsoldier
-
-- 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!!
+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.