From owner-svn-ports-head@FreeBSD.ORG Fri Oct 31 13:34:33 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 206F5E44; Fri, 31 Oct 2014 13:34:33 +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 E69FA19D; Fri, 31 Oct 2014 13:34:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9VDYWgq028483; Fri, 31 Oct 2014 13:34:32 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9VDYVXs028476; Fri, 31 Oct 2014 13:34:31 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201410311334.s9VDYVXs028476@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 31 Oct 2014 13:34:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371823 - in head/net-mgmt: unifi2 unifi2/files unifi3 unifi3/files 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-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Oct 2014 13:34:33 -0000 Author: feld Date: Fri Oct 31 13:34:31 2014 New Revision: 371823 URL: https://svnweb.freebsd.org/changeset/ports/371823 QAT: https://qat.redports.org/buildarchive/r371823/ Log: Update CONFLICTS Update my email address in the rc script Modified: head/net-mgmt/unifi2/Makefile head/net-mgmt/unifi2/files/unifi.in head/net-mgmt/unifi3/Makefile head/net-mgmt/unifi3/files/unifi.in Modified: head/net-mgmt/unifi2/Makefile ============================================================================== --- head/net-mgmt/unifi2/Makefile Fri Oct 31 13:34:08 2014 (r371822) +++ head/net-mgmt/unifi2/Makefile Fri Oct 31 13:34:31 2014 (r371823) @@ -35,7 +35,7 @@ GROUPS= unifi WRKSRC= ${WRKDIR}/UniFi RESTRICTED= Redistribution of bundled firmware images is not permitted -CONFLICTS= unifi3-* +CONFLICTS= unifi3-* unifi4-* post-extract: ${MKDIR} ${WRKSRC}/webapps/ROOT Modified: head/net-mgmt/unifi2/files/unifi.in ============================================================================== --- head/net-mgmt/unifi2/files/unifi.in Fri Oct 31 13:34:08 2014 (r371822) +++ head/net-mgmt/unifi2/files/unifi.in Fri Oct 31 13:34:31 2014 (r371823) @@ -1,6 +1,6 @@ #!/bin/sh # -# Created by: Mark Felder +# Created by: Mark Felder # $FreeBSD: head/net-mgmt/unifi/files/unifi.in 334865 2013-11-25 16:52:21Z feld $ # Modified: head/net-mgmt/unifi3/Makefile ============================================================================== --- head/net-mgmt/unifi3/Makefile Fri Oct 31 13:34:08 2014 (r371822) +++ head/net-mgmt/unifi3/Makefile Fri Oct 31 13:34:31 2014 (r371823) @@ -34,7 +34,7 @@ GROUPS= unifi WRKSRC= ${WRKDIR}/UniFi RESTRICTED= Redistribution of bundled firmware images is not permitted -CONFLICTS= unifi2-* +CONFLICTS= unifi2-* unifi4-* post-extract: ${MKDIR} ${WRKSRC}/webapps/ROOT Modified: head/net-mgmt/unifi3/files/unifi.in ============================================================================== --- head/net-mgmt/unifi3/files/unifi.in Fri Oct 31 13:34:08 2014 (r371822) +++ head/net-mgmt/unifi3/files/unifi.in Fri Oct 31 13:34:31 2014 (r371823) @@ -1,6 +1,6 @@ #!/bin/sh # -# Created by: Mark Felder +# Created by: Mark Felder # $FreeBSD: head/net-mgmt/unifi/files/unifi.in 334865 2013-11-25 16:52:21Z feld $ #