From 7c89ef977333e9a56a5eda52f2827f91042fdb2b Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 27 Jan 2014 08:14:30 +0000
Subject: [PATCH] Do not pass DESTDIR to build target (with a syntax compatible
 with both fmake and bmake) That fixes a couple of STAGEDIR references in the
 install files

---
 Mk/Uses/desthack.mk | 9 +--------
 Mk/bsd.port.mk      | 4 ++--
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Mk/Uses/desthack.mk b/Mk/Uses/desthack.mk
index eb49af650cfc..6322f1f7825d 100644
--- a/Mk/Uses/desthack.mk
+++ b/Mk/Uses/desthack.mk
@@ -14,16 +14,9 @@
 _INCLUDE_USES_DESTHACK_MK=	yes
 
 .if defined(_desthack_ARGS)
-IGNORE=	USES=desthack does not require args
+IGNORE=	USES=desthack valide args are none or 'la'
 .endif
 
-_USES_POST=	desthack
 GNU_CONFIGURE_PREFIX=	\$${${DESTDIRNAME}}${PREFIX}
 GNU_CONFIGURE_MANPREFIX=	\$${${DESTDIRNAME}}${MANPREFIX}
 .endif
-
-.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_DESTHACK_POST_MK)
-_INCLUDE_USES_DESTHACK_POST_MK=	yes
-post-stage:
-	@${SED} -i '' -e 's,${STAGEDIR},,g' ${STAGEDIR}${PREFIX}/lib/*.la
-.endif
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 76d8c00b4ae4..952782f04143 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -3625,10 +3625,10 @@ do-configure:
 .endif
 
 # Build
-
+# XXX: ${MAKE_ARGS:N${DESTDIRNAME}=*} would be easier but it is not valid with the old fmake
 .if !target(do-build)
 do-build:
-	@(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \
+	@(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS:C,${DESTDIRNAME}=.*,,g} ${ALL_TARGET}; then \
 		if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \
 			${ECHO_MSG} "===> Compilation failed unexpectedly."; \
 			(${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT} 75 79 ; \