Sun Feb 14 22:28:55 2010 UTC ()
DESTDIR support. SETGIDGAME. Bump revision.


(joerg)
diff -r1.20 -r1.21 pkgsrc/games/xsoldier/Makefile
diff -r1.5 -r1.6 pkgsrc/games/xsoldier/distinfo
diff -r1.4 -r1.5 pkgsrc/games/xsoldier/patches/patch-aa
cvs diff -r1.20 -r1.21 pkgsrc/games/xsoldier/Makefile (expand / switch to unified diff)

--- pkgsrc/games/xsoldier/Makefile 2008/01/19 09:16:23 1.20
+++ pkgsrc/games/xsoldier/Makefile 2010/02/14 22:28:55 1.21
@@ -1,25 +1,30 @@ @@ -1,25 +1,30 @@
1# $NetBSD: Makefile,v 1.20 2008/01/19 09:16:23 wiz Exp $ 1# $NetBSD: Makefile,v 1.21 2010/02/14 22:28:55 joerg Exp $
2# 2#
3 3
4DISTNAME= xsoldier-0.96 4DISTNAME= xsoldier-0.96
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= games x11 6CATEGORIES= games x11
7MASTER_SITES= http://www.interq.or.jp/libra/oohara/xsoldier/ 7MASTER_SITES= http://www.interq.or.jp/libra/oohara/xsoldier/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.interq.or.jp/libra/oohara/xsoldier/ 10HOMEPAGE= http://www.interq.or.jp/libra/oohara/xsoldier/
11COMMENT= Updated xgalaga type game with awesome graphics 11COMMENT= Updated xgalaga type game with awesome graphics
12 12
 13PKG_DESTDIR_SUPPORT= user-destdir
 14
 15SETGIDGAME= yes
 16SPECIAL_PERMS+= bin/xsoldier ${SETGID_GAMES_PERMS}
 17
13USE_IMAKE= YES 18USE_IMAKE= YES
14NO_INSTALL_MANPAGES= YES 19NO_INSTALL_MANPAGES= YES
15 20
16MAKE_ENV+= BINOWN=${BINOWN:Q} 21MAKE_ENV+= BINOWN=${BINOWN:Q}
17 22
18CONF_FILES_PERMS= ${PREFIX}/share/xsoldier/xsoldier.score.dist \ 23CONF_FILES_PERMS= ${PREFIX}/share/xsoldier/xsoldier.score.dist \
19 /var/games/xsoldier \ 24 /var/games/xsoldier \
20 games games 0664 25 games games 0664
21 26
22post-patch: 27post-patch:
23 ${TOUCH} ${WRKSRC}/xsoldier.man 28 ${TOUCH} ${WRKSRC}/xsoldier.man
24 29
25.include "../../x11/libXpm/buildlink3.mk" 30.include "../../x11/libXpm/buildlink3.mk"
cvs diff -r1.5 -r1.6 pkgsrc/games/xsoldier/distinfo (expand / switch to unified diff)

