From owner-svn-ports-head@freebsd.org  Sun Jul 16 10:00:44 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 1D489BFB80F;
 Sun, 16 Jul 2017 10:00:44 +0000 (UTC) (envelope-from pi@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 E12BD743C3;
 Sun, 16 Jul 2017 10:00:43 +0000 (UTC) (envelope-from pi@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6GA0hWq078224;
 Sun, 16 Jul 2017 10:00:43 GMT (envelope-from pi@FreeBSD.org)
Received: (from pi@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6GA0htF078223;
 Sun, 16 Jul 2017 10:00:43 GMT (envelope-from pi@FreeBSD.org)
Message-Id: <201707161000.v6GA0htF078223@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org
 using -f
From: Kurt Jaeger <pi@FreeBSD.org>
Date: Sun, 16 Jul 2017 10:00:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r445992 - head/security/softether
X-SVN-Group: ports-head
X-SVN-Commit-Author: pi
X-SVN-Commit-Paths: head/security/softether
X-SVN-Commit-Revision: 445992
X-SVN-Commit-Repository: ports
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: Sun, 16 Jul 2017 10:00:44 -0000

Author: pi
Date: Sun Jul 16 10:00:42 2017
New Revision: 445992
URL: https://svnweb.freebsd.org/changeset/ports/445992

Log:
  security/softether: Add conflict with softether-devel
  
  PR:		219136
  Submitted by:	Franco Fichtner <franco@opnsense.org>
  Approved by:	net@arrishq.net (maintainer)

Modified:
  head/security/softether/Makefile

Modified: head/security/softether/Makefile
==============================================================================
--- head/security/softether/Makefile	Sun Jul 16 09:31:09 2017	(r445991)
+++ head/security/softether/Makefile	Sun Jul 16 10:00:42 2017	(r445992)
@@ -12,6 +12,8 @@ COMMENT=	Softether VPN solution
 
 LICENSE=	GPLv2
 
+CONFLICTS_INSTALL=	softether-devel
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib