More /var/games changes for scorfiles

4 files changed, 44 insertions, 13 deletions

diff --git a/games/maelstrom/Makefile b/games/maelstrom/Makefile
index dad3a80fbb0..1df8ae0189c 100644
--- a/games/maelstrom/Makefile
+++ b/games/maelstrom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/08/27 14:06:08 garbled Exp $
+# $NetBSD: Makefile,v 1.4 1998/09/14 19:34:23 garbled Exp $
 
 DISTNAME=		Maelstrom-1.4.3-L2.0.6-src.tar.gz
 PKGNAME=		maelstrom-2.0.6
@@ -29,8 +29,8 @@ post-install:
 	pax -rzf ${DISTDIR}/${SWARS} -p m
 	chown ${BINOWN}:games ${PREFIX}/bin/Maelstrom
 	chmod 2755 ${PREFIX}/bin/Maelstrom
-	chown ${BINOWN}:games ${PREFIX}/share/maelstrom/Maelstrom-Scores
-	chmod 0664 ${PREFIX}/share/maelstrom/Maelstrom-Scores
+	chown ${BINOWN}:games /var/games/Maelstrom-Scores
+	chmod 0664 /var/games/Maelstrom-Scores
 	${INSTALL_DATA} ${WRKSRC}/README.* ${PREFIX}/share/maelstrom
 	${INSTALL_PROGRAM} ${WRKSRC}/netplayd/netplayd ${PREFIX}/bin/Maelstrom_netplayd
 
diff --git a/games/maelstrom/patches/patch-ae b/games/maelstrom/patches/patch-ae
index 3fd794ad3ce..77c2a1784c5 100644
--- a/games/maelstrom/patches/patch-ae
+++ b/games/maelstrom/patches/patch-ae
@@ -1,7 +1,6 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 10:40:42 agc Exp $
-
---- Makefile.orig	Wed Feb  5 14:12:18 1997
-+++ Makefile	Fri Jul 31 00:59:32 1998
+$NetBSD: patch-ae,v 1.3 1998/09/14 19:34:23 garbled Exp $
+--- Makefile.orig	Wed Feb  5 06:12:18 1997
++++ Makefile	Mon Sep 14 12:10:06 1998
 @@ -18,7 +18,7 @@
  	@echo "Installing binaries in $(BINDIR)..."
  	@for i in $(MAELSTROM) ; do \
@@ -11,15 +10,18 @@ $NetBSD: patch-ae,v 1.2 1998/08/07 10:40:42 agc Exp $
  	done
  	@if [ ! -d $(LIBDIR) ]; then \
  		mkdir $(LIBDIR); chmod 755 $(LIBDIR); \
-@@ -26,9 +26,10 @@
+@@ -26,10 +26,11 @@
  	@echo "Installing data files in $(LIBDIR) ..."
  	@tar cf - $(DATAFILES) | (cd $(LIBDIR); tar xvf -)
  	@chmod -R +r $(LIBDIR)
+-	@if [ ! -f "$(LIBDIR)/Maelstrom-Scores" ]; then \
 +	@chown -R ${BINOWN}:${BINGRP} $(LIBDIR)
- 	@if [ ! -f "$(LIBDIR)/Maelstrom-Scores" ]; then \
++	@if [ ! -f "/var/games/Maelstrom-Scores" ]; then \
  		echo "Installing Maelstrom high-scores file"; \
 -		$(INSTALL) -m 666 Maelstrom-Scores  $(LIBDIR); \
-+		$(INSTALL) -c -m 666 Maelstrom-Scores  $(LIBDIR); \
- 		chmod 666 $(LIBDIR)/Maelstrom-Scores; \
+-		chmod 666 $(LIBDIR)/Maelstrom-Scores; \
++		$(INSTALL) -c -m 666 Maelstrom-Scores  /var/games; \
++		chmod 666 /var/games/Maelstrom-Scores; \
  	fi
  	@-if [ "$(SYSTEM)" = "Linux" ]; then \
+ 		echo "Fixing permissions for Maelstrom (set-uid root)"; \
diff --git a/games/maelstrom/patches/patch-ag b/games/maelstrom/patches/patch-ag
new file mode 100644
index 00000000000..9e3dd4ed7b3
--- /dev/null
+++ b/games/maelstrom/patches/patch-ag
@@ -0,0 +1,30 @@
+$NetBSD: patch-ag,v 1.1 1998/09/14 19:34:23 garbled Exp $
+--- scores.cpp.orig	Mon Sep 14 12:06:20 1998
++++ scores.cpp	Mon Sep 14 12:08:28 1998
+@@ -11,7 +11,7 @@
+ #include "Maelstrom_Globals.h"
+ #include "dialog.h"
+ 
+-#define MAELSTROM_SCORES	"Maelstrom-Scores"
++#define MAELSTROM_SCORES	"/var/games/Maelstrom-Scores"
+ #define NUM_SCORES		10		// Do not change this!
+ 
+ /* Everyone can write to scores file if defined to 0 */
+@@ -49,7 +49,7 @@
+ 			gNetScores = 0;
+ 		}
+ 	}
+-	scoresfile = file2libpath(MAELSTROM_SCORES);
++	scoresfile = MAELSTROM_SCORES;
+ 	memset(&hScores, 0, sizeof(hScores));
+ 	if ( (scores_fp=fopen(scoresfile, "r")) == NULL )
+ 		return;
+@@ -72,7 +72,7 @@
+ 	if ( gNetScores )
+ 		return;
+ 
+-	scoresfile = file2libpath(MAELSTROM_SCORES);
++	scoresfile = MAELSTROM_SCORES;
+ #ifndef __WIN95__
+ 	omask=umask(SCORES_PERMMASK);
+ #endif
diff --git a/games/maelstrom/pkg/PLIST b/games/maelstrom/pkg/PLIST
index 85f82d9dae3..51ae3878bca 100644
--- a/games/maelstrom/pkg/PLIST
+++ b/games/maelstrom/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 1998/07/30 23:11:41 tron Exp $
+@comment $NetBSD: PLIST,v 1.2 1998/09/14 19:34:23 garbled Exp $
 share/maelstrom/NewSounds/Simpsons_Sounds
 share/maelstrom/NewSounds/Maelstrom Sounds
 share/maelstrom/NewSounds/Martin_Sounds
@@ -49,7 +49,6 @@ share/maelstrom/Images/Maelstrom_Icon#134.cicn
 share/maelstrom/Images/Maelstrom_Icon#135.cicn
 share/maelstrom/Images/Maelstrom_Icon#136.cicn
 share/maelstrom/Images/Maelstrom_Icon#137.cicn
-share/maelstrom/Maelstrom-Scores
 bin/Maelstrom_netplayd
 bin/Maelstrom
 bin/Maelstrom_sound