7 files changed, 25 insertions, 26 deletions

diff --git a/audio/pianobar/Makefile b/audio/pianobar/Makefile
index 17eff14fddaf..ad587219ff57 100644
--- a/audio/pianobar/Makefile
+++ b/audio/pianobar/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pianobar
-PORTVERSION=	2010.11.06
+PORTVERSION=	2011.01.24
 CATEGORIES=	audio
 MASTER_SITES=	http://6xq.net/media/00/16/
 
diff --git a/audio/pianobar/distinfo b/audio/pianobar/distinfo
index 3400e8963bc4..29582eb7c1cc 100644
--- a/audio/pianobar/distinfo
+++ b/audio/pianobar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pianobar-2010.11.06.tar.bz2) = 3acfb82a67ace74eb74660e66e0c853fcfdd41b982fd96fe184e09e9c54df1ce
-SIZE (pianobar-2010.11.06.tar.bz2) = 56235
+SHA256 (pianobar-2011.01.24.tar.bz2) = d81c93c1d6facf6c35fa42b3569df6442f275686f872220b26bfff4d1f3fe19e
+SIZE (pianobar-2011.01.24.tar.bz2) = 57710
diff --git a/audio/pianobar/files/patch-Makefile b/audio/pianobar/files/patch-Makefile
index cd85cc7b69bc..460ff9ed83b0 100644
--- a/audio/pianobar/files/patch-Makefile
+++ b/audio/pianobar/files/patch-Makefile
@@ -1,19 +1,19 @@
---- Makefile.orig	2010-10-07 01:54:32.000000000 -0700
-+++ Makefile	2010-10-08 16:25:33.000000000 -0700
+--- Makefile.orig	2011-01-24 04:00:25.000000000 -0800
++++ Makefile	2011-04-07 14:26:46.000000000 -0700
 @@ -3,8 +3,8 @@
  PREFIX:=/usr/local
  BINDIR:=${PREFIX}/bin
  LIBDIR:=${PREFIX}/lib
 -MANDIR:=${PREFIX}/share/man
--CFLAGS:=-Wall -g -std=c99 -pedantic
+-CFLAGS:=-std=c99 -O2 -DNDEBUG
 +MANDIR:=${PREFIX}/man
-+CFLAGS:=-Wall -g -std=c99 -pedantic -I/usr/local/include
++CFLAGS:=-Wall -std=c99 -O2 -DNDEBUG -pedantic -I/usr/local/include
  
  PIANOBAR_DIR=src
  PIANOBAR_SRC=\
-@@ -58,8 +58,8 @@
+@@ -59,8 +59,8 @@
  LIBEZXML_RELOBJ=${LIBEZXML_SRC:.c=.lo}
- LIBEZXML_INCLUDE=libezxml/src
+ LIBEZXML_INCLUDE=${LIBEZXML_DIR}
  
 -LIBAO_INCLUDE=/usr/include
 -LIBAO_LIB=-lao
@@ -23,24 +23,24 @@
  LIBM_LIB=-lm
  
 @@ -68,8 +68,8 @@
- 	LIBFAAD_LIB=
- 	LIBFAAD_SWITCH=
+ 	LIBFAAD_CFLAGS=
+ 	LIBFAAD_LDFLAGS=
  else
 -	LIBFAAD_INCLUDE:=/usr/include
 -	LIBFAAD_LIB:=-lfaad
 +	LIBFAAD_INCLUDE:=/usr/local/include
 +	LIBFAAD_LIB:=-L/usr/local/lib -lfaad
- 	LIBFAAD_SWITCH=-DENABLE_FAAD
+ 	LIBFAAD_CFLAGS=-I ${LIBFAAD_INCLUDE} -DENABLE_FAAD
+ 	LIBFAAD_LDFLAGS=${LIBFAAD_LIB}
  endif
- 
 @@ -78,8 +78,8 @@
- 	LIBMAD_LIB=
- 	LIBMAD_SWITCH=
+ 	LIBMAD_CFLAGS=
+ 	LIBMAD_LDFLAGS=
  else
 -	LIBMAD_INCLUDE:=/usr/include
 -	LIBMAD_LIB:=-lmad
 +	LIBMAD_INCLUDE:=/usr/local/include
 +	LIBMAD_LIB:=-L/usr/local/lib -lmad
- 	LIBMAD_SWITCH=-DENABLE_MAD
+ 	LIBMAD_CFLAGS=-I ${LIBMAD_INCLUDE} -DENABLE_MAD
+ 	LIBMAD_LDFLAGS=${LIBMAD_LIB}
  endif
- 
diff --git a/audio/pianobar/files/patch-main.c b/audio/pianobar/files/patch-main.c
index 66f08246efe0..a8c8ac269db3 100644
--- a/audio/pianobar/files/patch-main.c
+++ b/audio/pianobar/files/patch-main.c
@@ -1,5 +1,5 @@
---- src/main.c.orig	2010-10-07 01:54:32.000000000 -0700
-+++ src/main.c	2010-10-08 14:51:13.000000000 -0700
+--- src/main.c.orig	2011-01-24 04:00:25.000000000 -0800
++++ src/main.c	2011-04-07 14:28:49.000000000 -0700
 @@ -21,9 +21,6 @@
  THE SOFTWARE.
  */
diff --git a/audio/pianobar/files/patch-terminal.c b/audio/pianobar/files/patch-terminal.c
index 372c27121a47..915956ad28da 100644
--- a/audio/pianobar/files/patch-terminal.c
+++ b/audio/pianobar/files/patch-terminal.c
@@ -1,5 +1,5 @@
---- src/terminal.c.orig	2010-10-07 01:54:32.000000000 -0700
-+++ src/terminal.c	2010-10-08 14:51:21.000000000 -0700
+--- src/terminal.c.orig	2011-01-24 04:00:25.000000000 -0800
++++ src/terminal.c	2011-04-07 14:29:03.000000000 -0700
 @@ -21,9 +21,6 @@
  THE SOFTWARE.
  */
@@ -9,4 +9,3 @@
 -
  #include <termios.h>
  #include <stdio.h>
- 
diff --git a/audio/pianobar/files/patch-ui.c b/audio/pianobar/files/patch-ui.c
index dc1fdba6bbfa..70f903d8fd3b 100644
--- a/audio/pianobar/files/patch-ui.c
+++ b/audio/pianobar/files/patch-ui.c
@@ -1,5 +1,5 @@
---- src/ui.c.orig	2010-10-07 01:54:32.000000000 -0700
-+++ src/ui.c	2010-10-08 14:51:28.000000000 -0700
+--- src/ui.c.orig	2011-01-24 04:00:25.000000000 -0800
++++ src/ui.c	2011-04-07 14:29:19.000000000 -0700
 @@ -23,9 +23,6 @@
  
  /* everything that interacts with the user */
diff --git a/audio/pianobar/files/patch-waitress.c b/audio/pianobar/files/patch-waitress.c
index 87a2d8c38f65..4cb930b1494e 100644
--- a/audio/pianobar/files/patch-waitress.c
+++ b/audio/pianobar/files/patch-waitress.c
@@ -1,5 +1,5 @@
---- libwaitress/src/waitress.c.orig	2010-10-07 01:54:32.000000000 -0700
-+++ libwaitress/src/waitress.c	2010-10-08 14:51:41.000000000 -0700
+--- src/libwaitress/waitress.c.orig	2011-01-24 04:00:25.000000000 -0800
++++ src/libwaitress/waitress.c	2011-04-07 14:29:37.000000000 -0700
 @@ -21,9 +21,6 @@
  THE SOFTWARE.
  */