From amdmi3@amdmi3.ru  Tue Jan 21 05:09:46 2014
Return-Path: <amdmi3@amdmi3.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 41365964;
	Tue, 21 Jan 2014 05:09:46 +0000 (UTC)
Received: from smtpout3.timeweb.ru (smtpout3.timeweb.ru [92.53.117.25])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id EDBC5113B;
	Tue, 21 Jan 2014 05:09:45 +0000 (UTC)
Received: from [213.148.20.85] (helo=hive.panopticon)
	by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.76)
	(envelope-from <amdmi3@amdmi3.ru>)
	id 1W5Tap-0000DJ-17; Tue, 21 Jan 2014 09:09:43 +0400
Received: from hades.panopticon (hades.panopticon [192.168.0.32])
	by hive.panopticon (Postfix) with ESMTP id A6623632;
	Tue, 21 Jan 2014 09:09:42 +0400 (MSK)
Received: by hades.panopticon (Postfix, from userid 1000)
	id 9CC7C1D46A; Tue, 21 Jan 2014 09:09:42 +0400 (MSK)
Message-Id: <20140121050942.9CC7C1D46A@hades.panopticon>
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: [PATCH] sysutils/cpuburn: fix build on 10.x
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         185958
>Category:       ports
>Synopsis:       [PATCH] sysutils/cpuburn: fix build on 10.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    avg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 21 05:10:01 UTC 2014
>Closed-Date:    Tue Jan 21 16:57:13 UTC 2014
>Last-Modified:  Tue Jan 21 17:00:00 UTC 2014
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->avg 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Jan 21 05:10:16 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185958 

From: Andriy Gapon <avg@FreeBSD.org>
To: bug-followup@FreeBSD.org, amdmi3@amdmi3.ru
Cc:  
Subject: Re: ports/185958: [PATCH] sysutils/cpuburn: fix build on 10.x
Date: Tue, 21 Jan 2014 17:48:56 +0200

 Looks very good to me!
 Thanks a lot, Dmitry!
 
 -- 
 Andriy Gapon
State-Changed-From-To: open->closed 
State-Changed-By: amdmi3 
State-Changed-When: Tue Jan 21 16:57:12 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185958 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/185958: commit references a PR
Date: Tue, 21 Jan 2014 16:57:19 +0000 (UTC)

 Author: amdmi3
 Date: Tue Jan 21 16:57:11 2014
 New Revision: 340621
 URL: http://svnweb.freebsd.org/changeset/ports/340621
 QAT: https://qat.redports.org/buildarchive/r340621/
 
 Log:
   - Fix build on 10.x
   - Support staging
   - Convert NOPORTDOCS to OPTIONS
   
   PR:		185958
   Submitted by:	amdmi3
   Approved by:	avg (maintainer)
 
 Modified:
   head/sysutils/cpuburn/Makefile
 
 Modified: head/sysutils/cpuburn/Makefile
 ==============================================================================
 --- head/sysutils/cpuburn/Makefile	Tue Jan 21 16:43:00 2014	(r340620)
 +++ head/sysutils/cpuburn/Makefile	Tue Jan 21 16:57:11 2014	(r340621)
 @@ -6,8 +6,7 @@ DISTVERSION=	1_4
  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 @@ ONLY_FOR_ARCHS=	i386 amd64
  PORTDOCS=	README Design
  CPUS=		BX K6 K7 MMX P5 P6
  PLIST_FILES=	${CPUS:S+^+bin/burn+}
 +USE_GCC=	yes
 +
 +OPTIONS_DEFINE=	DOCS
  
 -NO_STAGE=	yes
  do-build:
  .for CPU in ${CPUS}
  	${CC} -m32 -s -nostdlib -o ${WRKSRC}/burn${CPU} ${WRKSRC}/burn${CPU}.S
 @@ -29,12 +30,10 @@ do-build:
  
  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>
 _______________________________________________
 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"
 
>Unformatted:
