diff options
| author | kris <kris@FreeBSD.org> | 2002-06-04 10:44:57 +0800 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2002-06-04 10:44:57 +0800 |
| commit | 7c1175372003d5a64fdaa787c162f7cb225c3f58 (patch) | |
| tree | 9cdbdd05b90b88eb0f2e40ecdde5bc2b3d7427d5 /audio | |
| parent | 6e0f99f7acbbed3ead0b052ccb7c63577d6c8e2f (diff) | |
| download | freebsd-ports-gnome-7c1175372003d5a64fdaa787c162f7cb225c3f58.tar.gz freebsd-ports-gnome-7c1175372003d5a64fdaa787c162f7cb225c3f58.tar.zst freebsd-ports-gnome-7c1175372003d5a64fdaa787c162f7cb225c3f58.zip | |
Respect CC and CFLAGS, and remove a bogus patch which deliberately
did #include <machine/soundcard.h> instead of <sys/soundcard.h>
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/cam/files/patch-ab | 15 | ||||
| -rw-r--r-- | audio/cam/files/patch-ad | 27 |
2 files changed, 14 insertions, 28 deletions
diff --git a/audio/cam/files/patch-ab b/audio/cam/files/patch-ab deleted file mode 100644 index 40b7498a9775..000000000000 --- a/audio/cam/files/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -diff -ru ../cam-1.02-virgin/cam.h ./cam.h ---- ../cam-1.02-virgin/cam.h Mon Oct 21 13:08:08 1996 -+++ ./cam.h Sun Nov 10 12:19:52 1996 -@@ -23,7 +23,11 @@ - #include <stdio.h> - #include <ncurses.h> - #include <signal.h> -+#ifdef __FreeBSD__ -+#include <machine/soundcard.h> -+#else - #include <sys/soundcard.h> -+#endif - #include <fcntl.h> - - #include "sounds.h" diff --git a/audio/cam/files/patch-ad b/audio/cam/files/patch-ad index 660a902e513c..e17aebef9fc8 100644 --- a/audio/cam/files/patch-ad +++ b/audio/cam/files/patch-ad @@ -1,13 +1,13 @@ -diff -ru ../cam-1.02-virgin/xcam ./xcam ---- ../cam-1.02-virgin/xcam Thu Sep 19 12:10:40 1996 -+++ ./xcam Sun Nov 10 12:21:10 1996 -@@ -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 +--- Makefile.orig Thu Sep 19 10:18:29 1996 ++++ Makefile Mon Jun 3 19:43:39 2002 +@@ -4,15 +4,15 @@ + # jvdbergh@uia.ua.ac.be # + ############################################################################### + +-CC = gcc +-CFLAGS = -Wall -O2 ++CC ?= gcc ++CFLAGS += -Wall LIBS = -lncurses INSTALL = install -BINDIR = /usr/local/bin @@ -21,16 +21,17 @@ diff -ru ../cam-1.02-virgin/xcam ./xcam OBJS = cam.o screens.o sounds.o ############################################################################### -@@ -69,12 +69,9 @@ +@@ -68,11 +68,8 @@ + install:$(EFILE) $(MANFILE) @echo "" @echo "installing $(EFILE) in directory $(BINDIR)" -+ @$(INSTALL) -c -m 755 -o $(BINOWN) -g $(BINGRP) $(EFILE) $(BINDIR) - @$(INSTALL) -m 755 -o root -g root $(EFILE) $(BINDIR) - @$(INSTALL) -m 755 -o root -g root $(XEFILE) $(BINDIR) ++ @$(INSTALL) -c -m 755 -o $(BINOWN) -g $(BINGRP) $(EFILE) $(BINDIR) @echo "" @echo "installing manpages for cam" -+ @$(INSTALL) -c -m 644 -o $(MANOWN) -g $(MANGRP) $(MANFILE) $(MANDIR) - @$(INSTALL) -m 644 -o root -g root $(MANFILE) $(MANDIR) - @echo "" - @. installvgafont.sh ++ @$(INSTALL) -c -m 644 -o $(MANOWN) -g $(MANGRP) $(MANFILE) $(MANDIR) @echo "" |