From owner-svn-ports-head@FreeBSD.ORG  Fri Jan  3 16:47:13 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 C008137D;
 Fri,  3 Jan 2014 16:47:13 +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 AB85B1DE1;
 Fri,  3 Jan 2014 16:47:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s03GlDhW044864;
 Fri, 3 Jan 2014 16:47:13 GMT (envelope-from feld@svn.freebsd.org)
Received: (from feld@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s03GlD4U044862;
 Fri, 3 Jan 2014 16:47:13 GMT (envelope-from feld@svn.freebsd.org)
Message-Id: <201401031647.s03GlD4U044862@svn.freebsd.org>
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 3 Jan 2014 16:47:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338564 - in head: . net-mgmt/unifi3
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: Fri, 03 Jan 2014 16:47:13 -0000

Author: feld
Date: Fri Jan  3 16:47:12 2014
New Revision: 338564
URL: http://svnweb.freebsd.org/changeset/ports/338564

Log:
  Add CONFLICTS for incoming net-mgmt/unifi2
  Update the LEGAL entry for net-mgmt/unifi3, missed during the MOVE
  
  Approved by:	swills (mentor)

Modified:
  head/LEGAL
  head/net-mgmt/unifi3/Makefile

Modified: head/LEGAL
==============================================================================
--- head/LEGAL	Fri Jan  3 16:40:01 2014	(r338563)
+++ head/LEGAL	Fri Jan  3 16:47:12 2014	(r338564)
@@ -266,7 +266,7 @@ twelf-*			lang/twelf		License is current
 tw_cli-*		sysutils/tw_cli		Redistribution forbidden by license
 uDrawGraph-*		graphics/uDrawGraph	Binary under GNU LGPL without accompanying source
 ue*dev.zip		editors/uemacs		Resale allowed for media cost only
-UniFi.unix.zip		net-mgmt/unifi		Redistribution limited
+unifi-3*/UniFi.unix.zip	net-mgmt/unifi3		Redistribution limited
 uplink-demo*		games/linux-uplink-demo	Redistribution is limited, see license
 uppaal-*.zip		devel/uppaal		Downloading requires completion of a license agreement
 ut2004-lnx-*		games/linux-ut2004-demo	Redistribution limited

Modified: head/net-mgmt/unifi3/Makefile
==============================================================================
--- head/net-mgmt/unifi3/Makefile	Fri Jan  3 16:40:01 2014	(r338563)
+++ head/net-mgmt/unifi3/Makefile	Fri Jan  3 16:47:12 2014	(r338564)
@@ -34,6 +34,7 @@ PLIST_SUB+=	GROUPS="${GROUPS}"
 WRKSRC=	${WRKDIR}/UniFi
 
 RESTRICTED=	Redistribution of bundled firmware images is not permitted
+CONFLICTS=	unifi2-*
 
 do-install:
 	${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/unifi