Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 31 Oct 2014 13:34:31 +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: r371823 - in head/net-mgmt: unifi2 unifi2/files unifi3 unifi3/files
Message-ID:  <201410311334.s9VDYVXs028476@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <feld@feld.me>
+# Created by: Mark Felder <feld@FreeBSD.org>
 # $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 <feld@feld.me>
+# Created by: Mark Felder <feld@FreeBSD.org>
 # $FreeBSD: head/net-mgmt/unifi/files/unifi.in 334865 2013-11-25 16:52:21Z feld $
 #
 



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