CVS commit: pkgsrc/audio/sfxr

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jul 13 12:16:27 UTC 2017

Modified Files:
        pkgsrc/audio/sfxr: Makefile distinfo
Added Files:
        pkgsrc/audio/sfxr/patches: patch-Makefile

Log Message:
Honor LDFLAGS (and CXXFLAGS while I'm here). Fixes RELRO build.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/audio/sfxr/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/sfxr/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/sfxr/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/audio/sfxr/Makefile
diff -u pkgsrc/audio/sfxr/Makefile:1.26 pkgsrc/audio/sfxr/Makefile:1.27
--- pkgsrc/audio/sfxr/Makefile:1.26     Sun Feb 12 06:25:05 2017
+++ pkgsrc/audio/sfxr/Makefile  Thu Jul 13 12:16:27 2017
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2017/02/12 06:25:05 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.27 2017/07/13 12:16:27 wiz Exp $
 
 DISTNAME=      sfxr-sdl-1.2.1
 PKGNAME=       ${DISTNAME:S/-sdl//}

Index: pkgsrc/audio/sfxr/distinfo
diff -u pkgsrc/audio/sfxr/distinfo:1.3 pkgsrc/audio/sfxr/distinfo:1.4
--- pkgsrc/audio/sfxr/distinfo:1.3      Tue Nov  3 01:12:49 2015
+++ pkgsrc/audio/sfxr/distinfo  Thu Jul 13 12:16:27 2017
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 01:12:49 agc Exp $
+$NetBSD: distinfo,v 1.4 2017/07/13 12:16:27 wiz Exp $
 
 SHA1 (sfxr-sdl-1.2.1.tar.gz) = c5b1a755f45aae256101b1f83dcd6f71efb4f206
 RMD160 (sfxr-sdl-1.2.1.tar.gz) = be13e8591b109dcc348bc407f3d5dcfae540cf13
 SHA512 (sfxr-sdl-1.2.1.tar.gz) = a918f5212d77e10769d44808e0fa34c3df1da6880663c6a7d966860d145c0c2979b6a6772d12a35ca44b4d7337a38698c722569446eca95c2041ae86ec691adc
 Size (sfxr-sdl-1.2.1.tar.gz) = 19444 bytes
+SHA1 (patch-Makefile) = 95463748fccf863936c8bfc4f45a411d8b4b98b3

Added files:

Index: pkgsrc/audio/sfxr/patches/patch-Makefile
diff -u /dev/null pkgsrc/audio/sfxr/patches/patch-Makefile:1.1
--- /dev/null   Thu Jul 13 12:16:27 2017
+++ pkgsrc/audio/sfxr/patches/patch-Makefile    Thu Jul 13 12:16:27 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-Makefile,v 1.1 2017/07/13 12:16:27 wiz Exp $
+
+Honor CXXFLAGS and LDFLAGS.
+
+--- Makefile.orig      2017-07-13 12:05:54.572398200 +0000
++++ Makefile
+@@ -1,7 +1,7 @@
+ CFLAGS=-ggdb
+ GTK=3.0
+-CXXFLAGS=$(CFLAGS) `sdl-config --cflags` `pkg-config gtk+-${GTK} --cflags`
+-LDFLAGS=`sdl-config --libs` `pkg-config gtk+-${GTK} --libs`
++CXXFLAGS+=$(CFLAGS) `sdl-config --cflags` `pkg-config gtk+-${GTK} --cflags`
++LDFLAGS+=`sdl-config --libs` `pkg-config gtk+-${GTK} --libs`
+ 
+ sfxr: main.cpp tools.h sdlkit.h
+       $(CXX) $< $(CXXFLAGS) $(LDFLAGS) -o $@