- Update to 2011.12.11

- Pet portlint

PR:		163425
Submitted by:	John Hixson <john@pcbsd.org> (maintainer)

audio/pianobar/Makefile

@@ -6,20 +6,20 @@
 #
 
 PORTNAME=	pianobar
-PORTVERSION=	2011.11.11
+PORTVERSION=	2011.12.11
 CATEGORIES=	audio
 MASTER_SITES=	http://6xq.net/static/projects/${PORTNAME}/
 
 MAINTAINER=	john@pcbsd.org
 COMMENT=	Command line Pandora player
 
+LICENSE=	MIT
+
 LIB_DEPENDS=	ao:${PORTSDIR}/audio/libao \
 		faad:${PORTSDIR}/audio/faad \
 		mad:${PORTSDIR}/audio/libmad \
 		gnutls.47:${PORTSDIR}/security/gnutls
 
-LICENSE=	MIT
-
 MAN1=		pianobar.1
 MAN_COMPRESSED=	no
 
@@ -28,6 +28,7 @@ PLIST_FILES=	bin/pianobar
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 
-CFLAGS=
+CFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>

audio/pianobar/distinfo

@@ -1,2 +1,2 @@
-SHA256 (pianobar-2011.11.11.tar.bz2) = c1f5df7813b543992b79ac1558d27ff3fb0198f7bfb2d5d2e39173df4fae951b
-SIZE (pianobar-2011.11.11.tar.bz2) = 67778
+SHA256 (pianobar-2011.12.11.tar.bz2) = 6963d21376f201dfbf9f9ed403c84aebd23e64616d35b5a7d22cfd30a6755e6d
+SIZE (pianobar-2011.12.11.tar.bz2) = 68121

audio/pianobar/files/patch-Makefile

@@ -1,6 +1,6 @@
---- Makefile.orig	2011-09-22 03:34:19.000000000 -0700
-+++ Makefile	2011-09-22 22:58:18.000000000 -0700
-@@ -4,12 +4,12 @@
+--- Makefile.orig	2011-12-11 10:39:27.000000000 -0800
++++ Makefile	2011-12-17 22:41:34.000000000 -0800
+@@ -4,7 +4,7 @@
  BINDIR:=${PREFIX}/bin
  LIBDIR:=${PREFIX}/lib
  INCDIR:=${PREFIX}/include
@@ -9,27 +9,3 @@
  DYNLINK:=0
  
  # Respect environment variables set by user; does not work with :=
- ifeq (${CFLAGS},)
--	CFLAGS=-O2 -DNDEBUG
-+	CFLAGS=-O2 -DNDEBUG -I/usr/local/include
- endif
- ifeq (${CC},cc)
- 	CC=c99
-@@ -74,7 +74,7 @@
- 	LIBFAAD_LDFLAGS=
- else
- 	LIBFAAD_CFLAGS=-DENABLE_FAAD
--	LIBFAAD_LDFLAGS=-lfaad
-+	LIBFAAD_LDFLAGS=-L/usr/local/lib -lfaad
- endif
- 
- ifeq (${DISABLE_MAD}, 1)
-@@ -82,7 +82,7 @@
- 	LIBMAD_LDFLAGS=
- else
- 	LIBMAD_CFLAGS=-DENABLE_MAD
--	LIBMAD_LDFLAGS=-lmad
-+	LIBMAD_LDFLAGS=-L/usr/local/lib -lmad
- endif
- 
- # build pianobar

audio/pianobar/files/patch-waitress.c

@@ -1,57 +0,0 @@
---- 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));

audio/pianobar/files/patch-waitress.h

@@ -1,25 +0,0 @@
---- 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;