Date: Tue, 31 Jul 2012 19:53:26 -0400 From: "Jason E. Hale" <bsdkaffee@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: gahr@FreeBSD.org Subject: ports/170304: [PATCH] audio/etcd: Remove audio/libmusicbrainz dependency Message-ID: <1343778806.656330.64894@mocha.verizon.net> Resent-Message-ID: <201208010000.q7100PHD004062@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 170304
>Category: ports
>Synopsis: [PATCH] audio/etcd: Remove audio/libmusicbrainz dependency
>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: Wed Aug 01 00:00:25 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Jason E. Hale
>Release: FreeBSD 9.0-RELEASE i386
>Organization:
none
>Environment:
System: FreeBSD mocha.verizon.net 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Thu Jan 19 11:42:41 EST 2012 Jason@mocha.verizon.net:/usr/obj/usr/src/sys/MOCHA9 i386
>Description:
- Remove the audio/libmusicbrainz dependency from audio/etcd
- audio/libmusicbrainz is deprecated and no longer functions this is one of
two ports still depending on it
>How-To-Repeat:
- Use attached diff
>Fix:
--- 2012-07-31-etcd.diff begins here ---
Index: files/patch-cddb.c
===================================================================
--- files/patch-cddb.c (revision 0)
+++ files/patch-cddb.c (working copy)
@@ -0,0 +1,20 @@
+--- ./cddb.c.orig 2008-07-16 05:33:59.000000000 -0400
++++ ./cddb.c 2012-07-31 19:20:32.000000000 -0400
+@@ -35,7 +35,6 @@
+
+ #include "cd-utils.h"
+ #include "cddb.h"
+-#include "tcd_mb.h"
+
+ static void append_data(char *dest, const char *data, size_t maxlen)
+ {
+@@ -233,9 +232,6 @@
+
+ result = 0;
+
+- if (!tcd_readmb(cds, cdrom))
+- return result;
+-
+ if ((filename = cddb_filename(cddb_discid(cdrom))) != NULL)
+ result = tcd_readcddb(cd, cdrom, filename);
+
Index: files/patch-Makefile
===================================================================
--- files/patch-Makefile (revision 0)
+++ files/patch-Makefile (working copy)
@@ -0,0 +1,11 @@
+--- ./Makefile.orig 2012-07-31 17:56:26.000000000 -0400
++++ ./Makefile 2012-07-31 17:56:46.000000000 -0400
+@@ -7,7 +7,7 @@
+ MB_LIBS?= # LDFLAGS for MusicBrainz
+ NCURSES_LIBS?= # LDFLAGS for ncurses
+
+-SRCS= cd-utils.c cddb.c tcd.c tcd_mb.c \
++SRCS= cd-utils.c cddb.c tcd.c \
+ tracked.c ui-layout.c user-interface.c
+ OBJS= ${SRCS:.c=.o}
+ PROG= etcd
Index: Makefile
===================================================================
--- Makefile (revision 301817)
+++ Makefile (working copy)
@@ -7,7 +7,7 @@
PORTNAME= etcd
PORTVERSION= 1.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://people.freebsd.org/~gahr/distfiles/ \
@@ -17,14 +17,11 @@
MAINTAINER= gahr@FreeBSD.org
COMMENT= Enhanced Tiny CD, a simple ncurses-based CD player
-LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
-
USE_SDL= sdl
MANCOMPRESSED= no
MAKE_ARGS= INCDIR=${LOCALBASE}/include LIBDIR=${LOCALBASE}/lib \
- SDL_LIBS=-lSDL MB_LIBS=-lmusicbrainz \
- NCURSES_LIBS="-lncursesw ${PTHREAD_LIBS}"
+ SDL_LIBS=-lSDL NCURSES_LIBS="-lncursesw ${PTHREAD_LIBS}"
PLIST_FILES= bin/etcd
--- 2012-07-31-etcd.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1343778806.656330.64894>