From 4a48f57964d65c8c2a5594d0ee6cb174b62b6fbc Mon Sep 17 00:00:00 2001
From: Christian Weisgerber <naddy@FreeBSD.org>
Date: Sun, 13 Mar 2011 13:04:41 +0000
Subject: Disable a bizarre attempt to use both BSD and GNU make constructs in
 parallel.  Fixes build with gmake 3.82.

While there, patch Variables.mk instead of running a substitution.
---
 devel/libarena/Makefile                    |  4 ----
 devel/libarena/files/patch-mk_Epilogue.mk  |  9 +++++++++
 devel/libarena/files/patch-mk_Prologue.mk  |  9 +++++++++
 devel/libarena/files/patch-mk_Variables.mk | 13 +++++++++++++
 4 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 devel/libarena/files/patch-mk_Epilogue.mk
 create mode 100644 devel/libarena/files/patch-mk_Prologue.mk
 create mode 100644 devel/libarena/files/patch-mk_Variables.mk

(limited to 'devel/libarena')

diff --git a/devel/libarena/Makefile b/devel/libarena/Makefile
index 5f6d1726ffdf..8fc2493fef2f 100644
--- a/devel/libarena/Makefile
+++ b/devel/libarena/Makefile
@@ -26,8 +26,4 @@ PLIST_FILES=	include/arena/align.h \
 		lib/libarena.a
 PLIST_DIRS=	include/arena
 
-post-patch:
-	@${REINPLACE_CMD} -E 's|^(PREFIX.*):=|\1?=|' \
-		${WRKSRC}/mk/Variables.mk
-
 .include <bsd.port.mk>
diff --git a/devel/libarena/files/patch-mk_Epilogue.mk b/devel/libarena/files/patch-mk_Epilogue.mk
new file mode 100644
index 000000000000..dea3881b4de4
--- /dev/null
+++ b/devel/libarena/files/patch-mk_Epilogue.mk
@@ -0,0 +1,9 @@
+--- mk/Epilogue.mk.orig	2011-03-13 13:59:37.000000000 +0100
++++ mk/Epilogue.mk	2011-03-13 13:59:59.000000000 +0100
+@@ -5,5 +5,5 @@
+ d	:= $(dirstack_$(sp))
+ 
+ sp	?= $(shell basename "$(sp)")
+-sp	!= basename "$(sp)"
++#sp	!= basename "$(sp)"
+ 
diff --git a/devel/libarena/files/patch-mk_Prologue.mk b/devel/libarena/files/patch-mk_Prologue.mk
new file mode 100644
index 000000000000..21bb3230fedf
--- /dev/null
+++ b/devel/libarena/files/patch-mk_Prologue.mk
@@ -0,0 +1,9 @@
+--- mk/Prologue.mk.orig	2011-03-13 13:59:37.000000000 +0100
++++ mk/Prologue.mk	2011-03-13 14:00:08.000000000 +0100
+@@ -9,5 +9,5 @@ d		:= $(dir)
+ 
+ # Our parent directory
+ $(d)/..		?= $(shell dirname "$(d)")
+-$(d)/..		!= dirname "$(d)"
++#$(d)/..		!= dirname "$(d)"
+ 
diff --git a/devel/libarena/files/patch-mk_Variables.mk b/devel/libarena/files/patch-mk_Variables.mk
new file mode 100644
index 000000000000..561fe61e64a7
--- /dev/null
+++ b/devel/libarena/files/patch-mk_Variables.mk
@@ -0,0 +1,13 @@
+--- mk/Variables.mk.orig	2011-03-13 13:59:37.000000000 +0100
++++ mk/Variables.mk	2011-03-13 13:59:47.000000000 +0100
+@@ -3,8 +3,8 @@
+ # PREFIX, EPREFIX, prefix and exec_prefix. Lower cases variants have higher
+ # priority.
+ #
+-PREFIX		:= $(prefix)
+-PREFIX		:= /usr/local
++PREFIX		?= $(prefix)
++PREFIX		?= /usr/local
+ EPREFIX		:= $(exec_prefix)
+ EPREFIX		:= $(PREFIX)
+ prefix		:= $(PREFIX)
-- 
cgit v1.2.3