From owner-svn-ports-all@FreeBSD.ORG  Thu Aug  9 12:01:20 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 84CAD106564A;
	Thu,  9 Aug 2012 12:01:20 +0000 (UTC)
	(envelope-from scheidell@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 55CDC8FC18;
	Thu,  9 Aug 2012 12:01:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q79C1Khr006609;
	Thu, 9 Aug 2012 12:01:20 GMT
	(envelope-from scheidell@svn.freebsd.org)
Received: (from scheidell@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q79C1K8I006606;
	Thu, 9 Aug 2012 12:01:20 GMT
	(envelope-from scheidell@svn.freebsd.org)
Message-Id: <201208091201.q79C1K8I006606@svn.freebsd.org>
From: Michael Scheidell <scheidell@FreeBSD.org>
Date: Thu, 9 Aug 2012 12:01:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r302338 - in head/games/blockrage: . files
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2012 12:01:20 -0000

Author: scheidell
Date: Thu Aug  9 12:01:19 2012
New Revision: 302338
URL: http://svn.freebsd.org/changeset/ports/302338

Log:
  - Replace unsafe blockrage.sh script
  - Update to OptionsNG
  - Bump PORTREVISION
  
  PR:		ports/170455
  Submitted by:	nemysis <nemysis@gmx.ch> (maintainer)

Added:
  head/games/blockrage/files/blockrage.in   (contents, props changed)
Modified:
  head/games/blockrage/Makefile   (contents, props changed)

Modified: head/games/blockrage/Makefile
==============================================================================
--- head/games/blockrage/Makefile	Thu Aug  9 11:38:19 2012	(r302337)
+++ head/games/blockrage/Makefile	Thu Aug  9 12:01:19 2012	(r302338)
@@ -7,6 +7,7 @@
 
 PORTNAME=	blockrage
 PORTVERSION=	0.2.3
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 
@@ -15,36 +16,45 @@ COMMENT=	Block Rage is falling blocks ga
 
 LICENSE=	GPLv2
 
+OPTIONS_DEFINE=	DATA
+OPTIONS_DEFAULT=	DATA
+
 GNU_CONFIGURE=	yes
 ALL_TARGET=	${PORTNAME}
 USE_SDL=	sdl image mixer
 MAKE_JOBS_SAFE=	yes
 
-PLIST_FILES=	bin/blockrage
+PLIST_FILES=	bin/${PORTNAME}
 
-MAN6=		blockrage.6
+MAN6=		${PORTNAME}.6
 
 PORTDATA=	*
 PORTDOCS=	ChangeLog KNOWN_BUGS README TODO
 
+SUB_FILES=	${PORTNAME}
+
+.include <bsd.port.options.mk>
+
 do-install:
 # Scripts
-	@${PRINTF} "#!/bin/sh\n\ncd ${DATADIR} &&\
-		./blockrage\n" > ${WRKDIR}/blockrage.sh
-	@${INSTALL_SCRIPT} ${WRKDIR}/blockrage.sh ${PREFIX}/bin/blockrage
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
+
 # Executable
 	${MKDIR} ${DATADIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/blockrage ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${DATADIR}
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/${MAN6} ${MAN6PREFIX}/man/man6
+
 # Data
-.for d in data blockrage-fhs.rc blockrage.cfg blockrage.rc
+.if ${PORT_OPTIONS:MDATA}
+.  for d in data blockrage-fhs.rc blockrage.cfg blockrage.rc
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR})
-.endfor
+.  endfor
+.endif
 
 # Documentations
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .  for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}

Added: head/games/blockrage/files/blockrage.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/blockrage/files/blockrage.in	Thu Aug  9 12:01:19 2012	(r302338)
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+echo "Block Rage: Starting up..."
+cd "%%DATADIR%%"
+./blockrage
\ No newline at end of file