From owner-svn-ports-all@FreeBSD.ORG Mon May 26 21:57:17 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 39E1DC65; Mon, 26 May 2014 21:57:17 +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 0E1102F1E; Mon, 26 May 2014 21:57:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4QLvGld092649; Mon, 26 May 2014 21:57:16 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4QLvGmA092647; Mon, 26 May 2014 21:57:16 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201405262157.s4QLvGmA092647@svn.freebsd.org> From: Dmitry Marakasov Date: Mon, 26 May 2014 21:57:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r355457 - branches/2014Q2/games/daimonin-music X-SVN-Group: ports-branches 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: Mon, 26 May 2014 21:57:17 -0000 Author: amdmi3 Date: Mon May 26 21:57:16 2014 New Revision: 355457 URL: http://svnweb.freebsd.org/changeset/ports/355457 QAT: https://qat.redports.org/buildarchive/r355457/ Log: MFH: r355449 - Fix conflict with games/daimonin Approved by: portmgr Modified: branches/2014Q2/games/daimonin-music/Makefile branches/2014Q2/games/daimonin-music/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/games/daimonin-music/Makefile ============================================================================== --- branches/2014Q2/games/daimonin-music/Makefile Mon May 26 21:33:05 2014 (r355456) +++ branches/2014Q2/games/daimonin-music/Makefile Mon May 26 21:57:16 2014 (r355457) @@ -3,6 +3,7 @@ PORTNAME= daimonin-music PORTVERSION= 20120402 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/daimonin/Addon%20packs/Music/ DISTNAME= AllMusic @@ -13,11 +14,16 @@ COMMENT= Music for daimonin client NO_BUILD= true USES= zip:infozip +NO_ARCH= yes MYDATADIR= ${PREFIX}/share/daimonin EXTRACT_BEFORE_ARGS= -aqo +post-extract: + @${MV} ${WRKDIR}/media/media.txt ${WRKDIR}/media/media-music.txt + @${RM} -f ${WRKDIR}/media/orchestral.ogg + do-install: ${MKDIR} ${STAGEDIR}${MYDATADIR} cd ${WRKDIR} && ${COPYTREE_SHARE} media ${STAGEDIR}${MYDATADIR}/ Modified: branches/2014Q2/games/daimonin-music/pkg-plist ============================================================================== --- branches/2014Q2/games/daimonin-music/pkg-plist Mon May 26 21:33:05 2014 (r355456) +++ branches/2014Q2/games/daimonin-music/pkg-plist Mon May 26 21:57:16 2014 (r355457) @@ -64,14 +64,13 @@ share/daimonin/media/frozen.ogg share/daimonin/media/ghost.ogg share/daimonin/media/jungle1.ogg share/daimonin/media/landing.ogg -share/daimonin/media/media.txt +share/daimonin/media/media-music.txt share/daimonin/media/ocean.ogg -share/daimonin/media/orchestral.ogg share/daimonin/media/rainthunder.ogg share/daimonin/media/raspy.ogg share/daimonin/media/rubberfreak.ogg share/daimonin/media/spokyspace.ogg share/daimonin/media/swamp.ogg share/daimonin/media/thonkdonk.ogg -@dirrm share/daimonin/media -@dirrm share/daimonin +@dirrmtry share/daimonin/media +@dirrmtry share/daimonin