Index: sysutils/bacula-server/Makefile
===================================================================
--- sysutils/bacula-server/Makefile
+++ sysutils/bacula-server/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bacula
 DISTVERSION=	7.0.5
+PORTREVISION?=	1
 CATEGORIES?=	sysutils
 MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
 PKGNAMEPREFIX?=	#
@@ -25,13 +26,57 @@
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-CPPFLAGS+=	-I/usr/include/readline -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 OPTIONS_DEFINE?=	SQLITE3 MYSQL PGSQL MTX PYTHON NLS OPENSSL
 OPTIONS_DEFAULT?=	NLS OPENSSL PGSQL
 MTX_DESC=		Install mtx for control of autochanger devices
 
+# Client only or full server version
+.if defined(WITH_CLIENT_ONLY)
+CONFFILES=	fd
+CONFIGURE_ARGS+=	--enable-client-only
+
+PKGDEINSTALL=	${FILESDIR}/pkg-deinstall.client
+PKGINSTALL=	${FILESDIR}/pkg-install.client
+.else
+# Server only Options
+CONFFILES=		sd dir
+# Server default database
+
+MYSQL_CONFIGURE_ON=	--with-mysql=yes
+MYSQL_USE=		MYSQL=yes
+SQLITE3_CONFIGURE_ON=	--with-sqlite3=yes
+SQLITE3_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
+PGSQL_CONFIGURE_ON=	--with-postgresql=yes
+PGSQL_USES=		pgsql
+
+MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx
+.endif
+
+.include <bsd.port.options.mk>
+
+
+.if !defined(WITH_CLIENT_ONLY)
+.if ${PORT_OPTIONS:MMYSQL}
+DBTYPE=			mysql
+SUB_LIST+=		REQ_MYSQL=mysql REQ_PGSQL=""
+.elif ${PORT_OPTIONS:MSQLITE3}
+DBTYPE=			sqlite3
+.else
+DBTYPE=			postgresql
+SUB_LIST+=		REQ_MYSQL="" REQ_PGSQL=postgresql
+.endif
+PLIST_SUB+=		DBTYPE=${DBTYPE}
+.endif
+
+.if ${OSVERSION} < 1100027
+USES+=			readline
+.else
+USES+=                  readline:port
+CONFIGURE_ARGS+=	--with-readline=/usr/local/include/readline
+.endif
+
+LDFLAGS+=	-L${LOCALBASE}/lib
+
 .if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server"  #Till end of the file
 
 PYTHON_USE=		PYTHON=yes
@@ -54,7 +99,6 @@
 		--sysconfdir=${ETCDIR} \
 		--with-working-dir=${BACULA_DIR} \
 		--with-scriptdir=${PREFIX}/share/${PORTNAME} \
-		--with-readline=yes \
 		--disable-conio \
 		--enable-batch-insert \
 		--with-plugindir=${PREFIX}/lib \
@@ -96,40 +140,6 @@
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-# Client only or full server version
-.if defined(WITH_CLIENT_ONLY)
-CONFFILES=	fd
-CONFIGURE_ARGS+=	--enable-client-only
-
-PKGDEINSTALL=	${FILESDIR}/pkg-deinstall.client
-PKGINSTALL=	${FILESDIR}/pkg-install.client
-.else
-# Server only Options
-CONFFILES=		sd dir
-# Server default database
-
-MYSQL_CONFIGURE_ON=	--with-mysql=yes
-MYSQL_USE=		MYSQL=yes
-SQLITE3_CONFIGURE_ON=	--with-sqlite3=yes
-SQLITE3_LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3
-PGSQL_CONFIGURE_ON=	--with-postgresql=yes
-PGSQL_USES=		pgsql
-
-MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:${PORTSDIR}/misc/mtx
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMYSQL}
-DBTYPE=			mysql
-SUB_LIST+=		REQ_MYSQL=mysql REQ_PGSQL=""
-.elif ${PORT_OPTIONS:MSQLITE3}
-DBTYPE=			sqlite3
-.else
-DBTYPE=			postgresql
-SUB_LIST+=		REQ_MYSQL="" REQ_PGSQL=postgresql
-.endif
-PLIST_SUB+=		DBTYPE=${DBTYPE}
-.endif
 
 .if defined(WITH_CLIENT_ONLY)
 MP8+=	bacula.8 bacula-fd.8 bconsole.8
@@ -151,7 +161,9 @@
 		${WRKSRC}/src/cats/Makefile.in    \
 		${WRKSRC}/src/dird/Makefile.in    \
 		${WRKSRC}/src/stored/Makefile.in  \
-		${WRKSRC}/src/tools/Makefile.in
+		${WRKSRC}/src/tools/Makefile.in   \
+		${WRKSRC}/src/lib/Makefile.in     \
+		${WRKSRC}/src/findlib/Makefile.in
 
 	# Default bconsole.conf is in ${ETCDIR}
 	@${REINPLACE_CMD} -e 's|./bconsole.conf|${ETCDIR}/bconsole.conf|g' ${WRKSRC}/src/console/console.c
Index: sysutils/bacula-server/pkg-plist.client
===================================================================
--- sysutils/bacula-server/pkg-plist.client
+++ sysutils/bacula-server/pkg-plist.client
@@ -16,6 +16,6 @@
 sbin/bacula-fd
 @(,bacula,750) sbin/bconsole
 @exec mkdir -p %%BACULA_DIR%%
-@dirrmtry %%BACULA_DIR%%
+@dirrmtry(bacula,bacula,) %%BACULA_DIR%%
 @dirrmtry share/bacula
-@dirrmtry %%ETCDIR%%
+@dirrmtry(,bacula,750) %%ETCDIR%%