diff options
author | Kris Kennaway <kris@FreeBSD.org> | 2003-10-19 08:28:57 +0000 |
---|---|---|
committer | Kris Kennaway <kris@FreeBSD.org> | 2003-10-19 08:28:57 +0000 |
commit | 39e928004ea2b7696ade100432f4ca2655fdde04 (patch) | |
tree | fa2da2def440fb62c1d41069a07ab89cff3c720d | |
parent | 85d2c34719451d1f33337b8f6367e9ae4d56836d (diff) | |
download | ports-39e928004ea2b7696ade100432f4ca2655fdde04.tar.gz ports-39e928004ea2b7696ade100432f4ca2655fdde04.zip |
Respect CC and CFLAGS
Notes
Notes:
svn path=/head/; revision=91627
-rw-r--r-- | benchmarks/netpipe/files/patch-makefile | 13 | ||||
-rw-r--r-- | chinese/gb2jis/files/patch-aa | 57 | ||||
-rw-r--r-- | chinese/jis2gb/files/patch-aa | 57 | ||||
-rw-r--r-- | converters/btoa/files/patch-aa | 23 |
4 files changed, 120 insertions, 30 deletions
diff --git a/benchmarks/netpipe/files/patch-makefile b/benchmarks/netpipe/files/patch-makefile new file mode 100644 index 000000000000..8c65dfb35255 --- /dev/null +++ b/benchmarks/netpipe/files/patch-makefile @@ -0,0 +1,13 @@ +--- makefile.orig Sun Oct 19 01:20:44 2003 ++++ makefile Sun Oct 19 01:20:53 2003 +@@ -20,8 +20,8 @@ + # + ######################################################################## + +-CC = cc +-CFLAGS = -O ++CC ?= cc ++CFLAGS ?= -O -pipe + SRC = ./src + + # For MPI, mpicc will set up the proper include and library paths diff --git a/chinese/gb2jis/files/patch-aa b/chinese/gb2jis/files/patch-aa index 8e7f37f74f2c..f3a5a0a61403 100644 --- a/chinese/gb2jis/files/patch-aa +++ b/chinese/gb2jis/files/patch-aa @@ -1,12 +1,45 @@ -*** Makefile.orig Sat Sep 16 14:28:25 2000 ---- Makefile Sat Sep 16 14:28:48 2000 -*************** -*** 24,29 **** ---- 24,30 ---- - install: gb2jis gb2jis.1 - cp gb2jis /usr/local/bin/gb2jis - cp gb2jis.1 /usr/local/man/man1/gb2jis.1 -+ cp gb2jis.el /usr/local/share/emacs/site-lisp/gb2jis.el - # nroff -man gb2jis.1 > /usr/local/catman/C/u_man/cat1/gb2jis.1 - - clean: +--- Makefile.orig Wed Feb 8 20:29:35 1995 ++++ Makefile Sun Oct 19 01:23:52 2003 +@@ -1,6 +1,8 @@ + SHELL = /bin/sh + +-CFLAGS = -O -DUNDEFCHAR=0xa2a2 ++CC ?= cc ++CFLAGS ?= -O -pipe ++CFLAGS += -DUNDEFCHAR=0xa2a2 + + TABLEC = GB2312JX0208.c GB2312JX0212.c GB2312UZPJ.c + TABLEO = GB2312JX0208.o GB2312JX0212.o GB2312UZPJ.o +@@ -11,19 +13,20 @@ + ./t2c $< $@ + + .c.o: +- cc $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) -c $< + + .t.o: + ./t2c $< $*.c +- cc $(CFLAGS) -c $*.c ++ $(CC) $(CFLAGS) -c $*.c + + gb2jis: $(TABLEO) gb2jis.o +- cc gb2jis.o $(TABLEO) -o gb2jis ++ $(CC) gb2jis.o $(TABLEO) -o gb2jis + strip gb2jis + + install: gb2jis gb2jis.1 + cp gb2jis /usr/local/bin/gb2jis + cp gb2jis.1 /usr/local/man/man1/gb2jis.1 ++ cp gb2jis.el /usr/local/share/emacs/site-lisp/gb2jis.el + # nroff -man gb2jis.1 > /usr/local/catman/C/u_man/cat1/gb2jis.1 + + clean: +@@ -34,7 +37,7 @@ + -egrep '0x([2-9].[8-f]|[8-f].[2-9])' GB2312UZPJ.c + + t2c: t2c.c +- cc $(CFLAGS) t2c.c -o t2c ++ $(CC) $(CFLAGS) t2c.c -o t2c + strip t2c + + $(TABLEC): t2c diff --git a/chinese/jis2gb/files/patch-aa b/chinese/jis2gb/files/patch-aa index d2a7c88a16c6..32aed525f20a 100644 --- a/chinese/jis2gb/files/patch-aa +++ b/chinese/jis2gb/files/patch-aa @@ -1,12 +1,45 @@ -*** Makefile Thu Oct 5 17:21:32 1995 ---- Makefile.new Thu Nov 8 17:38:38 2001 -*************** -*** 26,31 **** ---- 26,32 ---- - install: jis2gb jis2gb.1 - cp jis2gb /usr/local/bin/jis2gb - cp jis2gb.1 /usr/local/man/man1/jis2gb.1 -+ cp jis2gb.el /usr/local/share/emacs/site-lisp/jis2gb.el - # nroff -man jis2gb.1 > /usr/local/catman/C/u_man/cat1/jis2gb.1 - - clean: +--- Makefile.orig Thu Oct 5 01:21:32 1995 ++++ Makefile Sun Oct 19 01:25:55 2003 +@@ -1,6 +1,8 @@ + SHELL = /bin/sh + +-CFLAGS = -O -DUNDEFCHAR=0xa1f5 ++CC ?= cc ++CFLAGS ?= -O -pipe ++CFLAGS += -DUNDEFCHAR=0xa1f5 + + TABLEC = JX0208GB2312.c JX0208GB8565.c JX0212GB2312.c JX0212GB8565.c \ + MSSJISGB2312.c MSSJISJX0208.c MSSJISJX0212.c +@@ -13,19 +15,20 @@ + ./t2c $< $@ + + .c.o: +- cc $(CFLAGS) -c $< ++ $(CC) $(CFLAGS) -c $< + + .t.o: + ./t2c $< $*.c +- cc $(CFLAGS) -c $*.c ++ $(CC) $(CFLAGS) -c $*.c + + jis2gb: $(TABLEO) jis2gb.o +- cc jis2gb.o $(TABLEO) -o jis2gb ++ $(CC) jis2gb.o $(TABLEO) -o jis2gb + strip jis2gb + + install: jis2gb jis2gb.1 + cp jis2gb /usr/local/bin/jis2gb + cp jis2gb.1 /usr/local/man/man1/jis2gb.1 ++ cp jis2gb.el /usr/local/share/emacs/site-lisp/jis2gb.el + # nroff -man jis2gb.1 > /usr/local/catman/C/u_man/cat1/jis2gb.1 + + clean: +@@ -36,7 +39,7 @@ + -egrep '0x([2-9]|a[1-b]|f[0-9]|..[2-9])' JX0208GB8565.c JX0212GB8565.c + + t2c: t2c.c +- cc $(CFLAGS) t2c.c -o t2c ++ $(CC) $(CFLAGS) t2c.c -o t2c + strip t2c + + $(TABLEC): t2c diff --git a/converters/btoa/files/patch-aa b/converters/btoa/files/patch-aa index ea68760fdd6f..8017f45b9eec 100644 --- a/converters/btoa/files/patch-aa +++ b/converters/btoa/files/patch-aa @@ -1,19 +1,30 @@ ---- Makefile.sun.orig Fri Oct 8 13:00:00 1993 -+++ Makefile.sun Wed May 8 17:05:41 2002 -@@ -1,5 +1,9 @@ +--- Makefile.sun.orig Fri Oct 8 05:00:00 1993 ++++ Makefile.sun Sun Oct 19 01:28:03 2003 +@@ -1,13 +1,32 @@ OBJS = btoa.o atob.o repair.o +DESTDIR ?= /usr/local + ++CC ?= cc ++CFLAGS ?= -O -pipe ++ +all: btoa + btoa: $(OBJS) - cc -O $(OBJS) -o btoa +- cc -O $(OBJS) -o btoa ++ $(CC) $(CFLAGS) $(OBJS) -o btoa -@@ -11,3 +15,15 @@ + btoa.o: btoa.c btoa.h chksum.h +- cc -c -O btoa.c ++ $(CC) $(CFLAGS) -c btoa.c + + atob.o: atob.c btoa.h chksum.h +- cc -c -O atob.c ++ $(CC) $(CFLAGS) -c atob.c repair.o: repair.c btoa.h - cc -c -O repair.c +- cc -c -O repair.c ++ $(CC) $(CFLAGS) -c repair.c + +install: btoa btoa.1 + -@mkdir -p $(DESTDIR)/bin |