Attachment #15393 for bug #28581

View | Details | Raw Unified | Return to bug 28581
Collapse All | Expand All




#

PORTNAME=	dap
PORTVERSION=	2.1.2
CATEGORIES=	audio
MASTER_SITES=	http://www.cee.hw.ac.uk/~richardk/
EXTRACT_SUFX=.tgz


LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms

MAKEFILE=	Makefile.linux
USE_X_PREFIX=	yes
USE_XPM=	yes


	${INSTALL_MAN} ${WRKSRC}/COPYING ${WRKSRC}/README \
		${WRKSRC}/THANKS ${WRKSRC}/TODO ${PREFIX}/share/doc/DAP/
.endif
post-install:
	strip ${PREFIX}/bin/DAP

.include <bsd.port.mk>

Line 1 Link Here

(-)audio/dap/distinfo (-1 / +1 lines)
1	MD5 (dap-2.1.1.tgz) = 513b11421fd78cdd1f9bf45e7348191a	1	MD5 (dap-2.1.2.tgz) = 1a291cd774660580213764c2b58109c2




diff -urN ../dap-2.1.1.orig/Makefile ./Makefile
--- ../dap-2.1.1.orig/Makefile	Thu Jan  1 09:00:00 1970
+++ ./Makefile	Sat Jun 10 21:12:24 2000
@@ -0,0 +1,101 @@
+BACKDIR = ./bak
+HOMEDIR = $(HOME)
+DAPVER  = dap-2.1.1
+
+all: DAP
+
+DAP: 
+	(cd tooltips; make -f Makefile.linux);
+	(cd libaudio; make -f Makefile.linux);
+	(cd libaudiofile; make -f Makefile.linux);
+	(cd spkit/spkit; make -f Makefile.linux);
+	(cd main; make -f Makefile.linux);
+
+release: DAP
+	strip main/DAP
+	(cd ..; tar -cf $(HOMEDIR)/bin-linux-$(DAPVER).tar $(DAPVER)/main/DAP $(DAPVER)/main/effects \
+	$(DAPVER)/README $(DAPVER)/INSTALL $(DAPVER)/COPYING $(DAPVER)/CHANGES $(DAPVER)/TODO $(DAPVER)/THANKS);
+	gzip $(HOMEDIR)/bin-linux-$(DAPVER).tar; \
+	mv $(HOMEDIR)/bin-linux-$(DAPVER).tar.gz $(HOMEDIR)/bin-linux-$(DAPVER).tgz
+
+source:
+	(cd ..; tar -cf $(HOMEDIR)/$(DAPVER).tar $(DAPVER)/main/effects \
+	$(DAPVER)/README $(DAPVER)/INSTALL $(DAPVER)/COPYING $(DAPVER)/CHANGES $(DAPVER)/TODO $(DAPVER)/THANKS \
+	$(DAPVER)/Makefile.* $(DAPVER)/main/*.c $(DAPVER)/main/*.cc $(DAPVER)/main/*.h $(DAPVER)/main/*.fd \
+	$(DAPVER)/main/icons/*.gif $(DAPVER)/main/icons/*.xpm $(DAPVER)/main/Makefile.* \
+	$(DAPVER)/main/effects $(DAPVER)/sound/*.h $(DAPVER)/sound/*.cc $(DAPVER)/sound/*.inl \
+	$(DAPVER)/sound/Makefile.* $(DAPVER)/spkit/spkit/*.cc $(DAPVER)/spkit/spkit/*.h \
+	$(DAPVER)/libaudio/*.c $(DAPVER)/libaudio/*.h $(DAPVER)/libaudio/Makefile.* \
+	$(DAPVER)/libaudiofile/*.c $(DAPVER)/libaudiofile/*.h $(DAPVER)/libaudiofile/Makefile.* \
+	$(DAPVER)/spkit/spkit/Makefile.* $(DAPVER)/tooltips/CHANGES $(DAPVER)/tooltips/COPYING \
+	$(DAPVER)/tooltips/Makefile.* $(DAPVER)/tooltips/README $(DAPVER)/tooltips/THANKS \
+	$(DAPVER)/tooltips/TODO $(DAPVER)/tooltips/*.c  $(DAPVER)/tooltips/*.h $(DAPVER)/tooltips/*.fd \
+	$(DAPVER)/tooltips/examples/menu/Makefile $(DAPVER)/tooltips/examples/menu/*.c \
+	$(DAPVER)/tooltips/examples/menu/*.h $(DAPVER)/tooltips/examples/menu/*.fd);
+	gzip $(HOMEDIR)/$(DAPVER).tar; \
+	mv $(HOMEDIR)/$(DAPVER).tar.gz $(HOMEDIR)/$(DAPVER).tgz
+
+cleanall:
+	(cd tooltips; make -f Makefile.linux clean);
+	(cd libaudio; make -f Makefile.linux clean);
+	(cd libaudiofile; make -f Makefile.linux clean);
+	(cd sound; make -f Makefile.linux clean);
+	(cd spkit/spkit; make -f Makefile.linux clean);
+	(cd main; make -f Makefile.linux clean);
+
+emptyall:
+	(cd tooltips; make -f Makefile.linux empty);
+	(cd libaudio; make -f Makefile.linux empty);
+	(cd libaudiofile; make -f Makefile.linux empty);
+	(cd sound; make -f Makefile.linux empty);
+	(cd spkit/spkit; make -f Makefile.linux empty);
+	(cd main; make -f Makefile.linux empty);
+
+backall: back
+	(cd tooltips; make -f Makefile.linux back);
+	(cd libaudio; make -f Makefile.linux back);
+	(cd libaudiofile; make -f Makefile.linux back);
+	(cd sound; make -f Makefile.linux back);
+	(cd spkit/spkit; make -f Makefile.linux back);
+	(cd main; make -f Makefile.linux back);
+
+back:
+	"cp" README $(BACKDIR)
+	"cp" INSTALL $(BACKDIR)
+	"cp" COPYING $(BACKDIR)
+	"cp" CHANGES $(BACKDIR)
+	"cp" TODO $(BACKDIR)
+	"cp" THANKS $(BACKDIR)
+	"cp" Makefile.* $(BACKDIR)
+	lha a $(HOMEDIR)/tich4.lzh \
+	README INSTALL COPYING CHANGES TODO THANKS Makefile.*
+
+restoreall: restore
+	(cd tooltips; make -f Makefile.linux restore);
+	(cd libaudio; make -f Makefile.linux restore);
+	(cd libaudiofile; make -f Makefile.linux restore);
+	(cd sound; make -f Makefile.linux restore);
+	(cd spkit/spkit; make -f Makefile.linux restore);
+	(cd main; make -f Makefile.linux restore);
+
+restore:
+	lha x $(HOMEDIR)/tich4.lzh
+
+printall: print
+	(cd tooltips; make -f Makefile.linux print);
+	(cd libaudio; make -f Makefile.linux print);
+	(cd libaudiofile; make -f Makefile.linux print);
+	(cd sound; make -f Makefile.linux print);
+	(cd spkit/spkit; make -f Makefile.linux print);
+	(cd main; make -f Makefile.linux print);
+
+print:
+	a2ps \
+	README \
+	INSTALL \
+	COPYING \
+	CHANGES \
+	TODO \
+	THANKS \
+	Makefile.* \
+	>$(HOMEDIR)/tich4.ps




diff -urN ../dap-2.1.1.orig/libaudio/audio.h ./libaudio/audio.h
--- ../dap-2.1.1.orig/libaudio/audio.h	Tue Feb 29 10:16:06 2000
+++ ./libaudio/audio.h	Sun Jun 11 14:22:12 2000
@@ -20,7 +20,11 @@
 #define _audio_h
 
 #include <stdio.h>
+#ifdef __FreeBSD__
+#include <stdlib.h>
+#else
 #include <malloc.h>
+#endif
 #include <unistd.h>
 #include <fcntl.h>
 #include <limits.h>




--- libaudio/Makefile.linux.orig	Wed Aug  9 18:23:25 2000
+++ libaudio/Makefile.linux	Sun Jul  1 13:48:53 2001
+++ ./libaudio/Makefile.linux	Sun Jun 11 13:51:44 2000
@@ -1,11 +1,11 @@
-CC      = gcc
-CXX     = g++

 HOMEDIR = $(HOME)
 INCDIR  = -I.
-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}
 
 LIBNAME = libaudio.a
 OBJS    = audio.o
@@ -21,6 +21,7 @@
 libaudio.a: $(OBJS)
 	rm -f $(LIBNAME)
 	ar ruv $(LIBNAME) $(OBJS)
+	ranlib $(LIBNAME)
 
 clean:
 	-rm -f $(OBJS) core




--- spkit/spkit/Makefile.linux.orig	Sun Jul  1 13:36:58 2001
+++ spkit/spkit/Makefile.linux	Sun Jul  1 13:38:17 2001
@@ -1,16 +1,16 @@
@@ -1,5 +1,5 @@
-CC      = gcc
-CXX     = g++
+CC      ?= gcc

 FORMS   = ../../../xforms/FORMS
 SOUND   = ../../sound
 TOOLTIP = ../../tooltips
 BACKDIR = ../../bak/spkit/spkit
 MAINDIR = ../../main
 HOMEDIR = $(HOME)
-X11DIR  = /usr/X11R6
+X11DIR  = ${X11BASE}
 INCDIR  = -I. -I.. -I../.. -I$(SOUND) -I$(FORMS) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include
-CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
+CCFLAGS += $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 DEBUG   = -g3
-OPTIM   = -O2
+OPTIM   = ${CXXFLAGS}
 
 .c.o:
 	$(CC) $(CCFLAGS) -c $*.c -o $*.o
@@ -65,6 +65,7 @@
 libdsp.a: $(OBJS)
 	rm -f $(LIBNAME)
 	ar ruv $(LIBNAME) $(OBJS)
+	ranlib $(LIBNAME)
 
 clean:
 	rm -f $(OBJS)




--- main/Makefile.linux.orig	Sun Jul  1 13:42:55 2001
+++ main/Makefile.linux	Sun Jul  1 13:42:31 2001
+++ ./main/Makefile.linux	Sun Jun 11 13:51:02 2000
@@ -1,5 +1,5 @@
-CC      = gcc
-CXX     = g++

 FORMS   = ../../xforms/FORMS
 SOUND   = ../sound
 SPKIT   = ../spkit
@@ -8,13 +8,13 @@
 AUDIOF  = ../libaudiofile
 BACKDIR = ../bak/main
 HOMEDIR = $(HOME)
-X11DIR  = /usr/X11R6
+X11DIR  = ${X11BASE}
 INCDIR  = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include
 LIBDIR  = -L$(SPKIT)/spkit -L$(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

Lines 1-6 Link Here

(-)audio/dap/files/patch-af (-3 / +10 lines)
1	diff -urN ../dap-2.1.1.orig/sound/Makefile.linux ./sound/Makefile.linux	1	--- sound/Makefile.linux.orig Sun Jul 1 13:44:27 2001
2	--- ../dap-2.1.1.orig/sound/Makefile.linux Tue Feb 22 09:27:33 2000	2	+++ sound/Makefile.linux Sun Jul 1 13:45:00 2001
3	+++ ./sound/Makefile.linux Sun Jun 11 13:54:11 2000	3	@@ -1,5 +1,5 @@
		4	-CC = gcc
		5	-CXX = g++
		6	+CC ?= gcc
		7	+CXX ?= g++
		8	FORMS = ../../xforms/FORMS
		9	SPKIT = ../spkit
		10	AUDIO = ../libaudio
4	@@ -9,9 +9,9 @@	11	@@ -9,9 +9,9 @@
5	HOMEDIR = $(HOME)	12	HOMEDIR = $(HOME)
6	INCDIR = -I. -I.. -I$(SPKIT) -I$(MAINDIR)	13	INCDIR = -I. -I.. -I$(SPKIT) -I$(MAINDIR)




--- libaudiofile/Makefile.linux.orig	Sun Jul  1 13:45:51 2001
+++ libaudiofile/Makefile.linux	Sun Jul  1 13:46:27 2001
+++ ./libaudiofile/Makefile.linux	Sun Jun 11 14:27:36 2000
@@ -1,11 +1,11 @@
-CC      = gcc
-CXX     = g++

 
 LIBNAME = libaudiofile.a
 OBJS    = audiofile.o ieee.o macros.o raw.o wav.o
@@ -21,6 +21,7 @@
 libaudiofile.a: $(OBJS)
 	rm -f $(LIBNAME)
 	ar ruv $(LIBNAME) $(OBJS)
+	ranlib $(LIBNAME)
 
 clean:
 	-rm -f $(OBJS) core

Lines 1-6 Link Here

(-)audio/dap/pkg-plist (-5 / +5 lines)
1	bin/DAP	1	bin/DAP
2	share/doc/DAP/COPYING	2	%%PORTDOCS%%share/doc/DAP/COPYING
3	share/doc/DAP/README	3	%%PORTDOCS%%share/doc/DAP/README
4	share/doc/DAP/THANKS	4	%%PORTDOCS%%share/doc/DAP/THANKS
5	share/doc/DAP/TODO	5	%%PORTDOCS%%share/doc/DAP/TODO
6	@dirrm share/doc/DAP	6	%%PORTDOCS%%@dirrm share/doc/DAP

Return to bug 28581

Lines 6-12 Link Here

(-)audio/dap/Makefile (-3 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= dap	8	PORTNAME= dap
9	PORTVERSION= 2.1.1	9	PORTVERSION= 2.1.2
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= http://www.cee.hw.ac.uk/~richardk/	11	MASTER_SITES= http://www.cee.hw.ac.uk/~richardk/
12	EXTRACT_SUFX=.tgz	12	EXTRACT_SUFX=.tgz
Lines 15-20 Link Here
15		15
16	LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms	16	LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms
17		17
		18	MAKEFILE= Makefile.linux
18	USE_X_PREFIX= yes	19	USE_X_PREFIX= yes
19	USE_XPM= yes	20	USE_XPM= yes
20		21
Lines 25-31 Link Here
25	${INSTALL_MAN} ${WRKSRC}/COPYING ${WRKSRC}/README \	26	${INSTALL_MAN} ${WRKSRC}/COPYING ${WRKSRC}/README \
26	${WRKSRC}/THANKS ${WRKSRC}/TODO ${PREFIX}/share/doc/DAP/	27	${WRKSRC}/THANKS ${WRKSRC}/TODO ${PREFIX}/share/doc/DAP/
27	.endif	28	.endif
28	post-install:
29	strip ${PREFIX}/bin/DAP
30		29
31	.include <bsd.port.mk>	30	.include <bsd.port.mk>

Lines 1-105 Link Here

(-)audio/dap/files/patch-aa (-105 lines)
1	diff -urN ../dap-2.1.1.orig/Makefile ./Makefile
2	--- ../dap-2.1.1.orig/Makefile Thu Jan 1 09:00:00 1970
3	+++ ./Makefile Sat Jun 10 21:12:24 2000
4	@@ -0,0 +1,101 @@
5	+BACKDIR = ./bak
6	+HOMEDIR = $(HOME)
7	+DAPVER = dap-2.1.1
8	+
9	+all: DAP
10	+
11	+DAP:
12	+ (cd tooltips; make -f Makefile.linux);
13	+ (cd libaudio; make -f Makefile.linux);
14	+ (cd libaudiofile; make -f Makefile.linux);
15	+ (cd spkit/spkit; make -f Makefile.linux);
16	+ (cd main; make -f Makefile.linux);
17	+
18	+release: DAP
19	+ strip main/DAP
20	+ (cd ..; tar -cf $(HOMEDIR)/bin-linux-$(DAPVER).tar $(DAPVER)/main/DAP $(DAPVER)/main/effects \
21	+ $(DAPVER)/README $(DAPVER)/INSTALL $(DAPVER)/COPYING $(DAPVER)/CHANGES $(DAPVER)/TODO $(DAPVER)/THANKS);
22	+ gzip $(HOMEDIR)/bin-linux-$(DAPVER).tar; \
23	+ mv $(HOMEDIR)/bin-linux-$(DAPVER).tar.gz $(HOMEDIR)/bin-linux-$(DAPVER).tgz
24	+
25	+source:
26	+ (cd ..; tar -cf $(HOMEDIR)/$(DAPVER).tar $(DAPVER)/main/effects \
27	+ $(DAPVER)/README $(DAPVER)/INSTALL $(DAPVER)/COPYING $(DAPVER)/CHANGES $(DAPVER)/TODO $(DAPVER)/THANKS \
28	+ $(DAPVER)/Makefile.* $(DAPVER)/main/.c $(DAPVER)/main/.cc $(DAPVER)/main/.h $(DAPVER)/main/.fd \
29	+ $(DAPVER)/main/icons/.gif $(DAPVER)/main/icons/.xpm $(DAPVER)/main/Makefile.* \
30	+ $(DAPVER)/main/effects $(DAPVER)/sound/.h $(DAPVER)/sound/.cc $(DAPVER)/sound/*.inl \
31	+ $(DAPVER)/sound/Makefile.* $(DAPVER)/spkit/spkit/.cc $(DAPVER)/spkit/spkit/.h \
32	+ $(DAPVER)/libaudio/.c $(DAPVER)/libaudio/.h $(DAPVER)/libaudio/Makefile.* \
33	+ $(DAPVER)/libaudiofile/.c $(DAPVER)/libaudiofile/.h $(DAPVER)/libaudiofile/Makefile.* \
34	+ $(DAPVER)/spkit/spkit/Makefile.* $(DAPVER)/tooltips/CHANGES $(DAPVER)/tooltips/COPYING \
35	+ $(DAPVER)/tooltips/Makefile.* $(DAPVER)/tooltips/README $(DAPVER)/tooltips/THANKS \
36	+ $(DAPVER)/tooltips/TODO $(DAPVER)/tooltips/.c $(DAPVER)/tooltips/.h $(DAPVER)/tooltips/*.fd \
37	+ $(DAPVER)/tooltips/examples/menu/Makefile $(DAPVER)/tooltips/examples/menu/*.c \
38	+ $(DAPVER)/tooltips/examples/menu/.h $(DAPVER)/tooltips/examples/menu/.fd);
39	+ gzip $(HOMEDIR)/$(DAPVER).tar; \
40	+ mv $(HOMEDIR)/$(DAPVER).tar.gz $(HOMEDIR)/$(DAPVER).tgz
41	+
42	+cleanall:
43	+ (cd tooltips; make -f Makefile.linux clean);
44	+ (cd libaudio; make -f Makefile.linux clean);
45	+ (cd libaudiofile; make -f Makefile.linux clean);
46	+ (cd sound; make -f Makefile.linux clean);
47	+ (cd spkit/spkit; make -f Makefile.linux clean);
48	+ (cd main; make -f Makefile.linux clean);
49	+
50	+emptyall:
51	+ (cd tooltips; make -f Makefile.linux empty);
52	+ (cd libaudio; make -f Makefile.linux empty);
53	+ (cd libaudiofile; make -f Makefile.linux empty);
54	+ (cd sound; make -f Makefile.linux empty);
55	+ (cd spkit/spkit; make -f Makefile.linux empty);
56	+ (cd main; make -f Makefile.linux empty);
57	+
58	+backall: back
59	+ (cd tooltips; make -f Makefile.linux back);
60	+ (cd libaudio; make -f Makefile.linux back);
61	+ (cd libaudiofile; make -f Makefile.linux back);
62	+ (cd sound; make -f Makefile.linux back);
63	+ (cd spkit/spkit; make -f Makefile.linux back);
64	+ (cd main; make -f Makefile.linux back);
65	+
66	+back:
67	+ "cp" README $(BACKDIR)
68	+ "cp" INSTALL $(BACKDIR)
69	+ "cp" COPYING $(BACKDIR)
70	+ "cp" CHANGES $(BACKDIR)
71	+ "cp" TODO $(BACKDIR)
72	+ "cp" THANKS $(BACKDIR)
73	+ "cp" Makefile.* $(BACKDIR)
74	+ lha a $(HOMEDIR)/tich4.lzh \
75	+ README INSTALL COPYING CHANGES TODO THANKS Makefile.*
76	+
77	+restoreall: restore
78	+ (cd tooltips; make -f Makefile.linux restore);
79	+ (cd libaudio; make -f Makefile.linux restore);
80	+ (cd libaudiofile; make -f Makefile.linux restore);
81	+ (cd sound; make -f Makefile.linux restore);
82	+ (cd spkit/spkit; make -f Makefile.linux restore);
83	+ (cd main; make -f Makefile.linux restore);
84	+
85	+restore:
86	+ lha x $(HOMEDIR)/tich4.lzh
87	+
88	+printall: print
89	+ (cd tooltips; make -f Makefile.linux print);
90	+ (cd libaudio; make -f Makefile.linux print);
91	+ (cd libaudiofile; make -f Makefile.linux print);
92	+ (cd sound; make -f Makefile.linux print);
93	+ (cd spkit/spkit; make -f Makefile.linux print);
94	+ (cd main; make -f Makefile.linux print);
95	+
96	+print:
97	+ a2ps \
98	+ README \
99	+ INSTALL \
100	+ COPYING \
101	+ CHANGES \
102	+ TODO \
103	+ THANKS \
104	+ Makefile.* \
105	+ >$(HOMEDIR)/tich4.ps

Lines 1-15 Link Here

(-)audio/dap/files/patch-ab (-15 lines)
1	diff -urN ../dap-2.1.1.orig/libaudio/audio.h ./libaudio/audio.h
2	--- ../dap-2.1.1.orig/libaudio/audio.h Tue Feb 29 10:16:06 2000
3	+++ ./libaudio/audio.h Sun Jun 11 14:22:12 2000
4	@@ -20,7 +20,11 @@
5	#define _audio_h
6
7	#include <stdio.h>
8	+#ifdef __FreeBSD__
9	+#include <stdlib.h>
10	+#else
11	#include <malloc.h>
12	+#endif
13	#include <unistd.h>
14	#include <fcntl.h>
15	#include <limits.h>

Lines 1-6 Link Here

(-)audio/dap/files/patch-ac (-12 / +3 lines)
1	diff -urN ../dap-2.1.1.orig/libaudio/Makefile.linux ./libaudio/Makefile.linux	1	--- libaudio/Makefile.linux.orig Wed Aug 9 18:23:25 2000
2	--- ../dap-2.1.1.orig/libaudio/Makefile.linux Tue Feb 22 09:28:50 2000	2	+++ libaudio/Makefile.linux Sun Jul 1 13:48:53 2001
3	+++ ./libaudio/Makefile.linux Sun Jun 11 13:51:44 2000
4	@@ -1,11 +1,11 @@	3	@@ -1,11 +1,11 @@
5	-CC = gcc	4	-CC = gcc
6	-CXX = g++	5	-CXX = g++
Lines 10-27 Link Here
10	HOMEDIR = $(HOME)	9	HOMEDIR = $(HOME)
11	INCDIR = -I.	10	INCDIR = -I.
12	-CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused	11	-CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
13	+CCFLAGS = $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused	12	+CCFLAGS += $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
14	DEBUG = -g3	13	DEBUG = -g3
15	-OPTIM = -O1	14	-OPTIM = -O1
16	+OPTIM = ${CXXFLAGS}	15	+OPTIM = ${CXXFLAGS}
17		16
18	LIBNAME = libaudio.a	17	LIBNAME = libaudio.a
19	OBJS = audio.o	18	OBJS = audio.o
20	@@ -21,6 +21,7 @@
21	libaudio.a: $(OBJS)
22	rm -f $(LIBNAME)
23	ar ruv $(LIBNAME) $(OBJS)
24	+ ranlib $(LIBNAME)
25
26	clean:
27	-rm -f $(OBJS) core

Lines 1-7 Link Here

(-)audio/dap/files/patch-ad (-15 / +8 lines)
1	diff -urN ../dap-2.1.1.orig/spkit/spkit/Makefile.linux ./spkit/spkit/Makefile.linux	1	--- spkit/spkit/Makefile.linux.orig Sun Jul 1 13:36:58 2001
2	--- ../dap-2.1.1.orig/spkit/spkit/Makefile.linux Tue Feb 22 09:28:14 2000	2	+++ spkit/spkit/Makefile.linux Sun Jul 1 13:38:17 2001
3	+++ ./spkit/spkit/Makefile.linux Sun Jun 11 13:52:20 2000	3	@@ -1,16 +1,16 @@
4	@@ -1,5 +1,5 @@
5	-CC = gcc	4	-CC = gcc
6	-CXX = g++	5	-CXX = g++
7	+CC ?= gcc	6	+CC ?= gcc
Lines 9-31 Link Here
9	FORMS = ../../../xforms/FORMS	8	FORMS = ../../../xforms/FORMS
10	SOUND = ../../sound	9	SOUND = ../../sound
11	TOOLTIP = ../../tooltips	10	TOOLTIP = ../../tooltips
12	@@ -8,9 +8,9 @@	11	BACKDIR = ../../bak/spkit/spkit
		12	MAINDIR = ../../main
13	HOMEDIR = $(HOME)	13	HOMEDIR = $(HOME)
14	X11DIR = /usr/X11R6	14	-X11DIR = /usr/X11R6
		15	+X11DIR = ${X11BASE}
15	INCDIR = -I. -I.. -I../.. -I$(SOUND) -I$(FORMS) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include	16	INCDIR = -I. -I.. -I../.. -I$(SOUND) -I$(FORMS) -I$(MAINDIR) -I$(TOOLTIP) -I$(X11DIR)/include
16	-CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused	17	-CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
17	+CCFLAGS = $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused	18	+CCFLAGS += $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
18	DEBUG = -g3	19	DEBUG = -g3
19	-OPTIM = -O2	20	-OPTIM = -O2
20	+OPTIM = ${CXXFLAGS}	21	+OPTIM = ${CXXFLAGS}
21		22
22	.c.o:	23	.c.o:
23	$(CC) $(CCFLAGS) -c $.c -o $.o	24	$(CC) $(CCFLAGS) -c $.c -o $.o
24	@@ -65,6 +65,7 @@
25	libdsp.a: $(OBJS)
26	rm -f $(LIBNAME)
27	ar ruv $(LIBNAME) $(OBJS)
28	+ ranlib $(LIBNAME)
29
30	clean:
31	rm -f $(OBJS)

Lines 1-6 Link Here

(-)audio/dap/files/patch-ae (-6 / +9 lines)
1	diff -urN ../dap-2.1.1.orig/main/Makefile.linux ./main/Makefile.linux	1	--- main/Makefile.linux.orig Sun Jul 1 13:42:55 2001
2	--- ../dap-2.1.1.orig/main/Makefile.linux Thu May 25 17:52:37 2000	2	+++ main/Makefile.linux Sun Jul 1 13:42:31 2001
3	+++ ./main/Makefile.linux Sun Jun 11 13:51:02 2000
4	@@ -1,5 +1,5 @@	3	@@ -1,5 +1,5 @@
5	-CC = gcc	4	-CC = gcc
6	-CXX = g++	5	-CXX = g++
Lines 9-19 Link Here
9	FORMS = ../../xforms/FORMS	8	FORMS = ../../xforms/FORMS
10	SOUND = ../sound	9	SOUND = ../sound
11	SPKIT = ../spkit	10	SPKIT = ../spkit
12	@@ -11,10 +11,10 @@	11	@@ -8,13 +8,13 @@
13	X11DIR = /usr/X11R6	12	AUDIOF = ../libaudiofile
		13	BACKDIR = ../bak/main
		14	HOMEDIR = $(HOME)
		15	-X11DIR = /usr/X11R6
		16	+X11DIR = ${X11BASE}
14	INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include	17	INCDIR = -I. -I.. -I$(SOUND) -I$(SPKIT) -I$(FORMS) -I$(TOOLTIP) -I$(X11DIR)/include
15	LIBDIR = -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib	18	LIBDIR = -L$(SPKIT)/spkit -L$(FORMS) -L$(AUDIO) -L$(AUDIOF) -L$(TOOLTIP) -L$(X11DIR)/lib
16	-CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -DSIGNALWORKAROUND -Wall -Wno-unused	19	-CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
17	+CCFLAGS = $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused	20	+CCFLAGS = $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
18	DEBUG = -g3	21	DEBUG = -g3
19	-OPTIM = -O1	22	-OPTIM = -O1

Lines 1-6 Link Here

(-)audio/dap/files/patch-ag (-11 / +2 lines)
1	diff -urN ../dap-2.1.1.orig/libaudiofile/Makefile.linux ./libaudiofile/Makefile.linux	1	--- libaudiofile/Makefile.linux.orig Sun Jul 1 13:45:51 2001
2	--- ../dap-2.1.1.orig/libaudiofile/Makefile.linux Tue Feb 29 08:49:10 2000	2	+++ libaudiofile/Makefile.linux Sun Jul 1 13:46:27 2001
3	+++ ./libaudiofile/Makefile.linux Sun Jun 11 14:27:36 2000
4	@@ -1,11 +1,11 @@	3	@@ -1,11 +1,11 @@
5	-CC = gcc	4	-CC = gcc
6	-CXX = g++	5	-CXX = g++
Lines 17-27 Link Here
17		16
18	LIBNAME = libaudiofile.a	17	LIBNAME = libaudiofile.a
19	OBJS = audiofile.o ieee.o macros.o raw.o wav.o	18	OBJS = audiofile.o ieee.o macros.o raw.o wav.o
20	@@ -21,6 +21,7 @@
21	libaudiofile.a: $(OBJS)
22	rm -f $(LIBNAME)
23	ar ruv $(LIBNAME) $(OBJS)
24	+ ranlib $(LIBNAME)
25
26	clean:
27	-rm -f $(OBJS) core