Update to 2.1.2

Add PORTDOC compliance

PR:		28581
Submitted by:	Patrick Li <pat@databits.net>
No response:	maintainer

10 files changed, 40 insertions, 176 deletions

diff --git a/audio/dap/Makefile b/audio/dap/Makefile
index 0f25adf43a37..c9bade39e979 100644
--- a/audio/dap/Makefile
+++ b/audio/dap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dap
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.cee.hw.ac.uk/~richardk/
 EXTRACT_SUFX=.tgz
@@ -15,6 +15,7 @@ MAINTAINER=	yoshiaki@kt.rim.or.jp
 
 LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms
 
+MAKEFILE=	Makefile.linux
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 
@@ -25,7 +26,5 @@ do-install:
 	${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>
diff --git a/audio/dap/distinfo b/audio/dap/distinfo
index 8cc707412aac..7a300fcdb69a 100644
--- a/audio/dap/distinfo
+++ b/audio/dap/distinfo
@@ -1 +1 @@
-MD5 (dap-2.1.1.tgz) = 513b11421fd78cdd1f9bf45e7348191a
+MD5 (dap-2.1.2.tgz) = 1a291cd774660580213764c2b58109c2
diff --git a/audio/dap/files/patch-aa b/audio/dap/files/patch-aa
deleted file mode 100644
index 012fe89ed02c..000000000000
--- a/audio/dap/files/patch-aa
+++ /dev/null
@@ -1,105 +0,0 @@
-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 --git a/audio/dap/files/patch-ab b/audio/dap/files/patch-ab
deleted file mode 100644
index d854b26d0b03..000000000000
--- a/audio/dap/files/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-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>
diff --git a/audio/dap/files/patch-ac b/audio/dap/files/patch-ac
index fab25c8584e1..1ca1f9f380dc 100644
--- a/audio/dap/files/patch-ac
+++ b/audio/dap/files/patch-ac
@@ -1,6 +1,5 @@
-diff -urN ../dap-2.1.1.orig/libaudio/Makefile.linux ./libaudio/Makefile.linux
---- ../dap-2.1.1.orig/libaudio/Makefile.linux	Tue Feb 22 09:28:50 2000
-+++ ./libaudio/Makefile.linux	Sun Jun 11 13:51:44 2000
+--- libaudio/Makefile.linux.orig	Wed Aug  9 18:23:25 2000
++++ libaudio/Makefile.linux	Sun Jul  1 13:48:53 2001
 @@ -1,11 +1,11 @@
 -CC      = gcc
 -CXX     = g++
@@ -10,18 +9,10 @@ diff -urN ../dap-2.1.1.orig/libaudio/Makefile.linux ./libaudio/Makefile.linux
  HOMEDIR = $(HOME)
  INCDIR  = -I.
 -CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
-+CCFLAGS = $(INCDIR) $(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
diff --git a/audio/dap/files/patch-ad b/audio/dap/files/patch-ad
index faa405f96bfe..d7d50441956a 100644
--- a/audio/dap/files/patch-ad
+++ b/audio/dap/files/patch-ad
@@ -1,7 +1,6 @@
-diff -urN ../dap-2.1.1.orig/spkit/spkit/Makefile.linux ./spkit/spkit/Makefile.linux
---- ../dap-2.1.1.orig/spkit/spkit/Makefile.linux	Tue Feb 22 09:28:14 2000
-+++ ./spkit/spkit/Makefile.linux	Sun Jun 11 13:52:20 2000
-@@ -1,5 +1,5 @@
+--- 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 @@
 -CC      = gcc
 -CXX     = g++
 +CC      ?= gcc
@@ -9,23 +8,17 @@ diff -urN ../dap-2.1.1.orig/spkit/spkit/Makefile.linux ./spkit/spkit/Makefile.li
  FORMS   = ../../../xforms/FORMS
  SOUND   = ../../sound
  TOOLTIP = ../../tooltips
-@@ -8,9 +8,9 @@
+ BACKDIR = ../../bak/spkit/spkit
+ MAINDIR = ../../main
  HOMEDIR = $(HOME)
- X11DIR  = /usr/X11R6
+-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
++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)
diff --git a/audio/dap/files/patch-ae b/audio/dap/files/patch-ae
index 4f81d2084b27..f18dd87302dc 100644
--- a/audio/dap/files/patch-ae
+++ b/audio/dap/files/patch-ae
@@ -1,6 +1,5 @@
-diff -urN ../dap-2.1.1.orig/main/Makefile.linux ./main/Makefile.linux
---- ../dap-2.1.1.orig/main/Makefile.linux	Thu May 25 17:52:37 2000
-+++ ./main/Makefile.linux	Sun Jun 11 13:51:02 2000
+--- main/Makefile.linux.orig	Sun Jul  1 13:42:55 2001
++++ main/Makefile.linux	Sun Jul  1 13:42:31 2001
 @@ -1,5 +1,5 @@
 -CC      = gcc
 -CXX     = g++
@@ -9,11 +8,15 @@ diff -urN ../dap-2.1.1.orig/main/Makefile.linux ./main/Makefile.linux
  FORMS   = ../../xforms/FORMS
  SOUND   = ../sound
  SPKIT   = ../spkit
-@@ -11,10 +11,10 @@
- X11DIR  = /usr/X11R6
+@@ -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 -DSIGNALWORKAROUND -Wall -Wno-unused
+-CCFLAGS = $(INCDIR) $(DEBUG) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
 +CCFLAGS = $(INCDIR) $(OPTIM) -DLINUX -DBIGENDIAN -DUSINGGCC -Wall -Wno-unused
  DEBUG   = -g3
 -OPTIM   = -O1
diff --git a/audio/dap/files/patch-af b/audio/dap/files/patch-af
index 9d711d735a4d..2f5e8f0f1bd0 100644
--- a/audio/dap/files/patch-af
+++ b/audio/dap/files/patch-af
@@ -1,6 +1,13 @@
-diff -urN ../dap-2.1.1.orig/sound/Makefile.linux ./sound/Makefile.linux
---- ../dap-2.1.1.orig/sound/Makefile.linux	Tue Feb 22 09:27:33 2000
-+++ ./sound/Makefile.linux	Sun Jun 11 13:54:11 2000
+--- sound/Makefile.linux.orig	Sun Jul  1 13:44:27 2001
++++ sound/Makefile.linux	Sun Jul  1 13:45:00 2001
+@@ -1,5 +1,5 @@
+-CC      = gcc
+-CXX     = g++
++CC      ?= gcc
++CXX     ?= g++
+ FORMS   = ../../xforms/FORMS
+ SPKIT   = ../spkit
+ AUDIO   = ../libaudio
 @@ -9,9 +9,9 @@
  HOMEDIR = $(HOME)
  INCDIR  = -I. -I.. -I$(SPKIT) -I$(MAINDIR)
diff --git a/audio/dap/files/patch-ag b/audio/dap/files/patch-ag
index 5059b33dc447..f795098c3436 100644
--- a/audio/dap/files/patch-ag
+++ b/audio/dap/files/patch-ag
@@ -1,6 +1,5 @@
-diff -urN ../dap-2.1.1.orig/libaudiofile/Makefile.linux ./libaudiofile/Makefile.linux
---- ../dap-2.1.1.orig/libaudiofile/Makefile.linux	Tue Feb 29 08:49:10 2000
-+++ ./libaudiofile/Makefile.linux	Sun Jun 11 14:27:36 2000
+--- libaudiofile/Makefile.linux.orig	Sun Jul  1 13:45:51 2001
++++ libaudiofile/Makefile.linux	Sun Jul  1 13:46:27 2001
 @@ -1,11 +1,11 @@
 -CC      = gcc
 -CXX     = g++
@@ -17,11 +16,3 @@ diff -urN ../dap-2.1.1.orig/libaudiofile/Makefile.linux ./libaudiofile/Makefile.
  
  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
diff --git a/audio/dap/pkg-plist b/audio/dap/pkg-plist
index 504c5639a367..da7d68587b78 100644
--- a/audio/dap/pkg-plist
+++ b/audio/dap/pkg-plist
@@ -1,6 +1,6 @@
 bin/DAP
-share/doc/DAP/COPYING
-share/doc/DAP/README
-share/doc/DAP/THANKS
-share/doc/DAP/TODO
-@dirrm share/doc/DAP
+%%PORTDOCS%%share/doc/DAP/COPYING
+%%PORTDOCS%%share/doc/DAP/README
+%%PORTDOCS%%share/doc/DAP/THANKS
+%%PORTDOCS%%share/doc/DAP/TODO
+%%PORTDOCS%%@dirrm share/doc/DAP