From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Feb 16 16:20:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A7A763EA for ; Sat, 16 Feb 2013 16:20: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 89E5C192; Sat, 16 Feb 2013 16:20: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 r1GGK0PT012220; Sat, 16 Feb 2013 16:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r1GGK0hL012219; Sat, 16 Feb 2013 16:20:00 GMT (envelope-from gnats) Resent-Date: Sat, 16 Feb 2013 16:20:00 GMT Resent-Message-Id: <201302161620.r1GGK0hL012219@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Cc: Alexey Dokuchaev 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 6E5AC2AB for ; Sat, 16 Feb 2013 16:14:05 +0000 (UTC) (envelope-from christoph.mallon@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by mx1.freebsd.org (Postfix) with ESMTP id E8067166 for ; Sat, 16 Feb 2013 16:14:04 +0000 (UTC) Received: from mailout-de.gmx.net ([10.1.76.24]) by mrigmx.server.lan (mrigmx002) with ESMTP (Nemesis) id 0MKwSE-1U6kOp2gE4-0003NV for ; Sat, 16 Feb 2013 17:14:03 +0100 Received: (qmail invoked by alias); 16 Feb 2013 16:14:03 -0000 Received: from p5B1318B4.dip.t-dialin.net (EHLO rotluchs.lokal) [91.19.24.180] by mail.gmx.net (mp024) with SMTP; 16 Feb 2013 17:14:03 +0100 Received: from tron by rotluchs.lokal with local (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1U6kOo-0005wm-9m for FreeBSD-gnats-submit@freebsd.org; Sat, 16 Feb 2013 17:14:02 +0100 Message-Id: Date: Sat, 16 Feb 2013 17:14:02 +0100 From: Christoph Mallon To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 X-GNATS-Notify: Alexey Dokuchaev Subject: ports/176196: [PATCH] games/quake2-ctf: 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:20:00 -0000 >Number: 176196 >Category: ports >Synopsis: [PATCH] games/quake2-ctf: 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:20: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-quake2-ctf-Set-NO_WRKSUBDIR-and-BUILD_WRKSRC-i.patch begins here --- >From 0ae102bc5d51a0a76be84cd7cadc335a6b30ffac Mon Sep 17 00:00:00 2001 From: Christoph Mallon Date: Tue, 12 Feb 2013 19:53:44 +0100 Subject: [PATCH] games/quake2-ctf: Set NO_WRKSUBDIR and BUILD_WRKSRC instead of abusing WRKSRC. This allows simplification of USE_DOS2UNIX patterns. --- games/quake2-ctf/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/games/quake2-ctf/Makefile b/games/quake2-ctf/Makefile index f0204d4..ebdec23 100644 --- a/games/quake2-ctf/Makefile +++ b/games/quake2-ctf/Makefile @@ -20,8 +20,10 @@ MAINTAINER= danfe@FreeBSD.org COMMENT= Quake II CTF (Capture The Flag) modification USE_ZIP= yes -USE_DOS2UNIX= ../../../ctf/readme.txt ../../../ctf/server.cfg -WRKSRC= ${WRKDIR}/${CTF_SRC:S/.tar.gz//}/src/ctf +USE_DOS2UNIX= ctf/readme.txt ctf/server.cfg +NO_WRKSUBDIR= yes +BUILD_WRKSRC= ${WRKSRC}/${CTF_SRC:S/.tar.gz//}/src/ctf +PATCH_WRKSRC= ${BUILD_WRKSRC} LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} DOCSDIR= ${PREFIX}/share/doc/${LATEST_LINK} @@ -41,17 +43,17 @@ do-extract: ${DISTDIR}/${DIST_SUBDIR}/${CTF_DATA} -x *.dll *.ico post-extract: - @${CP} ${FILESDIR}/${MAKEFILE} ${WRKSRC} + @${CP} ${FILESDIR}/${MAKEFILE} ${BUILD_WRKSRC} do-install: ${MKDIR} ${Q2DIR}/ctf - ${INSTALL_PROGRAM} ${WRKSRC}/game.so ${Q2DIR}/ctf + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/game.so ${Q2DIR}/ctf .for f in *.cfg *.pak ${INSTALL_DATA} ${WRKDIR}/ctf/${f} ${Q2DIR}/ctf .endfor .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR} + ${INSTALL_DATA} ${BUILD_WRKSRC}/docs/* ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/ctf/readme.txt ${DOCSDIR} .endif -- 1.8.1.3 --- 0001-games-quake2-ctf-Set-NO_WRKSUBDIR-and-BUILD_WRKSRC-i.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: