svn commit: r309598 - in head/audio/pianobar: . files

[Jason Helfman]

Author: jgh
Date: Sat Dec 29 00:55:02 2012
New Revision: 309598
URL: http://svnweb.freebsd.org/changeset/ports/309598

Log:
  - restore CFLAGS/LDFLAGS to not be hardcoded
  
  Submitted by:	maintainer, john at pcbsd.org

Modified:
  head/audio/pianobar/Makefile
  head/audio/pianobar/files/patch-Makefile

Modified: head/audio/pianobar/Makefile
==============================================================================
--- head/audio/pianobar/Makefile	Sat Dec 29 00:05:40 2012	(r309597)
+++ head/audio/pianobar/Makefile	Sat Dec 29 00:55:02 2012	(r309598)
@@ -26,7 +26,7 @@ PLIST_FILES=	bin/pianobar
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 
-CFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CFLAGS+=	-I${LOCALBASE}/include -std=c99
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>

Modified: head/audio/pianobar/files/patch-Makefile
==============================================================================
--- head/audio/pianobar/files/patch-Makefile	Sat Dec 29 00:05:40 2012	(r309597)
+++ head/audio/pianobar/files/patch-Makefile	Sat Dec 29 00:55:02 2012	(r309598)
@@ -1,6 +1,6 @@
---- Makefile.orig	2012-09-07 07:44:39.000000000 -0700
-+++ Makefile	2012-09-07 14:52:09.940335486 -0700
-@@ -4,7 +4,7 @@
+--- Makefile	2012-12-01 09:03:23.000000000 -0800
++++ Makefile	2012-12-28 15:03:03.150101419 -0800
+@@ -4,16 +4,14 @@
  BINDIR:=${PREFIX}/bin
  LIBDIR:=${PREFIX}/lib
  INCDIR:=${PREFIX}/include
@@ -9,15 +9,17 @@
  DYNLINK:=0
  
  # Respect environment variables set by user; does not work with :=
-@@ -14,6 +14,7 @@
- ifeq (${CC},cc)
- 	CC=c99
+ ifeq (${CFLAGS},)
+ 	CFLAGS=-O2 -DNDEBUG
  endif
+-ifeq (${CC},cc)
+-	CC=c99
+-endif
 +DEPCC=cc
  
  PIANOBAR_DIR=src
  PIANOBAR_SRC=\
-@@ -119,7 +120,7 @@
+@@ -119,7 +117,7 @@
  # build dependency files
  %.d: %.c
  	@set -e; rm -f $@; \