diff -ruN net-mgmt/nagios-check_bacula.orig/Makefile net-mgmt/nagios-check_bacula/Makefile
--- net-mgmt/nagios-check_bacula.orig/Makefile	2010-05-19 11:57:11.000000000 +0300
+++ net-mgmt/nagios-check_bacula/Makefile	2010-05-20 21:24:22.000000000 +0300
@@ -5,34 +5,50 @@
 # $FreeBSD: ports/net-mgmt/nagios-check_bacula/Makefile,v 1.8 2010/04/14 00:31:39 wen Exp $
 #
 
-PORTNAME=	check_bacula
-PORTVERSION=	5.0.0
+PORTNAME=	bacula
+PKGNAMEPREFIX=  nagios-check_
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF/bacula/bacula/${PORTVERSION}
-PKGNAMEPREFIX=	nagios-
-DISTNAME=	bacula-${PORTVERSION}
+UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}
 
 MAINTAINER=	freebsd@troback.com
 COMMENT=	Nagios plugin for Bacula
 
-WRKSRC=		${WRKDIR}/bacula-${PORTVERSION}
+WITH_NAGIOS_CHECK_ONLY=	yes
+MASTERDIR=	${.CURDIR}/../../sysutils/bacula-server
+PLIST=		${.CURDIR}/pkg-plist
+
 CONFIGURE_ARGS=	--enable-client-only \
 		--disable-build-dird \
 		--disable-build-stored \
-		--disable-nls
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
+		--disable-nls \
+		--disable-xatt
+
+.include "${MASTERDIR}/Makefile"
 
 .include <bsd.port.pre.mk>
 
+.if exists(${LOCALBASE}/lib/libbac.so.${PORTVERSION:R:R})
+LIB_DEPENDS+=	bac.${PORTVERSION:R:R}:${PORTSDIR}/sysutils/bacula-client
+WITHOUT_LIBBAC=	YES
+PLIST_SUB+=	INDEP="@comment "
+.else
+PLIST_SUB+=	INDEP=""
+.endif
+
+pre-everything::
+	@${ECHO_MSG} "===> Building nagios check only."
+
 post-build:
 	${MAKE} -C ${WRKSRC}/examples/nagios/check_bacula
 
 do-install:
 	@${MKDIR} ${PREFIX}/libexec/nagios
 	${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bacula/.libs/check_bacula \
-		${PREFIX}/libexec/nagios/
-	${INSTALL_PROGRAM} ${WRKSRC}/src/lib/.libs/libbac.so.1 \
-		${PREFIX}/lib
+	    ${PREFIX}/libexec/nagios
+.if !defined(WITHOUT_LIBBAC)
+	@${ECHO_MSG} "===> Installing libbac.so.${PORTVERSION:R:R} "
+	${INSTALL_PROGRAM} ${WRKSRC}/src/lib/.libs/libbac.so.${PORTVERSION:R:R} \
+	    ${PREFIX}/lib
+.endif
 
 .include <bsd.port.post.mk>
diff -ruN net-mgmt/nagios-check_bacula.orig/distinfo net-mgmt/nagios-check_bacula/distinfo
--- net-mgmt/nagios-check_bacula.orig/distinfo	2010-05-19 11:57:11.000000000 +0300
+++ net-mgmt/nagios-check_bacula/distinfo	1970-01-01 03:00:00.000000000 +0300
@@ -1,3 +0,0 @@
-MD5 (bacula-5.0.0.tar.gz) = 68e008d2578a6d9a50af60439db17dcb
-SHA256 (bacula-5.0.0.tar.gz) = 4c6344807769d1b6b61f9cbddc0a5dc1160c3eb51744b23c790fcb57947ac294
-SIZE (bacula-5.0.0.tar.gz) = 4075825
diff -ruN net-mgmt/nagios-check_bacula.orig/pkg-plist net-mgmt/nagios-check_bacula/pkg-plist
--- net-mgmt/nagios-check_bacula.orig/pkg-plist	2010-05-19 11:57:11.000000000 +0300
+++ net-mgmt/nagios-check_bacula/pkg-plist	2010-05-20 12:02:26.000000000 +0300
@@ -1,3 +1,3 @@
 libexec/nagios/check_bacula
-lib/libbac.so.1
+%%INDEP%%lib/libbac.so.%%MAJOR%%
 @dirrmtry libexec/nagios