[pkgsrc/trunk]: pkgsrc/games/maelstrom-x11 Fixed reference to the /var direct...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/games/maelstrom-x11 Fixed reference to the /var direct...
From: rillig <rillig%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:40:11 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/e0291f20a959
branches:  trunk
changeset: 515143:e0291f20a959
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Jun 26 08:56:37 2006 +0000

description:
Fixed reference to the /var directory. Bumped PKGREVISION.

diffstat:

 games/maelstrom-x11/Makefile         |  19 ++++++++++++-------
 games/maelstrom-x11/PLIST            |   3 ++-
 games/maelstrom-x11/distinfo         |   8 ++++----
 games/maelstrom-x11/patches/patch-aa |   4 ++--
 games/maelstrom-x11/patches/patch-ae |  22 +++++++++++-----------
 games/maelstrom-x11/patches/patch-ag |   5 +++--
 6 files changed, 34 insertions(+), 27 deletions(-)

diffs (165 lines):

diff -r bb6d27d9a031 -r e0291f20a959 games/maelstrom-x11/Makefile
--- a/games/maelstrom-x11/Makefile      Mon Jun 26 06:47:43 2006 +0000
+++ b/games/maelstrom-x11/Makefile      Mon Jun 26 08:56:37 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2006/05/15 20:21:38 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/06/26 08:56:37 rillig Exp $
 
 DISTNAME=              Maelstrom-1.4.3-L2.0.6-src.tar.gz
 PKGNAME=               maelstrom-x11-2.0.6
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            games x11
 MASTER_SITES+=         ftp://ftp.devolution.com/pub/maelstrom/
 MASTER_SITES+=         ftp://ftp.devolution.com/pub/maelstrom/Maelstrom-binaries/
@@ -22,19 +22,24 @@
 EXTRACT_ONLY=          ${DISTNAME}
 
 WRKSRC=                        ${WRKDIR}/Maelstrom
-USE_LANGUAGES=         c++
+USE_LANGUAGES=         c c++
 USE_X11BASE=           YES
 MAKE_ENV+=             BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} XPMDIR=${BUILDLINK_PREFIX.xpm}
+MAKE_ENV+=             GAMEOWN=${GAMEOWN} GAMEGRP=${GAMEGRP}
+MAKE_ENV+=             GAMEMODE=${GAMEMODE} GAMEDATAMODE=${GAMEDATAMODE}
+MAKE_ENV+=             VARBASE=${VARBASE}
+
+MAKE_DIRS_PERMS+=      ${VARBASE}/games ${GAMEOWN} ${GAMEGRP} ${GAMEDIRMODE}
+CONF_FILES_PERMS+=     ${PREFIX}/share/maelstrom/Maelstrom-Scores \
+       ${VARBASE}/games/Maelstrom-Scores ${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE}
 
 post-install:
        cd ${PREFIX}/share/maelstrom && \
                ${PAX} -O -pm -zrf ${DISTDIR}/${ESOUND} && \
                ${PAX} -O -pm -zrf ${DISTDIR}/${STREK} && \
                ${PAX} -O -pm -zrf ${DISTDIR}/${SWARS}
-       ${CHOWN} ${BINOWN}:games ${PREFIX}/bin/Maelstrom
-       ${CHMOD} 2755 ${PREFIX}/bin/Maelstrom
-       ${CHOWN} ${BINOWN}:games /var/games/Maelstrom-Scores
-       ${CHMOD} 0664 /var/games/Maelstrom-Scores
+       ${CHOWN} ${GAMEOWN}:${GAMEGRP} ${PREFIX}/bin/Maelstrom
+       ${CHMOD} ${GAMEMODE} ${PREFIX}/bin/Maelstrom
        ${INSTALL_DATA} ${WRKSRC}/README.* ${PREFIX}/share/maelstrom
        ${INSTALL_PROGRAM} ${WRKSRC}/netplayd/netplayd ${PREFIX}/bin/Maelstrom_netplayd
 
diff -r bb6d27d9a031 -r e0291f20a959 games/maelstrom-x11/PLIST
--- a/games/maelstrom-x11/PLIST Mon Jun 26 06:47:43 2006 +0000
+++ b/games/maelstrom-x11/PLIST Mon Jun 26 08:56:37 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/11 13:26:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/06/26 08:56:37 rillig Exp $
 bin/Maelstrom
 bin/Maelstrom_netplayd
 bin/Maelstrom_sound
@@ -32,6 +32,7 @@
 share/maelstrom/Maelstrom Fonts
 share/maelstrom/Maelstrom Sounds
 share/maelstrom/Maelstrom Sprites
+share/maelstrom/Maelstrom-Scores
 share/maelstrom/NewSounds/Funky_Sounds
 share/maelstrom/NewSounds/Maelstrom Sounds
 share/maelstrom/NewSounds/Martin_Sounds
diff -r bb6d27d9a031 -r e0291f20a959 games/maelstrom-x11/distinfo
--- a/games/maelstrom-x11/distinfo      Mon Jun 26 06:47:43 2006 +0000
+++ b/games/maelstrom-x11/distinfo      Mon Jun 26 08:56:37 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/12/30 22:41:27 joerg Exp $
+$NetBSD: distinfo,v 1.7 2006/06/26 08:56:37 rillig Exp $
 
 SHA1 (Maelstrom-1.4.3-L2.0.6-src.tar.gz) = 66c81365104bfab9985919f0cba5a6d955727d79
 RMD160 (Maelstrom-1.4.3-L2.0.6-src.tar.gz) = 071b36ecd31830f3b62e4b6e2f64b7f7d87b1386
@@ -12,13 +12,13 @@
 SHA1 (Maelstrom-Sounds-L2.0.0.tar.gz) = 26f1fb329576fd95d7cd99d5a8b75a85654225b6
 RMD160 (Maelstrom-Sounds-L2.0.0.tar.gz) = ee11301b5acd54497b14642969d6abacbdc6ffd0
 Size (Maelstrom-Sounds-L2.0.0.tar.gz) = 1706928 bytes
-SHA1 (patch-aa) = 2a6f2e0304b6de08e7bbebe7b0a54b85feed8807
+SHA1 (patch-aa) = bf6a9c5394b5ac491a1b92d62d7dc716013ece23
 SHA1 (patch-ab) = d767d9646f98f1d8b7ce5f471a8a789ed29d0e75
 SHA1 (patch-ac) = 81ae36f64ea8db22ba81be8911e05f6c66459edc
 SHA1 (patch-ad) = d5405b696f839c4965fb8e299108aff1b689399a
-SHA1 (patch-ae) = 6f390cca5abbc0b277d22df8efc4ce589e8b0ecb
+SHA1 (patch-ae) = 8bda24b06ba07558ed3cbd46eb7e22d47795529b
 SHA1 (patch-af) = 46b5ab4cfe3e20401fc5feaa9319c093b025ca1d
-SHA1 (patch-ag) = aa7102be99466e81b95258a2a2ff888d7136fda3
+SHA1 (patch-ag) = 0accbc0a198e66a1cc2e86b62f32656e213d8de1
 SHA1 (patch-ah) = b39ccc02f3e27e655d5169bb843554b7bdb323a9
 SHA1 (patch-ai) = 153db1c1860e5d336a51aac2d86f753fc3858d31
 SHA1 (patch-aj) = 5135031fbbfa06eb11d24859bb1589361b025ba4
diff -r bb6d27d9a031 -r e0291f20a959 games/maelstrom-x11/patches/patch-aa
--- a/games/maelstrom-x11/patches/patch-aa      Mon Jun 26 06:47:43 2006 +0000
+++ b/games/maelstrom-x11/patches/patch-aa      Mon Jun 26 08:56:37 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2005/12/30 22:41:27 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2006/06/26 08:56:37 rillig Exp $
 
 --- Makeflags.orig     Mon Jul 14 14:32:13 1997
 +++ Makeflags  Sun Jul 30 01:32:07 2000
@@ -9,7 +9,7 @@
 -BINDIR = /usr/local/bin
 -LIBDIR = /usr/local/lib/Maelstrom
 +SYSTEM =
-+FEATURES = -DAUDIO_16BIT -DASYNCHRONOUS_IO -DUSE_POSIX_SIGNALS
++FEATURES = -DAUDIO_16BIT -DASYNCHRONOUS_IO -DUSE_POSIX_SIGNALS -DVARBASE=\"${VARBASE}\"
  
 -INSTALL = install
 +LOGIC = netlogic
diff -r bb6d27d9a031 -r e0291f20a959 games/maelstrom-x11/patches/patch-ae
--- a/games/maelstrom-x11/patches/patch-ae      Mon Jun 26 06:47:43 2006 +0000
+++ b/games/maelstrom-x11/patches/patch-ae      Mon Jun 26 08:56:37 2006 +0000
@@ -1,7 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/07/11 13:26:14 wiz Exp $
---- Makefile.orig      Wed Feb  5 06:12:18 1997
-+++ Makefile   Mon Sep 14 12:10:06 1998
-@@ -18,7 +18,7 @@
+$NetBSD: patch-ae,v 1.2 2006/06/26 08:56:37 rillig Exp $
+
+--- Makefile.orig      1997-02-05 14:12:18.000000000 +0100
++++ Makefile   2006-06-26 10:50:45.000000000 +0200
+@@ -18,7 +18,7 @@ install: $(MAELSTROM)
        @echo "Installing binaries in $(BINDIR)..."
        @for i in $(MAELSTROM) ; do \
                strip $$i; \
@@ -10,18 +11,17 @@
        done
        @if [ ! -d $(LIBDIR) ]; then \
                mkdir $(LIBDIR); chmod 755 $(LIBDIR); \
-@@ -26,10 +26,11 @@
+@@ -26,11 +26,8 @@ install: $(MAELSTROM)
        @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 "/var/games/Maelstrom-Scores" ]; then \
-               echo "Installing Maelstrom high-scores file"; \
+-              echo "Installing Maelstrom high-scores file"; \
 -              $(INSTALL) -m 666 Maelstrom-Scores  $(LIBDIR); \
 -              chmod 666 $(LIBDIR)/Maelstrom-Scores; \
-+              $(INSTALL) -c -m 666 Maelstrom-Scores  /var/games; \
-+              chmod 666 /var/games/Maelstrom-Scores; \
-       fi
+-      fi
++      @chown -R ${BINOWN}:${BINGRP} $(LIBDIR)
++      ${BSD_INSTALL_DATA} Maelstrom-Scores $(PREFIX)/share/maelstrom
        @-if [ "$(SYSTEM)" = "Linux" ]; then \
                echo "Fixing permissions for Maelstrom (set-uid root)"; \
+               chown root $(BINDIR)/Maelstrom && \
diff -r bb6d27d9a031 -r e0291f20a959 games/maelstrom-x11/patches/patch-ag
--- a/games/maelstrom-x11/patches/patch-ag      Mon Jun 26 06:47:43 2006 +0000
+++ b/games/maelstrom-x11/patches/patch-ag      Mon Jun 26 08:56:37 2006 +0000
@@ -1,4 +1,5 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/07/11 13:26:14 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2006/06/26 08:56:37 rillig Exp $
+
 --- scores.cpp.orig    Mon Sep 14 12:06:20 1998
 +++ scores.cpp Mon Sep 14 12:08:28 1998
 @@ -11,7 +11,7 @@
@@ -6,7 +7,7 @@
  #include "dialog.h"
  
 -#define MAELSTROM_SCORES      "Maelstrom-Scores"
-+#define MAELSTROM_SCORES      "/var/games/Maelstrom-Scores"
++#define MAELSTROM_SCORES      VARBASE"/games/Maelstrom-Scores"
  #define NUM_SCORES            10              // Do not change this!
  
  /* Everyone can write to scores file if defined to 0 */
Prev by Date: [pkgsrc/trunk]: pkgsrc/comms/kyopon The directory man/cat1 is needed prior to...
Next by Date: [pkgsrc/trunk]: pkgsrc/textproc/dict-server Removed a badly written configure...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/comms/kyopon The directory man/cat1 is needed prior to...
Next by Thread: [pkgsrc/trunk]: pkgsrc/textproc/dict-server Removed a badly written configure...
Indexes:
Home | Main Index | Thread Index | Old Index