From bsdkaffee@gmail.com  Tue Jul 31 23:53:27 2012
Return-Path: <bsdkaffee@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id ABFEC106566B;
	Tue, 31 Jul 2012 23:53:27 +0000 (UTC)
	(envelope-from bsdkaffee@gmail.com)
Received: from mail-vb0-f54.google.com (mail-vb0-f54.google.com [209.85.212.54])
	by mx1.freebsd.org (Postfix) with ESMTP id 56F3B8FC12;
	Tue, 31 Jul 2012 23:53:27 +0000 (UTC)
Received: by mail-vb0-f54.google.com with SMTP id v11so182535vbm.13
        for <multiple recipients>; Tue, 31 Jul 2012 16:53:27 -0700 (PDT)
Received: by 10.220.8.17 with SMTP id f17mr15475261vcf.20.1343778807071;
        Tue, 31 Jul 2012 16:53:27 -0700 (PDT)
Received: from mocha.verizon.net (c-71-61-40-68.hsd1.oh.comcast.net. [71.61.40.68])
        by mx.google.com with ESMTPS id l9sm1457438vdw.14.2012.07.31.16.53.26
        (version=TLSv1/SSLv3 cipher=OTHER);
        Tue, 31 Jul 2012 16:53:26 -0700 (PDT)
Message-Id: <1343778806.656330.64894@mocha.verizon.net>
Date: Tue, 31 Jul 2012 19:53:26 -0400
From: Jason E. Hale <bsdkaffee@gmail.com>
Reply-To: Jason E. Hale <bsdkaffee@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: gahr@freebsd.org
Subject: [PATCH] audio/etcd: Remove audio/libmusicbrainz dependency 
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         170304
>Category:       ports
>Synopsis:       [PATCH] audio/etcd: Remove audio/libmusicbrainz dependency
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gahr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 01 00:00:25 UTC 2012
>Closed-Date:    Mon Aug 06 12:02:41 UTC 2012
>Last-Modified:  Mon Aug  6 12:10:04 UTC 2012
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->gahr 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Aug 1 00:00:57 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170304 
State-Changed-From-To: open->closed 
State-Changed-By: gahr 
State-Changed-When: Mon Aug 6 12:02:39 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170304 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170304: commit references a PR
Date: Mon,  6 Aug 2012 12:02:49 +0000 (UTC)

 Author: gahr
 Date: Mon Aug  6 12:02:34 2012
 New Revision: 302171
 URL: http://svn.freebsd.org/changeset/ports/302171
 
 Log:
   - Update to 1.0.1
   - Remove dependency on audio/libmusicbrainz [1]
   
   PR:		170304 [1]
   Submitted by:	Jason E. Hale <bsdkaffee@gmail.com>
 
 Modified:
   head/audio/etcd/Makefile   (contents, props changed)
   head/audio/etcd/distinfo   (contents, props changed)
 
 Modified: head/audio/etcd/Makefile
 ==============================================================================
 --- head/audio/etcd/Makefile	Mon Aug  6 12:00:50 2012	(r302170)
 +++ head/audio/etcd/Makefile	Mon Aug  6 12:02:34 2012	(r302171)
 @@ -6,8 +6,7 @@
  #
  
  PORTNAME=	etcd
 -PORTVERSION=	1.0.0
 -PORTREVISION=	1
 +PORTVERSION=	1.0.1
  CATEGORIES=	audio
  MASTER_SITES=	${MASTER_SITE_LOCAL} \
  		http://people.freebsd.org/~gahr/distfiles/ \
 @@ -17,14 +16,11 @@ MASTER_SITE_SUBDIR=	gahr
  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
  
 
 Modified: head/audio/etcd/distinfo
 ==============================================================================
 --- head/audio/etcd/distinfo	Mon Aug  6 12:00:50 2012	(r302170)
 +++ head/audio/etcd/distinfo	Mon Aug  6 12:02:34 2012	(r302171)
 @@ -1,2 +1,2 @@
 -SHA256 (etcd-1.0.0.tar.gz) = 19f3dc6254a673ce2dd2f70d6483a7e2489d1051d1c18bf578a2613b6803b4ec
 -SIZE (etcd-1.0.0.tar.gz) = 10995
 +SHA256 (etcd-1.0.1.tar.gz) = 5690aeab6da9cb672f3c30f81d5034b53c0722213423913f56573f65cde01ad3
 +SIZE (etcd-1.0.1.tar.gz) = 9359
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
