Bug 187415 - [PATCH] sysutils/memtest86+: stage, USES=, gcc
Summary: [PATCH] sysutils/memtest86+: stage, USES=, gcc
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Steve Wills
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-03-10 12:20 UTC by Johannes Meixner
Modified: 2014-03-24 01:00 UTC (History)
1 user (show)

See Also:


Attachments
file.diff (1.75 KB, patch)
2014-03-10 12:20 UTC, Johannes Meixner
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Johannes Meixner 2014-03-10 12:20:00 UTC
- Stagify
- replace USE_GMAKE and USE_DOS2UNIX with respective USES=
- add USE_GCC= yes, as it won't build with clang34

Port maintainer (avg@icyb.net.ua) is cc'd.

portlint: complains about /boot and only one MASTER_SITE
port test: ok
testport: ok
redports: https://redports.org/buildarchive/20140310120511-64662/

Generated with FreeBSD Port Tools 1.00.2014.03.09 (mode: change, diff: SVN)

Fix: --- memtest86+-4.20.patch begins here ---
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2014-03-10 12:20:08 UTC
Maintainer of sysutils/memtest86+,

Please note that PR ports/187415 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/187415

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2014-03-10 12:20:09 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Andriy Gapon 2014-03-11 13:39:51 UTC
Looks good to me.  Thanks!

-- 
Andriy Gapon
Comment 4 Mark Linimon freebsd_committer freebsd_triage 2014-03-11 19:01:42 UTC
State Changed
From-To: feedback->open

Maintainer approved.
Comment 5 Steve Wills freebsd_committer freebsd_triage 2014-03-23 18:06:48 UTC
Responsible Changed
From-To: freebsd-ports-bugs->swills

I'll take it.
Comment 6 dfilter service freebsd_committer freebsd_triage 2014-03-24 00:52:38 UTC
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@chaot.net>
  Approved by:	Andriy Gapon <avg@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:
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 7 Steve Wills freebsd_committer freebsd_triage 2014-03-24 00:53:05 UTC
State Changed
From-To: open->closed

Committed. Thanks!