From owner-svn-ports-head@FreeBSD.ORG  Thu Sep 11 19:44:49 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 A8D85C13;
 Thu, 11 Sep 2014 19:44:49 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 79DDFB0E;
 Thu, 11 Sep 2014 19:44:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8BJin8I015941;
 Thu, 11 Sep 2014 19:44:49 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8BJinPC015939;
 Thu, 11 Sep 2014 19:44:49 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201409111944.s8BJinPC015939@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Thu, 11 Sep 2014 19:44:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r367966 - in head/devel/zpu-binutils: . files
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.18-1
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: Thu, 11 Sep 2014 19:44:49 -0000

Author: antoine
Date: Thu Sep 11 19:44:48 2014
New Revision: 367966
URL: http://svnweb.freebsd.org/changeset/ports/367966
QAT: https://qat.redports.org/buildarchive/r367966/

Log:
  Allow staging as regular user and don't violate stagedir

Deleted:
  head/devel/zpu-binutils/files/install.sh
Modified:
  head/devel/zpu-binutils/Makefile
  head/devel/zpu-binutils/files/patch-binutils_Makefile.in

Modified: head/devel/zpu-binutils/Makefile
==============================================================================
--- head/devel/zpu-binutils/Makefile	Thu Sep 11 19:29:18 2014	(r367965)
+++ head/devel/zpu-binutils/Makefile	Thu Sep 11 19:44:48 2014	(r367966)
@@ -13,6 +13,7 @@ COMMENT=	ZPU toolchain
 LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/toolchain
+INSTALL_WRKSRC=	${WRKSRC}/build
 MANDIRS=	${PREFIX}/zpu/man
 
 USES=		gettext gmake
@@ -21,14 +22,8 @@ INFO=		zpu/as zpu/bfd zpu/binutils zpu/c
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/%%CC%%/${CC}/' ${WRKSRC}/build.sh
-	@${CP}  ${FILESDIR}/install.sh ${WRKSRC}
-	@${REINPLACE_CMD} -e 's|%%GMAKE%%|${MAKE_CMD}|g' ${WRKSRC}/build.sh \
-		${WRKSRC}/install.sh
+	@${REINPLACE_CMD} -e 's|%%GMAKE%%|${MAKE_CMD}|g' ${WRKSRC}/build.sh
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/build.sh
-	@${REINPLACE_CMD} -e 's|%%DESTDIR%%|${STAGEDIR}|g' ${WRKSRC}/binutils/Makefile.in
-
-do-install:
-	@cd ${WRKSRC} && ${SH} install.sh
 
 do-build:
 	@cd ${WRKSRC} && ${SH} build.sh

Modified: head/devel/zpu-binutils/files/patch-binutils_Makefile.in
==============================================================================
--- head/devel/zpu-binutils/files/patch-binutils_Makefile.in	Thu Sep 11 19:29:18 2014	(r367965)
+++ head/devel/zpu-binutils/files/patch-binutils_Makefile.in	Thu Sep 11 19:44:48 2014	(r367966)
@@ -11,12 +11,3 @@
  
  CXX_FOR_BUILD = $(CXX)
  
-@@ -385,7 +385,7 @@
- 
- # Flags to pass down to all sub-makes.
- BASE_FLAGS_TO_PASS = \
--	"DESTDIR=$(DESTDIR)" \
-+	"DESTDIR=%%DESTDIR%%" \
- 	"RPATH_ENVVAR=$(RPATH_ENVVAR)" \
- 	"TARGET_SUBDIR=$(TARGET_SUBDIR)" \
- 	"bindir=$(bindir)" \