Date: Mon, 10 Mar 2014 14:12:07 +0200 (EET) From: Johannes Jost Meixner <xmj@chaot.net> To: FreeBSD-gnats-submit@freebsd.org Cc: avg@icyb.net.ua Subject: ports/187415: [PATCH] sysutils/memtest86+: stage, USES=, gcc Message-ID: <11945919490219826110.enqueue@mx12.chaot.net> Resent-Message-ID: <201403101220.s2ACK0Kf068293@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187415 >Category: ports >Synopsis: [PATCH] sysutils/memtest86+: stage, USES=, gcc >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Mar 10 12:20:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Johannes Jost Meixner >Release: FreeBSD 11.0-CURRENT amd64 >Organization: Goldener Grund OUe >Environment: System: FreeBSD mx12.chaot.net 11.0-CURRENT FreeBSD 11.0-CURRENT #0: Sun Mar 9 17:01:41 EET >Description: - 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) >How-To-Repeat: >Fix: --- memtest86+-4.20.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 347745) +++ Makefile (working copy) @@ -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 @@ 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 @@ 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 @@ @${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 @@ 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: --- memtest86+-4.20.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?11945919490219826110.enqueue>