ports/158769: [patch] update audio/pianobar to latest version

Sun Jul 10 17:20:10 UTC 2011

>Number:         158769
>Category:       ports
>Synopsis:       [patch] update audio/pianobar to latest version
>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 Jul 10 17:20:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Eitan Adler
>Release:        
>Organization:
>Environment:
>Description:
I purposely left the patch as one large file. This has already been submitted upstream. I hope that with the next version the patch could just be removed. 

To the current maintainer: I am willing the continue the maintaining the port if you wish

>How-To-Repeat:

>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/pianobar/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile

--- Makefile	2 May 2011 15:34:19 -0000	1.4
+++ Makefile	10 Jul 2011 17:09:16 -0000
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=	pianobar
-PORTVERSION=	2011.04.27
+PORTVERSION=	2011.07.09
 CATEGORIES=	audio
-MASTER_SITES=	http://6xq.net/media/00/16/
+MASTER_SITES=	http://6xq.net/static/projects/${PORTNAME}/
 
 MAINTAINER=	john at pcbsd.org
 COMMENT=	Command line Pandora player
 
+LICENSE=	MIT
+
 LIB_DEPENDS=	ao:${PORTSDIR}/audio/libao \
 	faad:${PORTSDIR}/audio/faad \
 	mad:${PORTSDIR}/audio/libmad