--- pkgsrc/games/xsoldier/distinfo 2005/02/23 23:12:05 1.5
+++ pkgsrc/games/xsoldier/distinfo 2010/02/14 22:28:55 1.6
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.5 2005/02/23 23:12:05 agc Exp $ 1$NetBSD: distinfo,v 1.6 2010/02/14 22:28:55 joerg Exp $
2 2
3SHA1 (xsoldier-0.96.tar.gz) = af16dbe1506cdd519a099ed58e26a5569400bea2 3SHA1 (xsoldier-0.96.tar.gz) = af16dbe1506cdd519a099ed58e26a5569400bea2
4RMD160 (xsoldier-0.96.tar.gz) = 2bf1d002b5a6e28af55c28f04cbda9fddd7bf1b8 4RMD160 (xsoldier-0.96.tar.gz) = 2bf1d002b5a6e28af55c28f04cbda9fddd7bf1b8
5Size (xsoldier-0.96.tar.gz) = 82413 bytes 5Size (xsoldier-0.96.tar.gz) = 82413 bytes
6SHA1 (patch-aa) = 26eb8778cf418e092e321bed04aee302135d2cbc 6SHA1 (patch-aa) = 570cc200b43deddebe84c5ced90593816f943044
7SHA1 (patch-ab) = 464407fb6e9e0af33b57d7dfc17a58acb1591f0a 7SHA1 (patch-ab) = 464407fb6e9e0af33b57d7dfc17a58acb1591f0a
8SHA1 (patch-ac) = 3551fd7507aa0ff8faeb9cdc8e2addc03dbc1274 8SHA1 (patch-ac) = 3551fd7507aa0ff8faeb9cdc8e2addc03dbc1274
9SHA1 (patch-ad) = 5689b9f211b89aebbc65eeabaac35531ab3ab819 9SHA1 (patch-ad) = 5689b9f211b89aebbc65eeabaac35531ab3ab819
cvs diff -r1.4 -r1.5 pkgsrc/games/xsoldier/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/games/xsoldier/patches/Attic/patch-aa 2001/09/14 03:48:07 1.4
+++ pkgsrc/games/xsoldier/patches/Attic/patch-aa 2010/02/14 22:28:55 1.5
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1$NetBSD: patch-aa,v 1.4 2001/09/14 03:48:07 jlam Exp $ 1$NetBSD: patch-aa,v 1.5 2010/02/14 22:28:55 joerg Exp $
2--- Imakefile.orig Fri Feb 28 08:48:57 1997 2--- Imakefile.orig Fri Feb 28 08:48:57 1997
3+++ Imakefile Mon Sep 14 16:52:46 1998 3+++ Imakefile Mon Sep 14 16:52:46 1998
4@@ -11,12 +11,12 @@ 4@@ -11,12 +11,12 @@
5  5
6 /* インストールディレクトリ */ 6 /* インストールディレクトリ */
7 /* 書き込み権限が無いとインストール出来ません．=> 遊べない．(^^; */ 7 /* 書き込み権限が無いとインストール出来ません．=> 遊べない．(^^; */
8-PIXMAPDIR = /usr/local/games/lib/xsoldier 8-PIXMAPDIR = /usr/local/games/lib/xsoldier
9-SCOREDIR = /usr/local/games/lib/xsoldier 9-SCOREDIR = /usr/local/games/lib/xsoldier
10-BINDIR = /usr/local/games 10-BINDIR = /usr/local/games
11+PIXMAPDIR = $(PREFIX)/share/xsoldier 11+PIXMAPDIR = ${DESTDIR}$(PREFIX)/share/xsoldier
12+SCOREDIR = /var/games/ 12+SCOREDIR = /var/games/
13+BINDIR = $(PREFIX)/bin 13+BINDIR = ${DESTDIR}$(PREFIX)/bin
14  14
15 /* スコアファイル名．SCOREDIR 以下に置かれます． */ 15 /* スコアファイル名．SCOREDIR 以下に置かれます． */
16-SCOREFILE = .scorefile 16-SCOREFILE = .scorefile
17+SCOREFILE = xsoldier 17+SCOREFILE = xsoldier
18  18
19  19
20 /* ----------------------------------------------------------------------- */ 20 /* ----------------------------------------------------------------------- */
21@@ -93,9 +93,9 @@ 21@@ -93,9 +93,9 @@
22 @echo "install update . done" 22 @echo "install update . done"
23  23
24 install.score:: 24 install.score::
25- @if [ -d $(SCOREDIR) ]; then chmod 755 $(SCOREDIR); \ 25- @if [ -d $(SCOREDIR) ]; then chmod 755 $(SCOREDIR); \
26- else $(MKDIRHIER) $(SCOREDIR); chmod 755 $(SCOREDIR); fi 26- else $(MKDIRHIER) $(SCOREDIR); chmod 755 $(SCOREDIR); fi
27- $(INSTALL) -c -m 600 scorefile.txt $(SCOREDIR)/$(SCOREFILE) 27- $(INSTALL) -c -m 600 scorefile.txt $(SCOREDIR)/$(SCOREFILE)
28+ @if [ ! -e $(PIXMAPDIR)/$(SCOREFILE).score.dist ]; then \ 28+ @if [ ! -e $(PIXMAPDIR)/$(SCOREFILE).score.dist ]; then \
29+ $(BSD_INSTALL_DATA) scorefile.txt $(PIXMAPDIR)/$(SCOREFILE).score.dist ; \ 29+ $(BSD_INSTALL_DATA) scorefile.txt $(PIXMAPDIR)/$(SCOREFILE).score.dist ; \
30+ fi 30+ fi
31 @echo "install score . done" 31 @echo "install score . done"
32  32
33 install.pixmap:: 33 install.pixmap::
34@@ -109,5 +109,5 @@ 34@@ -109,5 +109,5 @@
35 install.bin:: 35 install.bin::
36 @if [ -d $(BINDIR) ]; then set +x; \ 36 @if [ -d $(BINDIR) ]; then set +x; \
37 else (set -x; $(MKDIRHIER) $(BINDIR)); fi 37 else (set -x; $(MKDIRHIER) $(BINDIR)); fi
38- $(INSTALL) -c -m 4755 $(PROGRAM) $(BINDIR)/$(PROGRAM) 38- $(INSTALL) -c -m 4755 $(PROGRAM) $(BINDIR)/$(PROGRAM)
39+ $(INSTALL) -c -o $(BINOWN) -g games -m 2755 $(PROGRAM) $(BINDIR)/$(PROGRAM) 39+ $(BSD_INSTALL_PROGRAM) $(PROGRAM) $(BINDIR)/$(PROGRAM)
40 @echo "install bin . done" 40 @echo "install bin . done"