From owner-svn-ports-head@FreeBSD.ORG  Mon Jan 13 23:50:45 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AE06356F;
 Mon, 13 Jan 2014 23:50:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8E68515F5;
 Mon, 13 Jan 2014 23:50:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0DNoj17055013;
 Mon, 13 Jan 2014 23:50:45 GMT (envelope-from nemysis@svn.freebsd.org)
Received: (from nemysis@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0DNojRU055011;
 Mon, 13 Jan 2014 23:50:45 GMT (envelope-from nemysis@svn.freebsd.org)
Message-Id: <201401132350.s0DNojRU055011@svn.freebsd.org>
From: Rusmir Dusko <nemysis@FreeBSD.org>
Date: Mon, 13 Jan 2014 23:50:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339646 - in head/games/smashbattle: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jan 2014 23:50:45 -0000

Author: nemysis
Date: Mon Jan 13 23:50:44 2014
New Revision: 339646
URL: http://svnweb.freebsd.org/changeset/ports/339646

Log:
  - USES dos2unix and DOS2UNIX_FILES instead of USE_DOS2UNIX
  - Support STAGEDIR
  - Disable all warnings with -w
  - Change files/smashbattle.in

Modified:
  head/games/smashbattle/Makefile
  head/games/smashbattle/files/smashbattle.in

Modified: head/games/smashbattle/Makefile
==============================================================================
--- head/games/smashbattle/Makefile	Mon Jan 13 23:30:52 2014	(r339645)
+++ head/games/smashbattle/Makefile	Mon Jan 13 23:50:44 2014	(r339646)
@@ -15,35 +15,34 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/battle/Ba
 
 USE_ZIP=	yes
 EXTRACT_AFTER_ARGS=	-d ${WRKDIR}/${DISTNAME}
-USES=		gmake
+USES=		dos2unix gmake
+DOS2UNIX_FILES= *.cpp *.h Makefile
 USE_SDL=	sdl image mixer
-USE_DOS2UNIX=	*.cpp *.h *.ini Makefile
 ALL_TARGET=	battle
 
-NO_STAGE=	yes
 pre-extract:
 	@${MKDIR} ${WRKDIR}/${DISTNAME}
 
 SUB_FILES=	${PORTNAME}
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} \
-		-e 's|CC=|CC?=|' \
-		-e 's|CFLAGS=-c -Wall|CFLAGS += $$(shell sdl-config --cflags) -c -Wall|' \
-		-e 's|LDFLAGS=-lSDL -lSDL_mixer -lz -lstdc++|LDFLAGS += $$(shell $${SDL_CONFIG} --libs) -lSDL -lSDL_mixer -lz -lstdc++ -lm|' \
+		-e 's|CC=|CC?=| ; \
+		s|CFLAGS=-c -Wall|CFLAGS += $$(shell sdl-config --cflags) -c -w| ; \
+		s|LDFLAGS=-lSDL -lSDL_mixer -lz -lstdc++|LDFLAGS += $$(shell $${SDL_CONFIG} --libs) -lSDL -lSDL_mixer -lz -lstdc++ -lm|' \
 			${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|/usr/share/games/smashbattle/gfx/SB.png|${PORTNAME}|' \
-		-e 's|/usr/local/bin/smashbattle|${PORTNAME}|' \
+	@${REINPLACE_CMD} -e 's|/usr/share/games/smashbattle/gfx/SB.png|${PORTNAME}| ; \
+		s|/usr/local/bin/smashbattle|${PORTNAME}|' \
 		${WRKSRC}/linux/*.desktop
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "gfx music sfx stage" ${DATADIR})
-	${INSTALL_PROGRAM} ${WRKSRC}/battle ${DATADIR}/${PORTNAME}
-	${LN} -sf ${DATADIR}/gfx/SB.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
-#	${INSTALL_DATA} ${WRKSRC}/linux/*.desktop ${PREFIX}/share/applications/
-	${INSTALL_DATA} ${WRKSRC}/linux/*.desktop ${DESKTOPDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+.for d in gfx music sfx stage
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR})
+.endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/battle ${STAGEDIR}${DATADIR}/${PORTNAME}
+	${LN} -sf ${DATADIR}/gfx/SB.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
+	${INSTALL_DATA} ${WRKSRC}/linux/*.desktop ${STAGEDIR}${DESKTOPDIR}
 
 .include <bsd.port.mk>

Modified: head/games/smashbattle/files/smashbattle.in
==============================================================================
--- head/games/smashbattle/files/smashbattle.in	Mon Jan 13 23:30:52 2014	(r339645)
+++ head/games/smashbattle/files/smashbattle.in	Mon Jan 13 23:50:44 2014	(r339646)
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
+#
 
 cd "%%DATADIR%%"
 exec ./smashbattle "${@}"