ports/176195: [PATCH] games/cre: Set NO_WRKSUBDIR and BUILD_WRKSRC instead of abusing WRKSRC.

[Christoph Mallon]

>Number:         176195
>Category:       ports
>Synopsis:       [PATCH] games/cre: Set NO_WRKSUBDIR and BUILD_WRKSRC instead of abusing WRKSRC.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 16 16:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Christoph Mallon
>Release:        
>Organization:
>Environment:


	
>Description:
Set NO_WRKSUBDIR and BUILD_WRKSRC instead of abusing WRKSRC.
	
>How-To-Repeat:
	
>Fix:
Please apply this patch.

	

--- 0001-games-cre-Set-NO_WRKSUBDIR-and-BUILD_WRKSRC-instead-.patch begins here ---
>From 933f453664a70fa69fe139d44fb597769f6ff1a0 Mon Sep 17 00:00:00 2001
From: Christoph Mallon <christoph.mallon at gmx.de>
Date: Tue, 12 Feb 2013 19:53:44 +0100
Subject: [PATCH] games/cre: Set NO_WRKSUBDIR and BUILD_WRKSRC instead of
 abusing WRKSRC.

This allows simplification of the USE_DOS2UNIX pattern.
---
 games/cre/Makefile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/games/cre/Makefile b/games/cre/Makefile
index a1950d2..2167a83 100644
--- a/games/cre/Makefile
+++ b/games/cre/Makefile
@@ -14,24 +14,25 @@ DISTNAME=	${PORTNAME}_${DISTVERSION}_src
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Corewars Redcode Evolver
 
-USE_DOS2UNIX=	../*.txt
-WRKSRC=		${WRKDIR}/src
+USE_DOS2UNIX=	*.txt
+NO_WRKSUBDIR=	yes
+BUILD_WRKSRC=	${WRKSRC}/src
 
 post-extract:
-	@${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC}
+	@${CP} ${FILESDIR}/${MAKEFILE} ${BUILD_WRKSRC}
 
 post-patch:
-	@cd ${WRKSRC} && ${REINPLACE_CMD} -e '/memwatch\.h/d' \
+	@cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e '/memwatch\.h/d' \
 		asm.c pspace.c sim.c
-	@cd ${WRKSRC} && ${REINPLACE_CMD} -e \
+	@cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e \
 		's|random[[:blank:]]*(|myrandom(|' \
 		battler.c generator.c globals.h Main.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/*.txt ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
-- 
1.8.1.3
--- 0001-games-cre-Set-NO_WRKSUBDIR-and-BUILD_WRKSRC-instead-.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: