From 04b0a292b20f8415501af2614a934eb96395b757 Mon Sep 17 00:00:00 2001
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Tue, 9 Jul 2013 03:02:39 +0000
Subject: [PATCH] Respect CFLAGS is a saner manner.

---
 lang/ats/files/patch-Makefile            | 20 ++++++++++----------
 lang/ats/files/patch-Makefile__bootstrap |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lang/ats/files/patch-Makefile b/lang/ats/files/patch-Makefile
index 190dbc2177a9..f6db4d0638cc 100644
--- a/lang/ats/files/patch-Makefile
+++ b/lang/ats/files/patch-Makefile
@@ -57,30 +57,30 @@
 -	$(ATSLIB) $(ATS_PROOFCHECK) -O2 --libats
 -	$(ATSLIB) $(ATS_PROOFCHECK) -O2 --libats_lex
 -	$(ATSLIB) $(ATS_PROOFCHECK) -O2 --libats_smlbas
-+	$(ATSLIB) $(ATS_PROOFCHECK) -O2 $(CFLAGS) --libats
-+	$(ATSLIB) $(ATS_PROOFCHECK) -O2 $(CFLAGS) --libats_lex
-+	$(ATSLIB) $(ATS_PROOFCHECK) -O2 $(CFLAGS) --libats_smlbas
++	$(ATSLIB) $(ATS_PROOFCHECK) $(CFLAGS) --libats
++	$(ATSLIB) $(ATS_PROOFCHECK) $(CFLAGS) --libats_lex
++	$(ATSLIB) $(ATS_PROOFCHECK) $(CFLAGS) --libats_smlbas
  
  lib32files: .libfiles_local
 -	$(ATSLIB) $(ATS_PROOFCHECK) -m32 -O2 --libats
 -	$(ATSLIB) $(ATS_PROOFCHECK) -m32 -O2 --libats_lex
 -	$(ATSLIB) $(ATS_PROOFCHECK) -m32 -O2 --libats_smlbas
-+	$(ATSLIB) $(ATS_PROOFCHECK) -m32 -O2 $(CFLAGS) --libats
-+	$(ATSLIB) $(ATS_PROOFCHECK) -m32 -O2 $(CFLAGS) --libats_lex
-+	$(ATSLIB) $(ATS_PROOFCHECK) -m32 -O2 $(CFLAGS) --libats_smlbas
++	$(ATSLIB) $(ATS_PROOFCHECK) -m32 $(CFLAGS) --libats
++	$(ATSLIB) $(ATS_PROOFCHECK) -m32 $(CFLAGS) --libats_lex
++	$(ATSLIB) $(ATS_PROOFCHECK) -m32 $(CFLAGS) --libats_smlbas
  
  lib64files: .libfiles_local
 -	$(ATSLIB) $(ATS_PROOFCHECK) -m64 -O2 --libats
 -	$(ATSLIB) $(ATS_PROOFCHECK) -m64 -O2 --libats_lex
 -	$(ATSLIB) $(ATS_PROOFCHECK) -m64 -O2 --libats_smlbas
-+	$(ATSLIB) $(ATS_PROOFCHECK) -m64 -O2 $(CFLAGS) --libats
-+	$(ATSLIB) $(ATS_PROOFCHECK) -m64 -O2 $(CFLAGS) --libats_lex
-+	$(ATSLIB) $(ATS_PROOFCHECK) -m64 -O2 $(CFLAGS) --libats_smlbas
++	$(ATSLIB) $(ATS_PROOFCHECK) -m64 $(CFLAGS) --libats
++	$(ATSLIB) $(ATS_PROOFCHECK) -m64 $(CFLAGS) --libats_lex
++	$(ATSLIB) $(ATS_PROOFCHECK) -m64 $(CFLAGS) --libats_smlbas
  
  .libfiles_mt_local: .libfiles_mt ; $(CC) -E -P -x c -o $@ $<
  libfiles_mt: .libfiles_mt_local
 -	$(ATSLIB) $(ATS_PROOFCHECK) -D_ATS_MULTITHREAD -O2 --libats_mt
-+	$(ATSLIB) $(ATS_PROOFCHECK) -D_ATS_MULTITHREAD -O2 $(CFLAGS) --libats_mt
++	$(ATSLIB) $(ATS_PROOFCHECK) -D_ATS_MULTITHREAD $(CFLAGS) --libats_mt
  
  libatsdoca: ; $(MAKE) -C libatsdoc
  
diff --git a/lang/ats/files/patch-Makefile__bootstrap b/lang/ats/files/patch-Makefile__bootstrap
index a20bbab26859..df5c27b77f54 100644
--- a/lang/ats/files/patch-Makefile__bootstrap
+++ b/lang/ats/files/patch-Makefile__bootstrap
@@ -5,7 +5,7 @@
  BOOTSTRAP1=1
  ifdef BOOTSTRAP1
 -ATSCCFLAGS=-I$(ATSHOMEQ) -I$(ATSRUNTIME) -O2 -g
-+ATSCCFLAGS=-I$(ATSHOMEQ) -I$(ATSRUNTIME) -O2 -g $(CFLAGS)
++ATSCCFLAGS=-I$(ATSHOMEQ) -I$(ATSRUNTIME) $(CFLAGS)
  endif
  
  LIBGMP=