From owner-svn-ports-head@FreeBSD.ORG  Mon May 26 20:35:00 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
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 59D8D4C2;
 Mon, 26 May 2014 20:35:00 +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 2CD0E290B;
 Mon, 26 May 2014 20:35:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4QKZ0GA056207;
 Mon, 26 May 2014 20:35:00 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4QKYxOF056190;
 Mon, 26 May 2014 20:34:59 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201405262034.s4QKYxOF056190@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Mon, 26 May 2014 20:34:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r355449 - head/games/daimonin-music
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
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 May 2014 20:35:00 -0000

Author: amdmi3
Date: Mon May 26 20:34:59 2014
New Revision: 355449
URL: http://svnweb.freebsd.org/changeset/ports/355449
QAT: https://qat.redports.org/buildarchive/r355449/

Log:
  - Fix conflict with games/daimonin
  
  MFH:		2014Q2

Modified:
  head/games/daimonin-music/Makefile
  head/games/daimonin-music/pkg-plist

Modified: head/games/daimonin-music/Makefile
==============================================================================
--- head/games/daimonin-music/Makefile	Mon May 26 20:31:28 2014	(r355448)
+++ head/games/daimonin-music/Makefile	Mon May 26 20:34:59 2014	(r355449)
@@ -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: head/games/daimonin-music/pkg-plist
==============================================================================
--- head/games/daimonin-music/pkg-plist	Mon May 26 20:31:28 2014	(r355448)
+++ head/games/daimonin-music/pkg-plist	Mon May 26 20:34:59 2014	(r355449)
@@ -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