svn commit: r441680 - in head/net: samba42 samba43

[Bernard Spil]

Author: brnrd
Date: Thu May 25 12:36:48 2017
New Revision: 441680
URL: https://svnweb.freebsd.org/changeset/ports/441680

Log:
  net/samba43: Mark 4.2 and 4.3 deprecated
  
   - Add deprecation date and message
   - Update/simplify conflicts
  
  PR:		219514
  Approved by:	timur (maintainer)
  MFH:		2017Q2
  Security:	6f4d96c0-4062-11e7-b291-b499baebfeaf

Modified:
  head/net/samba42/Makefile
  head/net/samba43/Makefile

Modified: head/net/samba42/Makefile
==============================================================================
--- head/net/samba42/Makefile	Thu May 25 12:14:08 2017	(r441679)
+++ head/net/samba42/Makefile	Thu May 25 12:36:48 2017	(r441680)
@@ -13,7 +13,10 @@ COMMENT?=		Free SMB/CIFS and AD/DC serve
 
 LICENSE=		GPLv3
 
-CONFLICTS?=		*samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba43-4.3.* samba44-4.4.*
+CONFLICTS?=		samba4[3-9]-4.*
+
+DEPRECATED=             not supported upstream https://wiki.samba.org/index.php/Samba_Release_Planning
+EXPIRATION_DATE=        2016-09-07
 
 EXTRA_PATCHES=		${PATCHDIR}/extra-patch-progress:-p1
 

Modified: head/net/samba43/Makefile
==============================================================================
--- head/net/samba43/Makefile	Thu May 25 12:14:08 2017	(r441679)
+++ head/net/samba43/Makefile	Thu May 25 12:36:48 2017	(r441680)
@@ -13,7 +13,10 @@ COMMENT?=		Free SMB/CIFS and AD/DC serve
 
 LICENSE=		GPLv3
 
-CONFLICTS?=		*samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba42-4.2.* samba44-4.4.*
+CONFLICTS?=		samba4[24-9]-4.*
+
+DEPRECATED=		not supported upstream https://wiki.samba.org/index.php/Samba_Release_Planning
+EXPIRATION_DATE=	2017-03-07
 
 #EXTRA_PATCHES=		${PATCHDIR}/extra-patch-progress:-p1