Provide a buildlink3.mk file for bacula and correctly link the console

packages against the shared libraries. Bump revisions for the latter.

7 files changed, 47 insertions, 37 deletions

diff --git a/sysutils/bacula-gnome-console/Makefile b/sysutils/bacula-gnome-console/Makefile
index 523c2e31593..a22fb4911ce 100644
--- a/sysutils/bacula-gnome-console/Makefile
+++ b/sysutils/bacula-gnome-console/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2009/08/18 14:37:18 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2009/08/18 15:23:59 joerg Exp $
 
 PKGNAME=	${DISTNAME:S/-/-gnome-console-/}
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	Gnome console for Bacula - The Network Backup Solution
 CATEGORIES+=	gnome
 
@@ -15,12 +15,11 @@ CONFIGURE_ARGS+=	--enable-gnome
 
 USE_TOOLS+=		pkg-config
 
-BUILD_DIRS=		src/lib
-BUILD_DIRS+=		src/gnome2-console
-INSTALL_DIRS=		src/gnome2-console
+BUILD_DIRS=		src/gnome2-console
 
 INSTALLATION_DIRS=	sbin share/examples/bacula
 
 .include "../../sysutils/bacula/Makefile.common"
+.include "../../sysutils/bacula/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bacula-qt-console/Makefile b/sysutils/bacula-qt-console/Makefile
index 95ae964ea68..03a4bb6dfa6 100644
--- a/sysutils/bacula-qt-console/Makefile
+++ b/sysutils/bacula-qt-console/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2009/08/03 12:42:56 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2009/08/18 15:23:59 joerg Exp $
 
 PKGNAME=	${DISTNAME:S/-/-qt-console-/}
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	Qt-based console for Bacula - The Network Backup Solution
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -13,9 +13,7 @@ USE_TOOLS+=		gmake pkg-config
 CONFIGURE_ARGS+=	--enable-client-only
 CONFIGURE_ARGS+=	--enable-bat
 
-BUILD_DIRS=		src/lib
-BUILD_DIRS+=		src/qt-console
-INSTALL_DIRS=		src/qt-console
+BUILD_DIRS=		src/qt-console
 
 INSTALLATION_DIRS=	bin share/examples/bacula
 
@@ -26,6 +24,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/qt-console/bat.conf ${DESTDIR}${EXAMPLESDIR}
 
 .include "../../sysutils/bacula/Makefile.common"
+.include "../../sysutils/bacula/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bacula-wx-console/Makefile b/sysutils/bacula-wx-console/Makefile
index bbe698f3c3c..6942530b934 100644
--- a/sysutils/bacula-wx-console/Makefile
+++ b/sysutils/bacula-wx-console/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2009/05/20 01:09:13 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2009/08/18 15:23:59 joerg Exp $
 
 PKGNAME=	${DISTNAME:S/-/-wx-console-/}
-PKGREVISION=	1
+PKGREVISION=	2
 COMMENT=	wxWindows-based console for Bacula - The Network Backup Solution
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -12,11 +12,11 @@ PATCHDIR=		${.CURDIR}/../../sysutils/bacula/patches
 CONFIGURE_ARGS+=	--enable-client-only
 CONFIGURE_ARGS+=	--enable-bwx-console
 
-BUILD_DIRS=		src/lib
-BUILD_DIRS+=		src/wx-console
+BUILD_DIRS=		src/wx-console
 
 INSTALLATION_DIRS=	sbin share/examples/bacula
 
 .include "../../sysutils/bacula/Makefile.common"
+.include "../../sysutils/bacula/buildlink3.mk"
 .include "../../x11/wxGTK28/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bacula/buildlink3.mk b/sysutils/bacula/buildlink3.mk
new file mode 100644
index 00000000000..489052f9aee
--- /dev/null
+++ b/sysutils/bacula/buildlink3.mk
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.1 2009/08/18 15:23:59 joerg Exp $
+
+BUILDLINK_TREE+=	bacula
+
+.if !defined(BACULA_BUILDLINK3_MK)
+BACULA_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.bacula+=	{bacula,bacula-clientonly}>=3.0.1nb1
+BUILDLINK_PKGSRCDIR.bacula?=	../../sysutils/bacula
+.endif	# BACULA_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-bacula
diff --git a/sysutils/bacula/distinfo b/sysutils/bacula/distinfo
index 113fb640813..c40f5f9ce2d 100644
--- a/sysutils/bacula/distinfo
+++ b/sysutils/bacula/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2009/07/10 19:21:28 hasso Exp $
+$NetBSD: distinfo,v 1.36 2009/08/18 15:23:59 joerg Exp $
 
 SHA1 (bacula-3.0.1.tar.gz) = 073d3d9458b51b928c0b5f8cf830c94362366c9a
 RMD160 (bacula-3.0.1.tar.gz) = 8f23238a7475fb1d3371e583d43fbd6f49efc113
@@ -9,8 +9,8 @@ SHA1 (patch-ac) = db88570ebbed0e624315b6eb4668ff97b6b180b6
 SHA1 (patch-ad) = 6a739f6960da444d30df8ffd49cb258446e06797
 SHA1 (patch-ae) = 1b4d6fdeb8570be9f7e5f0355701d92d81f68b07
 SHA1 (patch-af) = 20429fa1f517348ee290d90dd1d420347fb1928e
