Index: head/sysutils/bacula9-bat/Makefile
===================================================================
--- head/sysutils/bacula9-bat/Makefile	(revision 449034)
+++ head/sysutils/bacula9-bat/Makefile	(revision 449035)
@@ -1,30 +1,30 @@
 # Created by: Dan Langille <dan@langille.org>
 # $FreeBSD$
 
 PORTNAME=	bacula
 PKGNAMESUFFIX=	9-bat
 
 COMMENT=	Network backup solution (GUI)
 
 LIB_DEPENDS+=	libqwt.so:x11-toolkits/qwt5 \
-		libbac.so:sysutils/bacula-client
+		libbac.so:sysutils/bacula9-client
 
 USES=		pkgconfig
 USE_QT4=	qmake_build uic_build moc_build rcc_build
 WITH_BAT=	yes
 
 PLIST=		${.CURDIR}/pkg-plist
 MAKE_ENV+=	MAKEOBJDIRPREFIX=/
 
-MASTERDIR=	${.CURDIR}/../../sysutils/bacula-server
+MASTERDIR=	${.CURDIR}/../../sysutils/bacula9-server
 
 CONFIGURE_ARGS+=	--enable-bat \
 			--with-qwt=${LOCALBASE}/lib \
 			--disable-build-dird \
 			--disable-build-stored \
 			--enable-client-only
 
 OPTIONS_DEFINE=	#
 OPTIONS_DEFAULT=#
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/bacula9-server/Makefile.common
===================================================================
--- head/sysutils/bacula9-server/Makefile.common	(revision 449034)
+++ head/sysutils/bacula9-server/Makefile.common	(revision 449035)
@@ -1,24 +1,24 @@
 .include <bsd.port.pre.mk>
 
 post-build:
 .if ${PKGNAMEPREFIX} == "nagios-check_"
 	${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bacula
 .endif
 
 do-install:
-.if ${PKGNAMESUFFIX} == "-bat"
+.if ${PKGNAMESUFFIX} == "9-bat"
 # Install config files and preserve existing ones
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_SCRIPT}  ${WRKSRC}/src/qt-console/bat.conf ${STAGEDIR}${PREFIX}/etc/bacula/bat.conf.sample
 	${INSTALL_MAN}     ${WRKSRC}/manpages/bat.1          ${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${STAGEDIR}${PREFIX}/sbin
 .endif
 .if ${PKGNAMEPREFIX} == "nagios-check_"
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
 	${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bacula/check_bacula \
 	${STAGEDIR}${PREFIX}/libexec/nagios
 .endif
 .if ${PKGNAMESUFFIX} == "9-client-static"
 	${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bacula-fd ${STAGEDIR}${PREFIX}/sbin/bacula-fd-static
 	${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static
 .endif