Bug 175092 - [MAINTAINER] games/assaultcube: Convert to OptionsNG
Summary: [MAINTAINER] games/assaultcube: Convert to OptionsNG
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-01-07 09:00 UTC by Sender Ghost
Modified: 2013-01-12 23:40 UTC (History)
0 users

See Also:


Attachments
file.diff (1.67 KB, patch)
2013-01-07 09:00 UTC, Sender Ghost
no flags Details | Diff
patch.txt (1.89 KB, text/plain; charset=UTF-8)
2013-01-12 19:26 UTC, lightside
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Sender Ghost 2013-01-07 09:00:00 UTC
Convert Makefile to OptionsNG.

Notified by: http://wiki.freebsd.org/Ports/Options/ConvertingToOptionsNG

Fix: Patch attached with submission follows:
Comment 1 Raphael Kubo da Costa freebsd_committer freebsd_triage 2013-01-12 15:38:01 UTC
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.
Comment 2 lightside 2013-01-12 19:26:12 UTC
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.
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-01-12 23:30:48 UTC
Author: rakuco
Date: Sat Jan 12 23:30:35 2013
New Revision: 310295
URL: http://svnweb.freebsd.org/changeset/ports/310295

Log:
  - Convert to OptionsNG.
  - Update maintainer's email address.
  
  PR:		ports/175092
  Submitted by:	Sender Ghost <lightside@safebox.ru> (maintainer)

Modified:
  head/games/assaultcube/Makefile

Modified: head/games/assaultcube/Makefile
==============================================================================
--- head/games/assaultcube/Makefile	Sat Jan 12 23:09:01 2013	(r310294)
+++ head/games/assaultcube/Makefile	Sat Jan 12 23:30:35 2013	(r310295)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	actioncube
-# Date created:				2007-02-25
-# Whom:					alepulver
-#
+# Created by: alepulver
 # $FreeBSD$
-#
 
 PORTNAME=	assaultcube
 PORTVERSION=	1.1.0.4
@@ -13,7 +9,7 @@ MASTER_SITES=	SF/actiongame/AssaultCube%
 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 +38,17 @@ MAKE_JOBS_SAFE=	yes
 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 <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.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 +61,13 @@ DESKTOP_ENTRIES="AssaultCube" "${COMMENT
 	"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 +82,7 @@ do-install:
 	${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 +93,4 @@ post-install:
 	@${ECHO_CMD} libexec/${PORTNAME}_${f} >> ${TMPPLIST}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 4 Raphael Kubo da Costa freebsd_committer freebsd_triage 2013-01-12 23:30:51 UTC
State Changed
From-To: open->closed

Committed. Thanks!