From owner-svn-ports-head@FreeBSD.ORG  Sat Jan 11 15:40:15 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B5357399;
 Sat, 11 Jan 2014 15:40:15 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A1AC81AAE;
 Sat, 11 Jan 2014 15:40:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0BFeFFI020435;
 Sat, 11 Jan 2014 15:40:15 GMT (envelope-from danilo@svn.freebsd.org)
Received: (from danilo@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0BFeFxi020434;
 Sat, 11 Jan 2014 15:40:15 GMT (envelope-from danilo@svn.freebsd.org)
Message-Id: <201401111540.s0BFeFxi020434@svn.freebsd.org>
From: Danilo Egea Gondolfo <danilo@FreeBSD.org>
Date: Sat, 11 Jan 2014 15:40:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r339430 - head/audio/csound6
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.17
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: Sat, 11 Jan 2014 15:40:15 -0000

Author: danilo
Date: Sat Jan 11 15:40:15 2014
New Revision: 339430
URL: http://svnweb.freebsd.org/changeset/ports/339430

Log:
  - Fix package name collision
  - Add csound-5.* to CONFLICTS

Modified:
  head/audio/csound6/Makefile

Modified: head/audio/csound6/Makefile
==============================================================================
--- head/audio/csound6/Makefile	Sat Jan 11 15:38:33 2014	(r339429)
+++ head/audio/csound6/Makefile	Sat Jan 11 15:40:15 2014	(r339430)
@@ -5,6 +5,7 @@ PORTNAME=	csound
 PORTVERSION=	6.02
 CATEGORIES=	audio lang
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}6/${PORTNAME:S/c/C/}${PORTVERSION}
+PKGNAMESUFFIX=	6
 DISTNAME=	${PORTNAME:S/c/C/}${PORTVERSION}
 DIST_SUBDIR=	csound
 
@@ -19,6 +20,8 @@ BUILD_DEPENDS=	boost-libs>0:${PORTSDIR}/
 		gmm++>0:${PORTSDIR}/math/gmm++
 LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 
+CONFLICTS=	csound-5.*
+
 OPTIONS_DEFINE=	ALSA DSSI FLTK FLUIDSYNTH JACK LUA NLS OPENMP OSC PNG \
 		PORTAUDIO PULSEAUDIO
 OPTIONS_DEFAULT=FLTK OPENMP