Date: Fri, 26 Aug 2005 19:54:17 +0800 (CST) From: Ying-Chieh Chen <yinjieh@csie.nctu.edu.tw> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/85312: [MAINTAINER-UPDATE] Update ports/games/xsoldier to 1.3 Message-ID: <200508261154.j7QBsHQB086563@alumni.csie.nctu.edu.tw> Resent-Message-ID: <200508261200.j7QC0ZQr078102@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 85312 >Category: ports >Synopsis: [MAINTAINER-UPDATE] Update ports/games/xsoldier to 1.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Aug 26 12:00:35 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Ying-Chieh Chen >Release: FreeBSD 4.11-RELEASE-p1 i386 >Organization: MANA lab, CCU CS >Environment: System: FreeBSD nb.mana.cs.ccu.edu.tw 4.11-RELEASE-p1 FreeBSD 4.11-RELEASE-p1 #3: Sat Apr 2 21:45:26 CST 2005 root@nb.mana.cs.ccu.edu.tw:/usr/obj/usr/src/sys/KERNEL i386 >Description: Update ports/games/xsoldier to version 1.3 Take over maintainership. Thanks for commiting! >How-To-Repeat: Apply the following patch. >Fix: --- xsoldier.patch begins here --- diff -ruN /usr/ports/games/xsoldier/Makefile xsoldier/Makefile --- /usr/ports/games/xsoldier/Makefile Fri Aug 5 17:32:10 2005 +++ xsoldier/Makefile Sun Aug 21 10:26:21 2005 @@ -6,20 +6,23 @@ # 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= ports@FreeBSD.org +MAINTAINER= yinjieh@csie.nctu.edu.tw COMMENT= Shooting game for x11 -USE_IMAKE= yes -USE_XPM= yes +USE_SDL= sdl image +USE_X_PREFIX= yes +GNU_CONFIGURE= yes + +CONFIGURE_ARGS+= --prefix=${PREFIX} \ + --mandir=${PREFIX}/man \ + --datadir=${DATADIR} \ + --localstatedir=${DATADIR} + + +MAN6= xsoldier.6 .include <bsd.port.mk> diff -ruN /usr/ports/games/xsoldier/distinfo xsoldier/distinfo --- /usr/ports/games/xsoldier/distinfo Thu Jan 29 15:24:11 2004 +++ xsoldier/distinfo Sun Aug 14 10:22:37 2005 @@ -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 -ruN /usr/ports/games/xsoldier/files/patch-Makefile.in xsoldier/files/patch-Makefile.in --- /usr/ports/games/xsoldier/files/patch-Makefile.in Thu Jan 1 08:00:00 1970 +++ xsoldier/files/patch-Makefile.in Sat Aug 20 19:51:06 2005 @@ -0,0 +1,49 @@ +--- Makefile.in.orig Sun May 26 16:37:48 2002 ++++ Makefile.in Fri Aug 19 22:16:26 2005 +@@ -72,7 +72,7 @@ + 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_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 = +@@ -356,8 +356,6 @@ + image.o: image.c config.h image.h xsoldier.h extern.h + input.o: input.c config.h image.h xsoldier.h extern.h graphic.h input.h \ + key.h manage.h +-joystick.o: joystick.c config.h image.h xsoldier.h key.h extern.h \ +- joystick.h + main.o: main.c config.h xsoldier.h image.h manage.h opening.h game.h \ + ending.h player.h star.h score.h graphic.h input.h extern.h + manage.o: manage.c config.h image.h xsoldier.h manage.h common.h \ +@@ -451,14 +449,14 @@ + + install-exec-local: + # install pixmap +- $(mkinstalldirs) $(DESTDIR)$(datadir)/games/xsoldier/ ++ $(mkinstalldirs) $(DESTDIR)$(datadir)/ + $(INSTALL_DATA) pixmap/*.xpm \ +- $(DESTDIR)$(datadir)/games/xsoldier/ ++ $(DESTDIR)$(datadir)/ + # install score file +- $(mkinstalldirs) $(DESTDIR)$(localstatedir)/games/xsoldier/ +- test -e $(DESTDIR)$(localstatedir)/games/xsoldier/xsoldier.scores \ ++ $(mkinstalldirs) $(DESTDIR)$(localstatedir)/ ++ test -e $(DESTDIR)$(localstatedir)/xsoldier.scores \ + || $(INSTALL_DATA) scorefile.txt \ +- $(DESTDIR)$(localstatedir)/games/xsoldier/xsoldier.scores ++ $(DESTDIR)$(localstatedir)/xsoldier.scores + + uninstall-local: + # uninstall pixmap diff -ruN /usr/ports/games/xsoldier/files/patch-aa xsoldier/files/patch-aa --- /usr/ports/games/xsoldier/files/patch-aa Wed Jan 10 03:36:58 2001 +++ xsoldier/files/patch-aa Thu Jan 1 08:00:00 1970 @@ -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 -ruN /usr/ports/games/xsoldier/files/patch-ab xsoldier/files/patch-ab --- /usr/ports/games/xsoldier/files/patch-ab Tue Jun 10 01:59:03 1997 +++ xsoldier/files/patch-ab Thu Jan 1 08:00:00 1970 @@ -1,10 +0,0 @@ ---- manage.c.orig Mon Jun 9 19:41:29 1997 -+++ manage.c Mon Jun 9 19:41:41 1997 -@@ -9,7 +9,6 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <malloc.h> - #include <X11/Xlib.h> - #include <X11/Xutil.h> - diff -ruN /usr/ports/games/xsoldier/files/patch-ac xsoldier/files/patch-ac --- /usr/ports/games/xsoldier/files/patch-ac Sun Jan 23 16:00:14 2000 +++ xsoldier/files/patch-ac Thu Jan 1 08:00:00 1970 @@ -1,19 +0,0 @@ ---- 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)); /*** コマンド名取得とコピー ***/ - - 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)) - { diff -ruN /usr/ports/games/xsoldier/files/patch-main.c xsoldier/files/patch-main.c --- /usr/ports/games/xsoldier/files/patch-main.c Thu Jan 1 08:00:00 1970 +++ xsoldier/files/patch-main.c Sun Aug 14 11:55:04 2005 @@ -0,0 +1,10 @@ +--- main.c.orig Sun Aug 14 11:53:46 2005 ++++ main.c Sun Aug 14 11:54:00 2005 +@@ -33,7 +33,6 @@ + /* DeleteAllStar */ + #include "star.h" + #include "score.h" +-#include "wait.h" + #include "graphic.h" + #include "input.h" + diff -ruN /usr/ports/games/xsoldier/files/patch-manage.c xsoldier/files/patch-manage.c --- /usr/ports/games/xsoldier/files/patch-manage.c Thu Jan 1 08:00:00 1970 +++ xsoldier/files/patch-manage.c Sun Aug 14 11:55:27 2005 @@ -0,0 +1,10 @@ +--- manage.c.orig Sun Aug 14 11:54:26 2005 ++++ manage.c Sun Aug 14 11:54:39 2005 +@@ -17,7 +17,6 @@ + + #include <stdio.h> + #include <stdlib.h> +-#include <malloc.h> + /* + #include <X11/Xlib.h> + #include <X11/Xutil.h> diff -ruN /usr/ports/games/xsoldier/pkg-plist xsoldier/pkg-plist --- /usr/ports/games/xsoldier/pkg-plist Mon Sep 28 10:34:32 1998 +++ xsoldier/pkg-plist Sun Aug 21 09:15:53 2005 @@ -1,32 +1,38 @@ 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 +%%DATADIR%%/Boss1.xpm +%%DATADIR%%/Boss2.xpm +%%DATADIR%%/Boss3.xpm +%%DATADIR%%/Boss4.xpm +%%DATADIR%%/Boss5.xpm +%%DATADIR%%/Boss6.xpm +%%DATADIR%%/Boss7.xpm +%%DATADIR%%/Enemy1.xpm +%%DATADIR%%/Enemy2.xpm +%%DATADIR%%/Enemy3.xpm +%%DATADIR%%/Enemy4.xpm +%%DATADIR%%/Enemy5.xpm +%%DATADIR%%/Enemy6.xpm +%%DATADIR%%/Enemy7.xpm +%%DATADIR%%/EnemyBound.xpm +%%DATADIR%%/EnemyLaser.xpm +%%DATADIR%%/EnemyMiss.xpm +%%DATADIR%%/EnemyRing.xpm +%%DATADIR%%/EnemyShot.xpm +%%DATADIR%%/ExpLarge.xpm +%%DATADIR%%/ExpSmall.xpm +%%DATADIR%%/Item.xpm +%%DATADIR%%/Player.xpm +%%DATADIR%%/PlayerShot1.xpm +%%DATADIR%%/PlayerShot2.xpm +%%DATADIR%%/PlayerShot3.xpm +%%DATADIR%%/Star1.xpm +%%DATADIR%%/Star2.xpm +%%DATADIR%%/Title.xpm +%%DATADIR%%/font1.xpm +%%DATADIR%%/font2.xpm +%%DATADIR%%/font3.xpm +%%DATADIR%%/font4.xpm +%%DATADIR%%/font5.xpm +%%DATADIR%%/font6.xpm +%%DATADIR%%/xsoldier.scores +@dirrm %%DATADIR%% --- xsoldier.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200508261154.j7QBsHQB086563>