-SHA1 (patch-ag) = 6123cbf2cb3517850e65251ea80fb9b505cdf230
-SHA1 (patch-ah) = c096a775d98eae0b4ce20bedbbb99ed9a646603e
+SHA1 (patch-ag) = ccb411db5fb65d5ef3ed5a56b70129d83a66da68
+SHA1 (patch-ah) = 72839df5640a649e2abcbaaa3dcc8ae32468e5ab
 SHA1 (patch-ai) = 388e075e7ec54fb377ee9dbe8338c667efb256ee
 SHA1 (patch-aj) = df5eba3c80d36ecc26c6acb1566a4411c308b2f0
 SHA1 (patch-ak) = d4c41a8a52d5420e1a9228d725dfd21e52c2fb3a
diff --git a/sysutils/bacula/patches/patch-ag b/sysutils/bacula/patches/patch-ag
index 16667cb3930..515f0c795f7 100644
--- a/sysutils/bacula/patches/patch-ag
+++ b/sysutils/bacula/patches/patch-ag
@@ -1,22 +1,22 @@
-$NetBSD: patch-ag,v 1.6 2009/05/16 08:06:57 adam Exp $
+$NetBSD: patch-ag,v 1.7 2009/08/18 15:23:59 joerg Exp $
 
 --- src/gnome2-console/Makefile.in.orig	2009-02-18 12:40:09.000000000 +0100
 +++ src/gnome2-console/Makefile.in
-@@ -64,7 +64,7 @@ support.o:   support.c
+@@ -62,7 +62,7 @@ support.o:   support.c
+ 	sed "s%parent = g_object_get_data%parent = \(GtkWidget \*\)g_object_get_data%" support.c.orig >support.c
+ 	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
  
- bgnome-console: Makefile $(CONSOBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) 
+-bgnome-console: Makefile $(CONSOBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) 
++bgnome-console: Makefile $(CONSOBJS)
  	$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -o $@ $(CONSOBJS) \
--	      $(LIBS) $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm
-+	      $(LIBS) $(DLIB) $(CONS_LIBS) ../lib/libbaccfg.la ../lib/libbac.la -lm
- 
- static-console: static-bgnome-console
+ 	      $(LIBS) $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm
  
 @@ -106,14 +106,14 @@ install: all
  	fi
  	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bgnome-console $(DESTDIR)$(sbindir)/bgnome-console
  	@srcconf=bgnome-console.conf; \
 -	if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-+	if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
++	if  test -f ${DESTDIR}/usr/pkg/share/examples/bacula/$$srcconf; then \
  	   destconf=$$srcconf.new; \
  	   echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
  	else \
@@ -24,8 +24,8 @@ $NetBSD: patch-ag,v 1.6 2009/05/16 08:06:57 adam Exp $
  	fi; \
 -	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 -	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-+	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
-+	${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
++	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf"; \
++	${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf
  	if test -f static-bgnome-console; then \
  	   $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bgnome-console $(DESTDIR)$(sbindir)/static-bgnome-console; \
  	fi 
diff --git a/sysutils/bacula/patches/patch-ah b/sysutils/bacula/patches/patch-ah
index cf6fd6ac124..e426d20a3e8 100644
--- a/sysutils/bacula/patches/patch-ah
+++ b/sysutils/bacula/patches/patch-ah
@@ -1,22 +1,22 @@
-$NetBSD: patch-ah,v 1.6 2009/05/16 08:06:57 adam Exp $
+$NetBSD: patch-ah,v 1.7 2009/08/18 15:23:59 joerg Exp $
 
 --- src/wx-console/Makefile.in.orig	2009-03-09 16:34:05.000000000 +0100
 +++ src/wx-console/Makefile.in
-@@ -83,7 +83,7 @@ bwx-console.app: bwx-console
+@@ -81,7 +81,7 @@ bwx-console.app: bwx-console
+ 	mv bwx-console bwx-console.app/Contents/MacOS/bwx-console
+ 	cp bwx-console.conf /Library/Preferences/org.bacula.wxconsole.conf
  
- bwx-console: Makefile $(CONSOBJS) @WIN32@ ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
+-bwx-console: Makefile $(CONSOBJS) @WIN32@ ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
++bwx-console: Makefile $(CONSOBJS) @WIN32@
  	$(LIBTOOL_LINK) $(CXX) $(CONSOBJS) $(WIN32RES) -o $@ $(LIBS) -L../lib $(CONS_LDFLAGS) \
--	  -lbaccfg -lbac $(OPENSSL_LIBS)
-+	  ../lib/libbaccfg.la ../lib/libbac.la $(OPENSSL_LIBS)
+ 	  -lbaccfg -lbac $(OPENSSL_LIBS)
  
- win32: bwx-console_private.res
- 	
 @@ -114,14 +114,14 @@ install: all
  	fi
  	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bwx-console $(DESTDIR)$(sbindir)/bwx-console
  	@srcconf=bwx-console.conf; \
 -	if  test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \
-+	if  test -f ${DESTDIR}%%EXAMPLESDIR%%/$$srcconf; then \
++	if  test -f ${DESTDIR}/usr/pkg/share/examples/bacula/$$srcconf; then \
  	   destconf=$$srcconf.new; \
  	   echo "  ==> Found existing $$srcconf, installing new conf file as $$destconf"; \
  	else \
@@ -24,8 +24,8 @@ $NetBSD: patch-ah,v 1.6 2009/05/16 08:06:57 adam Exp $
  	fi; \
 -	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
 -	${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
-+	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf"; \
-+	${INSTALL_CONFIG} $$srcconf ${DESTDIR}%%EXAMPLESDIR%%/$$destconf
++	echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf"; \
++	${INSTALL_CONFIG} $$srcconf ${DESTDIR}/usr/pkg/share/examples/bacula/$$destconf
  
  uninstall:
  	(cd $(DESTDIR)$(sbindir); $(RMF) bwx-console)