Respect CC and CFLAGS

9 files changed, 130 insertions, 13 deletions

diff --git a/audio/cd-discid/files/patch-Makefile b/audio/cd-discid/files/patch-Makefile
new file mode 100644
index 000000000000..579fda32c64a
--- /dev/null
+++ b/audio/cd-discid/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig	Wed Oct 22 16:40:23 2003
++++ Makefile	Wed Oct 22 16:40:34 2003
+@@ -1,6 +1,6 @@
+ VERSION = 0.8
+-CC = gcc
+-CFLAGS = -g -O2
++CC ?= cc
++CFLAGS ?= -O -pipe
+ LDFLAGS =
+ LIBS = 
+ DEFS =  
diff --git a/audio/rexima/files/patch-Makefile b/audio/rexima/files/patch-Makefile
index 1a635ce21dea..85b7577ce6af 100644
--- a/audio/rexima/files/patch-Makefile
+++ b/audio/rexima/files/patch-Makefile
@@ -1,6 +1,14 @@
---- Makefile.orig	Sun Jan 19 19:44:36 2003
-+++ Makefile	Sun Jan 19 19:44:49 2003
-@@ -7,7 +7,6 @@
+--- Makefile.orig	Mon Apr  7 06:51:06 2003
++++ Makefile	Wed Oct 22 16:41:57 2003
+@@ -1,13 +1,12 @@
+ # Makefile - makefile for rexima
+ 
+-CC=gcc
+-CFLAGS=-O -Wall
++CC?=cc
++CFLAGS?=-O -pipe
+ 
+ # Set BINDIR to directory for binary,
  # MANDIR to directory for man page.
  # Usually it will be simpler to just set PREFIX.
  #
diff --git a/biology/seqio/files/patch-Makefile b/biology/seqio/files/patch-Makefile
index 0efbc6f3f255..865b0c0f884c 100644
--- a/biology/seqio/files/patch-Makefile
+++ b/biology/seqio/files/patch-Makefile
@@ -1,9 +1,15 @@
---- Makefile.orig	Tue Aug 21 12:50:44 2001
-+++ Makefile	Tue Aug 21 12:51:13 2001
-@@ -12,7 +12,7 @@
- CFLAGS= -g -O2 -Wall -Wshadow
- 
+--- Makefile.orig	Tue Jul  9 20:20:42 1996
++++ Makefile	Wed Oct 22 16:43:02 2003
+@@ -8,11 +8,10 @@
+ # just set the CC value to your compiler and make sure optimization
+ # is turned on (it significantly affects the running time).
+ #
+-CC=gcc
+-CFLAGS= -g -O2 -Wall -Wshadow
++CC?=cc
++CFLAGS?=-O -pipe
  
+-
 -all: grepseq fmtseq idxseq typeseq wcseq examples
 +all: grepseq fmtseq idxseq typeseq wcseq
  
