Changes 2.1.5:

* Improvements

8 files changed, 77 insertions, 86 deletions

diff --git a/audio/dap/Makefile b/audio/dap/Makefile
index 7a02f7eb9dc..13a18c94b0a 100644
--- a/audio/dap/Makefile
+++ b/audio/dap/Makefile
@@ -1,31 +1,26 @@
-# $NetBSD: Makefile,v 1.32 2006/12/15 20:32:52 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2007/03/24 21:02:18 adam Exp $
 
-DISTNAME=		dap-2.1.2
-PKGREVISION=		6
-CATEGORIES=		audio
-MASTER_SITES=		# http://www.cee.hw.ac.uk/~richardk/downloads/
-EXTRACT_SUFX=		.tgz
+DISTNAME=	dap-2.1.5
+CATEGORIES=	audio
+MASTER_SITES=	http://www.cee.hw.ac.uk/~richardk/downloads/
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=		scw@NetBSD.org
-HOMEPAGE=		http://www.cee.hw.ac.uk/~richardk/
-COMMENT=		Digital audio recording and processing package
+MAINTAINER=	scw@NetBSD.org
+HOMEPAGE=	http://www.cee.hw.ac.uk/~richardk/
+COMMENT=	Digital audio recording and processing package
 
+USE_LANGUAGES=		c c++
+INSTALLATION_DIRS+=	share/doc/dap
 MAKE_FILE=		Makefile.netbsd
-
 MAKE_ENV+=		X11PREFIX=${X11PREFIX:Q}
 
-USE_LANGUAGES=		c c++
-INSTALLATION_DIRS=	bin
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/main/DAP ${PREFIX}/bin/dap
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dap
 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/TODO ${WRKSRC}/COPYING \
 		${WRKSRC}/FEATURES ${PREFIX}/share/doc/dap
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
-
+.include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/dap/distinfo b/audio/dap/distinfo
index d9fe251266b..b6d085dfb59 100644
--- a/audio/dap/distinfo
+++ b/audio/dap/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 20:39:44 agc Exp $
+$NetBSD: distinfo,v 1.8 2007/03/24 21:02:18 adam Exp $
 
-SHA1 (dap-2.1.2.tgz) = 42bfc1a79507fe5f5d175fd2d27a7a5264f1398b
-RMD160 (dap-2.1.2.tgz) = c5b44b41e3abf48af99c85fd875b905c371a1425
-Size (dap-2.1.2.tgz) = 290292 bytes
-SHA1 (patch-aa) = 0addbbf0c0be3065a2126c703ef1e37ee4402e8a
-SHA1 (patch-ab) = 3708354e3e5ac3681cd443bbbcbbb4b280a737c3
-SHA1 (patch-ad) = 01d6e14e7e9fffb9e16a85ddfaf60c96cb98afab
-SHA1 (patch-af) = 28d7ef813ea4147b0a2413bbfc3d9fc1bb90993c
-SHA1 (patch-ao) = 121724ac62a0879720cd8a9649676cf47a29a316
-SHA1 (patch-ap) = 8f9eefb33e6bdad1035d7d463698a61537663a69
+SHA1 (dap-2.1.5.tgz) = 947b5488bad395d20b88183b024311f7849765b4
+RMD160 (dap-2.1.5.tgz) = 97508843962cc63b670c7248ccc1531e1ee1bb7b
+Size (dap-2.1.5.tgz) = 290439 bytes
+SHA1 (patch-aa) = 22f6b9892f82ef059592b807e9a51c97f72fc2c2
+SHA1 (patch-ab) = fb89a62566a0e303012b6f3dbd43468fc9bb6ca5
+SHA1 (patch-ad) = 1a9b4aec50cde74262528e62723d91815923df94
+SHA1 (patch-af) = 735a9d8318479987deeecdfad2f77b9916fc24e9
+SHA1 (patch-ao) = 86d132c9dc6c9da42e5efd2a6e12ea8f2740100b
+SHA1 (patch-ap) = 465884660e922feb5c88314f7e878617f559fbb2
diff --git a/audio/dap/patches/patch-aa b/audio/dap/patches/patch-aa
index 0a715c6ecc6..c71aea1df22 100644
--- a/audio/dap/patches/patch-aa
+++ b/audio/dap/patches/patch-aa
@@ -1,23 +1,23 @@
-$NetBSD: patch-aa,v 1.7 2005/01/01 18:13:15 minskim Exp $
+$NetBSD: patch-aa,v 1.8 2007/03/24 21:02:18 adam Exp $
 
---- main/Makefile.netbsd.orig	2000-05-22 18:07:21.000000000 -0500
+--- main/Makefile.netbsd.orig	2003-09-10 02:06:24.000000000 +0200
 +++ main/Makefile.netbsd
-@@ -8,13 +8,13 @@ AUDIO   = ../libaudio
+@@ -7,13 +7,12 @@ AUDIO   = ../libaudio
  AUDIOF  = ../libaudiofile
  BACKDIR = ../bak/main
  HOMEDIR = $(HOME)
 -X11DIR  = /usr/X11R6
