Index: head/net/ocserv/Makefile
===================================================================
--- head/net/ocserv/Makefile	(revision 423486)
+++ head/net/ocserv/Makefile	(revision 423487)
@@ -1,76 +1,75 @@
 # Created by: Carlos J Puga Medina <cpm@fbsd.es>
 # $FreeBSD$
 
 PORTNAME=	ocserv
-PORTVERSION=	0.11.4
-PORTREVISION=	1
+PORTVERSION=	0.11.5
 CATEGORIES=	net security
 MASTER_SITES=	ftp://ftp.infradead.org/pub/ocserv/
 
 MAINTAINER=	cpm@FreeBSD.org
 COMMENT=	Server implementing the AnyConnect SSL VPN protocol
 
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	autogen:devel/autogen \
 		gsed:textproc/gsed \
 		bash:shells/bash
 LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
 		libiconv.so:converters/libiconv \
 		libtalloc.so:devel/talloc \
 		libprotobuf-c.so:devel/protobuf-c \
 		libgnutls.so:security/gnutls \
 		libtasn1.so:security/libtasn1 \
 		libev.so:devel/libev \
 		libnettle.so:security/nettle
 
 USES=		autoreconf cpe gmake gperf libtool localbase ncurses \
 		pathfix pkgconfig readline tar:xz
 CPE_VENDOR=	infradead
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--disable-nls \
 		--enable-local-libopts \
 		--without-http-parser \
 		--without-pcl-lib \
 		--without-radius
 
 USERS=		_ocserv
 GROUPS=		_ocserv
 
 USE_RC_SUBR=	ocserv
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=		DOCS EXAMPLES GSSAPI
 
 PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README TODO
 PORTEXAMPLES=	profile.xml sample.config sample.passwd
 
 GSSAPI_USES=		gssapi:mit
 GSSAPI_LIB_DEPENDS=	libkrb5support.so:security/krb5
 GSSAPI_CONFIGURE_OFF=	--without-gssapi
 
 post-patch:
 	${RM} ${WRKSRC}/doc/occtl.8
 	${RM} ${WRKSRC}/doc/ocpasswd.8
 	${RM} ${WRKSRC}/doc/ocserv.8
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/occtl
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ocpasswd
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/ocserv
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ocserv/
 	${MKDIR} ${STAGEDIR}/var/run/ocserv/
 	${CP} ${FILESDIR}/ocserv.conf ${STAGEDIR}${PREFIX}/etc/ocserv/conf.sample
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/net/ocserv/distinfo
===================================================================
--- head/net/ocserv/distinfo	(revision 423486)
+++ head/net/ocserv/distinfo	(revision 423487)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470657990
-SHA256 (ocserv-0.11.4.tar.xz) = f0c50cb92492808241086252f5b5d4f3bd99d63a09d544639074fbd0465f97b7
-SIZE (ocserv-0.11.4.tar.xz) = 755112
+TIMESTAMP = 1474711445
+SHA256 (ocserv-0.11.5.tar.xz) = 2a80e32e538044fba7745fd2a0cfaa27a398097fb8d4d684c1142118b69219cb
+SIZE (ocserv-0.11.5.tar.xz) = 758252
Index: head/net/ocserv/files/patch-src_config.c
===================================================================
--- head/net/ocserv/files/patch-src_config.c	(revision 423486)
+++ head/net/ocserv/files/patch-src_config.c	(revision 423487)
@@ -1,31 +1,34 @@
---- src/config.c.orig	2015-09-04 19:27:22 UTC
+--- src/config.c.orig	2016-09-22 13:51:31 UTC
 +++ src/config.c
-@@ -51,8 +51,7 @@
- #include <tlslib.h>
+@@ -54,8 +54,7 @@
+ #include <occtl/ctl.h>
  #include "common-config.h"
  
 -#define OLD_DEFAULT_CFG_FILE "/etc/ocserv.conf"
 -#define DEFAULT_CFG_FILE "/etc/ocserv/ocserv.conf"
 +#define DEFAULT_CFG_FILE "/usr/local/etc/ocserv/conf"
  
  static char pid_file[_POSIX_PATH_MAX] = "";
  static char cfg_file[_POSIX_PATH_MAX] = DEFAULT_CFG_FILE;
-@@ -416,7 +415,7 @@ static void figure_auth_funcs(struct per
+@@ -436,7 +435,7 @@ static void figure_auth_funcs(struct per
  			}
  			talloc_free(auth[j]);
  		}
--		fprintf(stderr, "Setting '%s' as primary authentication method\n", config->auth[0].name);
-+		/* fprintf(stderr, "Setting '%s' as primary authentication method\n", config->auth[0].name); */
+-		fprintf(stderr, NOTESTR"setting '%s' as primary authentication method\n", config->auth[0].name);
++		/* fprintf(stderr, NOTESTR"Setting '%s' as primary authentication method\n", config->auth[0].name); */
  	} else {
  		unsigned x = config->auth_methods;
  		/* Append authentication methods (alternative options) */
-@@ -586,9 +585,6 @@ size_t urlfw_size = 0;
+@@ -663,11 +662,8 @@ size_t urlfw_size = 0;
  #endif
  
  	pov = configFileLoad(file);
 -	if (pov == NULL && file != NULL && strcmp(file, DEFAULT_CFG_FILE) == 0)
 -		pov = configFileLoad(OLD_DEFAULT_CFG_FILE);
 -
  	if (pov == NULL) {
- 		fprintf(stderr, "Error loading config file %s\n", file);
+-		fprintf(stderr, ERRSTR"cannot load config file %s\n", file);
++		fprintf(stderr, ERRSTR"Cannot load config file %s\n", file);
  		exit(1);
+ 	}
+