Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 3 Jan 2014 16:47:13 +0000 (UTC)
From:      Mark Felder <feld@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r338564 - in head: . net-mgmt/unifi3
Message-ID:  <201401031647.s03GlD4U044862@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401031647.s03GlD4U044862>