Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Jan 2014 09:09:42 +0400 (MSK)
From:      Dmitry Marakasov <amdmi3@amdmi3.ru>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        avg@FreeBSD.org
Subject:   ports/185958: [PATCH] sysutils/cpuburn: fix build on 10.x
Message-ID:  <20140121050942.9CC7C1D46A@hades.panopticon>
Resent-Message-ID: <201401210510.s0L5A1Av067106@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         185958
>Category:       ports
>Synopsis:       [PATCH] sysutils/cpuburn: fix build on 10.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 21 05:10:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK
>Description:
- Fix build on 10.x
- Support staging
- Convert NOPORTDOCS to OPTIONS

Port maintainer (avg@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- cpuburn-1.4.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 340548)
+++ Makefile	(working copy)
@@ -6,8 +6,7 @@
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.bayofrum.net/dist/${PORTNAME}/ \
 		http://atarininja.org/distfiles/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	avg
+		LOCAL/avg
 DISTNAME=	cpuburn_${DISTVERSION}
 EXTRACT_SUFX=	_tar.gz
 
@@ -20,8 +19,10 @@
 PORTDOCS=	README Design
 CPUS=		BX K6 K7 MMX P5 P6
 PLIST_FILES=	${CPUS:S+^+bin/burn+}
+USE_GCC=	yes
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 do-build:
 .for CPU in ${CPUS}
 	${CC} -m32 -s -nostdlib -o ${WRKSRC}/burn${CPU} ${WRKSRC}/burn${CPU}.S
@@ -29,12 +30,10 @@
 
 do-install:
 .for CPU in ${CPUS}
-	${INSTALL_PROGRAM} ${WRKSRC}/burn${CPU} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/burn${CPU} ${STAGEDIR}${PREFIX}/bin/
 .endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Design ${DOCSDIR}
-.endif
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/Design ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
--- cpuburn-1.4.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?20140121050942.9CC7C1D46A>