From owner-svn-ports-all@FreeBSD.ORG Fri Oct 24 17:00:13 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 81322AF5; Fri, 24 Oct 2014 17:00:13 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5495DEBE; Fri, 24 Oct 2014 17:00:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9OH0DgI029205; Fri, 24 Oct 2014 17:00:13 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9OH0DD8029204; Fri, 24 Oct 2014 17:00:13 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201410241700.s9OH0DD8029204@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 24 Oct 2014 17:00:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371455 - head/games/marsnomercy 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.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Oct 2014 17:00:13 -0000 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 @@ -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