cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no longer broken, use private libscsi copy

Browse Source
This commit is contained in:
pvalchev 2003-08-09 17:39:16 +00:00
parent d4f6324a60
commit 60f73a9cd1
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
audio/tosha/Makefile
View File

@ -1,6 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2003/08/09 07:31:54 pvalchev Exp $
BROKEN= "relies on scsi API no longer part of libutil"
# $OpenBSD: Makefile,v 1.22 2003/08/09 17:39:16 pvalchev Exp $
COMMENT= "read CD digital audio data through the SCSI bus"
DISTNAME= tosha-0.6
@ -18,4 +16,7 @@ MAKE_ENV= SYSCONFDIR='${SYSCONFDIR}' CC="${CC}"
NO_REGRESS= Yes
post-patch:
@cp ${FILESDIR}/libscsi* ${WRKSRC}
.include <bsd.port.mk>

32
audio/tosha/patches/patch-Makefile
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-Makefile,v 1.1 2001/03/14 15:04:11 naddy Exp $
--- Makefile.orig Wed Dec 16 13:34:09 1998
+++ Makefile Wed Mar 14 15:55:55 2001
$OpenBSD: patch-Makefile,v 1.2 2003/08/09 17:39:16 pvalchev Exp $
--- Makefile.orig 1998-12-16 05:34:09.000000000 -0700
+++ Makefile 2003-08-09 11:40:17.000000000 -0600
@@ -5,10 +5,10 @@
# @(#)$Id: patch-Makefile,v 1.1 2001/03/14 15:04:11 naddy Exp $
# @(#)$Id: patch-Makefile,v 1.2 2003/08/09 17:39:16 pvalchev Exp $
#
-PREFIX?=/usr/local
@ -14,7 +14,7 @@ $OpenBSD: patch-Makefile,v 1.1 2001/03/14 15:04:11 naddy Exp $
###################################################
###### ######
@@ -16,17 +16,7 @@ MANDIR=$(PREFIX)/man
@@ -16,52 +16,40 @@ MANDIR=$(PREFIX)/man
###### ######
###################################################
@ -32,15 +32,27 @@ $OpenBSD: patch-Makefile,v 1.1 2001/03/14 15:04:11 naddy Exp $
+CFLAGS+= -DGLOBAL_ETC_DIR=\"$(ETCDIR)\"
BINS=tosha pcmplay pcmfade
OBJS=utils.o getlopt.o tosha.o toscsi.o toform.o toconf.o pcmplay.o pcmfade.o
@@ -43,25 +33,22 @@ pcmplay.o: pcmplay.c utils.h getlopt.h
-OBJS=utils.o getlopt.o tosha.o toscsi.o toform.o toconf.o pcmplay.o pcmfade.o
+OBJS=utils.o getlopt.o tosha.o libscsi.o toscsi.o toform.o toconf.o pcmplay.o pcmfade.o
all: $(BINS)
utils.o: utils.c utils.h
getlopt.o: getlopt.c getlopt.h
tosha.o: tosha.c global.h toscsi.h toform.h toconf.h utils.h getlopt.h
+libscsi.o: libscsi.c libscsi.h
toscsi.o: toscsi.c global.h toscsi.h utils.h
toform.o: toform.c global.h toform.h utils.h
toconf.o: toconf.c global.h toconf.h utils.h
pcmplay.o: pcmplay.c utils.h getlopt.h
pcmfade.o: pcmfade.c utils.h
tosha: tosha.o toscsi.o toform.o toconf.o utils.o getlopt.o
-tosha: tosha.o toscsi.o toform.o toconf.o utils.o getlopt.o
- $(CC) $(CFLAGS) -o tosha \
- tosha.o toscsi.o toform.o toconf.o utils.o getlopt.o $(LDFLAGS)
+ $(CC) $(CFLAGS) -o tosha tosha.o toscsi.o toform.o toconf.o \
+ utils.o getlopt.o -lutil -lossaudio
+tosha: tosha.o libscsi.o toscsi.o toform.o toconf.o utils.o getlopt.o
+ $(CC) $(CFLAGS) -o tosha tosha.o libscsi.o toscsi.o toform.o toconf.o \
+ utils.o getlopt.o -lossaudio
pcmplay: pcmplay.o utils.o getlopt.o
- $(CC) $(CFLAGS) -o pcmplay pcmplay.o utils.o getlopt.o