svn commit: r451339 - head/security/fwknop

[Carlo Strub]

Author: cs
Date: Thu Oct  5 19:27:45 2017
New Revision: 451339
URL: https://svnweb.freebsd.org/changeset/ports/451339

Log:
  Resolve conflict
  
  PR:		222382
  Submitted by:	Jens Grassel <jan0sch at mykolab.com>
  Approved by:	maintainer

Modified:
  head/security/fwknop/Makefile

Modified: head/security/fwknop/Makefile
==============================================================================
--- head/security/fwknop/Makefile	Thu Oct  5 19:23:16 2017	(r451338)
+++ head/security/fwknop/Makefile	Thu Oct  5 19:27:45 2017	(r451339)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fwknop
 PORTVERSION=	2.6.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.cipherdyne.org/fwknop/download/
 
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 BUILD_DEPENDS= wget:ftp/wget
 RUN_DEPENDS=   wget:ftp/wget
 LIB_DEPENDS+=  libassuan.so:security/libassuan
-
+CONFLICTS_BUILD=	fwknop-2.6.8_*
 CPE_VENDOR=	cipherdyne
 
 OPTIONS_DEFINE=	GPGME