From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Feb 16 16:10:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id E7955FF3 for ; Sat, 16 Feb 2013 16:10:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id C8B5E133 for ; Sat, 16 Feb 2013 16:10:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r1GGA0G4009674 for ; Sat, 16 Feb 2013 16:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r1GGA0Bs009670; Sat, 16 Feb 2013 16:10:00 GMT (envelope-from gnats) Resent-Date: Sat, 16 Feb 2013 16:10:00 GMT Resent-Message-Id: <201302161610.r1GGA0Bs009670@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Christoph Mallon Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 8AD32F9F for ; Sat, 16 Feb 2013 16:08:01 +0000 (UTC) (envelope-from christoph.mallon@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by mx1.freebsd.org (Postfix) with ESMTP id 13C9F11F for ; Sat, 16 Feb 2013 16:08:00 +0000 (UTC) Received: from mailout-de.gmx.net ([10.1.76.2]) by mrigmx.server.lan (mrigmx001) with ESMTP (Nemesis) id 0M1Cbu-1UvGSI0Bq4-00tB8Z for ; Sat, 16 Feb 2013 17:07:54 +0100 Received: (qmail invoked by alias); 16 Feb 2013 16:07:53 -0000 Received: from p5B1318B4.dip.t-dialin.net (EHLO rotluchs.lokal) [91.19.24.180] by mail.gmx.net (mp002) with SMTP; 16 Feb 2013 17:07:53 +0100 Received: from tron by rotluchs.lokal with local (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1U6kIp-0005uX-Gm for FreeBSD-gnats-submit@freebsd.org; Sat, 16 Feb 2013 17:07:51 +0100 Message-Id: Date: Sat, 16 Feb 2013 17:07:51 +0100 From: Christoph Mallon To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/176195: [PATCH] games/cre: Set NO_WRKSUBDIR and BUILD_WRKSRC instead of abusing WRKSRC. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Christoph Mallon List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Feb 2013 16:10:01 -0000 >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 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@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 -- 1.8.1.3 --- 0001-games-cre-Set-NO_WRKSUBDIR-and-BUILD_WRKSRC-instead-.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: