From 8a4fbb1ed5288a32b0017dd15afd21f9138a8dc0 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sat, 9 Oct 1999 16:51:09 +0000
Subject: * Don't hard-code libraries included by imlib; use imlib-config
 instead to   include the proper libraries; * Update dependency to pth-1.1.6;
 * Inform package installer to make the symlink for /dev/cdrom.

---
 audio/gdcd/Makefile         | 14 ++++++++------
 audio/gdcd/files/patch-sum  |  3 ++-
 audio/gdcd/patches/patch-ad | 15 +++++++++++++++
 audio/gdcd/pkg/MESSAGE      |  6 ++++++
 4 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 audio/gdcd/patches/patch-ad
 create mode 100644 audio/gdcd/pkg/MESSAGE

diff --git a/audio/gdcd/Makefile b/audio/gdcd/Makefile
index 1927fae2429..5bac808985b 100644
--- a/audio/gdcd/Makefile
+++ b/audio/gdcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/09/03 22:15:46 rh Exp $
+# $NetBSD: Makefile,v 1.2 1999/10/09 16:51:09 jlam Exp $
 #
 
 DISTNAME=	gdcd-0.0.2
@@ -8,15 +8,17 @@ MASTER_SITES=	http://cdcd.undergrid.net/gdcd/source_archive/
 MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://cdcd.undergrid.net/gdcd/
 
-DEPENDS+=	gtk+-1.2.4:../../x11/gtk
+DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 DEPENDS+=	imlib-1.9.4:../../graphics/imlib
-DEPENDS+=	pth-1.1.5:../../devel/pth
+DEPENDS+=	pth-1.1.6:../../devel/pth
 DEPENDS+=	libcdaudio-0.99.1:../../audio/libcdaudio
 
-GNU_CONFIGURE=	YES
 USE_X11BASE=	YES
-LDFLAGS+=	-ltiff -ljpeg -lpng -lgif -lz -lm
+GNU_CONFIGURE=	YES
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${PREFIX}/include"
+# for pth and libcdaudio
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/gdcd/files/patch-sum b/audio/gdcd/files/patch-sum
index 914a18c048b..88efe697e1f 100644
--- a/audio/gdcd/files/patch-sum
+++ b/audio/gdcd/files/patch-sum
@@ -1,5 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/09/03 22:17:54 rh Exp $
+$NetBSD: patch-sum,v 1.2 1999/10/09 16:51:10 jlam Exp $
 
 MD5 (patch-aa) = 899671889dbc6e9669803895e2a675bb
 MD5 (patch-ab) = 36730afa8d62c39d0b22aee9825361fe
 MD5 (patch-ac) = 67f8e2f8a94fd08269a9aeef5fcd0027
+MD5 (patch-ad) = 6cd207844db241c1cb60b83ee40e7932
diff --git a/audio/gdcd/patches/patch-ad b/audio/gdcd/patches/patch-ad
new file mode 100644
index 00000000000..f85027a9943
--- /dev/null
+++ b/audio/gdcd/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 1999/10/09 16:51:11 jlam Exp $
+
+--- source/Makefile.in.orig	Thu Sep  2 21:56:08 1999
++++ source/Makefile.in	Sat Oct  9 03:24:15 1999
+@@ -68,8 +68,8 @@
+ bin_PROGRAMS = gdcd
+ gdcd_SOURCES = gdcd.c thread.c cddb.c coverart.c
+ 
+-CFLAGS = @CFLAGS@ `gtk-config --cflags` -DIMAGE_PATH=\"@IMAGE_PATH@\"
+-LDFLAGS = @LDFLAGS@ `gtk-config --libs` -lcdaudio -lgdk_imlib -lpthread
++CFLAGS = @CFLAGS@ `gtk-config --cflags` `imlib-config --cflags` -DIMAGE_PATH=\"@IMAGE_PATH@\"
++LDFLAGS = @LDFLAGS@ `gtk-config --libs` `imlib-config --libs` -lcdaudio -lgdk_imlib -lpthread
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/audio/gdcd/pkg/MESSAGE b/audio/gdcd/pkg/MESSAGE
new file mode 100644
index 00000000000..138876c9aab
--- /dev/null
+++ b/audio/gdcd/pkg/MESSAGE
@@ -0,0 +1,6 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 1999/10/09 16:51:11 jlam Exp $
+
+Please make a symbolic link from your CD-ROM device to /dev/cdrom.
+
+===========================================================================
-- 
cgit v1.2.3