CVS commit: pkgsrc/games/monsterz

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jul 13 12:29:09 UTC 2017

Modified Files:
        pkgsrc/games/monsterz: distinfo
        pkgsrc/games/monsterz/patches: patch-aa patch-ab

Log Message:
Honor LDFLAGS, fixes RELRO build.

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


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/monsterz/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/monsterz/patches/patch-aa
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/monsterz/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/monsterz/distinfo
diff -u pkgsrc/games/monsterz/distinfo:1.4 pkgsrc/games/monsterz/distinfo:1.5
--- pkgsrc/games/monsterz/distinfo:1.4  Tue Nov  3 20:56:59 2015
+++ pkgsrc/games/monsterz/distinfo      Thu Jul 13 12:29:09 2017
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 20:56:59 agc Exp $
+$NetBSD: distinfo,v 1.5 2017/07/13 12:29:09 wiz Exp $
 
 SHA1 (monsterz-0.7.1.tar.gz) = 8fb1933b7141a058e7b55f85537873e65568cb00
 RMD160 (monsterz-0.7.1.tar.gz) = 6497b3c561f4a7c31b903a380d916778e44de5b8
 SHA512 (monsterz-0.7.1.tar.gz) = 62de125251a74e7ff237c90ad88e10a4953b8841251dfec45cc6b77f416677ef6d68cf4308c3190f65896b5bb1312934abd5e438f0341f08c02884585f0e4787
 Size (monsterz-0.7.1.tar.gz) = 1879537 bytes
-SHA1 (patch-aa) = 307d5c07baf9a6f84da9c79561c8f3fece188ca0
-SHA1 (patch-ab) = e8349bb09699ed38ee578f341b1bf6794a8cc0cb
+SHA1 (patch-aa) = e3b128540f8ce50bbd8fb0a3083b1c7297db1b64
+SHA1 (patch-ab) = 5d7dff54c6d462b2da6df681af254edb466796c4

Index: pkgsrc/games/monsterz/patches/patch-aa
diff -u pkgsrc/games/monsterz/patches/patch-aa:1.2 pkgsrc/games/monsterz/patches/patch-aa:1.3
--- pkgsrc/games/monsterz/patches/patch-aa:1.2  Sun Feb 15 21:53:40 2009
+++ pkgsrc/games/monsterz/patches/patch-aa      Thu Jul 13 12:29:09 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2009/02/15 21:53:40 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2017/07/13 12:29:09 wiz Exp $
 
 --- Makefile.orig      2007-12-17 22:05:00.000000000 +0000
 +++ Makefile
@@ -15,6 +15,15 @@ $NetBSD: patch-aa,v 1.2 2009/02/15 21:53
  scorefile = $(scoredir)/monsterz
  
  VERSION = 0.7.1
+@@ -22,7 +22,7 @@ INKSCAPE = inkscape -z
+ all: monsterz
+ 
+ monsterz: monsterz.c
+-      $(CC) -Wall monsterz.c -DDATADIR=\"$(pkgdatadir)\" -DSCOREFILE=\"$(scorefile)\" -o monsterz
++      $(CC) $(LDFLAGS) $(CFLAGS) -Wall monsterz.c -DDATADIR=\"$(pkgdatadir)\" -DSCOREFILE=\"$(scorefile)\" -o monsterz
+ 
+ bitmap: $(BITMAP)
+ 
 @@ -40,18 +40,17 @@ graphics/logo.png: graphics/graphics.svg
        $(INKSCAPE) graphics/graphics.svg -a 810:858:1220:1075 -w380 -h180 -e graphics/logo.png
  

Index: pkgsrc/games/monsterz/patches/patch-ab
diff -u pkgsrc/games/monsterz/patches/patch-ab:1.1 pkgsrc/games/monsterz/patches/patch-ab:1.2
--- pkgsrc/games/monsterz/patches/patch-ab:1.1  Sun Feb 15 21:53:40 2009
+++ pkgsrc/games/monsterz/patches/patch-ab      Thu Jul 13 12:29:09 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2009/02/15 21:53:40 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2017/07/13 12:29:09 wiz Exp $
 
 Fix 64-bit alignment issue with Python 2.5.
 http://sam.zoy.org/cgi-bin/viewcvs.cgi/monsterz.py?root=monsterz&rev=137&r1=135&r2=137
@@ -8,12 +8,6 @@ http://cvs.fedoraproject.org/viewvc/deve
 
 --- monsterz.py.orig   2007-12-17 22:05:00.000000000 +0000
 +++ monsterz.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/pkg/bin/python2.5
- # -*- coding: utf-8 -*-
- 
- """
 @@ -108,7 +108,9 @@ def semi_grayscale(surf):
                  M = int(max(r, g, b))
                  m = int(min(r, g, b))