svn commit: r367966 - in head/devel/zpu-binutils: . files

[Antoine Brodin]

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)" \