5 files changed, 13 insertions, 78 deletions

diff --git a/audio/dcd/Makefile b/audio/dcd/Makefile
index ba47a3ad7f9d..2f3090698863 100644
--- a/audio/dcd/Makefile
+++ b/audio/dcd/Makefile
@@ -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
 
diff --git a/audio/dcd/files/patch-Makefile b/audio/dcd/files/patch-Makefile
index fd60e4b8c0bd..ccde328ddb41 100644
--- a/audio/dcd/files/patch-Makefile
+++ b/audio/dcd/files/patch-Makefile
@@ -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}
  
diff --git a/audio/dcd/files/patch-mbo.c b/audio/dcd/files/patch-mbo.c
deleted file mode 100644
index 10af204e0f38..000000000000
--- a/audio/dcd/files/patch-mbo.c
+++ /dev/null
@@ -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) {
diff --git a/audio/dcd/files/patch-mbo.h b/audio/dcd/files/patch-mbo.h
deleted file mode 100644
index b6b9345d9ec7..000000000000
--- a/audio/dcd/files/patch-mbo.h
+++ /dev/null
@@ -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 */
diff --git a/audio/dcd/files/patch-screenop.c b/audio/dcd/files/patch-screenop.c
deleted file mode 100644
index 4baa6707e224..000000000000
--- a/audio/dcd/files/patch-screenop.c
+++ /dev/null
@@ -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 */
- }
-