aboutsummaryrefslogtreecommitdiff
path: root/net-mgmt
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2014-10-31 13:34:31 +0000
committerMark Felder <feld@FreeBSD.org>2014-10-31 13:34:31 +0000
commit31344dc93e94d9a092ddf241b48b3f063557def8 (patch)
tree5b831d33aa3e561c4a44fc1bdf4e9d528f4c54ec /net-mgmt
parent28add19527dd6a233cfefe96dc41f820ae7da159 (diff)
downloadports-31344dc93e94d9a092ddf241b48b3f063557def8.tar.gz
ports-31344dc93e94d9a092ddf241b48b3f063557def8.zip
Notes
Diffstat (limited to 'net-mgmt')
-rw-r--r--net-mgmt/unifi2/Makefile2
-rw-r--r--net-mgmt/unifi2/files/unifi.in2
-rw-r--r--net-mgmt/unifi3/Makefile2
-rw-r--r--net-mgmt/unifi3/files/unifi.in2
4 files changed, 4 insertions, 4 deletions
diff --git a/net-mgmt/unifi2/Makefile b/net-mgmt/unifi2/Makefile
index 701cc18c8c34..6f3758ef8a77 100644
--- a/net-mgmt/unifi2/Makefile
+++ b/net-mgmt/unifi2/Makefile
@@ -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
diff --git a/net-mgmt/unifi2/files/unifi.in b/net-mgmt/unifi2/files/unifi.in
index 5e61de90008d..99db99fb7c38 100644
--- a/net-mgmt/unifi2/files/unifi.in
+++ b/net-mgmt/unifi2/files/unifi.in
@@ -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 $
#
diff --git a/net-mgmt/unifi3/Makefile b/net-mgmt/unifi3/Makefile
index 78df63fae5fd..fa2bb7fced47 100644
--- a/net-mgmt/unifi3/Makefile
+++ b/net-mgmt/unifi3/Makefile
@@ -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
diff --git a/net-mgmt/unifi3/files/unifi.in b/net-mgmt/unifi3/files/unifi.in
index 5e61de90008d..99db99fb7c38 100644
--- a/net-mgmt/unifi3/files/unifi.in
+++ b/net-mgmt/unifi3/files/unifi.in
@@ -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 $
#