From owner-svn-ports-all@freebsd.org  Tue Nov  8 05:47:34 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 6346AC36061;
 Tue,  8 Nov 2016 05:47:34 +0000 (UTC)
 (envelope-from lwhsu@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 354ADAA8;
 Tue,  8 Nov 2016 05:47:34 +0000 (UTC)
 (envelope-from lwhsu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA85lXlm032600;
 Tue, 8 Nov 2016 05:47:33 GMT (envelope-from lwhsu@FreeBSD.org)
Received: (from lwhsu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA85lXsF032599;
 Tue, 8 Nov 2016 05:47:33 GMT (envelope-from lwhsu@FreeBSD.org)
Message-Id: <201611080547.uA85lXsF032599@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to
 lwhsu@FreeBSD.org using -f
From: Li-Wen Hsu <lwhsu@FreeBSD.org>
Date: Tue, 8 Nov 2016 05:47:33 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r425686 - head/security/py-paramiko
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Nov 2016 05:47:34 -0000

Author: lwhsu
Date: Tue Nov  8 05:47:33 2016
New Revision: 425686
URL: https://svnweb.freebsd.org/changeset/ports/425686

Log:
  Register conflict with security/py-paramiko1

Modified:
  head/security/py-paramiko/Makefile

Modified: head/security/py-paramiko/Makefile
==============================================================================
--- head/security/py-paramiko/Makefile	Tue Nov  8 05:46:16 2016	(r425685)
+++ head/security/py-paramiko/Makefile	Tue Nov  8 05:47:33 2016	(r425686)
@@ -3,6 +3,7 @@
 
 PORTNAME=	paramiko
 PORTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,6 +19,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryp
 USES=		python
 USE_PYTHON=	distutils autoplist
 
+CONFLICTS_INSTALL=	py??-paramiko1-*
+
 OPTIONS_DEFINE=	EXAMPLES
 
 regression-test: extract