diff options
author | Carlo Strub <cs@FreeBSD.org> | 2017-10-05 19:27:45 +0000 |
---|---|---|
committer | Carlo Strub <cs@FreeBSD.org> | 2017-10-05 19:27:45 +0000 |
commit | c2652f9fd8698db12fdcaddaa1315468f33db00f (patch) | |
tree | e980793ba0ae3b2a29cfc90c94cd020a1f13926f /security/fwknop | |
parent | d22ae2cfe3df34751a62e87c58b4f0836b961653 (diff) | |
download | ports-c2652f9fd8698db12fdcaddaa1315468f33db00f.tar.gz ports-c2652f9fd8698db12fdcaddaa1315468f33db00f.zip |
Resolve conflict
PR: 222382
Submitted by: Jens Grassel <jan0sch@mykolab.com>
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=451339
Diffstat (limited to 'security/fwknop')
-rw-r--r-- | security/fwknop/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/fwknop/Makefile b/security/fwknop/Makefile index 9719e7e960ff..8636210c55e2 100644 --- a/security/fwknop/Makefile +++ b/security/fwknop/Makefile @@ -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 |