From owner-svn-ports-head@freebsd.org  Thu May 25 12:36:50 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F7EBD80F2F;
 Thu, 25 May 2017 12:36:50 +0000 (UTC)
 (envelope-from brnrd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 F3854178A;
 Thu, 25 May 2017 12:36:49 +0000 (UTC)
 (envelope-from brnrd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4PCanNw007019;
 Thu, 25 May 2017 12:36:49 GMT (envelope-from brnrd@FreeBSD.org)
Received: (from brnrd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4PCamRK007017;
 Thu, 25 May 2017 12:36:48 GMT (envelope-from brnrd@FreeBSD.org)
Message-Id: <201705251236.v4PCamRK007017@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brnrd set sender to
 brnrd@FreeBSD.org using -f
From: Bernard Spil <brnrd@FreeBSD.org>
Date: Thu, 25 May 2017 12:36:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r441680 - in head/net: samba42 samba43
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 May 2017 12:36:50 -0000

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