From bsdkaffee@gmail.com  Tue Jul 31 23:53:21 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 92919106566B;
	Tue, 31 Jul 2012 23:53:21 +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 3D5168FC0C;
	Tue, 31 Jul 2012 23:53:21 +0000 (UTC)
Received: by vbmv11 with SMTP id v11so182535vbm.13
        for <multiple recipients>; Tue, 31 Jul 2012 16:53:20 -0700 (PDT)
Received: by 10.220.8.17 with SMTP id f17mr15475092vcf.20.1343778800375;
        Tue, 31 Jul 2012 16:53:20 -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 l12sm1461495vdh.8.2012.07.31.16.53.19
        (version=TLSv1/SSLv3 cipher=OTHER);
        Tue, 31 Jul 2012 16:53:19 -0700 (PDT)
Message-Id: <1343778799.740563.64850@mocha.verizon.net>
Date: Tue, 31 Jul 2012 19:53:19 -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/dcd: Remove audio/libmusicbrainz dependency 
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         170303
>Category:       ports
>Synopsis:       [PATCH] audio/dcd: 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:01:14 UTC 2012
>Last-Modified:  Mon Aug 06 12:01:14 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/dcd
- audio/libmusicbrainz is deprecated and no longer functions this is one of
  two ports still depending on it
	
>How-To-Repeat:
- Use attached diff
- Remove: files/patch-mbo.h, files/patch-mbo.c, files-patch-screenop.c
	
>Fix:

	



--- 2012-07-31-dcd.diff begins here ---
Index: files/patch-mbo.h
===================================================================
--- files/patch-mbo.h	(revision 301817)
+++ files/patch-mbo.h	(working copy)
@@ -1,10 +0,0 @@
---- mbo.h.orig	2003-08-28 03:36:01.000000000 +0200
-+++ mbo.h	2008-06-20 22:15:46.000000000 +0200
-@@ -6,6 +6,7 @@
- #endif
- 
- int mbo_init(char *device);
-+char *mbo_artistname (void);
- char *mbo_trackname (int i);
- 
- #define CDI_HOME ".cdindex" 	/* for historical reasons */
Index: files/patch-Makefile
===================================================================
--- files/patch-Makefile	(revision 301817)
+++ files/patch-Makefile	(working copy)
@@ -1,5 +1,5 @@
---- Makefile.orig	2003-08-28 03:44:07.000000000 +0200
-+++ Makefile	2008-06-20 21:57:34.000000000 +0200
+--- ./Makefile.orig	2003-08-27 21:44:07.000000000 -0400
++++ ./Makefile	2012-07-31 18:29:42.000000000 -0400
 @@ -1,11 +1,11 @@
  ## This is the makefile for dcd, dave's cd player.
  
@@ -23,6 +23,15 @@
  
  
  
+@@ -45,7 +45,7 @@
+ ## If you want to disable the network code, try this. It probably doesn't
+ ## work, but you're welcome to try ... Just comment out the next line.
+ 
+-NETWORK = 1
++# NETWORK = 1
+ 
+ ## Here be dragons... (Non-configurable parts past here.)
+ 
 @@ -94,10 +94,10 @@
  all: ${PROGS}
  
Index: files/patch-mbo.c
===================================================================
--- files/patch-mbo.c	(revision 301817)
+++ files/patch-mbo.c	(working copy)
@@ -1,20 +0,0 @@
---- mbo.c.orig	2003-08-28 01:34:12.000000000 +0200
-+++ mbo.c	2008-06-20 22:20:40.000000000 +0200
-@@ -46,6 +46,17 @@
-   return FALSE;
- }
- 
-+char *mbo_artistname (void) {
-+  char *res = (char *)malloc(255);
-+  if (mbo_ok == FALSE) return "";
-+  memset(res, '\0', 255);
-+  mb_GetResultData(mbo, MBE_AlbumGetAlbumArtistName, res, 255);
-+  #ifdef DEBUG
-+    fprintf (stderr, "cd_get_artistname: %s\n", res);
-+  #endif
-+  return res;
-+}
-+
- /* convenience hack. 0 is disc name, others are track names. */
- /* guess what, this too is XXX UNSAFE */
- char *mbo_trackname (int i) {
Index: files/patch-screenop.c
===================================================================
--- files/patch-screenop.c	(revision 301817)
+++ files/patch-screenop.c	(working copy)
@@ -1,43 +0,0 @@
---- screenop.c.orig	2003-08-28 01:42:36.000000000 +0200
-+++ screenop.c	2008-06-24 01:21:54.000000000 +0200
-@@ -15,23 +15,32 @@
- 
- void disk_directory(void) {
-   u_char ct = cd_current_track();
--  int tl;
--  char outline[80];
-+  char *art_name, *trk_name;
-+  int tl, tt;
-   int disc_length = cd_disc_length();
-   int i;
-   #ifdef DEBUG
-     fprintf (stderr, "Entering directory. tz is %i\n", cd_last_track());
-   #endif
- 
--  sprintf (outline, "Track  Time  (%i tracks / %2i:%02i) %30s",
--          cd_last_track(), disc_length/60, disc_length%60, mbo_trackname(0));
--  printf ("%s\n", outline);
-+  art_name = mbo_artistname();
-+  trk_name = mbo_trackname(0);
-+  printf ("Artist: %s\nAlbum : %s\nTrack  Time  (%i tracks / %2i:%02i)\n",
-+          art_name, trk_name, cd_last_track(), disc_length/60, disc_length%60);
-+  free(art_name);
-+  free(trk_name);
-   
-   for (i=1; i<=cd_last_track(); i++) {
-     tl = cd_track_length(i);
--    sprintf (outline, "%s %2i  %2i:%02i  %-45s", (i==ct ? "*" : " "),
--            i, (tl/60), (tl%60), mbo_trackname(i));
--    printf ("%s\n", outline);
-+    trk_name = mbo_trackname(i);
-+    if(i == ct && cd_active) {
-+	tt = cd_track_time();
-+	printf ("* %2i  %2i:%02i  %s [%i:%02i]\n", i, (tl/60), (tl%60),
-+		trk_name, (tt/60), (tt%60));
-+    } else
-+	printf ("  %2i  %2i:%02i  %s\n", i, (tl/60), (tl%60), trk_name);
-+
-+    free(trk_name);
-   } /* for */
- }
- 
Index: Makefile
===================================================================
--- Makefile	(revision 301817)
+++ Makefile	(working copy)
@@ -7,15 +7,14 @@
 
 PORTNAME=	dcd
 PORTVERSION=	0.99.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}player/${PORTNAME}player/${PORTVERSION}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	A simple, programmable, intelligent CD player
 
-LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
-    		cdaudio.1:${PORTSDIR}/audio/libcdaudio
+LIB_DEPENDS=	cdaudio:${PORTSDIR}/audio/libcdaudio
 
 USE_GMAKE=	yes
 
--- 2012-07-31-dcd.diff ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->gahr 
Responsible-Changed-By: wxs 
Responsible-Changed-When: Fri Aug 3 01:41:54 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer. 

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

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

 Author: gahr
 Date: Mon Aug  6 11:53:17 2012
 New Revision: 302168
 URL: http://svn.freebsd.org/changeset/ports/302168
 
 Log:
   - Remove dependency on audio/libmusicbrainz
   
   PR:		170303
   Submitted by:	Jason E. Hale <bsdkaffee@gmail.com>
 
 Deleted:
   head/audio/dcd/files/patch-mbo.c
   head/audio/dcd/files/patch-mbo.h
   head/audio/dcd/files/patch-screenop.c
 Modified:
   head/audio/dcd/Makefile   (contents, props changed)
   head/audio/dcd/files/patch-Makefile   (contents, props changed)
 
 Modified: head/audio/dcd/Makefile
 ==============================================================================
 --- head/audio/dcd/Makefile	Mon Aug  6 11:47:16 2012	(r302167)
 +++ head/audio/dcd/Makefile	Mon Aug  6 11:53:17 2012	(r302168)
 @@ -7,15 +7,14 @@
  
  PORTNAME=	dcd
  PORTVERSION=	0.99.2
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	audio
  MASTER_SITES=	SF/${PORTNAME}player/${PORTNAME}player/${PORTVERSION}
  
  MAINTAINER=	gahr@FreeBSD.org
  COMMENT=	A simple, programmable, intelligent CD player
  
 -LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 -    		cdaudio.1:${PORTSDIR}/audio/libcdaudio
 +LIB_DEPENDS=	cdaudio:${PORTSDIR}/audio/libcdaudio
  
  USE_GMAKE=	yes
  
 
 Modified: head/audio/dcd/files/patch-Makefile
 ==============================================================================
 --- head/audio/dcd/files/patch-Makefile	Mon Aug  6 11:47:16 2012	(r302167)
 +++ head/audio/dcd/files/patch-Makefile	Mon Aug  6 11:53:17 2012	(r302168)
 @@ -1,5 +1,5 @@
 ---- Makefile.orig	2003-08-28 03:44:07.000000000 +0200
 -+++ Makefile	2008-06-20 21:57:34.000000000 +0200
 +--- ./Makefile.orig	2003-08-27 21:44:07.000000000 -0400
 ++++ ./Makefile	2012-07-31 18:29:42.000000000 -0400
  @@ -1,11 +1,11 @@
   ## This is the makefile for dcd, dave's cd player.
   
 @@ -23,6 +23,15 @@
   
   
   
 +@@ -45,7 +45,7 @@
 + ## If you want to disable the network code, try this. It probably doesn't
 + ## work, but you're welcome to try ... Just comment out the next line.
 + 
 +-NETWORK = 1
 ++# NETWORK = 1
 + 
 + ## Here be dragons... (Non-configurable parts past here.)
 + 
  @@ -94,10 +94,10 @@
   all: ${PROGS}
   
 _______________________________________________
 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"
 
State-Changed-From-To: open->closed 
State-Changed-By: gahr 
State-Changed-When: Mon Aug 6 12:01:12 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170303 
>Unformatted:
