diff options
| author | jlam <jlam@pkgsrc.org> | 2001-09-14 03:48:06 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-09-14 03:48:06 +0000 |
| commit | cad6c11f9e9a5c20484b8b188d4bb8ef96369dcc (patch) | |
| tree | 8727e497b7c47ff5e1dc7b196292816dbad98137 /games/xsoldier/patches/patch-aa | |
| parent | aa0541e1f35bd69e986039899800eba0c0f7d177 (diff) | |
| download | pkgsrc-cad6c11f9e9a5c20484b8b188d4bb8ef96369dcc.tar.gz | |
Fix problems with xpkgwedge and score file installation noted by John
Darrow <John.P.Darrow@wheaton.edu> in pkg/13264. Changes noted in the PR
were applied with some small changes to use FILES_SUBST/FILES_SUBST_SED
to unify the various substitution patterns for the *INSTALL files, and to
use ${CMP} instead of diff in the DEINSTALL file.
Diffstat (limited to 'games/xsoldier/patches/patch-aa')
| -rw-r--r-- | games/xsoldier/patches/patch-aa | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/games/xsoldier/patches/patch-aa b/games/xsoldier/patches/patch-aa index dbe5e32b367..18830af7a57 100644 --- a/games/xsoldier/patches/patch-aa +++ b/games/xsoldier/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 1998/09/15 00:05:41 garbled Exp $ +$NetBSD: patch-aa,v 1.4 2001/09/14 03:48:07 jlam Exp $ --- Imakefile.orig Fri Feb 28 08:48:57 1997 +++ Imakefile Mon Sep 14 16:52:46 1998 @@ -11,12 +11,12 @@ @@ -8,9 +8,9 @@ $NetBSD: patch-aa,v 1.3 1998/09/15 00:05:41 garbled Exp $ -PIXMAPDIR = /usr/local/games/lib/xsoldier -SCOREDIR = /usr/local/games/lib/xsoldier -BINDIR = /usr/local/games -+PIXMAPDIR = $(X11BASE)/share/xsoldier ++PIXMAPDIR = $(PREFIX)/share/xsoldier +SCOREDIR = /var/games/ -+BINDIR = $(X11BASE)/bin ++BINDIR = $(PREFIX)/bin /* スコアファイル名．SCOREDIR 以下に置かれます． */ -SCOREFILE = .scorefile @@ -25,8 +25,8 @@ $NetBSD: patch-aa,v 1.3 1998/09/15 00:05:41 garbled Exp $ - @if [ -d $(SCOREDIR) ]; then chmod 755 $(SCOREDIR); \ - else $(MKDIRHIER) $(SCOREDIR); chmod 755 $(SCOREDIR); fi - $(INSTALL) -c -m 600 scorefile.txt $(SCOREDIR)/$(SCOREFILE) -+ @if [ ! -e $(SCOREDIR)/$(SCOREFILE) ]; then \ -+ $(INSTALL) -c -g games -o bin -m 664 scorefile.txt $(SCOREDIR)/$(SCOREFILE) ; \ ++ @if [ ! -e $(PIXMAPDIR)/$(SCOREFILE).score.dist ]; then \ ++ $(BSD_INSTALL_DATA) scorefile.txt $(PIXMAPDIR)/$(SCOREFILE).score.dist ; \ + fi @echo "install score . done" @@ -36,5 +36,5 @@ $NetBSD: patch-aa,v 1.3 1998/09/15 00:05:41 garbled Exp $ @if [ -d $(BINDIR) ]; then set +x; \ else (set -x; $(MKDIRHIER) $(BINDIR)); fi - $(INSTALL) -c -m 4755 $(PROGRAM) $(BINDIR)/$(PROGRAM) -+ $(INSTALL) -c -o bin -g games -m 2755 $(PROGRAM) $(BINDIR)/$(PROGRAM) ++ $(INSTALL) -c -o $(BINOWN) -g games -m 2755 $(PROGRAM) $(BINDIR)/$(PROGRAM) @echo "install bin . done" |