Thu Jul 13 12:29:09 2017 UTC ()
Honor LDFLAGS, fixes RELRO build.

While here, also honor CFLAGS and remove an unnecessary chunk.


(wiz)
diff -r1.4 -r1.5 pkgsrc/games/monsterz/distinfo
diff -r1.2 -r1.3 pkgsrc/games/monsterz/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/games/monsterz/patches/patch-ab
cvs diff -r1.4 -r1.5 pkgsrc/games/monsterz/distinfo (expand / switch to unified diff)

--- pkgsrc/games/monsterz/distinfo 2015/11/03 20:56:59 1.4
+++ pkgsrc/games/monsterz/distinfo 2017/07/13 12:29:09 1.5
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.4 2015/11/03 20:56:59 agc Exp $ 1$NetBSD: distinfo,v 1.5 2017/07/13 12:29:09 wiz Exp $
2 2
3SHA1 (monsterz-0.7.1.tar.gz) = 8fb1933b7141a058e7b55f85537873e65568cb00 3SHA1 (monsterz-0.7.1.tar.gz) = 8fb1933b7141a058e7b55f85537873e65568cb00
4RMD160 (monsterz-0.7.1.tar.gz) = 6497b3c561f4a7c31b903a380d916778e44de5b8 4RMD160 (monsterz-0.7.1.tar.gz) = 6497b3c561f4a7c31b903a380d916778e44de5b8
5SHA512 (monsterz-0.7.1.tar.gz) = 62de125251a74e7ff237c90ad88e10a4953b8841251dfec45cc6b77f416677ef6d68cf4308c3190f65896b5bb1312934abd5e438f0341f08c02884585f0e4787 5SHA512 (monsterz-0.7.1.tar.gz) = 62de125251a74e7ff237c90ad88e10a4953b8841251dfec45cc6b77f416677ef6d68cf4308c3190f65896b5bb1312934abd5e438f0341f08c02884585f0e4787
6Size (monsterz-0.7.1.tar.gz) = 1879537 bytes 6Size (monsterz-0.7.1.tar.gz) = 1879537 bytes
7SHA1 (patch-aa) = 307d5c07baf9a6f84da9c79561c8f3fece188ca0 7SHA1 (patch-aa) = e3b128540f8ce50bbd8fb0a3083b1c7297db1b64
8SHA1 (patch-ab) = e8349bb09699ed38ee578f341b1bf6794a8cc0cb 8SHA1 (patch-ab) = 5d7dff54c6d462b2da6df681af254edb466796c4
cvs diff -r1.2 -r1.3 pkgsrc/games/monsterz/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/games/monsterz/patches/patch-aa 2009/02/15 21:53:40 1.2
+++ pkgsrc/games/monsterz/patches/patch-aa 2017/07/13 12:29:09 1.3
@@ -1,30 +1,39 @@ @@ -1,30 +1,39 @@
1$NetBSD: patch-aa,v 1.2 2009/02/15 21:53:40 wiz Exp $ 1$NetBSD: patch-aa,v 1.3 2017/07/13 12:29:09 wiz Exp $
2 2
3--- Makefile.orig 2007-12-17 22:05:00.000000000 +0000 3--- Makefile.orig 2007-12-17 22:05:00.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -1,9 +1,9 @@ 5@@ -1,9 +1,9 @@
6  6
7-prefix = /usr/local 7-prefix = /usr/local
8-gamesdir = ${prefix}/games 8-gamesdir = ${prefix}/games
9+prefix = ${PREFIX} 9+prefix = ${PREFIX}
10+gamesdir = ${prefix}/bin 10+gamesdir = ${prefix}/bin
11 datadir = ${prefix}/share 11 datadir = ${prefix}/share
12 pkgdatadir = $(datadir)/games/monsterz 12 pkgdatadir = $(datadir)/games/monsterz
13-scoredir = /var/games 13-scoredir = /var/games
14+scoredir = ${VARBASE}/games 14+scoredir = ${VARBASE}/games
15 scorefile = $(scoredir)/monsterz 15 scorefile = $(scoredir)/monsterz
16  16
17 VERSION = 0.7.1 17 VERSION = 0.7.1
 18@@ -22,7 +22,7 @@ INKSCAPE = inkscape -z
 19 all: monsterz
 20
 21 monsterz: monsterz.c
 22- $(CC) -Wall monsterz.c -DDATADIR=\"$(pkgdatadir)\" -DSCOREFILE=\"$(scorefile)\" -o monsterz
 23+ $(CC) $(LDFLAGS) $(CFLAGS) -Wall monsterz.c -DDATADIR=\"$(pkgdatadir)\" -DSCOREFILE=\"$(scorefile)\" -o monsterz
 24
 25 bitmap: $(BITMAP)
 26
