From owner-svn-ports-all@FreeBSD.ORG  Fri Oct 18 01:20:49 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 ESMTP id 31C426DF;
 Fri, 18 Oct 2013 01:20:49 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
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 0714C2076;
 Fri, 18 Oct 2013 01:20:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9I1KmNa083223;
 Fri, 18 Oct 2013 01:20:48 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9I1Kmwh083222;
 Fri, 18 Oct 2013 01:20:48 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201310180120.r9I1Kmwh083222@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Fri, 18 Oct 2013 01:20:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r330715 - head/games/tomatoes
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Fri, 18 Oct 2013 01:20:49 -0000

Author: amdmi3
Date: Fri Oct 18 01:20:48 2013
New Revision: 330715
URL: http://svnweb.freebsd.org/changeset/ports/330715

Log:
  - Support staging
  - Convert USE_GMAKE to USES

Modified:
  head/games/tomatoes/Makefile

Modified: head/games/tomatoes/Makefile
==============================================================================
--- head/games/tomatoes/Makefile	Fri Oct 18 01:20:37 2013	(r330714)
+++ head/games/tomatoes/Makefile	Fri Oct 18 01:20:48 2013	(r330715)
@@ -18,7 +18,7 @@ TDATA=		${WRKDIR}/tomatoes-${PORTVERSION
 USE_BZIP2=	yes
 USE_SDL=	mixer image
 USE_GL=		gl
-USE_GMAKE=	yes
+USES=		gmake
 MAKEFILE=	makefile
 MAKE_ARGS=	CC="${CXX}" \
 		MPKDIR="${DATADIR}/" \
@@ -28,40 +28,26 @@ MAKE_ARGS=	CC="${CXX}" \
 		CFLAGS="${CXXFLAGS} ${SDL_CFLAGS}" \
 		LDFLAGS="${SDL_LDFLAGS}"
 
-PLIST_FILES=	bin/tomatoes \
-		%%DATADIR%%/config.cfg \
-		%%DATADIR%%/music/IHaveNoTomatoes.it \
-		%%DATADIR%%/tomatoes.mpk \
-		%%DATADIR%%/icon.png
-PLIST_DIRS=	%%DATADIR%%/music \
-		%%DATADIR%%
+PLIST_FILES=	bin/${PORTNAME}
+PORTDATA=	*
 
 SDL_CFLAGS=	`${SDL_CONFIG} --cflags` -I${LOCALBASE}/include
 SDL_LDFLAGS=	`${SDL_CONFIG} --libs` -lSDL_image -lSDL_mixer \
 		-L${LOCALBASE}/lib -lGL -lGLU
 
-DESKTOP_ENTRIES=	"Tomatoes" \
-			"I Have No Tomatoes" \
-			"${DATADIR}/icon.png" \
-			"tomatoes" \
-			"Game;ArcadeGame;" \
-			false
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-post-patch:
-.for file in include/font.h
-	cd ${WRKSRC} && ${CP} ${file} ${file}.bak \
-		&& ${TR} -d '\r' < ${file}.bak > ${file}
-.endfor
+DESKTOP_ENTRIES="Tomatoes" \
+		"${COMMENT}" \
+		"${DATADIR}/icon.png" \
+		"${PORTNAME}" \
+		"Game;ArcadeGame;" \
+		false
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${MKDIR} ${DATADIR}/music
-	${INSTALL_DATA} ${TDATA}/config.cfg ${DATADIR}
-	${INSTALL_DATA} ${TDATA}/tomatoes.mpk ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/icon.png ${DATADIR}
-	${INSTALL_DATA} ${TDATA}/music/IHaveNoTomatoes.it ${DATADIR}/music
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DATADIR}/music
+	${INSTALL_DATA} ${TDATA}/config.cfg ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${TDATA}/tomatoes.mpk ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/icon.png ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${TDATA}/music/IHaveNoTomatoes.it ${STAGEDIR}${DATADIR}/music
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>