diff options
author | cs <cs@FreeBSD.org> | 2017-10-06 03:27:45 +0800 |
---|---|---|
committer | cs <cs@FreeBSD.org> | 2017-10-06 03:27:45 +0800 |
commit | 58bd8e696e23cbbd306e7fa63706e6b04b64987d (patch) | |
tree | e980793ba0ae3b2a29cfc90c94cd020a1f13926f /security | |
parent | 48f8aa9d3f668292f892058817d0be9ab6dda906 (diff) | |
download | freebsd-ports-gnome-58bd8e696e23cbbd306e7fa63706e6b04b64987d.tar.gz freebsd-ports-gnome-58bd8e696e23cbbd306e7fa63706e6b04b64987d.tar.zst freebsd-ports-gnome-58bd8e696e23cbbd306e7fa63706e6b04b64987d.zip |
Resolve conflict
PR: 222382
Submitted by: Jens Grassel <jan0sch@mykolab.com>
Approved by: maintainer
Diffstat (limited to 'security')
-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 |