7 files changed, 17 insertions, 22 deletions

diff --git a/audio/dap/Makefile b/audio/dap/Makefile
index 6baff47ff30c..00d62f4b1717 100644
--- a/audio/dap/Makefile
+++ b/audio/dap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dap
-PORTVERSION=	2.1.4
+PORTVERSION=	2.1.5
 CATEGORIES=	audio
 MASTER_SITES=	http://www.cee.hw.ac.uk/~richardk/downloads/
 EXTRACT_SUFX=.tgz
@@ -20,6 +20,8 @@ MAKEFILE=	Makefile.linux
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 
+MAKE_ENV+=	OTHER_INCLUDE_DIR=. OTHER_LIBRARY_DIR=.
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/main/DAP ${PREFIX}/bin/
 .if !defined(NOPORTDOCS)
diff --git a/audio/dap/distinfo b/audio/dap/distinfo
index 2edbac7841bd..1e1cbdd27c59 100644
--- a/audio/dap/distinfo
+++ b/audio/dap/distinfo
@@ -1,2 +1,2 @@
-MD5 (dap-2.1.4.tgz) = 1650ac217bcd45d036ca6c39067b0aa9
-SIZE (dap-2.1.4.tgz) = 291383
+MD5 (dap-2.1.5.tgz) = 205f54bc769ec548581fbdac3433068c
+SIZE (dap-2.1.5.tgz) = 290439
diff --git a/audio/dap/files/patch-ac b/audio/dap/files/patch-ac
index 1ca1f9f380dc..20c886e252ed 100644
--- a/audio/dap/files/patch-ac
+++ b/audio/dap/files/patch-ac
@@ -7,7 +7,7 @@
 +CXX     ?= g++
  BACKDIR = ../bak/libaudio
  HOMEDIR = $(HOME)
- INCDIR  = -I.
+ INCDIR  = -I. -I$(OTHER_INCLUDE_DIR)
 -CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 +CCFLAGS += $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
  DEBUG   = -g3
diff --git a/audio/dap/files/patch-ad b/audio/dap/files/patch-ad
index a599d7eb0b6d..a003d6b5fcba 100644
--- a/audio/dap/files/patch-ad
+++ b/audio/dap/files/patch-ad
@@ -1,6 +1,6 @@
 --- spkit/spkit/Makefile.linux.orig	Fri Jul  5 06:10:23 2002
 +++ spkit/spkit/Makefile.linux	Sun Jan  5 22:15:45 2003
-@@ -1,15 +1,18 @@
+@@ -1,15 +1,15 @@
 -CC      = gcc
 -CXX     = g++
 +CC      ?= gcc
@@ -11,13 +11,10 @@
  MAINDIR = ../../main
  HOMEDIR = $(HOME)
 -X11DIR  = /usr/X11R6
--INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(XFORMS)/FORMS -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include
+-INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I$(OTHER_INCLUDE_DIR)
 -CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 +X11DIR  = ${X11BASE}
-+.if exists(${X11BASE}/include/X11/forms.h)
-+XFORMSINC = -I${X11BASE}/include/X11
-+.endif
-+INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(XFORMS)/FORMS -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include ${XFORMSINC}
++INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include -I$(X11DIR)/include/X11 -I$(OTHER_INCLUDE_DIR)
 +CCFLAGS += $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
  DEBUG   = -g3
 -OPTIM   = -O2
diff --git a/audio/dap/files/patch-ae b/audio/dap/files/patch-ae
index dc8f6c5fe5ef..437f29228377 100644
--- a/audio/dap/files/patch-ae
+++ b/audio/dap/files/patch-ae
@@ -1,5 +1,5 @@
---- main/Makefile.linux.orig	Fri Jul  5 06:06:15 2002
-+++ main/Makefile.linux	Sun Jan  5 22:23:45 2003
+--- main/Makefile.linux.orig	Wed Sep 10 02:06:24 2003
++++ main/Makefile.linux	Sun May 23 17:41:57 2004
 @@ -1,5 +1,5 @@
 -CC      = gcc
 -CXX     = g++
@@ -8,18 +8,14 @@
  SOUND   = ../sound
  SPKIT   = ../spkit
  TOOLTIP = ../tooltips
-@@ -7,12 +7,15 @@
+@@ -7,12 +7,12 @@
  AUDIOF  = ../libaudiofile
  BACKDIR = ../bak/main
  HOMEDIR = $(HOME)
 -X11DIR  = /usr/X11R6
--INCDIR  = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(XFORMS)/FORMS -I$(TOOLTIP) -I$(X11DIR)/include
 +X11DIR  = ${X11BASE}
-+.if exists(${X11BASE}/include/X11/forms.h)
-+XFORMSINC = -I${X11BASE}/include/X11
-+.endif
-+INCDIR  = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(XFORMS)/FORMS -I$(TOOLTIP) -I$(X11DIR)/include ${XFORMSINC}
- LIBDIR  = -L$(SPKIT)/spkit -L$(XFORMS)/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
 -CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 +CCFLAGS = $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
  DEBUG   = -g3
diff --git a/audio/dap/files/patch-af b/audio/dap/files/patch-af
index b4a41f78481b..c846c1cb3c6a 100644
--- a/audio/dap/files/patch-af
+++ b/audio/dap/files/patch-af
@@ -10,8 +10,8 @@
  AUDIOF  = ../libaudiofile
 @@ -8,9 +8,9 @@
  HOMEDIR = $(HOME)
- INCDIR  = -I. -I.. -I$(SPKIT) -I$(MAINDIR)
- LIBDIR  = -L$(SPKIT)/spkit -L$(AUDIO) -L$(AUDIOF)
+ 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 -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 +CCFLAGS = $(OPTIM) -DNOFORMS -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
  DEBUG   = -g3
diff --git a/audio/dap/files/patch-ag b/audio/dap/files/patch-ag
index f795098c3436..30506e7bd9bc 100644
--- a/audio/dap/files/patch-ag
+++ b/audio/dap/files/patch-ag
@@ -7,7 +7,7 @@
 +CXX     ?= g++
  BACKDIR = ../bak/libaudiofile
  HOMEDIR = $(HOME)
- INCDIR  = -I.
+ INCDIR  = -I. -I$(OTHER_INCLUDE_DIR)
 -CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 +CCFLAGS = $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
  DEBUG   = -g3