9 files changed, 127 insertions, 0 deletions

diff --git a/audio/Makefile b/audio/Makefile
index f55e7b428a7f..111608f7fb7c 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -604,6 +604,7 @@
     SUBDIR += pecl-id3
     SUBDIR += penguinsap
     SUBDIR += phatbeat
+    SUBDIR += pianobar
     SUBDIR += picard
     SUBDIR += pidgin-musictracker
     SUBDIR += pimp3
diff --git a/audio/pianobar/Makefile b/audio/pianobar/Makefile
new file mode 100644
index 000000000000..4efeb4e3dc94
--- /dev/null
+++ b/audio/pianobar/Makefile
@@ -0,0 +1,28 @@
+# New ports collection makefile for: pianobar
+# Date created: 8 October 2010
+# Whom: John Hixson <john@pcbsd.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	pianobar
+PORTVERSION=	2010.10.07
+CATEGORIES=	audio
+MASTER_SITES=	http://6xq.net/media/00/16/
+
+MAINTAINER=	john@pcbsd.org
+COMMENT=	Command line Pandora player
+
+LIB_DEPENDS=	ao:${PORTSDIR}/audio/libao \
+	faad:${PORTSDIR}/audio/faad \
+	mad:${PORTSDIR}/audio/libmad
+
+MAN1=	pianobar.1
+MAN_COMPRESSED=	no
+
+PLIST_FILES=	bin/pianobar
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+
+.include <bsd.port.mk>
diff --git a/audio/pianobar/distinfo b/audio/pianobar/distinfo
new file mode 100644
index 000000000000..076384c7dd8d
--- /dev/null
+++ b/audio/pianobar/distinfo
@@ -0,0 +1,3 @@
+MD5 (pianobar-2010.10.07.tar.bz2) = 826c2dadeadd7e2ae341914273a5183d
+SHA256 (pianobar-2010.10.07.tar.bz2) = bb7c51c10acffa3d5d3cc6352798db1341a61876f83dd6d4d926be00df33affe
+SIZE (pianobar-2010.10.07.tar.bz2) = 56022
diff --git a/audio/pianobar/files/patch-Makefile b/audio/pianobar/files/patch-Makefile
new file mode 100644
index 000000000000..cd85cc7b69bc
--- /dev/null
+++ b/audio/pianobar/files/patch-Makefile
@@ -0,0 +1,46 @@
+--- Makefile.orig	2010-10-07 01:54:32.000000000 -0700
++++ Makefile	2010-10-08 16:25:33.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
++MANDIR:=${PREFIX}/man
++CFLAGS:=-Wall -g -std=c99 -pedantic -I/usr/local/include
+ 
+ PIANOBAR_DIR=src
+ PIANOBAR_SRC=\
+@@ -58,8 +58,8 @@
+ LIBEZXML_RELOBJ=${LIBEZXML_SRC:.c=.lo}
+ LIBEZXML_INCLUDE=libezxml/src
+ 
+-LIBAO_INCLUDE=/usr/include
+-LIBAO_LIB=-lao
++LIBAO_INCLUDE=/usr/local/include
++LIBAO_LIB=-L/usr/local/lib -lao
+ 
+ LIBM_LIB=-lm
+ 
+@@ -68,8 +68,8 @@
+ 	LIBFAAD_LIB=
+ 	LIBFAAD_SWITCH=
+ else
+-	LIBFAAD_INCLUDE:=/usr/include
+-	LIBFAAD_LIB:=-lfaad
++	LIBFAAD_INCLUDE:=/usr/local/include
++	LIBFAAD_LIB:=-L/usr/local/lib -lfaad
+ 	LIBFAAD_SWITCH=-DENABLE_FAAD
+ endif
+ 
+@@ -78,8 +78,8 @@
+ 	LIBMAD_LIB=
+ 	LIBMAD_SWITCH=
+ else
+-	LIBMAD_INCLUDE:=/usr/include
+-	LIBMAD_LIB:=-lmad
++	LIBMAD_INCLUDE:=/usr/local/include
++	LIBMAD_LIB:=-L/usr/local/lib -lmad
+ 	LIBMAD_SWITCH=-DENABLE_MAD
+ endif
+ 
diff --git a/audio/pianobar/files/patch-main.c b/audio/pianobar/files/patch-main.c
new file mode 100644
index 000000000000..66f08246efe0
--- /dev/null
+++ b/audio/pianobar/files/patch-main.c
@@ -0,0 +1,12 @@
+--- src/main.c.orig	2010-10-07 01:54:32.000000000 -0700
++++ src/main.c	2010-10-08 14:51:13.000000000 -0700
+@@ -21,9 +21,6 @@
+ THE SOFTWARE.
+ */
+ 
+-#define _POSIX_C_SOURCE 1 /* fileno() */
+-#define _BSD_SOURCE /* strdup() */
+-
+ /* system includes */
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/audio/pianobar/files/patch-terminal.c b/audio/pianobar/files/patch-terminal.c
new file mode 100644
index 000000000000..372c27121a47
--- /dev/null
+++ b/audio/pianobar/files/patch-terminal.c
@@ -0,0 +1,12 @@
+--- src/terminal.c.orig	2010-10-07 01:54:32.000000000 -0700
++++ src/terminal.c	2010-10-08 14:51:21.000000000 -0700
+@@ -21,9 +21,6 @@
+ THE SOFTWARE.
+ */
+ 
+-#define _POSIX_C_SOURCE 1 /* fileno() */
+-#define _BSD_SOURCE /* setlinebuf() */
+-
+ #include <termios.h>
+ #include <stdio.h>
+ 
diff --git a/audio/pianobar/files/patch-ui.c b/audio/pianobar/files/patch-ui.c
new file mode 100644
index 000000000000..dc1fdba6bbfa
--- /dev/null
+++ b/audio/pianobar/files/patch-ui.c
@@ -0,0 +1,12 @@
+--- src/ui.c.orig	2010-10-07 01:54:32.000000000 -0700
++++ src/ui.c	2010-10-08 14:51:28.000000000 -0700
+@@ -23,9 +23,6 @@
+ 
+ /* everything that interacts with the user */
+ 
+-#define _POSIX_C_SOURCE 1 /* fileno() */
+-#define _BSD_SOURCE /* strdup() */
+-
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <unistd.h>
diff --git a/audio/pianobar/files/patch-waitress.c b/audio/pianobar/files/patch-waitress.c
new file mode 100644
index 000000000000..87a2d8c38f65
--- /dev/null
+++ b/audio/pianobar/files/patch-waitress.c
@@ -0,0 +1,12 @@
+--- 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
+@@ -21,9 +21,6 @@
+ THE SOFTWARE.
+ */
+ 
+-#define _POSIX_C_SOURCE 1 /* required by getaddrinfo() */
+-#define _BSD_SOURCE /* snprintf() */
+-
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netdb.h>
diff --git a/audio/pianobar/pkg-descr b/audio/pianobar/pkg-descr
new file mode 100644
index 000000000000..d666e1e43c07
--- /dev/null
+++ b/audio/pianobar/pkg-descr
@@ -0,0 +1 @@
+A free/open-source, console-based replacement for pandora's flash player.