Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Nov 2013 09:33:52 +0000 (UTC)
From:      Rusmir Dusko <nemysis@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r335270 - head/games/tong
Message-ID:  <201311300933.rAU9Xqcc073943@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nemysis
Date: Sat Nov 30 09:33:51 2013
New Revision: 335270
URL: http://svnweb.freebsd.org/changeset/ports/335270

Log:
  - Change Makefile header
  - Change maintainer email to @FreeBSD.org
  - USES gmake instead of USE_GMAKE
  - Support STAGEDIR
  - Add DOCS Option
  
  Approved by:	pawel / wg (mentors, implicit)

Modified:
  head/games/tong/Makefile

Modified: head/games/tong/Makefile
==============================================================================
--- head/games/tong/Makefile	Sat Nov 30 09:15:17 2013	(r335269)
+++ head/games/tong/Makefile	Sat Nov 30 09:33:51 2013	(r335270)
@@ -1,4 +1,4 @@
-# Created by: nemysis@gmx.ch
+# Created by: nemysis <nemysis@gmx.ch>
 # $FreeBSD$
 
 PORTNAME=	tong
@@ -7,13 +7,13 @@ PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.nongnu.org/tong/
 
-MAINTAINER=	nemysis@gmx.ch
+MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Tetris and Pong in the same place at the same time
 
 LICENSE=	GPLv3
 
+USES=		gmake
 USE_SDL=	image mixer sdl
-USE_GMAKE=	yes
 
 PORTDOCS=	CHANGELOG README making-of.txt notes.txt
 
@@ -22,8 +22,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 DESKTOP_ENTRIES="TONG!" "${COMMENT}" "${PORTNAME}" \
 		"${PORTNAME}" "Game;ArcadeGame;" false
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|GAME_DATA_DIR := .|GAME_DATA_DIR := ${DATADIR}|' \
@@ -31,15 +30,19 @@ post-patch:
 		${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} "*.png" ${DATADIR}
-	${MKDIR} ${DATADIR}/media
-	@cd ${WRKSRC}/media && ${COPYTREE_SHARE} "*.png *.xcf *.ogg *.ico" ${DATADIR}/media
-	${LN} -sf ${DATADIR}/media/icon.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
-
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} "*.png" ${STAGEDIR}${DATADIR}
+
+	@${MKDIR} ${STAGEDIR}${DATADIR}/media/
+
+.for d in *.png *.xcf *.ogg *.ico
+	@(cd ${WRKSRC}/media ; ${COPYTREE_SHARE} "${d}" ${STAGEDIR}${DATADIR}/media/)
+.endfor
+
+	${LN} -sf ${DATADIR}/media/icon.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
+
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311300933.rAU9Xqcc073943>