--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
+-INCDIR  = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11
+-LIBDIR  = -L$(SPKIT)/spkit -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 -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
++INCDIR  = -I. -I.. -I$(SOUND) -I$(SPKIT) -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$(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
+-OPTIM   = -O1
 -LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -lXpm -lX11 -lm -lossaudio
 +LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -ljpeg -lXpm -lX11 -lm ${LIBOSSAUDIO}
++OPTIM	= ${CFLAGS}
  
  PROGS =	DAP
  OBJS  = DPTich.o DPTich_cb.o DPTich_DSP.o DPTich_edit_cb.o DPTich_macros.o \
diff --git a/audio/dap/patches/patch-ab b/audio/dap/patches/patch-ab
index c871faa121f..99d88f9239e 100644
--- a/audio/dap/patches/patch-ab
+++ b/audio/dap/patches/patch-ab
@@ -1,14 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2005/01/01 18:13:15 minskim Exp $
+$NetBSD: patch-ab,v 1.4 2007/03/24 21:02:18 adam Exp $
 
---- sound/Makefile.netbsd.orig	2000-05-22 18:18:15.000000000 -0500
+--- sound/Makefile.netbsd.orig	2003-09-16 01:05:45.000000000 +0200
 +++ sound/Makefile.netbsd
-@@ -10,9 +10,9 @@ HOMEDIR = $(HOME)
- INCDIR  = -I. -I.. -I$(SPKIT) -I$(MAINDIR)
- LIBDIR  = -L$(SPKIT)/spkit -L$(AUDIO) -L$(AUDIOF)
+@@ -9,9 +9,7 @@ HOMEDIR = $(HOME)
+ INCDIR  = -I. -I.. -I$(SPKIT) -I$(MAINDIR) -I$(OTHER_INCLUDE_DIR)
+ LIBDIR  = -L$(SPKIT)/spkit -L$(AUDIO) -L$(AUDIOF) -L$(OTHER_LIBRARY_DIR)
  CCFLAGS = $(DEBUG) $(OPTIM) -DNOFORMS -DLINUX -DNETBSD -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 -DEBUG   = -g3
-+DEBUG   = #-g3
- OPTIM   = -O1
+-OPTIM   = -O1
 -LDFLAGS = $(LIBDIR) -laudio -laudiofile -lm -lossaudio
 +LDFLAGS = $(LIBDIR) -laudio -laudiofile -lm ${LIBOSSAUDIO}
  
diff --git a/audio/dap/patches/patch-ad b/audio/dap/patches/patch-ad
index f3eb3c691fd..f3ab8edd5e2 100644
--- a/audio/dap/patches/patch-ad
+++ b/audio/dap/patches/patch-ad
@@ -1,13 +1,14 @@
-$NetBSD: patch-ad,v 1.2 2000/02/29 16:57:46 scw Exp $
+$NetBSD: patch-ad,v 1.3 2007/03/24 21:02:18 adam Exp $
 
---- libaudio/Makefile.netbsd.orig	Fri Dec  3 21:50:24 1999
-+++ libaudio/Makefile.netbsd	Fri Dec  3 21:50:43 1999
-@@ -4,7 +4,7 @@
+--- libaudio/Makefile.netbsd.orig	2003-09-16 01:05:24.000000000 +0200
++++ libaudio/Makefile.netbsd
+@@ -4,8 +4,7 @@ BACKDIR = ../bak/libaudio
  HOMEDIR = $(HOME)
- INCDIR  = -I.
+ INCDIR  = -I. -I$(OTHER_INCLUDE_DIR)
  CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DNETBSD -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 -DEBUG   = -g3
-+DEBUG   = #-g3
- OPTIM   = -O1
+-OPTIM   = -O1
++OPTIM	= ${CFLAGS}
  
  LIBNAME = libaudio.a
+ OBJS    = audio.o
diff --git a/audio/dap/patches/patch-af b/audio/dap/patches/patch-af
index 024ee2ce79b..5ae7df30a18 100644
--- a/audio/dap/patches/patch-af
+++ b/audio/dap/patches/patch-af
@@ -1,13 +1,14 @@
-$NetBSD: patch-af,v 1.2 2000/02/29 16:57:46 scw Exp $
+$NetBSD: patch-af,v 1.3 2007/03/24 21:02:18 adam Exp $
 
---- libaudiofile/Makefile.netbsd.orig	Thu Nov 11 01:13:56 1999
-+++ libaudiofile/Makefile.netbsd	Fri Dec  3 21:55:30 1999
-@@ -4,7 +4,7 @@
+--- libaudiofile/Makefile.netbsd.orig	2003-09-16 01:05:37.000000000 +0200
++++ libaudiofile/Makefile.netbsd
+@@ -4,8 +4,7 @@ BACKDIR = ../bak/libaudiofile
  HOMEDIR = $(HOME)
- INCDIR  = -I.
+ INCDIR  = -I. -I$(OTHER_INCLUDE_DIR)
  CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DNETBSD -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 -DEBUG   = -g3
-+DEBUG   = #-g3
- OPTIM   = -O1
+-OPTIM   = -O1
++OPTIM	= ${CFLAGS}
  
  LIBNAME = libaudiofile.a
+ OBJS    = audiofile.o ieee.o macros.o raw.o wav.o
diff --git a/audio/dap/patches/patch-ao b/audio/dap/patches/patch-ao
index 022638c2f9f..c39f807ed5b 100644
--- a/audio/dap/patches/patch-ao
+++ b/audio/dap/patches/patch-ao
@@ -1,16 +1,19 @@
-$NetBSD: patch-ao,v 1.3 2001/05/31 12:30:12 agc Exp $
+$NetBSD: patch-ao,v 1.4 2007/03/24 21:02:18 adam Exp $
 
---- spkit/spkit/Makefile.netbsd.orig	Fri Dec  3 22:05:21 1999
-+++ spkit/spkit/Makefile.netbsd	Fri Dec  3 22:06:18 1999
-@@ -7,9 +7,9 @@
+--- spkit/spkit/Makefile.netbsd.orig	2003-09-16 01:06:28.000000000 +0200
++++ spkit/spkit/Makefile.netbsd
+@@ -5,11 +5,10 @@ TOOLTIP = ../../tooltips
+ BACKDIR = ../../bak/spkit/spkit
  MAINDIR = ../../main
  HOMEDIR = $(HOME)
- X11DIR  = /usr/X11R6
--INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(FORMS) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11
-+INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(FORMS) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I${X11PREFIX}/include -I${X11PREFIX}/include/X11
+-X11DIR  = /usr/X11R6
+-INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I$(OTHER_INCLUDE_DIR)
++X11DIR  = ${X11BASE}
++INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I$(OTHER_INCLUDE_DIR) -I${X11PREFIX}/include -I${X11PREFIX}/include/X11
  CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DNETBSD -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 -DEBUG   = -g3
-+DEBUG   = #-g3
- OPTIM   = -O2
+-OPTIM   = -O2
++OPTIM	= ${CFLAGS}
  
  .c.o:
+ 	$(CC) $(CCFLAGS) -c $*.c -o $*.o
diff --git a/audio/dap/patches/patch-ap b/audio/dap/patches/patch-ap
index bf6765a9728..4e8806ed271 100644
--- a/audio/dap/patches/patch-ap
+++ b/audio/dap/patches/patch-ap
@@ -1,36 +1,28 @@
-$NetBSD: patch-ap,v 1.4 2001/05/31 12:30:12 agc Exp $
+$NetBSD: patch-ap,v 1.5 2007/03/24 21:02:18 adam Exp $
 
---- tooltips/Makefile.netbsd.orig	Thu Feb 24 01:01:26 2000
-+++ tooltips/Makefile.netbsd	Mon Apr 10 20:34:10 2000
-@@ -29,17 +29,19 @@
- XFORMS_INCLUDE_DIR = $(HOME)/xforms/FORMS
+--- tooltips/Makefile.netbsd.orig	2003-09-16 01:05:51.000000000 +0200
++++ tooltips/Makefile.netbsd
+@@ -26,18 +26,20 @@
+ VERSION = 0.02g
  
  # Define where the X11 include files are.
--X11_INCLUDE_DIR = /usr/X11R6/include/X11
-+X11_INCLUDE_DIR = ${X11BASE}/include/X11
- 
- # Define where the X11 include files are for Sun systems
- SUN_INCLUDE_DIR = /usr/openwin/include
- 
- # Define other include file directories.
--OTHER_INCLUDE_DIR = /usr/X11R6/include
+-X11_INCLUDE_DIR = /usr/X11R6/include
++X11_INCLUDE_DIR = ${X11BASE}/include
 +OTHER_INCLUDE_DIR = ${X11PREFIX}/include/X11
-+
 +X11_BASE_INCLUDE= ${X11BASE}/include
  
  # Uncomment out this line if you do not want debug information included.
  # DEBUG = -g -Wall -ansi -pedantic
--DEBUG = 
-+DEBUG = -O2
+ DEBUG = 
  
  # Set the default optimisation
- OPTIM = -O1
-@@ -47,7 +49,7 @@
+-OPTIM = -O1
++OPTIM = ${CFLAGS}
+ 
  # Define the utilities to use for compilation.
  CC         = gcc
- CCOPTS     = $(DEBUG) $(OPTIM) -I$(XFORMS_INCLUDE_DIR) -I$(X11_INCLUDE_DIR) \
--             -I$(SUN_INCLUDE_DIR) -I$(OTHER_INCLUDE_DIR)
-+             -I$(SUN_INCLUDE_DIR) -I$(OTHER_INCLUDE_DIR) -I${X11_BASE_INCLUDE}
+-CCOPTS     = $(DEBUG) $(OPTIM) -I$(X11_INCLUDE_DIR) -I$(X11_INCLUDE_DIR)/X11 -I$(OTHER_INCLUDE_DIR)
++CCOPTS     = $(DEBUG) $(OPTIM) -I$(X11_INCLUDE_DIR) -I$(X11_INCLUDE_DIR)/X11 -I$(OTHER_INCLUDE_DIR) -I${X11_BASE_INCLUDE}
  AR         = ar
  AROPTS     = ruv
  SED        = sed