From 9807afcb602d970ee86027a46a72552f83b0c0c3 Mon Sep 17 00:00:00 2001 From: fredb Date: Wed, 17 Apr 2002 04:45:06 +0000 Subject: Update dependency on xforms. We're mainly bumping the dependency and package revision, since we may now link against the forms shared library, and because we also have to add a dependency on jpeg lib. --- audio/dap/Makefile | 6 ++++-- audio/dap/distinfo | 4 ++-- audio/dap/patches/patch-aa | 17 ++++++++++------- 3 files changed, 16 insertions(+), 11 deletions(-) (limited to 'audio/dap') diff --git a/audio/dap/Makefile b/audio/dap/Makefile index 441a68402ed..bd6036b4d13 100644 --- a/audio/dap/Makefile +++ b/audio/dap/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2002/04/01 15:26:36 fredb Exp $ +# $NetBSD: Makefile,v 1.13 2002/04/17 04:45:06 fredb Exp $ DISTNAME= dap-2.1.2 +PKGREVISION= 1 CATEGORIES= audio MASTER_SITES= http://www.cee.hw.ac.uk/~richardk/ EXTRACT_SUFX= .tgz @@ -9,7 +10,8 @@ MAINTAINER= scw@netbsd.org HOMEPAGE= http://www.cee.hw.ac.uk/~richardk/ COMMENT= Digital audio recording and processing package -DEPENDS+= xforms>=0.88nb1:../../x11/xforms +DEPENDS+= jpeg-6b:../../graphics/jpeg +DEPENDS+= xforms>=0.9999:../../x11/xforms MAKEFILE= Makefile.netbsd diff --git a/audio/dap/distinfo b/audio/dap/distinfo index 6fe60660deb..336095a4ac5 100644 --- a/audio/dap/distinfo +++ b/audio/dap/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2002/04/01 15:26:37 fredb Exp $ +$NetBSD: distinfo,v 1.5 2002/04/17 04:45:06 fredb Exp $ SHA1 (dap-2.1.2.tgz) = 42bfc1a79507fe5f5d175fd2d27a7a5264f1398b Size (dap-2.1.2.tgz) = 290292 bytes -SHA1 (patch-aa) = 259348b27efdf898003e78f35ebd7aaa8c3e6fb0 +SHA1 (patch-aa) = c081de78507a3bd03ab1b8e739c1da5340d6dae8 SHA1 (patch-ab) = 0ccf4aa10dfc059eb45f60794c10844b28c2fd1a SHA1 (patch-ad) = 01d6e14e7e9fffb9e16a85ddfaf60c96cb98afab SHA1 (patch-af) = 28d7ef813ea4147b0a2413bbfc3d9fc1bb90993c diff --git a/audio/dap/patches/patch-aa b/audio/dap/patches/patch-aa index 9de0fe9d144..80457dce0ee 100644 --- a/audio/dap/patches/patch-aa +++ b/audio/dap/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2001/05/31 12:30:12 agc Exp $ +$NetBSD: patch-aa,v 1.6 2002/04/17 04:45:07 fredb Exp $ ---- main/Makefile.netbsd.orig Wed Feb 23 23:56:39 2000 -+++ main/Makefile.netbsd Thu May 31 12:41:20 2001 -@@ -8,11 +8,11 @@ +--- main/Makefile.netbsd.orig Mon May 22 18:07:21 2000 ++++ main/Makefile.netbsd +@@ -8,13 +8,13 @@ AUDIOF = ../libaudiofile BACKDIR = ../bak/main HOMEDIR = $(HOME) @@ -10,11 +10,14 @@ $NetBSD: patch-aa,v 1.5 2001/05/31 12:30:12 agc Exp $ -INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -LIBDIR = -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib +X11DIR = ${X11BASE} -+INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I${X11PREFIX}/include -I${X11PREFIX}/include/X11 -+LIBDIR = -Wl,-R$(X11DIR)/lib -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib -Wl,-R${X11PREFIX}/lib -L${X11PREFIX}/lib ++INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I${X11PREFIX}/include -I${X11PREFIX}/include/X11 -I${LOCALBASE}/include ++LIBDIR = -Wl,-R$(X11DIR)/lib -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib -Wl,-R${X11PREFIX}/lib -L${X11PREFIX}/lib -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DNETBSD -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused -DEBUG = -g3 +DEBUG = #-g3 OPTIM = -O1 - LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -lXpm -lX11 -lm -lossaudio +-LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -lXpm -lX11 -lm -lossaudio ++LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -ljpeg -lXpm -lX11 -lm -lossaudio + PROGS = DAP + OBJS = DPTich.o DPTich_cb.o DPTich_DSP.o DPTich_edit_cb.o DPTich_macros.o \ -- cgit v1.2.3