Attached is a diff to update bacula to 2.2.3. Included with 2.2.x is a
new qt/qtw-based GUI admin tools called bat.
This update requires the qwt port I submitted already.
Please review, test comment.
-ME
Index: Makefile
===
RCS file: /cvs/ports/sysutils/bacula/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile5 Sep 2007 07:57:33 - 1.5
+++ Makefile12 Sep 2007 03:12:11 -
@@ -2,13 +2,15 @@
COMMENT-main= network backup solution
COMMENT-client=network backup solution (client)
+COMMENT-bat= network backup solution (gui-client)
COMMENT-server=network backup solution (server)
-VERSION= 2.0.3
+VERSION= 2.2.3
DISTNAME= bacula-${VERSION}
-PKGNAME-main= ${DISTNAME}p0
-FULLPKGNAME-client=bacula-client-${VERSION}p2
-PKGNAME-server=bacula-server-${VERSION}p1
+PKGNAME-main= ${DISTNAME}
+FULLPKGNAME-client=bacula-client-${VERSION}
+FULLPKGNAME-bat= bacula-bat-${VERSION}
+PKGNAME-server=bacula-server-${VERSION}
CATEGORIES=sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/}
@@ -20,8 +22,14 @@ MAINTAINER= Michael Erdely [EMAIL PROTECTED]
WANTLIB= c pthread crypto ssl z m stdc++
WANTLIB-server=${WANTLIB} readline termcap
WANTLIB-main= ${WANTLIB} readline termcap
+WANTLIB-main+= ICE QtCore QtGui SM X11 Xcursor Xext Xfixes Xi Xinerama
+WANTLIB-main+= Xrandr Xrender fontconfig freetype glib-2.0 gthread-2.0
+WANTLIB-main+= iconv intl png
+WANTLIB-bat= ${WANTLIB} ICE QtCore QtGui SM X11 Xcursor Xext Xfixes
+WANTLIB-bat+= Xi Xinerama Xrandr Xrender fontconfig freetype glib-2.0
+WANTLIB-bat+= gthread-2.0 iconv intl png
-MULTI_PACKAGES=-main -client -server
+MULTI_PACKAGES=-main -client -bat -server
# Modified GPLv2
# http://bacula.org/dev-manual/Bacula_Copyri_Tradem_Licens.html
@@ -55,18 +63,21 @@ CONFIGURE_ARGS= --enable-smartalloc \
--with-dir-group=_bacula \
--with-sd-user=root \
--with-sd-group=wheel \
+ --with-sbin-perm=755 \
--without-x \
--without-tcp-wrappers \
--without-smtp-host \
--without-job-email \
--without-dump-email \
--disable-gnome \
- --disable-wx-console \
+ --disable-bwx-console \
--disable-tray-monitor \
--disable-nls \
--disable-conio \
--enable-readline \
- --with-openssl
+ --with-openssl \
+ --enable-bat \
+ --with-qwt=${LOCALBASE}
CONFIGURE_ENV+=CPPFLAGS=-I/usr/include/readline \
-I${LOCALBASE}/include \
@@ -75,7 +86,8 @@ CONFIGURE_ENV+= CPPFLAGS=-I/usr/includ
PTHREAD_LIBS=${PTHREAD_LIBS} \
MTX=/bin/chio \
TAPEDRIVE=/dev/rst0 \
- CONFIG_SITE=${PORTSDIR}/infrastructure/db/config.site
+ CONFIG_SITE=${PORTSDIR}/infrastructure/db/config.site \
+
PKG_CONFIG_LIBDIR=${LOCALBASE}/lib/qt4/pkgconfig:${LOCALBASE}/lib/qt4
BACKEND=
.if ${FLAVOR:L:Mpgsql}
@@ -99,7 +111,8 @@ ERRORS+= Fatal: choose either pgsql or
CONFIGURE_ARGS+= --without-postgresql \
--with-mysql \
--without-sqlite \
- --without-sqlite3
+ --without-sqlite3 \
+ --enable-batch-insert
LIB_DEPENDS+= lib/mysql/mysqlclient.=10::databases/mysql
BACKEND= mysql
.else
@@ -140,13 +153,20 @@ ERRORS+= Fatal: choose either pgsql or
.endif
LIB_DEPENDS-client=
+LIB_DEPENDS-bat= qwt.=5::x11/qwt
+RUN_DEPENDS-bat= ${LIB_DEPENDS-bat}
+LIB_DEPENDS-main+= ${LIB_DEPENDS} ${LIB_DEPENDS-bat}
+RUN_DEPENDS-main+= ${LIB_DEPENDS-bat}
+
post-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bacula
${INSTALL_DATA} ${WRKINST}/etc/bacula/bacula-dir.conf \
${WRKINST}/etc/bacula/bacula-fd.conf \
${WRKINST}/etc/bacula/bacula-sd.conf \
${WRKINST}/etc/bacula/bconsole.conf \
+ ${WRKINST}/etc/bacula/bat.conf \
${PREFIX}/share/examples/bacula/
.include bsd.port.mk
Index: distinfo
