svn commit: r553366 - in head/net: samba410 samba411

[Mateusz Piotrowski]

Author: 0mp
Date: Mon Oct 26 16:29:37 2020
New Revision: 553366
URL: https://svnweb.freebsd.org/changeset/ports/553366

Log:
  Update conflicts
  
  Approved by:	portmgr blanket

Modified:
  head/net/samba410/Makefile
  head/net/samba411/Makefile

Modified: head/net/samba410/Makefile
==============================================================================
--- head/net/samba410/Makefile	Mon Oct 26 16:16:22 2020	(r553365)
+++ head/net/samba410/Makefile	Mon Oct 26 16:29:37 2020	(r553366)
@@ -18,7 +18,7 @@ DEPRECATED=			yes
 EXPIRATION_DATE=		2020-11-08
 
 IGNORE_NONTHREAD_PYTHON=	needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
-CONFLICTS_INSTALL?=		samba4-4.0.* samba4[1-9]-4.* p5-Parse-Pidl-4.*
+CONFLICTS_INSTALL?=		samba4-4.0.* samba4[1-9]-4.* samba41[1-9]-4.1* p5-Parse-Pidl-4.*
 
 USES=				cpe
 

Modified: head/net/samba411/Makefile
==============================================================================
--- head/net/samba411/Makefile	Mon Oct 26 16:16:22 2020	(r553365)
+++ head/net/samba411/Makefile	Mon Oct 26 16:29:37 2020	(r553366)
@@ -15,7 +15,7 @@ LICENSE=			GPLv3+
 LICENSE_FILE=			${WRKSRC}/COPYING
 
 IGNORE_NONTHREAD_PYTHON=	needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
-CONFLICTS_INSTALL?=		samba4-4.0.* samba4[1-9]-4.* samba410-4.10.* p5-Parse-Pidl-4.*
+CONFLICTS_INSTALL?=		samba4-4.0.* samba4[1-9]-4.* samba41[02-9]-4.1* p5-Parse-Pidl-4.*
 
 USES=				cpe