From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jan 7 09:00: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 0394F8EC for ; Mon, 7 Jan 2013 09:00: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 DFABF2F7 for ; Mon, 7 Jan 2013 09:00: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 r07901fF063670 for ; Mon, 7 Jan 2013 09:00:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r07901Jq063669; Mon, 7 Jan 2013 09:00:01 GMT (envelope-from gnats) Resent-Date: Mon, 7 Jan 2013 09:00:01 GMT Resent-Message-Id: <201301070900.r07901Jq063669@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, Sender Ghost Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 370E2872 for ; Mon, 7 Jan 2013 08:53:10 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 0EA302C2 for ; Mon, 7 Jan 2013 08:53:10 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r078r8ok016567 for ; Mon, 7 Jan 2013 08:53:08 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id r078r8F7016566; Mon, 7 Jan 2013 08:53:08 GMT (envelope-from nobody) Message-Id: <201301070853.r078r8F7016566@red.freebsd.org> Date: Mon, 7 Jan 2013 08:53:08 GMT From: Sender Ghost To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/175092: [MAINTAINER] games/assaultcube: Convert to OptionsNG X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jan 2013 09:00:02 -0000 >Number: 175092 >Category: ports >Synopsis: [MAINTAINER] games/assaultcube: Convert to OptionsNG >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Jan 07 09:00:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Sender Ghost >Release: FreeBSD 9.1-RELEASE >Organization: >Environment: >Description: Convert Makefile to OptionsNG. Notified by: http://wiki.freebsd.org/Ports/Options/ConvertingToOptionsNG >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN assaultcube.orig/Makefile assaultcube/Makefile --- assaultcube.orig/Makefile 2012-11-17 09:57:32.000000000 +0400 +++ assaultcube/Makefile 2013-01-07 12:32:04.000000000 +0400 @@ -42,17 +42,19 @@ PORTDATA= config demos packages PORTDOCS= * -OPTIONS= CLIENT "Build client" on \ - DEDICATED "Build dedicated server" on \ - MASTER "Build master server" off +OPTIONS_DEFINE= CLIENT DEDICATED DOCS 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) +.if !${PORT_OPTIONS:MCLIENT} && !${PORT_OPTIONS:MDEDICATED} && !${PORT_OPTIONS:MMASTER} 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 +67,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 +88,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 +99,4 @@ @${ECHO_CMD} libexec/${PORTNAME}_${f} >> ${TMPPLIST} .endfor -.include +.include >Release-Note: >Audit-Trail: >Unformatted: