Index: head/dns/knot/Makefile
===================================================================
--- head/dns/knot/Makefile	(revision 386669)
+++ head/dns/knot/Makefile	(revision 386670)
@@ -1,82 +1,79 @@
 # Created by: Leo Vandewoestijne <freebsd@dns-lab.com>
 # $FreeBSD$
 
 PORTNAME=	knot
 PORTVERSION=	1.6.3
+PORTREVISION=	1
 CATEGORIES=	dns ipv6
 MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
 		http://dns-lab.com/downloads/knot-dns/
 
 MAINTAINER=	freebsd@dns-lab.com
 COMMENT=	High performance authoritative-only DNS server
 
 LICENSE=	GPLv3
 
-CONFLICTS=	knot-devel-1.*
-
 BUILD_DEPENDS=	flex>=2.5.35_1:${PORTSDIR}/textproc/flex
 LIB_DEPENDS=	liburcu.so:${PORTSDIR}/sysutils/liburcu
 
+CONFLICTS=	knot-2.*
+
 USES=		alias bison libtool pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-storage=/var/db/knot \
 		--with-rundir=/var/run/knot \
 		--with-openssl=${OPENSSLBASE}
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 WITH_OPENSSL_PORT=	yes
 
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--disable-silent-rules
 .endif
 
 INSTALL_TARGET=	install-strip
 
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	pkg-message
 
 USERS=		knot
 GROUPS=		knot
 SUB_LIST+=	USERS="${USERS}" GROUPS="${GROUPS}"
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
 
-OPTIONS_DEFINE=	DNSTAP FASTPARSER GOST IDN LMDB
+OPTIONS_DEFINE=	DNSTAP FASTPARSER IDN LMDB
 
 DNSTAP_DESC=		dnstap support (see dnstap.info)
 FASTPARSER_DESC=	Fast zone parser (demanding compilation)
 GOST_DESC=		Enable GOST ciphers (requires OpenSSL >= 1.0.0)
 LMDB_DESC=		Enable LMDB backend
 
 DNSTAP_CONFIGURE_ENABLE=	dnstap
 DNSTAP_LIB_DEPENDS=	libfstrm.so:${PORTSDIR}/devel/fstrm \
 			libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
 
 FASTPARSER_CONFIGURE_ENABLE=	fastparser
 
 IDN_CONFIGURE_WITH=	libidn
 IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
 
 LMDB_CONFIGURE_ENABLE=	lmdb
 LMDB_LIB_DEPENDS=	liblmdb.so:${PORTSDIR}/databases/lmdb
 
 .include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGOST} && defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl
-IGNORE=	cannot use both LibreSSL and GOST (not installing correctly); either don't use GOST or do use OpenSSL
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@run_dir\@|' \
 		${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} 's|$$(INSTALL) -d $$(DESTDIR)/\@storage_dir\@|#$$(INSTALL) -d $$(DESTDIR)/\@storage_dir\@|' \
 		${WRKSRC}/src/Makefile.in
 	@${RM} -rf ${WRKSRC}/src/zscanner/scanner.c
 
 post-install:
 	${MV} ${STAGEDIR}${ETCDIR}/knot.sample.conf \
 		${STAGEDIR}${ETCDIR}/knot.conf.sample
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
Index: head/dns/knot/files/patch-src_libknot_dnssec_config.h
===================================================================
--- head/dns/knot/files/patch-src_libknot_dnssec_config.h	(revision 386669)
+++ head/dns/knot/files/patch-src_libknot_dnssec_config.h	(nonexistent)
@@ -1,11 +0,0 @@
---- src/libknot/dnssec/config.h.orig	2015-04-08 11:57:44 UTC
-+++ src/libknot/dnssec/config.h
-@@ -40,7 +40,7 @@
-   #undef KNOT_ENABLE_ECDSA
- #endif
- 
--#if !defined(OPENSSL_NO_GOST) && OPENSSL_VERSION_NUMBER >= 0x1000001fL
-+#if !defined(OPENSSL_NO_GOST) && OPENSSL_VERSION_NUMBER >= 0x1000001fL && !defined(LIBRESSL_VERSION_NUMBER)
-   #define KNOT_ENABLE_GOST 1
- #else
-   #undef KNOT_ENABLE_GOST

Property changes on: head/dns/knot/files/patch-src_libknot_dnssec_config.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/dns/knot/files/patch-src_libknot_dnssec_crypto.c
===================================================================
--- head/dns/knot/files/patch-src_libknot_dnssec_crypto.c	(nonexistent)
+++ head/dns/knot/files/patch-src_libknot_dnssec_crypto.c	(revision 386670)
@@ -0,0 +1,50 @@
+--- src/libknot/dnssec/crypto.c.orig	2015-04-08 11:57:44 UTC
++++ src/libknot/dnssec/crypto.c
+@@ -122,7 +122,14 @@ static unsigned long openssl_threadid_cb(void)
+ 
+ /*- pluggable engines -------------------------------------------------------*/
+ 
+-#if KNOT_ENABLE_GOST
++#if KNOT_ENABLE_GOST && !defined(LIBRESSL_VERSION_NUMBER)
++  #define KNOT_LOAD_GOST 1
++#else
++  #undef KNOT_LOAD_GOST
++#endif
++
++
++#if KNOT_LOAD_GOST
+ 
+ static ENGINE *gost_engine = NULL;
+ 
+@@ -130,6 +137,8 @@ static void init_gost_engine(void)
+ {
+ 	assert(gost_engine == NULL);
+ 
++	ENGINE_load_builtin_engines();
++
+ #ifndef OPENSSL_NO_STATIC_ENGINE
+ 	ENGINE_load_gost();
+ #else
+@@ -206,16 +215,19 @@ void knot_crypto_cleanup_threads(void)
+ 
+ void knot_crypto_load_engines(void)
+ {
+-#if KNOT_ENABLE_GOST
++#if KNOT_LOAD_GOST
+ 	if (!gost_engine) {
+ 		init_gost_engine();
+ 	}
+ #endif
++#if KNOT_ENABLE_GOST
++	OpenSSL_add_all_algorithms();
++#endif
+ }
+ 
+ void knot_crypto_unload_engines(void)
+ {
+-#if KNOT_ENABLE_GOST
++#if KNOT_LOAD_GOST
+ 	if (gost_engine) {
+ 		deinit_gost_engine();
+ 	}
+

Property changes on: head/dns/knot/files/patch-src_libknot_dnssec_crypto.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property