From owner-svn-ports-head@FreeBSD.ORG Tue May 27 13:21:14 2014 Return-Path: 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 654DAE90; Tue, 27 May 2014 13:21:14 +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 389F22904; Tue, 27 May 2014 13:21:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4RDLE1Z007327; Tue, 27 May 2014 13:21:14 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4RDLDxR007323; Tue, 27 May 2014 13:21:13 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201405271321.s4RDLDxR007323@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 27 May 2014 13:21:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355511 - in head/games: pingus pink-pony 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.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 May 2014 13:21:14 -0000 Author: bapt Date: Tue May 27 13:21:13 2014 New Revision: 355511 URL: http://svnweb.freebsd.org/changeset/ports/355511 QAT: https://qat.redports.org/buildarchive/r355511/ Log: Convert to USES=scons Stagify Modified: head/games/pingus/Makefile head/games/pink-pony/Makefile Modified: head/games/pingus/Makefile ============================================================================== --- head/games/pingus/Makefile Tue May 27 13:19:50 2014 (r355510) +++ head/games/pingus/Makefile Tue May 27 13:21:13 2014 (r355511) @@ -14,10 +14,8 @@ LIB_DEPENDS= libpng15.so:${PORTSDIR}/gra libboost_regex.so:${PORTSDIR}/devel/boost-libs \ libphysfs.so:${PORTSDIR}/devel/physfs -USE_BZIP2= yes -USES= iconv -USE_SCONS= yes -SCONS_ARGS= with_linuxusbmouse=0 \ +USES= iconv scons tar:bzip2 +MAKE_ARGS= with_linuxusbmouse=0 \ with_linuxevdev=0 USE_SDL= sdl image mixer @@ -27,7 +25,6 @@ DESKTOP_ENTRIES="Pingus" "${COMMENT}" \ PLIST= ${WRKDIR}/pkg-plist -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|add_path("data")|add_path("${DATADIR}")|g' \ ${WRKSRC}/src/pingus_main.cpp @@ -42,11 +39,10 @@ pre-install: @${ECHO_CMD} "@dirrm %%DATADIR%%" >> ${PLIST} do-install: - @${MKDIR} ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} @cd ${WRKSRC}/data && \ - ${FIND} * -type d -exec ${MKDIR} "${DATADIR}/{}" \; && \ - ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \; - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/src/win32/icon1.ico ${PREFIX}/share/pixmaps/${PORTNAME}.ico + ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/src/win32/icon1.ico ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.ico .include Modified: head/games/pink-pony/Makefile ============================================================================== --- head/games/pink-pony/Makefile Tue May 27 13:19:50 2014 (r355510) +++ head/games/pink-pony/Makefile Tue May 27 13:21:13 2014 (r355511) @@ -20,9 +20,7 @@ LIB_DEPENDS= libIL.so:${PORTSDIR}/graphi libftgl.so:${PORTSDIR}/graphics/ftgl \ libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 -USES= dos2unix pkgconfig tar:bzip2 -USE_BZIP2= yes -USE_SCONS= yes +USES= dos2unix pkgconfig scons tar:bzip2 USE_GL= gl glu USE_SDL= mixer SUB_FILES= pink-pony.sh