- Update to 2011.11.11

PR:		162750
Submitted by:	John Hixson <john@pcbsd.org> (maintainer)
Feature safe:	yes

4 files changed, 89 insertions, 6 deletions

diff --git a/audio/pianobar/Makefile b/audio/pianobar/Makefile
index 54e14d08c8f1..e2db05f99bb0 100644
--- a/audio/pianobar/Makefile
+++ b/audio/pianobar/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pianobar
-PORTVERSION=	2011.09.22
+PORTVERSION=	2011.11.11
 CATEGORIES=	audio
 MASTER_SITES=	http://6xq.net/static/projects/${PORTNAME}/
 
@@ -14,12 +14,13 @@ MAINTAINER=	john@pcbsd.org
 COMMENT=	Command line Pandora player
 
 LIB_DEPENDS=	ao:${PORTSDIR}/audio/libao \
-	faad:${PORTSDIR}/audio/faad \
-	mad:${PORTSDIR}/audio/libmad
+		faad:${PORTSDIR}/audio/faad \
+		mad:${PORTSDIR}/audio/libmad \
+		gnutls.47:${PORTSDIR}/security/gnutls
 
 LICENSE=	MIT
 
-MAN1=	pianobar.1
+MAN1=		pianobar.1
 MAN_COMPRESSED=	no
 
 PLIST_FILES=	bin/pianobar
diff --git a/audio/pianobar/distinfo b/audio/pianobar/distinfo
index bc2b47ca7400..e5764edceacf 100644
--- a/audio/pianobar/distinfo
+++ b/audio/pianobar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pianobar-2011.09.22.tar.bz2) = 6e54d4881e7ada6b0443611b0853215e9e54253667a58310d96dfe38be258ed3
-SIZE (pianobar-2011.09.22.tar.bz2) = 65436
+SHA256 (pianobar-2011.11.11.tar.bz2) = c1f5df7813b543992b79ac1558d27ff3fb0198f7bfb2d5d2e39173df4fae951b
+SIZE (pianobar-2011.11.11.tar.bz2) = 67778
diff --git a/audio/pianobar/files/patch-waitress.c b/audio/pianobar/files/patch-waitress.c
new file mode 100644
index 000000000000..660348d9b970
--- /dev/null
+++ b/audio/pianobar/files/patch-waitress.c
@@ -0,0 +1,57 @@
+--- src/libwaitress/waitress.c.orig	2011-11-11 03:37:58.000000000 -0800
++++ src/libwaitress/waitress.c	2011-11-21 23:34:11.000000000 -0800
+@@ -443,10 +443,11 @@
+  *	@param write count bytes
+  *	@return number of written bytes or -1 on error
+  */
+-static ssize_t WaitressPollWrite (WaitressHandle_t *waith,
+-		const char *buf, size_t count) {
++static ssize_t WaitressPollWrite (void *wptr, const void *bptr, size_t count) {
+ 	int pollres = -1;
+ 	ssize_t retSize;
++	WaitressHandle_t *waith = wptr;
++	const char *buf = bptr;
+ 
+ 	assert (waith != NULL);
+ 	assert (buf != NULL);
+@@ -489,10 +490,11 @@
+  *	@param buffer size
+  *	@return number of read bytes or -1 on error
+  */
+-static ssize_t WaitressPollRead (WaitressHandle_t *waith, char *buf,
+-		size_t count) {
++static ssize_t WaitressPollRead (void *wptr, void *bptr, size_t count) {
+ 	int pollres = -1;
+ 	ssize_t retSize;
++	WaitressHandle_t *waith = wptr;
++	char *buf = bptr;
+ 
+ 	assert (waith != NULL);
+ 	assert (buf != NULL);
+@@ -515,7 +517,7 @@
+ }
+ 
+ static WaitressReturn_t WaitressOrdinaryRead (WaitressHandle_t *waith,
+-		char *buf, const size_t size, size_t *retSize) {
++		char *buf, const size_t size, ssize_t *retSize) {
+ 	const ssize_t ret = WaitressPollRead (waith, buf, size);
+ 	if (ret != -1) {
+ 		*retSize = ret;
+@@ -524,7 +526,7 @@
+ }
+ 
+ static WaitressReturn_t WaitressGnutlsRead (WaitressHandle_t *waith,
+-		char *buf, const size_t size, size_t *retSize) {
++		char *buf, const size_t size, ssize_t *retSize) {
+ 	ssize_t ret = gnutls_record_recv (waith->request.tlsSession, buf, size);
+ 	if (ret < 0) {
+ 		return WAITRESS_RET_TLS_READ_ERR;
+@@ -809,7 +811,7 @@
+ 		/* set up proxy tunnel */
+ 		if (WaitressProxyEnabled (waith)) {
+ 			char buf[256];
+-			size_t size;
++			ssize_t size;
+ 			snprintf (buf, sizeof (buf), "CONNECT %s:%s HTTP/"
+ 					WAITRESS_HTTP_VERSION "\r\n\r\n",
+ 					waith->url.host, WaitressDefaultPort (&waith->url));
diff --git a/audio/pianobar/files/patch-waitress.h b/audio/pianobar/files/patch-waitress.h
new file mode 100644
index 000000000000..38f0f956c485
--- /dev/null
+++ b/audio/pianobar/files/patch-waitress.h
@@ -0,0 +1,25 @@
+--- src/libwaitress/waitress.h.orig	2011-11-11 03:37:58.000000000 -0800
++++ src/libwaitress/waitress.h	2011-11-21 23:34:09.000000000 -0800
+@@ -82,7 +82,8 @@
+ 
+ /*	reusable handle
+  */
+-typedef struct {
++struct WaitressHandle_t;
++typedef struct WaitressHandle_t {
+ 	WaitressUrl_t url;
+ 	WaitressMethod_t method;
+ 	const char *extraHeaders;
+@@ -102,9 +103,9 @@
+ 		char *buf;
+ 		gnutls_session_t tlsSession;
+ 		/* first argument is WaitressHandle_t, but that's not defined here */
+-		WaitressHandlerReturn_t (*dataHandler) (void *, char *, const size_t);
+-		ssize_t (*read) (void *, char *, const size_t, ssize_t *);
+-		ssize_t (*write) (void *, const char *, const size_t);
++		WaitressHandlerReturn_t (*dataHandler) (struct WaitressHandle_t *, char *, const size_t);
++		WaitressReturn_t (*read) (struct WaitressHandle_t *, char *, const size_t, ssize_t *);
++		WaitressReturn_t (*write) (struct WaitressHandle_t *, const char *, const size_t);
+ 		/* temporary return value storage */
+ 		WaitressReturn_t readWriteRet;
+ 	} request;