From 435fbf28495095ea26d0dd530a100b9c691abfaa Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Tue, 16 Jul 2002 08:49:30 +0000
Subject: Add buildlink.mk files where necessary (gnome-libs being tha main
 one)

Strongly buildlinkify this package.

Adapt coverart to new structure layout in libcdaudio - fixes a problem
which showed up in latest bulk build.
---
 audio/gdcd/Makefile         | 15 ++++++---------
 audio/gdcd/distinfo         |  4 ++--
 audio/gdcd/patches/patch-ad | 20 +++++++++++++++++++-
 3 files changed, 27 insertions(+), 12 deletions(-)

(limited to 'audio/gdcd')

diff --git a/audio/gdcd/Makefile b/audio/gdcd/Makefile
index 3d93d72715a..68ea398ad77 100644
--- a/audio/gdcd/Makefile
+++ b/audio/gdcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/03/13 17:36:36 fredb Exp $
+# $NetBSD: Makefile,v 1.13 2002/07/16 08:49:30 agc Exp $
 #
 
 DISTNAME=	gdcd-0.2.1
@@ -10,18 +10,15 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://cdcd.undergrid.net/
 COMMENT=	CD player for the X Window System using the GIMP Tool Kit (GTK)
 
-DEPENDS+=	gtk+-1.2.*:../../x11/gtk
-DEPENDS+=	imlib>=1.9.11nb1:../../graphics/imlib
-DEPENDS+=	libcdaudio>0.99.4:../../audio/libcdaudio
-
 USE_X11BASE=	YES
 GNU_CONFIGURE=	YES
 
-# for pth and libcdaudio
-CPPFLAGS+=	-I${LOCALBASE}/include
-CPPFLAGS+=	-D_POSIX_THREAD_SYSCALL_SOFT=1
-LDFLAGS+=	-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
+USE_BUILDLINK_ONLY=	yes
 
+.include "../../audio/libcdaudio/buildlink.mk"
+.include "../../graphics/gdk-pixbuf/buildlink.mk"
+.include "../../graphics/imlib/buildlink.mk"
+.include "../../x11/gnome-libs/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
 .include "../../graphics/imlib/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
diff --git a/audio/gdcd/distinfo b/audio/gdcd/distinfo
index c0f6544b3c2..3f1b279b761 100644
--- a/audio/gdcd/distinfo
+++ b/audio/gdcd/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2001/05/19 13:34:31 drochner Exp $
+$NetBSD: distinfo,v 1.5 2002/07/16 08:49:30 agc Exp $
 
 SHA1 (gdcd-0.2.1.tar.gz) = 90d3a443adea4cfdfad57d254cbf4a48bac30b9f
 Size (gdcd-0.2.1.tar.gz) = 244312 bytes
 SHA1 (patch-aa) = 972ec8f5ca0e6c308c87d3ec9e3b774e78e726c4
 SHA1 (patch-ab) = e67964ffe48972beee0314a8eb84a20ddcc81e68
 SHA1 (patch-ac) = 1a3711d8d4cadbc0d9c4f022ffa8f0c620e3660f
-SHA1 (patch-ad) = 7fcfea1fc1f1dafcb3b921352c56d005b3d6cb8c
+SHA1 (patch-ad) = 4d0aaa53fd3e1962821575daf3d00c8ad55166cc
 SHA1 (patch-ae) = 8954d5d44d01a50736e5ba191fee8f10eeb4d3bd
diff --git a/audio/gdcd/patches/patch-ad b/audio/gdcd/patches/patch-ad
index 4dff7f2e677..5a808caf4f7 100644
--- a/audio/gdcd/patches/patch-ad
+++ b/audio/gdcd/patches/patch-ad
@@ -1,7 +1,25 @@
-$NetBSD: patch-ad,v 1.2 2001/05/14 17:09:14 rh Exp $
+$NetBSD: patch-ad,v 1.3 2002/07/16 08:49:31 agc Exp $
 
 --- source/coverart.c.orig	Sun May  6 18:18:16 2001
 +++ source/coverart.c
+@@ -96,7 +96,7 @@
+ 	 return NULL;
+       }
+       
+-      write(fd, art.art_data, art.art_length);
++      write(fd, art.art_image, art.art_length);
+       close(fd);
+       
+       thread_invoke_operation(display_sock, "COVR", filename, strlen(filename));
+@@ -167,7 +167,7 @@
+ 	 return NULL;
+       }
+       
+-      write(fd, art.art_data, art.art_length);
++      write(fd, art.art_image, art.art_length);
+       close(fd);
+    } else
+       snprintf(filename, 108, "L%s.png", cddb_genre(data.data_genre));
 @@ -197,7 +197,12 @@
           return -1;
        }
-- 
cgit v1.2.3