Update to 2.1.1

PR:		19362
Submitted by:	maintainer

1 files changed, 52 insertions, 32 deletions

diff --git a/audio/dap/files/patch-aa b/audio/dap/files/patch-aa
index 7878b0f41017..012fe89ed02c 100644
--- a/audio/dap/files/patch-aa
+++ b/audio/dap/files/patch-aa
@@ -1,7 +1,10 @@
-Index: Makefile
-@@ -0,0 +1,83 @@
+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
 +
@@ -14,40 +17,51 @@ Index: Makefile
 +
 +release: DAP
 +	strip main/DAP
-+	(cd ..; tar -cf $(HOMEDIR)/LinuxDAP.tar dap/main/DAP dap/main/effects \
-+	dap/README dap/INSTALL dap/COPYING dap/CHANGES dap/TODO dap/THANKS);
-+	gzip $(HOMEDIR)/LinuxDAP.tar
++	(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)/DAPSource.tar \
-+	dap/README dap/INSTALL dap/COPYING dap/CHANGES dap/TODO dap/THANKS \
-+	dap/Makefile.* dap/main/*.c dap/main/*.cc dap/main/*.h dap/main/*.fd \
-+	dap/main/icons/*.gif dap/main/icons/*.xpm dap/main/Makefile.* \
-+	dap/main/effects dap/sound/*.h dap/sound/*.cc dap/sound/*.inl \
-+	dap/sound/Makefile.* dap/spkit/spkit/*.cc dap/spkit/spkit/*.h \
-+	dap/spkit/spkit/Makefile.* dap/tooltips/CHANGES dap/tooltips/COPYING \
-+    dap/tooltips/Makefile dap/tooltips/README dap/tooltips/THANKS \
-+    dap/tooltips/TODO dap/tooltips/*.c  dap/tooltips/*.h dap/tooltips/*.fd \
-+	dap/tooltips/examples/menu/Makefile dap/tooltips/examples/menu/*.c \
-+	dap/tooltips/examples/menu/*.h dap/tooltips/examples/menu/*.fd);
-+	gzip $(HOMEDIR)/DAPSource.tar
++	(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 clean);
-+	(cd main; make -f Makefile.freebsd clean);
-+	(cd sound; make -f Makefile.freebsd clean);
-+	(cd spkit/spkit; make -f Makefile.freebsd clean);
++	(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 clean);
-+	(cd main; make -f Makefile.freebsd empty);
-+	(cd sound; make -f Makefile.freebsd empty);
-+	(cd spkit/spkit; make -f Makefile.freebsd empty);
++	(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 main; make -f Makefile.freebsd back);
-+	(cd sound; make -f Makefile.freebsd back);
-+	(cd spkit/spkit; make -f Makefile.freebsd 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)
@@ -61,17 +75,23 @@ Index: Makefile
 +	README INSTALL COPYING CHANGES TODO THANKS Makefile.*
 +
 +restoreall: restore
-+	(cd main; make -f Makefile.freebsd restore);
-+	(cd sound; make -f Makefile.freebsd restore);
-+	(cd spkit/spkit; make -f Makefile.freebsd 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 main; make -f Makefile.linux 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 \