don't override CC in Makefiles, it's already defined in MAKE_ENV.

fixes build with non-gcc.

5 files changed, 25 insertions, 33 deletions

diff --git a/devel/pccts/distinfo b/devel/pccts/distinfo
index 1c196750f61..b71bba1f67a 100644
--- a/devel/pccts/distinfo
+++ b/devel/pccts/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2003/11/09 06:15:24 fredb Exp $
+$NetBSD: distinfo,v 1.5 2004/01/29 11:49:50 grant Exp $
 
 SHA1 (pccts-1.33.22/pccts133mr22.zip) = ccdfaf8f69ddc59ad6d7e3f05922c693db0cf987
 Size (pccts-1.33.22/pccts133mr22.zip) = 717522 bytes
-SHA1 (patch-aa) = f44db7a7fb0c8a81e8b5445b2ec7d6160c9a2fdc
-SHA1 (patch-ab) = b9ebaf849cb738bd975cdee733afa3a3c0d8e0c9
-SHA1 (patch-ac) = b249a362461e460be6be7195d96ea7705485105f
-SHA1 (patch-ad) = 0af7bb8491402f8fb2e96fb0e5aa6cc117ffae0c
+SHA1 (patch-aa) = b6037043b1841575fd98c1f011e7e22a8ecd5b99
+SHA1 (patch-ab) = 43a05786923583efeadde34eb775f45862315865
+SHA1 (patch-ac) = aa1869debc128dd9b017f3790899aa2b32aaa185
+SHA1 (patch-ad) = 86184ed7d610ad4da21e385c72cb254eb17d09bc
 SHA1 (patch-ae) = bdfbc276cbf7217bdf48bb1b6df787d61f1d6267
 SHA1 (patch-af) = 5910279eb5d9d216c1051c48038792fc3841c568
 SHA1 (patch-ag) = 6637240de0c79b4f41f34d658ed99001adeab539
diff --git a/devel/pccts/patches/patch-aa b/devel/pccts/patches/patch-aa
index ebcd737edd0..d2569eb6676 100644
--- a/devel/pccts/patches/patch-aa
+++ b/devel/pccts/patches/patch-aa
@@ -1,15 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2000/03/20 16:55:37 agc Exp $
+$NetBSD: patch-aa,v 1.2 2004/01/29 11:49:50 grant Exp $
 
-Use gcc instead of cc, mainly for Solaris.
-
---- antlr/makefile	2000/03/20 16:33:12	1.1
-+++ antlr/makefile	2000/03/20 16:33:29
-@@ -164,7 +164,7 @@
+--- antlr/makefile.orig	2000-02-16 02:40:15.000000000 +1100
++++ antlr/makefile
+@@ -164,7 +164,7 @@ PCCTS_H=../h
  #
  #   UNIX  (default)
  #
 -CC=cc
-+CC=gcc
++#CC=cc
  ANTLR=../bin/antlr
  DLG=../bin/dlg
  OBJ_EXT=o
diff --git a/devel/pccts/patches/patch-ab b/devel/pccts/patches/patch-ab
index 583920b449a..1eab9e4ba04 100644
--- a/devel/pccts/patches/patch-ab
+++ b/devel/pccts/patches/patch-ab
@@ -1,15 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2000/04/04 02:17:11 itohy Exp $
+$NetBSD: patch-ab,v 1.3 2004/01/29 11:49:50 grant Exp $
 
-Use gcc in place of cc.
-
---- dlg/makefile	2000/03/20 16:10:48	1.1
-+++ dlg/makefile	2000/04/04 10:38:49
-@@ -114,7 +114,7 @@
+--- dlg/makefile.orig	2000-02-16 03:05:43.000000000 +1100
++++ dlg/makefile
+@@ -114,7 +114,7 @@ PCCTS_H=../h
  #
  #   UNIX
  #
 -CC=cc
-+CC=gcc
++#CC=cc
  ANTLR=../bin/antlr
  DLG=../bin/dlg
  CFLAGS= -O -I. -I$(SET) -I$(PCCTS_H) -DUSER_ZZSYN -DZZLEXBUFSIZE=32000
diff --git a/devel/pccts/patches/patch-ac b/devel/pccts/patches/patch-ac
index 4c65d7025f1..a5b12c780fc 100644
--- a/devel/pccts/patches/patch-ac
+++ b/devel/pccts/patches/patch-ac
@@ -1,15 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2000/03/20 16:55:37 agc Exp $
+$NetBSD: patch-ac,v 1.2 2004/01/29 11:49:50 grant Exp $
 
-Use gcc in place of cc, mainly for Solaris.
-
---- sorcerer/makefile	2000/03/20 16:13:28	1.1
-+++ sorcerer/makefile	2000/03/20 16:13:41
-@@ -16,12 +16,12 @@
+--- sorcerer/makefile.orig	2000-02-16 03:07:11.000000000 +1100
++++ sorcerer/makefile
+@@ -16,12 +16,12 @@ GRM = sor.g
  SRC = sor.c scan.c err.c main.c globals.c gen.c $(SET)/set.c hash.c look.c cpp.c
  OBJ = sor.o scan.o err.o main.o globals.o gen.o set.o hash.o look.o cpp.o
  GENHFILES = tokens.h mode.h stdpccts.h
 -CC=cc
-+CC=gcc
++#CC=cc
  SHELL=/bin/sh
  
  all:
diff --git a/devel/pccts/patches/patch-ad b/devel/pccts/patches/patch-ad
index 7f95a5e374e..0f6876c6aa3 100644
--- a/devel/pccts/patches/patch-ad
+++ b/devel/pccts/patches/patch-ad
@@ -1,15 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2000/03/20 16:55:37 agc Exp $
+$NetBSD: patch-ad,v 1.2 2004/01/29 11:49:50 grant Exp $
 
-Use gcc in place of cc, mainly for Solaris.
-
---- support/genmk/makefile	2000/03/20 16:36:13	1.1
-+++ support/genmk/makefile	2000/03/20 16:36:24
-@@ -9,7 +9,7 @@
+--- support/genmk/makefile.orig	1998-06-09 00:45:10.000000000 +1000
++++ support/genmk/makefile
+@@ -9,7 +9,7 @@ OBJ=genmk.o
  # see pccts/h/pcctscfg.h
  #CFLAGS=-I../../h -DPC
  CFLAGS=-I../../h
 -CC=cc
-+CC=gcc
++#CC=cc
  BAG=../../bin/bag
  
  genmk: $(OBJ) $(SRC) ../../h/pcctscfg.h