Attachment 15393 Details for Bug 28581 – file.diff

[patch] file.diff

file.diff (text/plain), 11.59 KB, created by pat on 2001-07-01 19:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: pat

Created: 2001-07-01 19:10:01 UTC

Size: 11.59 KB

patch

obsolete

>diff -ruN /usr/ports/audio/dap/Makefile audio/dap/Makefile
>--- /usr/ports/audio/dap/Makefile	Thu Aug  3 05:22:25 2000
>+++ audio/dap/Makefile	Sun Jul  1 13:55:48 2001
>@@ -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 @@
> 
> LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms
> 
>+MAKEFILE=	Makefile.linux
> USE_X_PREFIX=	yes
> USE_XPM=	yes
> 
>@@ -25,7 +26,5 @@
> 	${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 -ruN /usr/ports/audio/dap/distinfo audio/dap/distinfo
>--- /usr/ports/audio/dap/distinfo	Wed Jun 28 09:43:00 2000
>+++ audio/dap/distinfo	Sun Jul  1 13:25:23 2001
>@@ -1 +1 @@
>-MD5 (dap-2.1.1.tgz) = 513b11421fd78cdd1f9bf45e7348191a
>+MD5 (dap-2.1.2.tgz) = 1a291cd774660580213764c2b58109c2
>diff -ruN /usr/ports/audio/dap/files/patch-aa audio/dap/files/patch-aa
>--- /usr/ports/audio/dap/files/patch-aa	Wed Jun 28 09:43:01 2000
>+++ audio/dap/files/patch-aa	Wed Dec 31 19:00:00 1969
>@@ -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 -ruN /usr/ports/audio/dap/files/patch-ab audio/dap/files/patch-ab
>--- /usr/ports/audio/dap/files/patch-ab	Wed Jun 28 09:43:01 2000
>+++ audio/dap/files/patch-ab	Wed Dec 31 19:00:00 1969
>@@ -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 -ruN /usr/ports/audio/dap/files/patch-ac audio/dap/files/patch-ac
>--- /usr/ports/audio/dap/files/patch-ac	Sun Jul 16 15:53:07 2000
>+++ audio/dap/files/patch-ac	Sun Jul  1 13:49:40 2001
>@@ -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 @@
>  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 -ruN /usr/ports/audio/dap/files/patch-ad audio/dap/files/patch-ad
>--- /usr/ports/audio/dap/files/patch-ad	Wed Jun 28 09:43:01 2000
>+++ audio/dap/files/patch-ad	Sun Jul  1 13:39:00 2001
>@@ -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 @@
>  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 -ruN /usr/ports/audio/dap/files/patch-ae audio/dap/files/patch-ae
>--- /usr/ports/audio/dap/files/patch-ae	Sun Jul 16 15:53:07 2000
>+++ audio/dap/files/patch-ae	Sun Jul  1 13:43:27 2001
>@@ -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 @@
>  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 -ruN /usr/ports/audio/dap/files/patch-af audio/dap/files/patch-af
>--- /usr/ports/audio/dap/files/patch-af	Sun Jul 16 15:53:07 2000
>+++ audio/dap/files/patch-af	Sun Jul  1 13:45:28 2001
>@@ -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 -ruN /usr/ports/audio/dap/files/patch-ag audio/dap/files/patch-ag
>--- /usr/ports/audio/dap/files/patch-ag	Sun Jul 16 15:53:07 2000
>+++ audio/dap/files/patch-ag	Sun Jul  1 13:46:58 2001
>@@ -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 @@
>  
>  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 -ruN /usr/ports/audio/dap/pkg-plist audio/dap/pkg-plist
>--- /usr/ports/audio/dap/pkg-plist	Wed Sep 16 08:54:00 1998
>+++ audio/dap/pkg-plist	Sat Jun 30 01:28:44 2001
>@@ -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

Actions: View | Diff

Attachments on bug 28581: 15393