Index: sysutils/bareos-bat/Makefile
===================================================================
--- sysutils/bareos-bat/Makefile	(revision 466545)
+++ sysutils/bareos-bat/Makefile	(working copy)
@@ -19,7 +19,7 @@
 PLIST=		${.CURDIR}/pkg-plist
 MAKE_ENV+=	MAKEOBJDIRPREFIX=/
 
-MASTERDIR=	${.CURDIR}/../../sysutils/bareos-server
+MASTERDIR=	${.CURDIR}/../bareos-server
 
 CONFIGURE_ARGS+=	--enable-bat \
 			--with-qwt=${LOCALBASE}/lib \
@@ -27,7 +27,4 @@
 			--disable-build-stored \
 			--enable-client-only
 
-OPTIONS_DEFINE=	OPENSSL
-OPTIONS_DEFAULT=OPENSSL
-
 .include "${MASTERDIR}/Makefile"
Index: sysutils/bareos-client/Makefile
===================================================================
--- sysutils/bareos-client/Makefile	(revision 466545)
+++ sysutils/bareos-client/Makefile	(working copy)
@@ -13,10 +13,9 @@
 USE_RC_SUBR=	bareos-fd
 
 PLIST=		${PKGDIR}/pkg-plist.client
-MASTERDIR=	${.CURDIR}/../../sysutils/bareos-server
+MASTERDIR=	${.CURDIR}/../bareos-server
 
 OPTIONS_DEFINE=	NLS PYTHON LMDB SCSICRYPTO
-OPTIONS_DEFAULT=#
 LMDB_DESC=	Enable build of LMDB support
 
 .include "${MASTERDIR}/Makefile"
Index: sysutils/bareos-client-static/Makefile
===================================================================
--- sysutils/bareos-client-static/Makefile	(revision 466545)
+++ sysutils/bareos-client-static/Makefile	(working copy)
@@ -8,13 +8,12 @@
 COMMENT=	Backup archiving recovery open sourced (static client)
 
 PLIST=		${.CURDIR}/pkg-plist
-MASTERDIR=	${.CURDIR}/../../sysutils/bareos-server
+MASTERDIR=	${.CURDIR}/../bareos-server
 
 PLIST_FILES=	sbin/bareos-fd-static \
 		sbin/bconsole-static
 
 OPTIONS_DEFINE=	NLS LMDB
-OPTIONS_DEFAULT=#
 LMDB_DESC=	Enable build of LMDB support
 
 CONFIGURE_ARGS+=	--enable-client-only \
Index: sysutils/bareos-server/Makefile
===================================================================
--- sysutils/bareos-server/Makefile	(revision 466545)
+++ sysutils/bareos-server/Makefile	(working copy)
@@ -37,16 +37,20 @@
 CPPFLAGS+=	-I${LOCALBASE}/readline -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE?=	MTX PYTHON NDMP NLS OPENSSL SCSICRYPTO
-OPTIONS_DEFAULT?=	OPENSSL PGSQL SCSICRYPTO
+OPTIONS_DEFAULT=	OPENSSL
+OPTIONS_SINGLE=		CRYPTO
+OPTIONS_SINGLE_CRYPTO=	OPENSSL GNUTLS
 OPTIONS_SUB=		yes
+CRYPTO_DESC=		Cryptographic library
 MTX_DESC=		Install mtx for control of autochanger devices
 NDMP_DESC=		Enable build of NDMP support
 SCSICRYPTO_DESC=	Build LTO AME crypto plugin
 
 .if ${PKGNAMESUFFIX} == "-server"
+OPTIONS_DEFINE=		MTX PYTHON NDMP NLS SCSICRYPTO
+OPTIONS_DEFAULT+=	PGSQL SCSICRYPTO
 OPTIONS_SINGLE_DATABASE=	SQLITE3 MYSQL PGSQL
-OPTIONS_SINGLE=		DATABASE
+OPTIONS_SINGLE+=	DATABASE
 DATABASE_DESC=		Database support
 
 NDMP_CONFIGURE_ON=	--enable-ndmp=yes
@@ -53,6 +57,9 @@
 NDMP_CONFIGURE_OFF=	--enable-ndmp=no
 .endif
 
+GNUTLS_CONFIGURE_WITH=	gnutls=${LOCALBASE}
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
+
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
 OPENSSL_CONFIGURE_OFF=	--with-openssl="no"
Index: sysutils/bareos-traymonitor/Makefile
===================================================================
--- sysutils/bareos-traymonitor/Makefile	(revision 466545)
+++ sysutils/bareos-traymonitor/Makefile	(working copy)
@@ -20,7 +20,7 @@
 PLIST=		${.CURDIR}/pkg-plist
 MAKE_ENV+=	MAKEOBJDIRPREFIX=/
 
-MASTERDIR=	${.CURDIR}/../../sysutils/bareos-server
+MASTERDIR=	${.CURDIR}/../bareos-server
 
 CONFIGURE_ARGS+=	--enable-traymonitor=yes \
 			--with-qwt=${LOCALBASE}/lib \
@@ -30,7 +30,4 @@
 			--with-jansson=${LOCALBASE} \
 			--enable-nls=yes
 
-OPTIONS_DEFINE=	OPENSSL
-OPTIONS_DEFAULT=OPENSSL
-
 .include "${MASTERDIR}/Makefile"