From owner-svn-ports-head@FreeBSD.ORG  Mon Jan 27 08:14:31 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 33273AB2;
 Mon, 27 Jan 2014 08:14:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 04B891D05;
 Mon, 27 Jan 2014 08:14:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0R8EUf6095723;
 Mon, 27 Jan 2014 08:14:30 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0R8EUej095720;
 Mon, 27 Jan 2014 08:14:30 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401270814.s0R8EUej095720@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 27 Jan 2014 08:14:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r341335 - in head/Mk: . Uses
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Jan 2014 08:14:31 -0000

Author: bapt
Date: Mon Jan 27 08:14:30 2014
New Revision: 341335
URL: http://svnweb.freebsd.org/changeset/ports/341335
QAT: https://qat.redports.org/buildarchive/r341335/

Log:
  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

Modified:
  head/Mk/Uses/desthack.mk
  head/Mk/bsd.port.mk

Modified: head/Mk/Uses/desthack.mk
==============================================================================
--- head/Mk/Uses/desthack.mk	Mon Jan 27 07:32:02 2014	(r341334)
+++ head/Mk/Uses/desthack.mk	Mon Jan 27 08:14:30 2014	(r341335)
@@ -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

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Mon Jan 27 07:32:02 2014	(r341334)
+++ head/Mk/bsd.port.mk	Mon Jan 27 08:14:30 2014	(r341335)
@@ -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 ; \