diff --git a/chinese/ve/files/patch-Makefile b/chinese/ve/files/patch-Makefile
new file mode 100644
index 000000000000..725f6f357693
--- /dev/null
+++ b/chinese/ve/files/patch-Makefile
@@ -0,0 +1,26 @@
+--- Makefile.orig	Wed Oct 22 16:44:56 2003
++++ Makefile	Wed Oct 22 16:45:37 2003
+@@ -1,10 +1,11 @@
+-CC = gcc
++CC ?= cc
+ OBJ = edit.o term.o screen.o stuff.o io.o editor.o
+ 
+ #----------------------------------------------------------
+ # FreeBSD
+ #----------------------------------------------------------
+-CFLAGS = -DVEDITOR
++CFLAGS ?= -O -pipe
++CFLAGS += -DVEDITOR
+ LIBS = -ltermcap -lcompat
+ 
+ #----------------------------------------------------------
+@@ -31,7 +32,7 @@
+ 	cp 00readme.txt ve.hlp /usr/local/share/ve
+ 
+ ve: $(OBJ)
+-	gcc $(CFLAGS) -o ve $(OBJ) $(LIBS)
++	$(CC) $(CFLAGS) -o ve $(OBJ) $(LIBS)
+ 
+ entab: entab.o
+-	gcc -o entab entab.o
++	$(CC) -o entab entab.o
diff --git a/graphics/fly/files/patch-Makefile b/graphics/fly/files/patch-Makefile
new file mode 100644
index 000000000000..f756894b3aba
--- /dev/null
+++ b/graphics/fly/files/patch-Makefile
@@ -0,0 +1,22 @@
+--- Makefile.orig	Wed Oct 22 16:52:11 2003
++++ Makefile	Wed Oct 22 16:53:04 2003
+@@ -5,15 +5,16 @@
+ # following line
+ #       GD = /path/to/gd/directory
+         GD = gd1.3
+-        CC = gcc
+-    CFLAGS = -O -I$(GD)
++        CC ?= cc
++    CFLAGS ?= -O -pipe
++    CFLAGS += -I$(GD)
+    #CFLAGS = -O -pedantic -Wall -I$(GD)
+       LIBS = -L$(GD) -lgd -lm
+ 
+ all: gd fly
+ 
+ gd: $(GD)
+-	cd $(GD); make CC=$(CC)
++	cd $(GD); make CC="$(CC)" CFLAGS="$(CFLAGS)"
+ 
+ 
+ fly.o: fly.c fly.h
diff --git a/japanese/epwutil/files/patch-makefile.unx b/japanese/epwutil/files/patch-makefile.unx
new file mode 100644
index 000000000000..60a227bbe971
--- /dev/null
+++ b/japanese/epwutil/files/patch-makefile.unx
@@ -0,0 +1,13 @@
+--- makefile.unx.orig	Wed Oct 22 16:55:42 2003
++++ makefile.unx	Wed Oct 22 16:55:57 2003
+@@ -1,7 +1,8 @@
+ # EPWUTIL Makefile for UNIX/gcc
+ 
+-CC	= gcc
+-CFLAGS	= -DUNIX -DEUC
++CC	?= cc
++CFLAGS	?= -O -pipe
++CFLAGS	+= -DUNIX -DEUC
+ 
+ .c.o:
+ 	$(CC) -c $(CFLAGS) $*.c
diff --git a/net/tdetect/files/patch-Makefile b/net/tdetect/files/patch-Makefile
new file mode 100644
index 000000000000..ce7a5c22899d
--- /dev/null
+++ b/net/tdetect/files/patch-Makefile
@@ -0,0 +1,16 @@
+--- Makefile.orig	Wed Oct 22 16:58:23 2003
++++ Makefile	Wed Oct 22 16:58:37 2003
+@@ -1,11 +1,11 @@
+ # Makefile
+ 
+-CC=gcc
++CC?=cc
+ #DEBUG=-g -DDEBUG
+ 
+ # Add -DLINUX if you compile on Linux
+ # Thanks to Gary Miller <gem@rellim.com>
+-CFLAGS=-O2 -Wall
++CFLAGS?=-O -pipe
+ OBJS=main.o null.o ether.o ip.o
+ LIBS= -lpcap
+ SRC=$(OBJS:%.o=%.c)
diff --git a/news/xmitbin/files/patch-aa b/news/xmitbin/files/patch-aa
index 1cbda21c16fe..1a56d8872212 100644
--- a/news/xmitbin/files/patch-aa
+++ b/news/xmitbin/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.old	Fri May 15 19:21:24 1998
-+++ Makefile	Fri May 15 19:22:47 1998
+--- Makefile.orig	Sun Jan 30 09:24:09 1994
++++ Makefile	Wed Oct 22 17:00:29 2003
 @@ -1,5 +1,5 @@
  # Installation directory...
 -INSTDIR	= /mnt3/deej
@@ -16,7 +16,7 @@
  # ...BSD mailing on a BSD system...
  # CCOPTS	=
  # ...you might also want to define "SYSV" if you're on a System V machine
-@@ -24,11 +24,13 @@
+@@ -24,11 +24,15 @@
  # ...of course, you could do both, too!
  # CCOPTS 	= -DSYSV -DSysVMail
  # ...options for gcc on a Linux 386/486 system...
@@ -27,11 +27,13 @@
  # ...options for Apollo...
  # CCOPTS	= -DAPOLLO -DSysVMail
 +# ...options for FreeBSD...
-+CCOPTS		= -O6 -Wall -DSysVMail
++CFLAGS		?= -O -pipe
++CCOPTS		= ${CFLAGS}
++CCOPTS		+= -DSysVMail
  
  #
  # END OF USER-CONFIGURABLE ITEMS - NO MODIFICATIONS BEYOND THIS POINT SHOULD
-@@ -44,13 +46,23 @@
+@@ -44,13 +48,23 @@
  clean:
  	rm -f ${TARGET} ${OBJS}
  
diff --git a/security/autossh/files/patch-Makefile b/security/autossh/files/patch-Makefile
new file mode 100644
index 000000000000..e4a8ffeb22d3
--- /dev/null
+++ b/security/autossh/files/patch-Makefile
@@ -0,0 +1,13 @@
+--- Makefile.bsd.bak	Wed Oct 22 16:48:40 2003
++++ Makefile.bsd	Wed Oct 22 16:49:17 2003
+@@ -9,7 +9,9 @@
+ SSH=		/usr/bin/ssh
+ PREFIX?=	/usr/local
+ 
+-CFLAGS=		-Wall -pedantic -D"SSH_PATH=\"$(SSH)\""\
++CC?=		cc
++CFLAGS?=	-O -pipe
++CFLAGS+=	-D"SSH_PATH=\"$(SSH)\""\
+ 		-D"VER=\"$(VER)\""
+ OFILES=		autossh.o
+ LIBS=