From 055eb2336855cbab853f4f0f582bc5746636477c Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Thu, 8 Sep 2011 14:48:25 +0000
Subject: [PATCH] properly honor CC/CFLAGS

---
 math/prover9/ladr/Makefile                           |  8 ++++----
 math/prover9/ladr/patches/patch-apps_src_Makefile    | 11 -----------
 math/prover9/ladr/patches/patch-ladr_Makefile        | 11 -----------
 math/prover9/ladr/patches/patch-mace4_src_Makefile   | 11 -----------
 math/prover9/ladr/patches/patch-provers_src_Makefile | 11 -----------
 5 files changed, 4 insertions(+), 48 deletions(-)
 delete mode 100644 math/prover9/ladr/patches/patch-apps_src_Makefile
 delete mode 100644 math/prover9/ladr/patches/patch-ladr_Makefile
 delete mode 100644 math/prover9/ladr/patches/patch-mace4_src_Makefile
 delete mode 100644 math/prover9/ladr/patches/patch-provers_src_Makefile

diff --git a/math/prover9/ladr/Makefile b/math/prover9/ladr/Makefile
index 38abc03b576..24d32679b01 100644
--- a/math/prover9/ladr/Makefile
+++ b/math/prover9/ladr/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2011/07/05 09:13:36 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2011/09/08 14:48:25 naddy Exp $
 
 COMMENT=		Library for Automated Deduction Research
 
 DISTNAME=		LADR-Dec-2007
 PKGNAME=		${DISTNAME:L:S/-Dec//}
-REVISION =		1
+REVISION =		2
 
 MASTER_SITES=		${HOMEPAGE}/download/
 
@@ -16,7 +16,7 @@ UTIL_FILES=		utilities/attack \
 			utilities/looper \
 			utilities/prover9-mace4
 
-MAKE_ENV+=		XFLAGS="${CFLAGS}"
+MAKE_FLAGS=		CC="${CC}" CFLAGS="${CFLAGS}"
 
 REGRESS_TARGET=		test1 test2 test3
 
@@ -29,7 +29,7 @@ pre-configure:
 .endfor
 
 do-build:
-	@cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} ${ALL_TARGET}
+	@cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} ${ALL_TARGET}
 
 do-install:
 	${INSTALL_DATA_DIR} ${BIN_DIR} ${EXAMPLE_DIR}/{mace4,prover9}
diff --git a/math/prover9/ladr/patches/patch-apps_src_Makefile b/math/prover9/ladr/patches/patch-apps_src_Makefile
deleted file mode 100644
index ca0b273c71d..00000000000
--- a/math/prover9/ladr/patches/patch-apps_src_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-apps_src_Makefile,v 1.1.1.1 2011/03/07 22:26:24 jasper Exp $
---- apps.src/Makefile.orig	Mon Jan 17 23:11:34 2011
-+++ apps.src/Makefile	Mon Jan 17 23:11:38 2011
-@@ -1,6 +1,6 @@
- # LADR/apps.src
- 
--CC = gcc
-+CC ?= gcc
- 
- # XFLAGS can be specified on the command line (see XFLAGS below)
- 
diff --git a/math/prover9/ladr/patches/patch-ladr_Makefile b/math/prover9/ladr/patches/patch-ladr_Makefile
deleted file mode 100644
index aa030c2e978..00000000000
--- a/math/prover9/ladr/patches/patch-ladr_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-ladr_Makefile,v 1.1.1.1 2011/03/07 22:26:24 jasper Exp $
---- ladr/Makefile.orig	Mon Jan 17 23:09:11 2011
-+++ ladr/Makefile	Mon Jan 17 23:09:17 2011
-@@ -1,6 +1,6 @@
- # LADR/ladr
- 
--CC = gcc
-+CC ?= gcc
- 
- # XFLAGS can be specified on the command line (see XFLAGS below)
- 
diff --git a/math/prover9/ladr/patches/patch-mace4_src_Makefile b/math/prover9/ladr/patches/patch-mace4_src_Makefile
deleted file mode 100644
index 82604419033..00000000000
--- a/math/prover9/ladr/patches/patch-mace4_src_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-mace4_src_Makefile,v 1.1.1.1 2011/03/07 22:26:24 jasper Exp $
---- mace4.src/Makefile.orig	Mon Jan 17 23:11:03 2011
-+++ mace4.src/Makefile	Mon Jan 17 23:11:07 2011
-@@ -1,6 +1,6 @@
- # LADR/mace4.src
- 
--CC = gcc
-+CC ?= gcc
- 
- # XFLAGS can be specified on the command line (see XFLAGS below)
- 
diff --git a/math/prover9/ladr/patches/patch-provers_src_Makefile b/math/prover9/ladr/patches/patch-provers_src_Makefile
deleted file mode 100644
index 921e82eb961..00000000000
--- a/math/prover9/ladr/patches/patch-provers_src_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-provers_src_Makefile,v 1.1.1.1 2011/03/07 22:26:24 jasper Exp $
---- provers.src/Makefile.orig	Mon Jan 17 23:11:16 2011
-+++ provers.src/Makefile	Mon Jan 17 23:11:20 2011
-@@ -1,6 +1,6 @@
- # LADR/prover9.src
- 
--CC = gcc
-+CC ?= gcc
- 
- # XFLAGS can be specified on the command line (see XFLAGS below)
-