Always use ${CFLAGS} and ${LDFLAGS}.

4 files changed, 27 insertions, 15 deletions

diff --git a/audio/rtunes/distinfo b/audio/rtunes/distinfo
index eb8b465b442..81f6e360e92 100644
--- a/audio/rtunes/distinfo
+++ b/audio/rtunes/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2008/01/06 17:17:14 rillig Exp $
+$NetBSD: distinfo,v 1.4 2013/03/31 08:31:49 sbd Exp $
 
 SHA1 (rtunes-snap-20071122.tar.bz2) = 8de9a4e7811785bf2fa05f1da85319942a38c000
 RMD160 (rtunes-snap-20071122.tar.bz2) = 8442a8f90a1a94bdeb61fb8bf1d94bcd861169ab
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = de448ef28337874aef3704f013b0c8e914f6cdb4
 SHA1 (patch-ac) = 323085981da113f9cc118895af14a60b2ce6fba1
 SHA1 (patch-ad) = 199a0844ce3e62f53e5f34df00af3eb26ab8cbb6
 SHA1 (patch-ae) = 45afb27cd512e77aee74c4da1607f85fd5d15ee1
-SHA1 (patch-af) = d3cec3bcf6054eacb5567080ae9f7472926e5268
-SHA1 (patch-ag) = e5fb147e809875404a1cd239751b7d8667e0b927
-SHA1 (patch-ah) = 7c04858f66bce0e9def8689b4ecf0f1a5d2c3948
+SHA1 (patch-af) = 3526da2d01ab8ae9a72fa71de0aa0cda5cf58273
+SHA1 (patch-ag) = 6efc41568d307f3e5897debd767a368f5725a337
+SHA1 (patch-ah) = 6d337e5ec8c20e5bae60b1b5327c1b86c545fc34
 SHA1 (patch-ai) = aeef0d06c04eb03e4cf6f0786a3e1c518e9cb82a
diff --git a/audio/rtunes/patches/patch-af b/audio/rtunes/patches/patch-af
index 9bb800abe05..bdfa3d060b6 100644
--- a/audio/rtunes/patches/patch-af
+++ b/audio/rtunes/patches/patch-af
@@ -1,8 +1,13 @@
-$NetBSD: patch-af,v 1.2 2007/12/29 19:54:02 joerg Exp $
+$NetBSD: patch-af,v 1.3 2013/03/31 08:31:49 sbd Exp $
 
---- libbsd/GNUmakefile.orig	2006-05-06 10:15:59.000000000 -0400
+--- libbsd/GNUmakefile.orig	2006-05-06 14:15:59.000000000 +0000
 +++ libbsd/GNUmakefile
-@@ -5,10 +5,10 @@ libbsd.a:	strlcpy.o strlcat.o arc4random
+@@ -1,14 +1,15 @@
+ CCFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes -c
++CCFLAGS += ${CFLAGS} ${LDFLAGS}
+ 
+ libbsd.a:	strlcpy.o strlcat.o arc4random.o
+ 		ar -r libbsd.a strlcpy.o strlcat.o arc4random.o
  		ranlib libbsd.a
  
  strlcpy.o:	strlcpy.c
diff --git a/audio/rtunes/patches/patch-ag b/audio/rtunes/patches/patch-ag
index 3565c8f27a4..20548f549dd 100644
--- a/audio/rtunes/patches/patch-ag
+++ b/audio/rtunes/patches/patch-ag
@@ -1,8 +1,14 @@
-$NetBSD: patch-ag,v 1.1.1.1 2007/11/23 00:18:41 bjs Exp $
+$NetBSD: patch-ag,v 1.2 2013/03/31 08:31:49 sbd Exp $
 
---- librtunes/GNUmakefile.orig	2006-05-21 14:03:08.000000000 -0400
+--- librtunes/GNUmakefile.orig	2006-05-21 18:03:08.000000000 +0000
 +++ librtunes/GNUmakefile
-@@ -6,7 +6,7 @@ librtunes.a:	rtunes.o ${RT}/cipher.o ${R
+@@ -1,4 +1,5 @@
+ CCFLAGS = -O2 -pipe -Wall -Wstrict-prototypes -c
++CCFLAGS += ${CFLAGS} ${LDFLAGS}
+ RT = ../rtunes
+ LB = ../libbsd
+ 
+@@ -6,7 +7,7 @@ librtunes.a:	rtunes.o ${RT}/cipher.o ${R
  		ar -r librtunes.a rtunes.o ${RT}/cipher.o ${RT}/mp4.o ${RT}/rtsp.o ${RT}/sys.o ${LB}/arc4random.o ${LB}/strlcat.o ${LB}/strlcpy.o
  
  rtunes.o:	rtunes.c
diff --git a/audio/rtunes/patches/patch-ah b/audio/rtunes/patches/patch-ah
index 81cfcea6eb5..2ee5fd365da 100644
--- a/audio/rtunes/patches/patch-ah
+++ b/audio/rtunes/patches/patch-ah
@@ -1,13 +1,15 @@
-$NetBSD: patch-ah,v 1.1.1.1 2007/11/23 00:18:41 bjs Exp $
+$NetBSD: patch-ah,v 1.2 2013/03/31 08:31:49 sbd Exp $
 
---- rtunes/GNUmakefile.orig	2006-05-06 10:02:13.000000000 -0400
+--- rtunes/GNUmakefile.orig	2006-05-06 14:02:13.000000000 +0000
 +++ rtunes/GNUmakefile
-@@ -3,31 +3,31 @@
+@@ -2,31 +2,32 @@
+ 
  CCFLAGS = -O2 -pipe -Wall -Wstrict-prototypes -c
++CCFLAGS += ${CFLAGS} ${LDFLAGS}
  
  rtunes:		rtunes.o cipher.o mp4.o rtsp.o sys.o parse.o scan.o
 -		cc -L../libbsd -o rtunes rtunes.o cipher.o mp4.o rtsp.o sys.o parse.o scan.o -lbsd -lcrypto
-+		${CC} -L../libbsd -o rtunes rtunes.o cipher.o mp4.o rtsp.o sys.o parse.o scan.o -lbsd -lcrypto
++		${CC} ${CFLAGS} ${LDFLAGS} -L../libbsd -o rtunes rtunes.o cipher.o mp4.o rtsp.o sys.o parse.o scan.o -lbsd -lcrypto
  		strip rtunes
  
  rtunes.o:	rtunes.c
@@ -41,4 +43,3 @@ $NetBSD: patch-ah,v 1.1.1.1 2007/11/23 00:18:41 bjs Exp $
 +		${CC} ${CCFLAGS} -o scan.o lex.yy.c
  
  clean:
- 		rm -f rtunes y.tab.c y.tab.h lex.yy.c *.o