From tobias.rehbein@web.de  Fri Jun  8 08:13:07 2012
Return-Path: <tobias.rehbein@web.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CE528106567A
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  8 Jun 2012 08:13:07 +0000 (UTC)
	(envelope-from tobias.rehbein@web.de)
Received: from mout.web.de (mout.web.de [212.227.17.12])
	by mx1.freebsd.org (Postfix) with ESMTP id 6517D8FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  8 Jun 2012 08:13:07 +0000 (UTC)
Received: from oshi.local ([94.45.239.111]) by smtp.web.de (mrweb102) with
 ESMTPSA (Nemesis) id 0LlWGZ-1S4wk90f3f-00as6G for
 <FreeBSD-gnats-submit@freebsd.org>; Fri, 08 Jun 2012 10:13:06 +0200
Received: from oshi.local (localhost [127.0.0.1])
	by oshi.local (8.14.5/8.14.5) with ESMTP id q588D46W002747
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 8 Jun 2012 10:13:05 +0200 (CEST)
	(envelope-from tobi@oshi.local)
Received: (from tobi@localhost)
	by oshi.local (8.14.5/8.14.5/Submit) id q588D4CK002746;
	Fri, 8 Jun 2012 10:13:04 +0200 (CEST)
	(envelope-from tobi)
Message-Id: <201206080813.q588D4CK002746@oshi.local>
Date: Fri, 8 Jun 2012 10:13:04 +0200 (CEST)
From: Tobias Rehbein <tobias.rehbein@web.de>
Reply-To: Tobias Rehbein <tobias.rehbein@web.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer-update] convert options to optionsNG
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         168837
>Category:       ports
>Synopsis:       [maintainer-update] games/stonesoup: convert options to optionsNG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    madpilot
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jun 08 08:20:17 UTC 2012
>Closed-Date:    Tue Jun 12 21:08:59 UTC 2012
>Last-Modified:  Tue Jun 12 21:10:07 UTC 2012
>Originator:     Tobias Rehbein
>Release:        FreeBSD 9.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD oshi.local 9.0-RELEASE-p2 FreeBSD 9.0-RELEASE-p2 #5: Wed May 30 22:44:11 CEST 2012 tobi@oshi.local:/usr/obj/usr/src/sys/OSHI amd64


	
>Description:
	
	Convert makefile options to the new options framework.
>How-To-Repeat:
	
>Fix:

	

--- games-stonesoup_optionsng.diff begins here ---
diff -urN /usr/.zfs/snapshot/2012-06-07/ports/games/stonesoup/Makefile games/stonesoup/Makefile
--- /usr/.zfs/snapshot/2012-06-07/ports/games/stonesoup/Makefile	2012-06-01 07:19:20.000000000 +0200
+++ games/stonesoup/Makefile	2012-06-07 18:44:20.922585162 +0200
@@ -34,9 +34,10 @@
 SUB_FILES=	README.FreeBSD
 PLIST_SUB=	SAVEDIR="${SAVEDIR}"
 
-OPTIONS=	SOUND		"Sound support"			off \
-		WIZARD		"Wizard mode"			off \
-		LUA_BINDINGS	"Bindings for LUA user scripts"	off
+OPTIONS_DEFINE=	SOUND WIZARD LUA_BINDINGS DOCS EXAMPLES
+SOUND_DESC=	"Sound support"
+WIZARD_DESC=	"Wizard mode"
+LUA_BINDINGS_DESC=	"Bindings for LUA user scripts"
 
 MAKE_ARGS=	prefix=${PREFIX} \
 		DATADIR=${DATADIR} \
@@ -60,11 +61,11 @@
 MAKE_ARGS+=	V=yes
 .endif
 
-.if defined(WITHOUT_WIZARD)
+.if !${PORT_OPTIONS:MWIZARD}
 MAKE_ARGS+=	NOWIZARD=y
 .endif
 
-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MSDL}
 CONFLICTS+=	${PORTNAME}-[0-9]*
 MAKE_ARGS+=	TILES=y
 PLIST_SUB+=	SDL=""
@@ -79,16 +80,16 @@
 PLIST_SUB+=	SDL="@comment "
 .endif
 
-.if defined(WITH_SOUND)
+.if ${PORT_OPTIONS:MSOUND}
 RUN_DEPENDS+=	sox:${PORTSDIR}/audio/sox
 .endif
 
-.if defined(WITHOUT_LUA_BINDINGS)
+.if !${PORT_OPTIONS:MLUA_BINDINGS}
 MAKE_ARGS+=	NO_LUA_BINDINGS=yes
 .endif
 
 post-patch:
-.if defined(WITH_SOUND)
+.if ${PORT_OPTIONS:MSOUND}
 	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/AppHdr.h
 	@${REINPLACE_CMD} -e "s,%%SOUND%%,," ${WRKSRC}/AppHdr.h
 .else
@@ -96,11 +97,11 @@
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/README.FreeBSD ${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${DATADIR}/settings/init.txt ${EXAMPLESDIR}/sample.crawlrc
 .endif
--- games-stonesoup_optionsng.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->madpilot 
Responsible-Changed-By: madpilot 
Responsible-Changed-When: Fri Jun 8 10:15:31 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168837 

From: Guido Falsi <madpilot@FreeBSD.org>
To: bug-followup@FreeBSD.org, tobias.rehbein@web.de
Cc: Chris Rees <crees@FreeBSD.org>, 
 Thomas Abthorpe <tabthorpe@FreeBSD.org>
Subject: Re: ports/168837: [maintainer-update] games/stonesoup: convert options
 to optionsNG
Date: Sun, 10 Jun 2012 15:15:57 +0200

 This is a multi-part message in MIME format.
 --------------010403040404040407000600
 Content-Type: text/plain; charset=ISO-8859-15; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Hi,
 
 I made a small change to your submission to complete the transition.
 
 stonesoup also has a slave port which needs too to use the new options 
 framework. Please check the attached patch(relative to ports) which I 
 tested to update both.
 
 I'll wait for your approval before committing.
 
 Thanks in advance!
 
 -- 
 Guido Falsi <madpilot@FreeBSD.org>
 
 
 --------------010403040404040407000600
 Content-Type: text/plain; charset=us-ascii;
  name="stonesoup.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="stonesoup.diff"
 
 Index: games/stonesoup/Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/games/stonesoup/Makefile,v
 retrieving revision 1.21
 diff -u -r1.21 Makefile
 --- games/stonesoup/Makefile	1 Jun 2012 05:19:20 -0000	1.21
 +++ games/stonesoup/Makefile	10 Jun 2012 13:14:06 -0000
 @@ -34,9 +34,11 @@
  SUB_FILES=	README.FreeBSD
  PLIST_SUB=	SAVEDIR="${SAVEDIR}"
  
 -OPTIONS=	SOUND		"Sound support"			off \
 -		WIZARD		"Wizard mode"			off \
 -		LUA_BINDINGS	"Bindings for LUA user scripts"	off
 +OPTIONS_DEFINE+=	SOUND WIZARD LUA_BINDINGS DOCS EXAMPLES
 +
 +SOUND_DESC=	Sound support
 +WIZARD_DESC=	Wizard mode
 +LUA_BINDINGS_DESC=	Bindings for LUA user scripts
  
  MAKE_ARGS=	prefix=${PREFIX} \
  		DATADIR=${DATADIR} \
 @@ -60,11 +62,11 @@
  MAKE_ARGS+=	V=yes
  .endif
  
 -.if defined(WITHOUT_WIZARD)
 +.if !${PORT_OPTIONS:MWIZARD}
  MAKE_ARGS+=	NOWIZARD=y
  .endif
  
 -.if defined(WITH_SDL)
 +.if ${PORT_OPTIONS:MSDL}
  CONFLICTS+=	${PORTNAME}-[0-9]*
  MAKE_ARGS+=	TILES=y
  PLIST_SUB+=	SDL=""
 @@ -79,16 +81,16 @@
  PLIST_SUB+=	SDL="@comment "
  .endif
  
 -.if defined(WITH_SOUND)
 +.if ${PORT_OPTIONS:MSOUND}
  RUN_DEPENDS+=	sox:${PORTSDIR}/audio/sox
  .endif
  
 -.if defined(WITHOUT_LUA_BINDINGS)
 +.if !${PORT_OPTIONS:MLUA_BINDINGS}
  MAKE_ARGS+=	NO_LUA_BINDINGS=yes
  .endif
  
  post-patch:
 -.if defined(WITH_SOUND)
 +.if ${PORT_OPTIONS:MSOUND}
  	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/AppHdr.h
  	@${REINPLACE_CMD} -e "s,%%SOUND%%,," ${WRKSRC}/AppHdr.h
  .else
 @@ -96,11 +98,11 @@
  .endif
  
  post-install:
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	${MKDIR} ${DOCSDIR}
  	${INSTALL_DATA} ${WRKDIR}/README.FreeBSD ${DOCSDIR}
  .endif
 -.if !defined(NOPORTEXAMPLES)
 +.if ${PORT_OPTIONS:MEXAMPLES}
  	${MKDIR} ${EXAMPLESDIR}
  	${INSTALL_DATA} ${DATADIR}/settings/init.txt ${EXAMPLESDIR}/sample.crawlrc
  .endif
 Index: games/stonesoup-sdl/Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/games/stonesoup-sdl/Makefile,v
 retrieving revision 1.1
 diff -u -r1.1 Makefile
 --- games/stonesoup-sdl/Makefile	8 Aug 2010 18:04:52 -0000	1.1
 +++ games/stonesoup-sdl/Makefile	10 Jun 2012 13:14:06 -0000
 @@ -5,7 +5,8 @@
  # $FreeBSD: ports/games/stonesoup-sdl/Makefile,v 1.1 2010/08/08 18:04:52 rene Exp $
  #
  
 -WITH_SDL=	yes
 +OPTIONS_DEFINE=	SDL
 +OPTIONS_DEFAULT=	SDL
  
  MASTERDIR=	${.CURDIR}/../stonesoup
  
 
 --------------010403040404040407000600--

From: Guido Falsi <madpilot@FreeBSD.org>
To: bug-followup@FreeBSD.org, tobias.rehbein@web.de
Cc: Chris Rees <crees@FreeBSD.org>, Thomas Abthorpe <tabthorpe@FreeBSD.org>
Subject: Re: ports/168837: [maintainer-update] games/stonesoup: convert
 options to optionsNG
Date: Mon, 11 Jun 2012 11:32:33 +0200

 --6c2NcOVqGQ03X4Wi
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 My mentor suggested a few fixes to my patch, for which I also thank him.
 
 So please ignore my previous patch and check the attached one.
 
 Thank you again.
 
 -- 
 Guido Falsi <madpilot@FreeBSD.org>
 
 --6c2NcOVqGQ03X4Wi
 Content-Type: text/x-diff; charset=us-ascii
 Content-Disposition: attachment; filename="stonesoup.diff"
 
 Index: games/stonesoup/Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/games/stonesoup/Makefile,v
 retrieving revision 1.21
 diff -u -r1.21 Makefile
 --- games/stonesoup/Makefile	1 Jun 2012 05:19:20 -0000	1.21
 +++ games/stonesoup/Makefile	11 Jun 2012 09:31:41 -0000
 @@ -34,9 +34,11 @@
  SUB_FILES=	README.FreeBSD
  PLIST_SUB=	SAVEDIR="${SAVEDIR}"
  
 -OPTIONS=	SOUND		"Sound support"			off \
 -		WIZARD		"Wizard mode"			off \
 -		LUA_BINDINGS	"Bindings for LUA user scripts"	off
 +OPTIONS_DEFINE=	SOUND WIZARD LUA_BINDINGS DOCS EXAMPLES
 +
 +SOUND_DESC=	Sound support
 +WIZARD_DESC=	Wizard mode
 +LUA_BINDINGS_DESC=	Bindings for LUA user scripts
  
  MAKE_ARGS=	prefix=${PREFIX} \
  		DATADIR=${DATADIR} \
 @@ -60,11 +62,11 @@
  MAKE_ARGS+=	V=yes
  .endif
  
 -.if defined(WITHOUT_WIZARD)
 +.if empty(PORT_OPTIONS:MWIZARD)
  MAKE_ARGS+=	NOWIZARD=y
  .endif
  
 -.if defined(WITH_SDL)
 +.if ${PORT_OPTIONS:MSDL}
  CONFLICTS+=	${PORTNAME}-[0-9]*
  MAKE_ARGS+=	TILES=y
  PLIST_SUB+=	SDL=""
 @@ -79,16 +81,16 @@
  PLIST_SUB+=	SDL="@comment "
  .endif
  
 -.if defined(WITH_SOUND)
 +.if ${PORT_OPTIONS:MSOUND}
  RUN_DEPENDS+=	sox:${PORTSDIR}/audio/sox
  .endif
  
 -.if defined(WITHOUT_LUA_BINDINGS)
 +.if empty(PORT_OPTIONS:MLUA_BINDINGS)
  MAKE_ARGS+=	NO_LUA_BINDINGS=yes
  .endif
  
  post-patch:
 -.if defined(WITH_SOUND)
 +.if ${PORT_OPTIONS:MSOUND}
  	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE}," ${WRKSRC}/AppHdr.h
  	@${REINPLACE_CMD} -e "s,%%SOUND%%,," ${WRKSRC}/AppHdr.h
  .else
 @@ -96,11 +98,11 @@
  .endif
  
  post-install:
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	${MKDIR} ${DOCSDIR}
  	${INSTALL_DATA} ${WRKDIR}/README.FreeBSD ${DOCSDIR}
  .endif
 -.if !defined(NOPORTEXAMPLES)
 +.if ${PORT_OPTIONS:MEXAMPLES}
  	${MKDIR} ${EXAMPLESDIR}
  	${INSTALL_DATA} ${DATADIR}/settings/init.txt ${EXAMPLESDIR}/sample.crawlrc
  .endif
 Index: games/stonesoup-sdl/Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/games/stonesoup-sdl/Makefile,v
 retrieving revision 1.1
 diff -u -r1.1 Makefile
 --- games/stonesoup-sdl/Makefile	8 Aug 2010 18:04:52 -0000	1.1
 +++ games/stonesoup-sdl/Makefile	11 Jun 2012 09:31:41 -0000
 @@ -5,7 +5,7 @@
  # $FreeBSD: ports/games/stonesoup-sdl/Makefile,v 1.1 2010/08/08 18:04:52 rene Exp $
  #
  
 -WITH_SDL=	yes
 +PORT_OPTIONS+=	SDL
  
  MASTERDIR=	${.CURDIR}/../stonesoup
  
 
 --6c2NcOVqGQ03X4Wi--
State-Changed-From-To: open->feedback 
State-Changed-By: madpilot 
State-Changed-When: Mon Jun 11 11:24:58 UTC 2012 
State-Changed-Why:  
Ask for maintainer approval. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168837 

From: Tobias Rehbein <tobias.rehbein@web.de>
To: Guido Falsi <madpilot@freebsd.org>
Cc: bug-followup@freebsd.org, Chris Rees <crees@freebsd.org>,
        Thomas Abthorpe <tabthorpe@freebsd.org>
Subject: Re: ports/168837: [maintainer-update] games/stonesoup: convert options to optionsNG
Date: Tue, 12 Jun 2012 18:35:18 +0200

 Am Mon, Jun 11, 2012 at 11:32:33AM +0200 schrieb Guido Falsi:
 > My mentor suggested a few fixes to my patch, for which I also thank him.
 > 
 > So please ignore my previous patch and check the attached one.
 > 
 > Thank you again.
 
 Hi.
 
 Interesting. I thought the direct manipulation of PORT_OPTIONS might be
 forbidden. But if the proposed solution is ok, it seems legit to me.
 
 Regards,
 
 	Tobias
State-Changed-From-To: feedback->closed 
State-Changed-By: madpilot 
State-Changed-When: Tue Jun 12 21:08:59 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168837 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/168837: commit references a PR
Date: Tue, 12 Jun 2012 21:09:05 +0000 (UTC)

 madpilot    2012-06-12 21:08:54 UTC
 
   FreeBSD ports repository
 
   Modified files:
     games/stonesoup      Makefile 
     games/stonesoup-sdl  Makefile 
   Log:
   Convert to new options framework.
   
   PR:             ports/168837
   Submitted by:   Tobias Rehbein <tobias.rehbein@web.de> (maintainer)
   Approved by:    crees (mentor)
   
   Revision  Changes    Path
   1.2       +1 -1      ports/games/stonesoup-sdl/Makefile
   1.22      +12 -10    ports/games/stonesoup/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