18@@ -40,18 +40,17 @@ graphics/logo.png: graphics/graphics.svg 27@@ -40,18 +40,17 @@ graphics/logo.png: graphics/graphics.svg
19 $(INKSCAPE) graphics/graphics.svg -a 810:858:1220:1075 -w380 -h180 -e graphics/logo.png 28 $(INKSCAPE) graphics/graphics.svg -a 810:858:1220:1075 -w380 -h180 -e graphics/logo.png
20  29
21 install: all 30 install: all
22- mkdir -p $(DESTDIR)$(gamesdir) 31- mkdir -p $(DESTDIR)$(gamesdir)
23- cp monsterz $(DESTDIR)$(gamesdir)/ 32- cp monsterz $(DESTDIR)$(gamesdir)/
24- chown root:games $(DESTDIR)$(gamesdir)/monsterz 33- chown root:games $(DESTDIR)$(gamesdir)/monsterz
25- chmod g+s $(DESTDIR)$(gamesdir)/monsterz 34- chmod g+s $(DESTDIR)$(gamesdir)/monsterz
26- mkdir -p $(DESTDIR)$(pkgdatadir)/graphics 35- mkdir -p $(DESTDIR)$(pkgdatadir)/graphics
27- mkdir -p $(DESTDIR)$(pkgdatadir)/sound 36- mkdir -p $(DESTDIR)$(pkgdatadir)/sound
28- cp monsterz.py $(DESTDIR)$(pkgdatadir)/ 37- cp monsterz.py $(DESTDIR)$(pkgdatadir)/
29- cp $(BITMAP) $(DESTDIR)$(pkgdatadir)/graphics/ 38- cp $(BITMAP) $(DESTDIR)$(pkgdatadir)/graphics/
30- cp $(SOUND) $(MUSIC) $(DESTDIR)$(pkgdatadir)/sound/ 39- cp $(SOUND) $(MUSIC) $(DESTDIR)$(pkgdatadir)/sound/
cvs diff -r1.1 -r1.2 pkgsrc/games/monsterz/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/games/monsterz/patches/patch-ab 2009/02/15 21:53:40 1.1
+++ pkgsrc/games/monsterz/patches/patch-ab 2017/07/13 12:29:09 1.2
@@ -1,29 +1,23 @@ @@ -1,29 +1,23 @@
1$NetBSD: patch-ab,v 1.1 2009/02/15 21:53:40 wiz Exp $ 1$NetBSD: patch-ab,v 1.2 2017/07/13 12:29:09 wiz Exp $
2 2
3Fix 64-bit alignment issue with Python 2.5. 3Fix 64-bit alignment issue with Python 2.5.
4http://sam.zoy.org/cgi-bin/viewcvs.cgi/monsterz.py?root=monsterz&rev=137&r1=135&r2=137 4http://sam.zoy.org/cgi-bin/viewcvs.cgi/monsterz.py?root=monsterz&rev=137&r1=135&r2=137
5 5
6Fix blit crash, using patch from Fedora: 6Fix blit crash, using patch from Fedora:
7http://cvs.fedoraproject.org/viewvc/devel/monsterz/monsterz-0.7.1-blit-crash.patch?view=log 7http://cvs.fedoraproject.org/viewvc/devel/monsterz/monsterz-0.7.1-blit-crash.patch?view=log
8 8
9--- monsterz.py.orig 2007-12-17 22:05:00.000000000 +0000 9--- monsterz.py.orig 2007-12-17 22:05:00.000000000 +0000
10+++ monsterz.py 10+++ monsterz.py
11@@ -1,4 +1,4 @@ 
12-#!/usr/bin/env python 
13+#!/usr/pkg/bin/python2.5 
14 # -*- coding: utf-8 -*- 
15  
16 """ 
17@@ -108,7 +108,9 @@ def semi_grayscale(surf): 11@@ -108,7 +108,9 @@ def semi_grayscale(surf):
18 M = int(max(r, g, b)) 12 M = int(max(r, g, b))
19 m = int(min(r, g, b)) 13 m = int(min(r, g, b))
20 val = (2 * M + r + g + b) / 5 14 val = (2 * M + r + g + b) / 5
21- p[:] = (val + r) / 2, (val + g) / 2, (val + b) / 2 15- p[:] = (val + r) / 2, (val + g) / 2, (val + b) / 2
22+ p[0] = (val + r) / 2 16+ p[0] = (val + r) / 2
23+ p[1] = (val + g) / 2 17+ p[1] = (val + g) / 2
24+ p[2] = (val + b) / 2 18+ p[2] = (val + b) / 2
25 if alpha[y][x] >= 250: 19 if alpha[y][x] >= 250:
26 alpha[y][x] = 255 - (M - m) * 3 / 4 20 alpha[y][x] = 255 - (M - m) * 3 / 4
27 del pixels 21 del pixels
28@@ -129,7 +131,9 @@ def semi_transp(surf): 22@@ -129,7 +131,9 @@ def semi_transp(surf):
29 r, g, b = p 23 r, g, b = p