From 039f7ca538bdbe3610b87538fb35093e0be90431 Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 28 Jul 2000 21:47:49 +0000 Subject: Make use of new USE_CURSES functionality. Also close PR#10344 by Ben Collver . --- audio/timidity/Makefile | 15 +++++++++++++-- audio/timidity/files/patch-sum | 8 ++++---- audio/timidity/patches/patch-ab | 10 +++++----- audio/timidity/patches/patch-ba | 13 +++++++------ audio/timidity/patches/patch-bf | 20 ++++++++++++++++---- audio/timidity/pkg/PLIST | 4 ++-- 6 files changed, 47 insertions(+), 23 deletions(-) (limited to 'audio') diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile index 3c376baa0d9..06328ea2113 100644 --- a/audio/timidity/Makefile +++ b/audio/timidity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2000/01/15 18:46:24 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2000/07/28 21:47:49 jlam Exp $ # DISTNAME= timidity-0.2i @@ -11,9 +11,10 @@ MAINTAINER= mycroft@NetBSD.ORG HOMEPAGE= http://www.cgs.fi/~tt/timidity/ BUILD_DEPENDS= unzip:../../archivers/unzip -DEPENDS+= ncurses>=4.2:../../devel/ncurses DEPENDS+= tk-8.0.5:../../x11/tk80 +USE_CURSES= # defined + NO_CDROM= "Uses copyrighted patches" EXTRACT_ONLY= ${DISTNAME}.tar.gz @@ -29,3 +30,13 @@ post-install: unzip -o -q -L ${DISTDIR}/${TIINS} .include "../../mk/bsd.pkg.mk" + +.if defined(NEED_NCURSES) && ${NEED_NCURSES} == "YES" +EXTRAINCS+= -DHAVE_NCURSES_H=1 -I${LOCALBASE}/include +EXTRALIBS+= -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -lncurses +MAKE_ENV+= EXTRAINCS="${EXTRAINCS}" +.else +EXTRALIBS+= -lcurses -ltermcap +.endif + +MAKE_ENV+= EXTRALIBS="${EXTRALIBS}" diff --git a/audio/timidity/files/patch-sum b/audio/timidity/files/patch-sum index 3fbf608c39b..e2066abc400 100644 --- a/audio/timidity/files/patch-sum +++ b/audio/timidity/files/patch-sum @@ -1,14 +1,14 @@ -$NetBSD: patch-sum,v 1.3 2000/04/27 14:44:23 mycroft Exp $ +$NetBSD: patch-sum,v 1.4 2000/07/28 21:47:51 jlam Exp $ -MD5 (patch-ab) = 3d3f5d550a45ce69513d3db5c83688ac +MD5 (patch-ab) = 9e2a7c797056515e1257fe670b662098 MD5 (patch-ac) = b00b62c0d213a28b5523125c5fd6d869 MD5 (patch-ad) = cad5e8ebb3635a2acaddff06a5267d3d -MD5 (patch-ba) = 830a16f595d02db0dee9555402c6952a +MD5 (patch-ba) = 2d489eb28c4e6f0f6f8d74137af3a857 MD5 (patch-bb) = b9a76caba807ffdd3860dab0e3cf40b9 MD5 (patch-bc) = 85e7d701f9508aee853c0e0ce7e75d68 MD5 (patch-bd) = 4fa3bb07ab5476dc710330f1ead63b1b MD5 (patch-be) = df99699640fbd1f0f1cf1423589aaf29 -MD5 (patch-bf) = 1a54e0203c6e7bd48ef1712891a641e9 +MD5 (patch-bf) = 18d23a6f4dbdf74e49ad73bd51003b26 MD5 (patch-bg) = e88dabce6f6864944cb0ccd4c9563cd1 MD5 (patch-bh) = 8c2d76414acafacf63e0473277d57441 MD5 (patch-bi) = b2287228c110a6245f174808c9569535 diff --git a/audio/timidity/patches/patch-ab b/audio/timidity/patches/patch-ab index 127ce2fb524..51f102cbff4 100644 --- a/audio/timidity/patches/patch-ab +++ b/audio/timidity/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.7 1999/11/24 13:49:03 hubertf Exp $ +$NetBSD: patch-ab,v 1.8 2000/07/28 21:47:51 jlam Exp $ ---- Makefile.orig Sun May 26 11:26:46 1996 -+++ Makefile Wed Nov 24 14:50:18 1999 +--- Makefile.orig Sun May 26 05:26:46 1996 ++++ Makefile Fri Jul 28 17:19:20 2000 @@ -24,22 +24,23 @@ # But where to change without revealing my secret identity? @@ -68,8 +68,8 @@ $NetBSD: patch-ab,v 1.7 1999/11/24 13:49:03 hubertf Exp $ SYSEXTRAS += ncurs_c.c -EXTRAINCS += -I/usr/include/ncurses -EXTRALIBS += -lncurses -+EXTRAINCS += -I${PREFIX}/include -+EXTRALIBS += -L${PREFIX}/lib -lncurses -Wl,-R${PREFIX}/lib ++#EXTRAINCS += -I/usr/include/ncurses ++#EXTRALIBS += -lncurses ## Select the S-Lang full-screen interface #SYSTEM += -DIA_SLANG diff --git a/audio/timidity/patches/patch-ba b/audio/timidity/patches/patch-ba index 4717b2c61a9..f75b023be68 100644 --- a/audio/timidity/patches/patch-ba +++ b/audio/timidity/patches/patch-ba @@ -1,17 +1,18 @@ -$NetBSD: patch-ba,v 1.3 2000/04/27 14:44:23 mycroft Exp $ +$NetBSD: patch-ba,v 1.4 2000/07/28 21:47:52 jlam Exp $ --- config.h.orig Sat Jun 1 08:54:49 1996 -+++ config.h Thu Apr 27 10:35:09 2000 -@@ -186,7 +186,7 @@ ++++ config.h Fri Jul 28 17:36:20 2000 +@@ -186,7 +186,8 @@ #define AUDIO_BUFFER_SIZE (1< for FreeBSD and DEC OSF/1 */ -#ifdef DEC +#if defined(DEC) || defined(__NetBSD__) ++#include #include #endif -@@ -223,6 +223,14 @@ +@@ -223,6 +224,14 @@ #endif /* DEC MMS has 64 bit long words */ @@ -26,7 +27,7 @@ $NetBSD: patch-ba,v 1.3 2000/04/27 14:44:23 mycroft Exp $ #ifdef DEC typedef unsigned int uint32; typedef int int32; -@@ -234,6 +242,7 @@ +@@ -234,6 +243,7 @@ typedef short int16; typedef unsigned char uint8; typedef char int8; @@ -34,7 +35,7 @@ $NetBSD: patch-ba,v 1.3 2000/04/27 14:44:23 mycroft Exp $ /* Instrument files are little-endian, MIDI files big-endian, so we need to do some conversions. */ -@@ -323,6 +332,18 @@ +@@ -323,6 +333,18 @@ extern char *optarg; #define PI 3.14159265358979323846 #define rindex(s,c) strrchr(s,c) diff --git a/audio/timidity/patches/patch-bf b/audio/timidity/patches/patch-bf index c4ae044c759..b433b696e14 100644 --- a/audio/timidity/patches/patch-bf +++ b/audio/timidity/patches/patch-bf @@ -1,8 +1,20 @@ -$NetBSD: patch-bf,v 1.3 1998/08/07 10:36:17 agc Exp $ +$NetBSD: patch-bf,v 1.4 2000/07/28 21:47:52 jlam Exp $ --- ncurs_c.c.orig Mon May 20 17:27:35 1996 -+++ ncurs_c.c Sat Mar 7 15:03:37 1998 -@@ -354,7 +354,13 @@ ++++ ncurs_c.c Fri Jul 28 17:27:35 2000 +@@ -26,7 +26,11 @@ + #include + #include + ++#ifdef HAVE_NCURSES_H + #include ++#else ++#include ++#endif + + #include "config.h" + #include "common.h" +@@ -354,7 +358,13 @@ if (ctl.trace_playing) dftwin=stdscr; else @@ -17,7 +29,7 @@ $NetBSD: patch-bf,v 1.3 1998/08/07 10:36:17 agc Exp $ werase(dftwin); wmove(dftwin, 0,0); -@@ -422,7 +428,7 @@ +@@ -422,7 +432,7 @@ static int ctl_read(int32 *valp) { int c; diff --git a/audio/timidity/pkg/PLIST b/audio/timidity/pkg/PLIST index 5b1863e78a1..417da981667 100644 --- a/audio/timidity/pkg/PLIST +++ b/audio/timidity/pkg/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.5 1998/03/07 19:08:38 mycroft Exp $ +@comment $NetBSD: PLIST,v 1.6 2000/07/28 21:47:53 jlam Exp $ bin/timidity bin/bag bin/wav2pat -man/man1/timidity.1.gz +man/man1/timidity.1 lib/timidity/timidity.cfg lib/timidity/gsdrum.cfg lib/timidity/gravis.cfg -- cgit v1.2.3