From d7196a51337c9f11a31c1806d1b31ebf2f844ac1 Mon Sep 17 00:00:00 2001
From: frueauf <frueauf>
Date: Fri, 24 Jul 1998 09:13:12 +0000
Subject: Use the package libscsi instead of its own copy to make it work on
 alpha. Closes pr 5813 by Tim Rightnour.

---
 audio/cdd/Makefile         |  4 +++-
 audio/cdd/patches/patch-aa | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'audio/cdd')

diff --git a/audio/cdd/Makefile b/audio/cdd/Makefile
index b74ee48f14d..89564bb2c10 100644
--- a/audio/cdd/Makefile
+++ b/audio/cdd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 1998/07/17 07:58:38 hubertf Exp $
+#	$NetBSD: Makefile,v 1.3 1998/07/24 09:13:12 frueauf Exp $
 
 DISTNAME=	cdd-1.0myc2
 PKGNAME=	cdd-1.0myc2
@@ -8,6 +8,8 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	thorpej@netbsd.org
 
+DEPENDS+=	libscsi-1.6:../../devel/libscsi
+
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/cdd ${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/stripzeros ${PREFIX}/bin
diff --git a/audio/cdd/patches/patch-aa b/audio/cdd/patches/patch-aa
index 9a287975f49..b58b49e4de4 100644
--- a/audio/cdd/patches/patch-aa
+++ b/audio/cdd/patches/patch-aa
@@ -1,19 +1,19 @@
---- Makefile.orig	Thu Jul 16 14:23:29 1998
-+++ Makefile	Thu Jul 16 14:25:55 1998
-@@ -14,9 +14,15 @@
+--- Makefile.orig	Sun Mar 29 00:54:57 1998
++++ Makefile	Wed Jul 22 17:17:23 1998
+@@ -1,4 +1,4 @@
+ CC = cc 
+-CFLAGS = -g -O3 -Wall -DNETWORK_DB -Ilibscsi -Ist
+-LDFLAGS = -Llibscsi -lscsi -Lst -lst
++CFLAGS = -g -O3 -Wall -DNETWORK_DB -I${PREFIX}/include -Ist
++LDFLAGS = -L${PREFIX}/lib -lscsi -Lst -lst
  
- STRIPZEROS_OBJECTS = stripzeros.o
+@@ -16,5 +16,8 @@
  
 -all: cdd pcmplay stripzeros
-+all: scsilib stlib cdd pcmplay stripzeros
++all: stlib cdd pcmplay stripzeros
  
  $(CDD_OBJECTS): cdd.h
 +
-+scsilib:
-+	cd libscsi; make
-+
 +stlib:
 +	cd st; make
  
- pcmplay: $(PCMPLAY_OBJECTS)
- 	$(CC) $(CFLAGS) -o $@ $(PCMPLAY_OBJECTS) $(LDFLAGS) -lossaudio
-- 
cgit v1.2.3