From owner-svn-ports-all@FreeBSD.ORG Wed Jun 25 12:56:22 2014 Return-Path: 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 ESMTPS id 7367A7D8; Wed, 25 Jun 2014 12:56:22 +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 5F34F2498; Wed, 25 Jun 2014 12:56:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5PCuMfP006562; Wed, 25 Jun 2014 12:56:22 GMT (envelope-from jhale@svn.freebsd.org) Received: (from jhale@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5PCuL0X006558; Wed, 25 Jun 2014 12:56:21 GMT (envelope-from jhale@svn.freebsd.org) Message-Id: <201406251256.s5PCuL0X006558@svn.freebsd.org> From: "Jason E. Hale" Date: Wed, 25 Jun 2014 12:56:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359236 - in head/games: fretsonfire fretsonfire-data 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 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: Wed, 25 Jun 2014 12:56:22 -0000 Author: jhale Date: Wed Jun 25 12:56:21 2014 New Revision: 359236 URL: http://svnweb.freebsd.org/changeset/ports/359236 QAT: https://qat.redports.org/buildarchive/r359236/ Log: - Support staging - Tab -> space in pkg-descr - Add DOCS option Approved by: portmgr (blanket approval) Modified: head/games/fretsonfire-data/Makefile head/games/fretsonfire-data/pkg-descr head/games/fretsonfire/Makefile head/games/fretsonfire/pkg-descr Modified: head/games/fretsonfire-data/Makefile ============================================================================== --- head/games/fretsonfire-data/Makefile Wed Jun 25 12:50:40 2014 (r359235) +++ head/games/fretsonfire-data/Makefile Wed Jun 25 12:56:21 2014 (r359236) @@ -19,11 +19,10 @@ WRKSRC= ${WRKDIR}/Frets\ on\ Fire-${POR EXTRACT_AFTER_ARGS= --exclude 'win32' "Frets on Fire-${PORTVERSION}/${PORTNAME}" -NO_STAGE= yes do-install: - @${MKDIR} ${PREFIX}/${DATADIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/${DATADIR} @cd ${WRKSRC}/data && \ - ${FIND} * -type d -exec ${MKDIR} "${PREFIX}/${DATADIR}/{}" \; && \ - ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/${DATADIR}/{}" \; + ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/${DATADIR}/{}" \; && \ + ${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${PREFIX}/${DATADIR}/{}" \; .include Modified: head/games/fretsonfire-data/pkg-descr ============================================================================== --- head/games/fretsonfire-data/pkg-descr Wed Jun 25 12:50:40 2014 (r359235) +++ head/games/fretsonfire-data/pkg-descr Wed Jun 25 12:56:21 2014 (r359236) @@ -1,3 +1,3 @@ The Frets on Fire data files -WWW: http://louhi.kempele.fi/~skyostil/uv/fretsonfire/ +WWW: http://louhi.kempele.fi/~skyostil/uv/fretsonfire/ Modified: head/games/fretsonfire/Makefile ============================================================================== --- head/games/fretsonfire/Makefile Wed Jun 25 12:50:40 2014 (r359235) +++ head/games/fretsonfire/Makefile Wed Jun 25 12:56:21 2014 (r359236) @@ -3,7 +3,7 @@ PORTNAME= fretsonfire PORTVERSION= 1.3.110 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games python MASTER_SITES= SF DISTNAME= ${PORTNAME:S/f/F/g:S/o/O/}-${PORTVERSION} @@ -31,26 +31,20 @@ WRKSRC= "${WRKDIR}/Frets on Fire-${PORT FOF_DIR= ${PREFIX}/lib/${PORTNAME} -NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS do-install: - ${MKDIR} ${FOF_DIR}/${PORTNAME:S/f/F/g:S/o/O/} + @${MKDIR} ${STAGEDIR}${FOF_DIR}/${PORTNAME:S/f/F/g:S/o/O/} @cd ${WRKSRC}/src && \ - ${FIND} * -type d -exec ${MKDIR} "${FOF_DIR}/${PORTNAME:S/f/F/g:S/o/O/}/{}" \; && \ - ${FIND} -E * -type f -iregex ".*\.(py)" -exec ${INSTALL_DATA} "{}" "${FOF_DIR}/${PORTNAME:S/f/F/g:S/o/O/}/{}" \; + ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${FOF_DIR}/${PORTNAME:S/f/F/g:S/o/O/}/{}" \; && \ + ${FIND} -E * -type f -iregex ".*\.(py)" -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${FOF_DIR}/${PORTNAME:S/f/F/g:S/o/O/}/{}" \; - ${MKDIR} ${FOF_DIR}/data - ${LN} -s ${LOCALBASE}/${DATADIR}/* ${FOF_DIR}/data - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME:S/f/F/g:S/o/O/} ${PREFIX}/bin - -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR}/README - ${INSTALL_DATA} ${WRKSRC}/install.txt ${DOCSDIR}/INSTALL -.endif + @${MKDIR} ${STAGEDIR}${FOF_DIR}/data + ${LN} -s ${LOCALBASE}/${DATADIR}/* ${STAGEDIR}${FOF_DIR}/data + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME:S/f/F/g:S/o/O/} ${STAGEDIR}${PREFIX}/bin + + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}/README + ${INSTALL_DATA} ${WRKSRC}/install.txt ${STAGEDIR}${DOCSDIR}/INSTALL -post-install: - @${CAT} ${PKGMESSAGE} - -.include +.include Modified: head/games/fretsonfire/pkg-descr ============================================================================== --- head/games/fretsonfire/pkg-descr Wed Jun 25 12:50:40 2014 (r359235) +++ head/games/fretsonfire/pkg-descr Wed Jun 25 12:56:21 2014 (r359236) @@ -1,4 +1,4 @@ Frets on Fire is a game of musical skill and fast fingers. The aim of the game is to play guitar with the keyboard as accurately as possible. -WWW: http://fretsonfire.sf.net +WWW: http://fretsonfire.sf.net