Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Oct 2014 17:00:13 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r371455 - head/games/marsnomercy
Message-ID:  <201410241700.s9OH0DD8029204@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Fri Oct 24 17:00:12 2014
New Revision: 371455
URL: https://svnweb.freebsd.org/changeset/ports/371455
QAT: https://qat.redports.org/buildarchive/r371455/

Log:
  - Simplify installation and plist generation

Modified:
  head/games/marsnomercy/Makefile

Modified: head/games/marsnomercy/Makefile
==============================================================================
--- head/games/marsnomercy/Makefile	Fri Oct 24 16:56:10 2014	(r371454)
+++ head/games/marsnomercy/Makefile	Fri Oct 24 17:00:12 2014	(r371455)
@@ -17,12 +17,12 @@ USE_GL=		gl
 USE_SDL=	sdl image ttf
 SCONS_ARGS=	prefix=${PREFIX}
 
-PLIST=		${WRKDIR}/pkg-plist
-PLIST_FILES=	bin/mars-nomercy libexec/mars
-PLIST_DIRS=	%%DATADIR%%
 SUB_FILES=	mars-nomercy pkg-message
 WRKSRC=		${WRKDIR}/mars-${PORTVERSION}
 
+PLIST_FILES=	bin/mars-nomercy libexec/mars
+PORTDATA=	*
+
 OPTIONS_DEFINE=	DEBUG OPENGL
 
 .include <bsd.port.options.mk>
@@ -42,18 +42,10 @@ SCONS_ARGS+=	with_opengl=0
 do-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} scons ${SCONS_ARGS}
 
-pre-install:
-	@${RM} -f ${PLIST}
-	@cd ${WRKSRC}/data && \
-		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \
-		${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST}
-
 do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	@cd ${WRKSRC}/data && \
-		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DATADIR}/{}" \; && \
-			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DATADIR}/{}" \;
-	@${INSTALL_SCRIPT} ${WRKDIR}/mars-nomercy ${STAGEDIR}${PREFIX}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/mars ${STAGEDIR}${PREFIX}/libexec/mars
+	${INSTALL_SCRIPT} ${WRKDIR}/mars-nomercy ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/mars ${STAGEDIR}${PREFIX}/libexec/mars
+	cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
+	@${RM} -f ${STAGEDIR}${DATADIR}/SConscript
 
 .include <bsd.port.mk>



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