Thu Jul 13 12:16:27 2017 UTC ()
Honor LDFLAGS (and CXXFLAGS while I'm here). Fixes RELRO build.


(wiz)
diff -r1.26 -r1.27 pkgsrc/audio/sfxr/Makefile
diff -r1.3 -r1.4 pkgsrc/audio/sfxr/distinfo
diff -r0 -r1.1 pkgsrc/audio/sfxr/patches/patch-Makefile
cvs diff -r1.26 -r1.27 pkgsrc/audio/sfxr/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/sfxr/Makefile 2017/02/12 06:25:05 1.26
+++ pkgsrc/audio/sfxr/Makefile 2017/07/13 12:16:27 1.27
@@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
1# $NetBSD: Makefile,v 1.26 2017/02/12 06:25:05 ryoon Exp $ 1# $NetBSD: Makefile,v 1.27 2017/07/13 12:16:27 wiz Exp $
2# 
3 2
4DISTNAME= sfxr-sdl-1.2.1 3DISTNAME= sfxr-sdl-1.2.1
5PKGNAME= ${DISTNAME:S/-sdl//} 4PKGNAME= ${DISTNAME:S/-sdl//}
6PKGREVISION= 15 5PKGREVISION= 15
7CATEGORIES= audio 6CATEGORIES= audio
8MASTER_SITES= http://www.drpetter.se/files/ 7MASTER_SITES= http://www.drpetter.se/files/
9 8
10MAINTAINER= wiz@NetBSD.org 9MAINTAINER= wiz@NetBSD.org
11HOMEPAGE= http://www.drpetter.se/project_sfxr.html 10HOMEPAGE= http://www.drpetter.se/project_sfxr.html
12COMMENT= Sound generator for 8-bit game sounds 11COMMENT= Sound generator for 8-bit game sounds
13LICENSE= mit 12LICENSE= mit
14 13
15USE_LANGUAGES= c++ 14USE_LANGUAGES= c++
cvs diff -r1.3 -r1.4 pkgsrc/audio/sfxr/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/sfxr/distinfo 2015/11/03 01:12:49 1.3
+++ pkgsrc/audio/sfxr/distinfo 2017/07/13 12:16:27 1.4
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.3 2015/11/03 01:12:49 agc Exp $ 1$NetBSD: distinfo,v 1.4 2017/07/13 12:16:27 wiz Exp $
2 2
3SHA1 (sfxr-sdl-1.2.1.tar.gz) = c5b1a755f45aae256101b1f83dcd6f71efb4f206 3SHA1 (sfxr-sdl-1.2.1.tar.gz) = c5b1a755f45aae256101b1f83dcd6f71efb4f206
4RMD160 (sfxr-sdl-1.2.1.tar.gz) = be13e8591b109dcc348bc407f3d5dcfae540cf13 4RMD160 (sfxr-sdl-1.2.1.tar.gz) = be13e8591b109dcc348bc407f3d5dcfae540cf13
5SHA512 (sfxr-sdl-1.2.1.tar.gz) = a918f5212d77e10769d44808e0fa34c3df1da6880663c6a7d966860d145c0c2979b6a6772d12a35ca44b4d7337a38698c722569446eca95c2041ae86ec691adc 5SHA512 (sfxr-sdl-1.2.1.tar.gz) = a918f5212d77e10769d44808e0fa34c3df1da6880663c6a7d966860d145c0c2979b6a6772d12a35ca44b4d7337a38698c722569446eca95c2041ae86ec691adc
6Size (sfxr-sdl-1.2.1.tar.gz) = 19444 bytes 6Size (sfxr-sdl-1.2.1.tar.gz) = 19444 bytes
 7SHA1 (patch-Makefile) = 95463748fccf863936c8bfc4f45a411d8b4b98b3
File Added: pkgsrc/audio/sfxr/patches/patch-Makefile
$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 $@