[pkgsrc/trunk]: pkgsrc/games/glaxium Fix install to not depend on umask. Avoi...

[dholland <dholland%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0cfa4d344f1b
branches:  trunk
changeset: 355752:0cfa4d344f1b
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Mon Dec 12 06:21:47 2016 +0000

description:
Fix install to not depend on umask. Avoid undefined behavior to make it
run. PKGREVISION -> 11.

diffstat:

 games/glaxium/Makefile                    |  21 +++++++++++++++------
 games/glaxium/distinfo                    |   4 +++-
 games/glaxium/patches/patch-fighter2.cpp  |  15 +++++++++++++++
 games/glaxium/patches/patch-variables.cpp |  14 ++++++++++++++
 4 files changed, 47 insertions(+), 7 deletions(-)

diffs (91 lines):

diff -r d2fdc0de5d95 -r 0cfa4d344f1b games/glaxium/Makefile
--- a/games/glaxium/Makefile    Mon Dec 12 06:20:52 2016 +0000
+++ b/games/glaxium/Makefile    Mon Dec 12 06:21:47 2016 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2015/04/25 14:22:55 tnn Exp $
+# $NetBSD: Makefile,v 1.25 2016/12/12 06:21:47 dholland Exp $
 #
 
 DISTNAME=      glaxium_0.5
 PKGNAME=       ${DISTNAME:S/_/-/}
-PKGREVISION=   10
+PKGREVISION=   11
 CATEGORIES=    games
 MASTER_SITES=  http://xhosxe.free.fr/glaxium/
 
@@ -24,10 +24,19 @@
 SUBST_SED.bill=                -e "s,share\/games,share,g"
 SUBST_MESSAGE.bill=    Fixing data path.
 
-INSTALLATION_DIRS+=    bin
-INSTALL_MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX} \
-                       exec_prefix=${DESTDIR}${PREFIX} \
-                       mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man6 \
+                       share/glaxium/samples share/glaxium/textures
+
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/glaxium ${DESTDIR}${PREFIX}/bin/
+       ${INSTALL_MAN} ${WRKSRC}/glaxium.6 \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/
+       ${INSTALL_DATA} ${WRKSRC}/samples/*.wav \
+               ${DESTDIR}${PREFIX}/share/glaxium/samples/
+       ${INSTALL_DATA} ${WRKSRC}/samples/*.xm \
+               ${DESTDIR}${PREFIX}/share/glaxium/samples/
+       ${INSTALL_DATA} ${WRKSRC}/textures/*.png \
+               ${DESTDIR}${PREFIX}/share/glaxium/textures/
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "DragonFly" || ${OPSYS} == "SunOS"
diff -r d2fdc0de5d95 -r 0cfa4d344f1b games/glaxium/distinfo
--- a/games/glaxium/distinfo    Mon Dec 12 06:20:52 2016 +0000
+++ b/games/glaxium/distinfo    Mon Dec 12 06:21:47 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 20:56:51 agc Exp $
+$NetBSD: distinfo,v 1.6 2016/12/12 06:21:47 dholland Exp $
 
 SHA1 (glaxium_0.5.tar.gz) = 42526a009a377a6fede7b7d343a0cd57c2f8e23e
 RMD160 (glaxium_0.5.tar.gz) = 5c988c53d4205ac80e0011a893a80daecf096c1f
@@ -8,3 +8,5 @@
 SHA1 (patch-ab) = e8f2abea9053d73090fdb9ec92806fe21b68d3ce
 SHA1 (patch-ac) = ac0a11ca229865eb637425d6065729d1c8fc3da2
 SHA1 (patch-ad) = 3572e6f5c97f342d5b68024c7ebb17aeedb8b667
+SHA1 (patch-fighter2.cpp) = 7afee16e4d915f724416a626a68a61a50932af69
+SHA1 (patch-variables.cpp) = 8b398ef48cbb08776898cb2d512d4c44d7803c94
diff -r d2fdc0de5d95 -r 0cfa4d344f1b games/glaxium/patches/patch-fighter2.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/glaxium/patches/patch-fighter2.cpp  Mon Dec 12 06:21:47 2016 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-fighter2.cpp,v 1.1 2016/12/12 06:21:47 dholland Exp $
+
+Use right array size; avoid running off the end.
+
+--- fighter2.cpp~      2002-10-04 18:05:20.000000000 +0000
++++ fighter2.cpp
+@@ -87,7 +87,7 @@ void Fighter2::initList()
+        }
+    
+     
+-    for (i=0;i<587;i++) {
++    for (i=0;i<578;i++) {
+         fighter2_meshes[i*24+7] = 1 - fighter2_meshes[i*24+7];
+         fighter2_meshes[i*24+7+8] = 1 - fighter2_meshes[i*24+7+8];
+         fighter2_meshes[i*24+7+16] = 1 - fighter2_meshes[i*24+7+16];
diff -r d2fdc0de5d95 -r 0cfa4d344f1b games/glaxium/patches/patch-variables.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/glaxium/patches/patch-variables.cpp Mon Dec 12 06:21:47 2016 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-variables.cpp,v 1.1 2016/12/12 06:21:47 dholland Exp $
+
+Avoid undefined behavior.
+
+--- variables.cpp~     2002-10-17 21:53:00.000000000 +0000
++++ variables.cpp
+@@ -453,6 +453,7 @@ char* GlaxiumVariables::getFullOptionsPa
+       static char strReturn[1024];
+       strcpy(strReturn, getenv("HOME"));
+       strcat(strReturn, "/.glaxiumrc");
++      return strReturn;
+ #endif
+ }
+