ports/163425: audio/pianobar update to 2011.12.11
John Hixson
john at pcbsd.org
Sun Dec 18 07:00:25 UTC 2011
>Number: 163425
>Category: ports
>Synopsis: audio/pianobar update to 2011.12.11
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 18 07:00:17 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: John Hixson
>Release: 10.0-CURRENT
>Organization:
iXsystems
>Environment:
FreeBSD thinkbsd 9.9-CURRENT FreeBSD 10.0-CURRENT #20: Sun Dec 11 23:59:22 UTC 2011 root@:/usr/obj/usr/src/sys/THINKBSD amd64
>Description:
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -urN pianobar/Makefile pianobar.new/Makefile
--- pianobar/Makefile 2011-11-22 07:58:12.000000000 -0800
+++ pianobar.new/Makefile 2011-12-17 22:47:00.000000000 -0800
@@ -2,11 +2,11 @@
# Date created: 8 October 2010
# Whom: John Hixson <john at pcbsd.org>
#
-# $FreeBSD: ports/audio/pianobar/Makefile,v 1.7 2011/11/22 15:58:12 miwi Exp $
+# $FreeBSD: ports/audio/pianobar/Makefile,v 1.2 2010/11/08 18:23:57 jpaetzel Exp $
#
PORTNAME= pianobar
-PORTVERSION= 2011.11.11
+PORTVERSION= 2011.12.11
CATEGORIES= audio
MASTER_SITES= http://6xq.net/static/projects/${PORTNAME}/
@@ -14,13 +14,13 @@
COMMENT= Command line Pandora player
LIB_DEPENDS= ao:${PORTSDIR}/audio/libao \
- faad:${PORTSDIR}/audio/faad \
- mad:${PORTSDIR}/audio/libmad \
- gnutls.47:${PORTSDIR}/security/gnutls
+ faad:${PORTSDIR}/audio/faad \
+ mad:${PORTSDIR}/audio/libmad \
+ gnutls:${PORTSDIR}/security
LICENSE= MIT
-MAN1= pianobar.1
+MAN1= pianobar.1
MAN_COMPRESSED= no
PLIST_FILES= bin/pianobar
@@ -28,6 +28,7 @@
USE_BZIP2= yes
USE_GMAKE= yes
-CFLAGS=
+CFLAGS= -I${LOCALBASE}/include
+LDFLAGS= -L${LOCALBASE}/lib
.include <bsd.port.mk>
diff -urN pianobar/distinfo pianobar.new/distinfo
--- pianobar/distinfo 2011-11-22 07:58:12.000000000 -0800
+++ pianobar.new/distinfo 2011-12-17 22:34:42.000000000 -0800
@@ -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
diff -urN pianobar/files/patch-Makefile pianobar.new/files/patch-Makefile
--- pianobar/files/patch-Makefile 2011-09-25 20:33:07.000000000 -0700
+++ pianobar.new/files/patch-Makefile 2011-12-17 22:41:55.000000000 -0800
@@ -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
diff -urN pianobar/files/patch-waitress.c pianobar.new/files/patch-waitress.c
--- pianobar/files/patch-waitress.c 2011-11-22 07:58:12.000000000 -0800
+++ pianobar.new/files/patch-waitress.c 1969-12-31 16:00:00.000000000 -0800
@@ -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));
diff -urN pianobar/files/patch-waitress.h pianobar.new/files/patch-waitress.h
--- pianobar/files/patch-waitress.h 2011-11-22 07:58:12.000000000 -0800
+++ pianobar.new/files/patch-waitress.h 1969-12-31 16:00:00.000000000 -0800
@@ -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;
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list