svn commit: r348915 - head/sysutils/memtest86+

[Steve Wills]

Author: swills
Date: Mon Mar 24 00:52:35 2014
New Revision: 348915
URL: http://svnweb.freebsd.org/changeset/ports/348915
QAT: https://qat.redports.org/buildarchive/r348915/

Log:
  - Stagify
  - Replace USE_GMAKE and USE_DOS2UNIX with respective USES=
  - Add USE_GCC= yes, as it won't build with clang34
  
  PR:		ports/187415
  Submitted by:	Johannes Jost Meixner <xmj at chaot.net>
  Approved by:	Andriy Gapon <avg at icyb.net.ua> (maintainer)

Modified:
  head/sysutils/memtest86+/Makefile

Modified: head/sysutils/memtest86+/Makefile
==============================================================================
--- head/sysutils/memtest86+/Makefile	Mon Mar 24 00:22:02 2014	(r348914)
+++ head/sysutils/memtest86+/Makefile	Mon Mar 24 00:52:35 2014	(r348915)
@@ -3,7 +3,7 @@
 
 PORTNAME=	memtest86+
 PORTVERSION=	4.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.memtest.org/download/${PORTVERSION}/
 
@@ -12,11 +12,12 @@ COMMENT=	Stand-alone memory test for x86
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USE_DOS2UNIX=	README memtest.lds setup.S
-USE_GMAKE=	yes
+USES=	gmake dos2unix
 ALL_TARGET=	all
 PORTDOCS=	*
 
+USE_GCC=	yes
+
 # Please provide absolute path below (cannot be root)
 BOOT_DIR?=	/boot/opt
 
@@ -29,7 +30,6 @@ BOOT_DESC=	Build ELF image loadable by b
 SERIAL_DESC=	Enable serial console at COM1/9600
 HISPEED_DESC=	Set COM1 serial console speed to 115200
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MBOOT}
@@ -59,6 +59,9 @@ pre-fetch:
 	@${ECHO} "build ISO image with custom tweaks in memtest86+ code."
 .endif
 
+post-patch:
+	${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/Makefile
+
 PLIST=		${WRKDIR}/pkg-plist
 
 pre-install:
@@ -76,17 +79,17 @@ pre-install:
 
 do-install:
 .if ${PORT_OPTIONS:MISO}
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/mt${PORTVERSION:C/\.//}.iso ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/mt${PORTVERSION:C/\.//}.iso ${STAGEDIR}${DATADIR}
 .endif
 .if ${PORT_OPTIONS:MBOOT}
-	@${MKDIR} ${BOOT_DIR}
+	@${MKDIR} ${STAGEDIR}${BOOT_DIR}
 # XXX is INSTALL_KLD really appropriate here? XXX
-	${INSTALL_KLD} ${WRKSRC}/memtest ${BOOT_DIR}/memtest86+
+	${INSTALL_KLD} ${WRKSRC}/memtest ${STAGEDIR}${BOOT_DIR}/memtest86+
 .endif
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
 
 post-install: