3 files changed, 18 insertions, 19 deletions

diff --git a/audio/dap/files/patch-ad b/audio/dap/files/patch-ad
index 8822b938ff1e..a599d7eb0b6d 100644
--- a/audio/dap/files/patch-ad
+++ b/audio/dap/files/patch-ad
@@ -1,25 +1,24 @@
---- spkit/spkit/Makefile.linux.orig	Wed Aug  9 18:27:20 2000
-+++ spkit/spkit/Makefile.linux	Tue Jul  2 02:11:41 2002
-@@ -1,16 +1,19 @@
+--- 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 @@
 -CC      = gcc
 -CXX     = g++
 +CC      ?= gcc
 +CXX     ?= g++
- FORMS   = ../../../xforms/FORMS
  SOUND   = ../../sound
  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
+-INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(XFORMS)/FORMS -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include
 -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$(FORMS) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include ${XFORMSINC}
-+CCFLAGS += $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
++INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(XFORMS)/FORMS -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include ${XFORMSINC}
++CCFLAGS += $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
  DEBUG   = -g3
 -OPTIM   = -O2
 +OPTIM   = ${CXXFLAGS}
diff --git a/audio/dap/files/patch-ae b/audio/dap/files/patch-ae
index c50786623061..dc8f6c5fe5ef 100644
--- a/audio/dap/files/patch-ae
+++ b/audio/dap/files/patch-ae
@@ -1,30 +1,30 @@
---- main/Makefile.linux.orig	Tue Nov  7 18:16:54 2000
-+++ main/Makefile.linux	Tue Jul  2 02:16:04 2002
+--- main/Makefile.linux.orig	Fri Jul  5 06:06:15 2002
++++ main/Makefile.linux	Sun Jan  5 22:23:45 2003
 @@ -1,5 +1,5 @@
 -CC      = gcc
 -CXX     = g++
 +CC      ?= gcc
 +CXX     ?= g++
- FORMS   = ../../xforms/FORMS
  SOUND   = ../sound
  SPKIT   = ../spkit
-@@ -8,12 +8,15 @@
+ TOOLTIP = ../tooltips
+@@ -7,12 +7,15 @@
  AUDIOF  = ../libaudiofile
  BACKDIR = ../bak/main
  HOMEDIR = $(HOME)
 -X11DIR  = /usr/X11R6
--INCDIR  = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include
+-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$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include ${XFORMSINC}
- LIBDIR  = -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib
++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
 -CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 +CCFLAGS = $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
  DEBUG   = -g3
 -OPTIM   = -O1
-+OPTIM   = ${CXXFLAGS}
++OPTIM   = ${CCXFLAGS}
  LDFLAGS = $(LIBDIR) -ldsp -laudio -laudiofile -ltooltips -lforms -lXpm -lX11 -lm
  
  PROGS =	DAP
diff --git a/audio/dap/files/patch-af b/audio/dap/files/patch-af
index 2f5e8f0f1bd0..b4a41f78481b 100644
--- a/audio/dap/files/patch-af
+++ b/audio/dap/files/patch-af
@@ -1,14 +1,14 @@
---- sound/Makefile.linux.orig	Sun Jul  1 13:44:27 2001
-+++ sound/Makefile.linux	Sun Jul  1 13:45:00 2001
+--- sound/Makefile.linux.orig	Fri Jul  5 06:08:17 2002
++++ sound/Makefile.linux	Sun Jan  5 22:27:56 2003
 @@ -1,5 +1,5 @@
 -CC      = gcc
 -CXX     = g++
 +CC      ?= gcc
 +CXX     ?= g++
- FORMS   = ../../xforms/FORMS
  SPKIT   = ../spkit
  AUDIO   = ../libaudio
-@@ -9,9 +9,9 @@
+ AUDIOF  = ../libaudiofile
+@@ -8,9 +8,9 @@
  HOMEDIR = $(HOME)
  INCDIR  = -I. -I.. -I$(SPKIT) -I$(MAINDIR)
  LIBDIR  = -L$(SPKIT)/spkit -L$(AUDIO) -L$(AUDIOF)