@@ -25,4 +27,6 @@
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 
+CFLAGS+=	-std=c99 -W -I${LOCALBASE}/include -L${LOCALBASE}/lib
+
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/audio/pianobar/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo	2 May 2011 15:34:19 -0000	1.4
+++ distinfo	10 Jul 2011 17:09:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (pianobar-2011.04.27.tar.bz2) = e4b1354974af36d32dc34b3329bd09f3e0437127539024cf7add61facbb621dc
-SIZE (pianobar-2011.04.27.tar.bz2) = 61317
+SHA256 (pianobar-2011.07.09.tar.bz2) = e8ecc60637b57a807e3db35242e968fa8ce60b0db8a3268acd52a16c027e89b4
+SIZE (pianobar-2011.07.09.tar.bz2) = 64497
Index: files/patch-Makefile
===================================================================
RCS file: files/patch-Makefile
diff -N files/patch-Makefile
--- files/patch-Makefile	2 May 2011 15:34:19 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
---- Makefile.orig	2011-04-27 14:11:06.000000000 -0500
-+++ Makefile	2011-04-30 09:03:16.000000000 -0500
-@@ -4,11 +4,10 @@
- BINDIR:=${PREFIX}/bin
- LIBDIR:=${PREFIX}/lib
- INCDIR:=${PREFIX}/include
--MANDIR:=${PREFIX}/share/man
-+MANDIR:=${PREFIX}/man
- DYNLINK:=0
--CFLAGS:=-O2 -DNDEBUG
-+CFLAGS:=-Wall -std=c99 -O2 -DNDEBUG -pedantic -I/usr/local/include -L/usr/local/lib -lao
- LDFLAGS:=
--CC:=c99
- 
- PIANOBAR_DIR=src
- PIANOBAR_SRC=\
Index: files/patch-main.c
===================================================================
RCS file: files/patch-main.c
diff -N files/patch-main.c
--- files/patch-main.c	8 Apr 2011 12:36:57 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
---- 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.
- */
- 
--#define _POSIX_C_SOURCE 1 /* fileno() */
--#define _BSD_SOURCE /* strdup() */
--
- /* system includes */
- #include <stdlib.h>
- #include <string.h>
Index: files/patch-pianobar
===================================================================
RCS file: files/patch-pianobar
diff -N files/patch-pianobar
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-pianobar	10 Jul 2011 17:09:16 -0000
@@ -0,0 +1,133 @@
+diff --git Makefile Makefile
+index 97ca76b..962a2e2 100644
+--- Makefile
++++ Makefile
+@@ -9,10 +9,10 @@ DYNLINK:=0
+ 
+ # Respect environment variables set by user; does not work with :=
+ ifeq (${CFLAGS},)
+	CFLAGS=-O2 -DNDEBUG
+ endif
+ ifeq (${CC},cc)
+-	CC=c99
++#	CC=c99
+ endif
+ 
+ PIANOBAR_DIR=src
+diff --git src/libezxml/ezxml.c src/libezxml/ezxml.c
+index 967d535..e0b5a15 100644
+--- src/libezxml/ezxml.c
++++ src/libezxml/ezxml.c
+@@ -22,7 +22,9 @@
+  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  */
+ 
++#ifndef __FreeBSD__
+ #define _BSD_SOURCE /* required by strdup() */
++#endif
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
+diff --git src/libpiano/piano.c src/libpiano/piano.c
+index 3ed835a..34be389 100644
+--- src/libpiano/piano.c
++++ src/libpiano/piano.c
+@@ -21,7 +21,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
+ 
++#ifndef __FreeBSD__
+ #define _BSD_SOURCE /* required by strdup() */
++#endif
+ 
+ #include <stdio.h>
+ #include <string.h>
+diff --git src/libpiano/xml.c src/libpiano/xml.c
+index b067bc0..6d8e7f9 100644
+--- src/libpiano/xml.c
++++ src/libpiano/xml.c
+@@ -21,7 +21,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
+ 
++#ifndef __FreeBSD__
+ #define _BSD_SOURCE /* required by strdup() */
++#endif
+ 
+ #include <stdio.h>
+ #include <string.h>
+diff --git src/libwaitress/waitress.c src/libwaitress/waitress.c
+index 8bef2f6..93b60a2 100644
+--- src/libwaitress/waitress.c
++++ src/libwaitress/waitress.c
+@@ -21,8 +21,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
+ 
++#ifndef __FreeBSD__
+ #define _POSIX_C_SOURCE 1 /* required by getaddrinfo() */
+ #define _BSD_SOURCE /* snprintf() */
++#endif
+ 
+ #include <sys/types.h>
+ #include <sys/socket.h>
+diff --git src/main.c src/main.c
+index ae661c8..094197a 100644
+--- src/main.c
++++ src/main.c
+@@ -21,8 +21,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
+ 
++#ifndef __FreeBSD__
+ #define _POSIX_C_SOURCE 1 /* fileno() */
+ #define _BSD_SOURCE /* strdup() */
++#endif
+ 
+ /* system includes */
+ #include <stdlib.h>
+diff --git src/settings.c src/settings.c
+index 7b46df3..cae4c8e 100644
+--- src/settings.c
++++ src/settings.c
+@@ -23,8 +23,10 @@ THE SOFTWARE.
+ 
+ /* application settings */
+ 
++#ifndef __FreeBSD__
+ #define _POSIX_C_SOURCE 1 /* PATH_MAX */
+ #define _BSD_SOURCE /* strdup() */
++#endif
+ 
+ #include <string.h>
+ #include <stdlib.h>
+diff --git src/terminal.c src/terminal.c
+index 666d97b..4808083 100644
+--- src/terminal.c
++++ src/terminal.c
+@@ -21,8 +21,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
+ 
++#ifndef __FreeBSD__
+ #define _POSIX_C_SOURCE 1 /* fileno() */
+ #define _BSD_SOURCE /* setlinebuf() */
++#endif
+ 
+ #include <termios.h>
+ #include <stdio.h>
+diff --git src/ui.c src/ui.c
+index a025b9c..decb0b6 100644
+--- src/ui.c
++++ src/ui.c
+@@ -23,8 +23,10 @@ THE SOFTWARE.
+ 
+ /* everything that interacts with the user */
+ 
++#ifndef __FreeBSD__
+ #define _POSIX_C_SOURCE 1 /* fileno() */
+ #define _BSD_SOURCE /* strdup() */
++#endif
+ 
+ #include <stdio.h>
+ #include <stdarg.h>
Index: files/patch-terminal.c
===================================================================
RCS file: files/patch-terminal.c
diff -N files/patch-terminal.c
--- files/patch-terminal.c	8 Apr 2011 12:36:57 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- 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.
- */
- 
--#define _POSIX_C_SOURCE 1 /* fileno() */
--#define _BSD_SOURCE /* setlinebuf() */
--
- #include <termios.h>
- #include <stdio.h>
Index: files/patch-ui.c
===================================================================
RCS file: files/patch-ui.c
diff -N files/patch-ui.c
--- files/patch-ui.c	8 Apr 2011 12:36:57 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
---- 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 */
- 
--#define _POSIX_C_SOURCE 1 /* fileno() */
--#define _BSD_SOURCE /* strdup() */
--
- #include <stdio.h>
- #include <stdarg.h>
- #include <unistd.h>
Index: files/patch-waitress.c
===================================================================
RCS file: files/patch-waitress.c
diff -N files/patch-waitress.c
--- files/patch-waitress.c	8 Apr 2011 12:36:57 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
---- 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.
- */
- 
--#define _POSIX_C_SOURCE 1 /* required by getaddrinfo() */
--#define _BSD_SOURCE /* snprintf() */
--
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netdb.h>


>Release-Note:
>Audit-Trail:
>Unformatted:

