From nemysis@gmx.ch  Thu Aug 16 15:32:00 2012
Return-Path: <nemysis@gmx.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 471EA106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 16 Aug 2012 15:32:00 +0000 (UTC)
	(envelope-from nemysis@gmx.ch)
Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.23])
	by mx1.freebsd.org (Postfix) with SMTP id AFEC68FC15
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 16 Aug 2012 15:31:59 +0000 (UTC)
Received: (qmail invoked by alias); 16 Aug 2012 15:31:52 -0000
Received: from cpe.r57.logikom.net (EHLO something.email.com) [213.244.239.57]
  by mail.gmx.net (mp041) with SMTP; 16 Aug 2012 17:31:52 +0200
Received: by something.email.com (sSMTP sendmail emulation); Thu, 16 Aug 2012 17:31:52 +0200
Message-Id: <20120816153200.471EA106564A@hub.freebsd.org>
Date: Thu, 16 Aug 2012 17:31:52 +0200
From: nemysis <nemysis@gmx.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] games/twind: Makefile changed, OptionsNG
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         170671
>Category:       ports
>Synopsis:       [MAINTAINER] games/twind: Makefile changed, OptionsNG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    amdmi3
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 16 15:40:09 UTC 2012
>Closed-Date:    Fri Aug 17 17:46:34 UTC 2012
>Last-Modified:  Fri Aug 17 17:50:06 UTC 2012
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC
>Description:

Makefile changed, OptionsNG added

.if ${PORT_OPTIONS:MDATA}

.if ${PORT_OPTIONS:MDOCS}

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- twind-1.1.0.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/twind/Makefile ./Makefile
--- /usr/ports/games/twind/Makefile	2012-05-03 22:56:57.000000000 +0200
+++ ./Makefile	2012-08-16 17:17:57.000000000 +0200
@@ -15,15 +15,20 @@
 
 LICENSE=	GPLv2
 
+OPTIONS_DEFINE=	DATA
+OPTIONS_DEFAULT=	DATA
+
 USE_SDL=	sdl image mixer
 MAKE_JOBS_SAFE=	yes
 
-PLIST_FILES=	bin/twind \
+PLIST_FILES=	bin/${PORTNAME} \
 		share/pixmaps/${PORTNAME}.png
 
 PORTDATA=	*
 PORTDOCS=	AUTHORS CREDITS ChangeLog NEWS README TODO
 
+.include <bsd.port.options.mk>
+
 do-build:
 	cd ${WRKSRC} && ${CC} -o ${PORTNAME} ${CFLAGS} \
 		-DDATA_PREFIX=\"${DATADIR}/\" -DAUDIO -DLINUX \
@@ -31,17 +36,22 @@
 do-install:
 # Executable
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-# Pixmaps
-	${INSTALL_DATA} ${WRKSRC}/graphics/twind.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
+
 # Data
+.if ${PORT_OPTIONS:MDATA}
 	${MKDIR} ${DATADIR}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "graphics music sound" ${DATADIR})
+.endif
+
+# Pixmaps
+	${INSTALL_DATA} ${WRKSRC}/graphics/${PORTNAME}.png ${PREFIX}/share/pixmaps/
+
 # Documentation
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
+.  for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
+.  endfor
 .endif
 
 .include <bsd.port.mk>
--- twind-1.1.0.patch ends here ---

>Release-Note:
>Audit-Trail:

From: nemysis <nemysis@gmx.ch>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170671: [MAINTAINER] games/twind: Makefile changed,
 OptionsNG
Date: Thu, 16 Aug 2012 18:10:54 +0200

 Please change
 
 Severity: 	serious
 
 to
 
 Severity: 	non-critical
 
 This is a Mistake, sorry.
 
  

From: nemysis <nemysis@gmx.ch>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170671: [MAINTAINER] games/twind: Makefile changed,
 OptionsNG
Date: Thu, 16 Aug 2012 23:28:15 +0200

 --MP_/TVO.TXJwbZq8/bCZ2y3Ox+Z
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 
 --MP_/TVO.TXJwbZq8/bCZ2y3Ox+Z
 Content-Type: text/x-patch
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment; filename=twind.diff
 
 diff -ruN twind.orig/Makefile twind/Makefile
 --- twind.orig/Makefile	2012-08-16 17:17:57.000000000 +0200
 +++ twind/Makefile	2012-08-16 23:25:50.000000000 +0200
 @@ -7,6 +7,7 @@
  
  PORTNAME=	twind
  PORTVERSION=	1.1.0
 +PORTREVISION=	1
  CATEGORIES=	games
  MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
  
 
 --MP_/TVO.TXJwbZq8/bCZ2y3Ox+Z--
Responsible-Changed-From-To: freebsd-ports-bugs->amdmi3 
Responsible-Changed-By: amdmi3 
Responsible-Changed-When: Fri Aug 17 17:44:11 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170671 
State-Changed-From-To: open->closed 
State-Changed-By: amdmi3 
State-Changed-When: Fri Aug 17 17:46:33 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170671: commit references a PR
Date: Fri, 17 Aug 2012 17:46:41 +0000 (UTC)

 Author: amdmi3
 Date: Fri Aug 17 17:46:32 2012
 New Revision: 302690
 URL: http://svn.freebsd.org/changeset/ports/302690
 
 Log:
   - Switch to optionsNG
   
   PR:		ports/170671
   Submitted by:	nemysis <nemysis@gmx.ch>
 
 Modified:
   head/games/twind/Makefile
 
 Modified: head/games/twind/Makefile
 ==============================================================================
 --- head/games/twind/Makefile	Fri Aug 17 17:43:59 2012	(r302689)
 +++ head/games/twind/Makefile	Fri Aug 17 17:46:32 2012	(r302690)
 @@ -15,15 +15,20 @@ COMMENT=	Match and remove all of the blo
  
  LICENSE=	GPLv2
  
 +OPTIONS_DEFINE=	DATA
 +OPTIONS_DEFAULT=	DATA
 +
  USE_SDL=	sdl image mixer
  MAKE_JOBS_SAFE=	yes
  
 -PLIST_FILES=	bin/twind \
 +PLIST_FILES=	bin/${PORTNAME} \
  		share/pixmaps/${PORTNAME}.png
  
  PORTDATA=	*
  PORTDOCS=	AUTHORS CREDITS ChangeLog NEWS README TODO
  
 +.include <bsd.port.options.mk>
 +
  do-build:
  	cd ${WRKSRC} && ${CC} -o ${PORTNAME} ${CFLAGS} \
  		-DDATA_PREFIX=\"${DATADIR}/\" -DAUDIO -DLINUX \
 @@ -31,17 +36,22 @@ do-build:
  do-install:
  # Executable
  	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 -# Pixmaps
 -	${INSTALL_DATA} ${WRKSRC}/graphics/twind.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
 +
  # Data
 +.if ${PORT_OPTIONS:MDATA}
  	${MKDIR} ${DATADIR}
  	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "graphics music sound" ${DATADIR})
 +.endif
 +
 +# Pixmaps
 +	${INSTALL_DATA} ${WRKSRC}/graphics/${PORTNAME}.png ${PREFIX}/share/pixmaps/
 +
  # Documentation
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	${MKDIR} ${DOCSDIR}
 -.for f in ${PORTDOCS}
 +.  for f in ${PORTDOCS}
  	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 -.endfor
 +.  endfor
  .endif
  
  .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"
 
>Unformatted:
