From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jan 12 19:40:02 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 09C1AA0C for ; Sat, 12 Jan 2013 19:40:02 +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 E23C96FE for ; Sat, 12 Jan 2013 19:40:01 +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 r0CJe1RW030041 for ; Sat, 12 Jan 2013 19:40:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r0CJe1Rf030040; Sat, 12 Jan 2013 19:40:01 GMT (envelope-from gnats) Date: Sat, 12 Jan 2013 19:40:01 GMT Message-Id: <201301121940.r0CJe1Rf030040@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org Cc: From: Sender Ghost Subject: Re: ports/175092: [MAINTAINER] games/assaultcube: Convert to OptionsNG X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Sender Ghost List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Jan 2013 19:40:02 -0000 The following reply was made to PR ports/175092; it has been noted by GNATS. From: Sender Ghost To: bug-followup@FreeBSD.org Cc: Raphael Kubo da Costa Subject: Re: ports/175092: [MAINTAINER] games/assaultcube: Convert to OptionsNG Date: Sat, 12 Jan 2013 23:26:12 +0400 This is a multi-part message in MIME format. --------------070104010904050105020004 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Raphael Kubo da Costa wrote: > Hi, > > I suggest taking one step further and using OPTIONS_MULTI (which defines > lists in which at least one option must be selected) in order to get rid > of the `IGNORE' block at the beginning. > > Hello, Raphael. Ok, I made necessary changes and submit new patch. Thanks for suggestion. Also, I changed maintainer e-mail address, because of b.barracudacentral.org for SMTP server of previous e-mail address. --------------070104010904050105020004 Content-Type: text/plain; charset=UTF-8; name="patch.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch.txt" diff -ruN assaultcube.orig/Makefile assaultcube/Makefile --- assaultcube.orig/Makefile 2012-11-17 09:57:32.000000000 +0400 +++ assaultcube/Makefile 2013-01-12 22:52:29.000000000 +0400 @@ -13,7 +13,7 @@ DISTFILES= AssaultCube_v${PORTVERSION}_source${EXTRACT_SUFX} \ AssaultCube_v${PORTVERSION}${EXTRACT_SUFX} -MAINTAINER= lightside@safebox.ru +MAINTAINER= lightside@gmx.com COMMENT= Total conversion of the FPS game called Cube LICENSE_COMB= multi @@ -42,17 +42,17 @@ PORTDATA= config demos packages PORTDOCS= * -OPTIONS= CLIENT "Build client" on \ - DEDICATED "Build dedicated server" on \ - MASTER "Build master server" off +OPTIONS_DEFINE= DOCS +OPTIONS_MULTI= BUILD +OPTIONS_MULTI_BUILD= CLIENT DEDICATED MASTER +OPTIONS_DEFAULT= CLIENT DEDICATED +CLIENT_DESC= Build client +DEDICATED_DESC= Build dedicated server +MASTER_DESC= Build master server -.include +.include -.if defined(WITHOUT_CLIENT) && defined(WITHOUT_DEDICATED) && defined(WITHOUT_MASTER) -IGNORE= needs at least one executable (CLIENT, DEDICATED or MASTER) -.endif - -.if !defined(WITHOUT_CLIENT) +.if ${PORT_OPTIONS:MCLIENT} USE_GETTEXT= yes USE_GL= yes USE_SDL= image mixer sdl @@ -65,13 +65,13 @@ "Application;Game;" ${FALSE} .endif -.if !defined(WITHOUT_DEDICATED) +.if ${PORT_OPTIONS:MDEDICATED} ALL_TARGET+= server SUB_FILES+= ${PORTNAME}_server ACUBE_BIN+= server .endif -.if !defined(WITHOUT_MASTER) +.if ${PORT_OPTIONS:MMASTER} ALL_TARGET+= master SUB_FILES+= ${PORTNAME}_master ACUBE_BIN+= master @@ -86,7 +86,7 @@ ${MKDIR} ${DATADIR} cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" ${DATADIR} .endif -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR} .endif @@ -97,4 +97,4 @@ @${ECHO_CMD} libexec/${PORTNAME}_${f} >> ${TMPPLIST} .endfor -.include +.include --------------070104010904050105020004--