head 1.4; access; symbols pkgsrc-2023Q4:1.3.0.100 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.98 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.96 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.94 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.92 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.90 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.88 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.86 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.84 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.82 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.80 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.78 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.76 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.74 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.70 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.50 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.72 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.68 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.66 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.64 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.62 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.60 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.58 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.56 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.54 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.52 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.48 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.46 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.44 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.42 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.40 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.38 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.36 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.34 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.32 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.30 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.28 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.26 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.24 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.22 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.20 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.18 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.16 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.14 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.12 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.10 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.8 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.6 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.4 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.2 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.2.0.46 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.44 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.42 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.40 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.38 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.36 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.34 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.32 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.30 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.28 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.26 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.24 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.22 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.20 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.18 pkgsrc-2008Q1:1.2.0.16 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.14 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.12 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.10 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.8 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.6 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.4 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.2 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.1.1.1.0.26 pkgsrc-2006Q1-base:1.1.1.1 pkgsrc-2005Q4:1.1.1.1.0.24 pkgsrc-2005Q4-base:1.1.1.1 pkgsrc-2005Q3:1.1.1.1.0.22 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-2005Q2:1.1.1.1.0.20 pkgsrc-2005Q2-base:1.1.1.1 pkgsrc-2005Q1:1.1.1.1.0.18 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-2004Q4:1.1.1.1.0.16 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-2004Q3:1.1.1.1.0.14 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.12 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.10 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-2003Q4:1.1.1.1.0.8 pkgsrc-2003Q4-base:1.1.1.1 netbsd-1-6-1:1.1.1.1.0.4 netbsd-1-6-1-base:1.1.1.1 netbsd-1-6:1.1.1.1.0.6 netbsd-1-6-RELEASE-base:1.1.1.1 pkgviews:1.1.1.1.0.2 pkgviews-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2024.01.27.13.40.31; author nia; state dead; branches; next 1.3; commitid P5Cv0aAxLxJGJ5WE; 1.3 date 2011.07.19.04.24.19; author dholland; state Exp; branches; next 1.2; 1.2 date 2006.06.26.08.56.37; author rillig; state Exp; branches; next 1.1; 1.1 date 2002.07.11.13.26.14; author wiz; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.07.11.13.26.14; author wiz; state Exp; branches; next ; desc @@ 1.4 log @games: Remove maelstrom-x11; use malestrom-sdl instead. Obsolete, unmaintained, and no longer runs. SDL version should run on more platforms anyway. @ text @$NetBSD: patch-ae,v 1.3 2011/07/19 04:24:19 dholland Exp $ - destdir support - use install -c --- Makefile.orig 1997-02-05 13:12:18.000000000 +0000 +++ Makefile @@@@ -10,32 +10,15 @@@@ include Makeflags install: $(MAELSTROM) - @@if [ "$(LIBDIR)" = "." ]; then \ - echo " Nothing to do! (Install to current directory)"; \ - exit 1; \ - fi - @@if [ ! -d "$(BINDIR)" ]; then mkdir $(BINDIR); fi - @@echo "Installing binaries in $(BINDIR)..." + @@echo "Installing binaries in $(DESTDIR)$(BINDIR)..." @@for i in $(MAELSTROM) ; do \ strip $$i; \ - $(INSTALL) -m 755 $$i $(BINDIR); \ + $(INSTALL) -c -m 755 $$i $(DESTDIR)$(BINDIR); \ done - @@if [ ! -d $(LIBDIR) ]; then \ - mkdir $(LIBDIR); chmod 755 $(LIBDIR); \ - fi - @@echo "Installing data files in $(LIBDIR) ..." - @@tar cf - $(DATAFILES) | (cd $(LIBDIR); tar xvf -) - @@chmod -R +r $(LIBDIR) - @@if [ ! -f "$(LIBDIR)/Maelstrom-Scores" ]; then \ - echo "Installing Maelstrom high-scores file"; \ - $(INSTALL) -m 666 Maelstrom-Scores $(LIBDIR); \ - chmod 666 $(LIBDIR)/Maelstrom-Scores; \ - fi - @@-if [ "$(SYSTEM)" = "Linux" ]; then \ - echo "Fixing permissions for Maelstrom (set-uid root)"; \ - chown root $(BINDIR)/Maelstrom && \ - chmod u+s $(BINDIR)/Maelstrom; \ - fi + @@echo "Installing data files in $(DESTDIR)$(LIBDIR) ..." + @@(umask 022; tar cf - $(DATAFILES) | (cd $(DESTDIR)$(LIBDIR); tar xvf -)) + @@chmod -R +r $(DESTDIR)$(LIBDIR) + ${BSD_INSTALL_DATA} Maelstrom-Scores $(DESTDIR)$(PREFIX)/share/maelstrom @@echo "Maelstrom installed!" @@echo "" @@echo "Make sure that $(BINDIR) is in your execution path" @@@@ -107,7 +90,7 @@@@ clobber: spotless Maelstrom_Globals.h: Mac_Resource.h sound.h fontserv.h framebuf.h \ x11_framebuf.h vga_framebuf.h dga_framebuf.h \ - Maelstrom.h Maelstrom_Inline.h + Maelstrom.h Maelstrom_Inline.h @@if [ -f "$@@" ]; then touch "$@@"; fi # DO NOT DELETE @ 1.3 log @Fix build with clang. While here, fix scorefile handling and add DESTDIR support. PKGREVISION -> 3. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.2 2006/06/26 08:56:37 rillig Exp $ @ 1.2 log @Fixed reference to the /var directory. Bumped PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.1.1.1 2002/07/11 13:26:14 wiz Exp $ d3 16 a18 4 --- 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)..." d22 1 a22 1 + $(INSTALL) -c -m 755 $$i $(BINDIR); \ d24 6 a29 6 @@if [ ! -d $(LIBDIR) ]; then \ mkdir $(LIBDIR); chmod 755 $(LIBDIR); \ @@@@ -26,11 +26,8 @@@@ install: $(MAELSTROM) @@echo "Installing data files in $(LIBDIR) ..." @@tar cf - $(DATAFILES) | (cd $(LIBDIR); tar xvf -) @@chmod -R +r $(LIBDIR) d35 21 a55 5 + @@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 && \ @ 1.1 log @Initial revision @ text @d1 5 a5 4 $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 @@@@ d14 1 a14 1 @@@@ -26,10 +26,11 @@@@ d19 1 a19 3 + @@chown -R ${BINOWN}:${BINGRP} $(LIBDIR) + @@if [ ! -f "/var/games/Maelstrom-Scores" ]; then \ echo "Installing Maelstrom high-scores file"; \ d22 3 a24 3 + $(INSTALL) -c -m 666 Maelstrom-Scores /var/games; \ + chmod 666 /var/games/Maelstrom-Scores; \ fi d27 1 @ 1.1.1.1 log @Re-import of maelstrom as maelstrom-x11 to better show which version it is; also, the SDL version seems to be the only one that's under development right now. Requested in pkg/15583 by Ben Wong. @ text @@