Don't compress manpage by default, and merge two patches

into one (patch-ac); Fixes PR 5042 by Markus Illenseer.

3 files changed, 35 insertions, 44 deletions

diff --git a/audio/cam/patches/patch-aa b/audio/cam/patches/patch-aa
index fccade6a166..9aee8389e01 100644
--- a/audio/cam/patches/patch-aa
+++ b/audio/cam/patches/patch-aa
@@ -43,34 +43,3 @@ diff -ru ../cam-1.02-virgin/xcam ./xcam
 @@ -1 +1 @@
 -color-xterm -tn xterm-color -font vga  -geometry 80x25 -bg black -fg gray -e cam
 +color_xterm -tn xterm-color -font vga  -geometry 80x25 -bg black -fg gray -e ./cam
---- Makefile~	Tue Nov 12 16:03:05 1996
-+++ Makefile	Tue Nov 12 16:03:57 1996
-@@ -8,11 +8,11 @@
- CFLAGS = -Wall -O2
- LIBS   = -lncurses
- INSTALL = install
--BINDIR = /usr/local/bin
-+BINDIR = ${PREFIX}/bin
- MANFILE= cam.1
--MANDIR = /usr/man/man1
-+MANDIR = ${PREFIX}/man/man1
- EFILE  = cam
--XEFILE = xcam
-+#XEFILE = xcam
- OBJS   = cam.o screens.o sounds.o
- ###############################################################################
- 
-@@ -69,12 +69,10 @@
- 	@echo ""
- 	@echo "installing $(EFILE) in directory $(BINDIR)"
-+	@$(INSTALL) -m 755 -o root -g bin $(EFILE) $(BINDIR)
--	@$(INSTALL) -m 755 -o root -g root $(EFILE) $(BINDIR)
--	@$(INSTALL) -m 755 -o root -g root $(XEFILE) $(BINDIR)
- 	@echo ""
- 	@echo "installing manpages for cam"
-+	@$(INSTALL) -m 644 -o root -g bin $(MANFILE) $(MANDIR)
--	@$(INSTALL) -m 644 -o root -g root $(MANFILE) $(MANDIR)
-+	@gzip -9nf ${MANDIR}/${MANFILE}
--	@echo ""
--	@. installvgafont.sh
- 	@echo ""
diff --git a/audio/cam/patches/patch-ab b/audio/cam/patches/patch-ab
index e0d47098d0d..7d95efaf00f 100644
--- a/audio/cam/patches/patch-ab
+++ b/audio/cam/patches/patch-ab
@@ -1,16 +1,3 @@
-diff -u ../../work/cam-1.02/Makefile ./Makefile
---- ../../work/cam-1.02/Makefile	Wed Oct 29 18:59:28 1997
-+++ ./Makefile	Wed Oct 29 18:54:20 1997
-@@ -6,7 +6,8 @@
- 
- CC     = gcc
- CFLAGS = -Wall -O2
--LIBS   = -lncurses
-+CFLAGS+= -I${PREFIX}/include
-+LIBS   = -L${PREFIX}/lib -lncurses -lossaudio
- INSTALL = install
- BINDIR = ${PREFIX}/bin
- MANFILE= cam.1
 diff -u ../../work/cam-1.02/cam.h ./cam.h
 --- ../../work/cam-1.02/cam.h	Wed Oct 29 18:59:27 1997
 +++ ./cam.h	Wed Oct 29 18:43:33 1997
diff --git a/audio/cam/patches/patch-ac b/audio/cam/patches/patch-ac
new file mode 100644
index 00000000000..db694c7cc11
--- /dev/null
+++ b/audio/cam/patches/patch-ac
@@ -0,0 +1,35 @@
+--- Makefile.orig	Mon Feb 23 22:37:07 1998
++++ Makefile	Mon Feb 23 22:37:18 1998
+@@ -6,13 +6,14 @@
+ 
+ CC     = gcc
+ CFLAGS = -Wall -O2
+-LIBS   = -lncurses
++CFLAGS+= -I${PREFIX}/include
++LIBS   = -L${PREFIX}/lib -lncurses -lossaudio
+ INSTALL = install
+-BINDIR = /usr/local/bin
++BINDIR = ${PREFIX}/bin
+ MANFILE= cam.1
+-MANDIR = /usr/man/man1
++MANDIR = ${PREFIX}/man/man1
+ EFILE  = cam
+-XEFILE = xcam
++#XEFILE = xcam
+ OBJS   = cam.o screens.o sounds.o
+ ###############################################################################
+ 
+@@ -68,11 +69,8 @@
+ install:$(EFILE) $(MANFILE)
+ 	@echo ""
+ 	@echo "installing $(EFILE) in directory $(BINDIR)"
+-	@$(INSTALL) -m 755 -o root -g root $(EFILE) $(BINDIR)
+-	@$(INSTALL) -m 755 -o root -g root $(XEFILE) $(BINDIR)
++	@$(INSTALL) -m 755 -o root -g bin $(EFILE) $(BINDIR)
+ 	@echo ""
+ 	@echo "installing manpages for cam"
+-	@$(INSTALL) -m 644 -o root -g root $(MANFILE) $(MANDIR)
+-	@echo ""
+-	@. installvgafont.sh
++	@$(INSTALL) -m 644 -o root -g bin $(MANFILE) $(MANDIR)
+ 	@echo ""