Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 Jan 2013 08:53:08 GMT
From:      Sender Ghost <lightside@safebox.ru>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/175092: [MAINTAINER] games/assaultcube: Convert to OptionsNG 
Message-ID:  <201301070853.r078r8F7016566@red.freebsd.org>
Resent-Message-ID: <201301070900.r07901Jq063669@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>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 <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>


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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301070853.r078r8F7016566>