The following diff updates bacula to 2.4.1.
Port Changes:
- Stop using qwt
- Use SUBST_CMD
- Fix PKGPATH for -main (thanks, naddy@)
- Fix PKGPATH for -bat, too
- Fix WANTLIB-mysql (thanks, sthen@)
- Regen patches (add @bin)
- Remove unnecessary patches/patch-scripts_bacula_in
Bacula Changes:
- Many bugfixes
- Major SD reservation rewrite
- Major autochanger code rewrite
Please test. ok?
-ME
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/bacula/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 16 Feb 2008 21:22:41 -0000 1.10
+++ Makefile 10 Jul 2008 20:44:02 -0000
@@ -3,10 +3,11 @@
COMMENT-main= network backup solution (client)
COMMENT-server= network backup solution (server)
-V= 2.2.8
+V= 2.4.1
DISTNAME= bacula-$V
-FULLPKGNAME-main= bacula-client-$Vp0
-PKGNAME-server= bacula-server-$Vp0
+FULLPKGNAME-main= bacula-client-$V
+FULLPKGPATH-main= ${PKGPATH},-main
+PKGNAME-server= bacula-server-$V
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bacula/}
@@ -52,12 +53,14 @@ CONFIGURE_ARGS= --enable-smartalloc \
--with-dir-group=_bacula \
--with-sd-user=${SD_USER} \
--with-sd-group=_bacula \
+ --with-archivedir=/tmp \
--with-sbin-perm=755 \
--without-x \
--without-tcp-wrappers \
--without-smtp-host \
--without-job-email \
--without-dump-email \
+ --without-qwt \
--disable-gnome \
--disable-bwx-console \
--disable-tray-monitor \
@@ -101,7 +104,7 @@ CONFIGURE_ARGS+= --without-postgresql \
--without-sqlite \
--without-sqlite3 \
--enable-batch-insert
-LIB_DEPENDS+= lib/mysql/mysqlclient.>=10::databases/mysql
+LIB_DEPENDS+= mysqlclient_r.>=18::databases/mysql
BACKEND= mysql
.else
CONFIGURE_ARGS+= --without-mysql
@@ -144,23 +147,26 @@ LIB_DEPENDS-main=
PSEUDO_FLAVORS+= no_bat
.if ${FLAVOR:L:Mno_bat}
-CONFIGURE_ARGS+= --disable-bat \
- --without-qwt
+CONFIGURE_ARGS+= --disable-bat
.else
-CONFIGURE_ARGS+= --enable-bat \
- --with-qwt=${LOCALBASE}
-FULLPKGNAME-bat= bacula-bat-$Vp0
-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
+CONFIGURE_ARGS+= --enable-bat
+FULLPKGNAME-bat= bacula-bat-$V
+FULLPKGPATH-bat= ${PKGPATH},-bat
+WANTLIB-bat= ${WANTLIB} ICE SM X11 Xcursor Xext Xfixes
+WANTLIB-bat+= Xi Xinerama Xrandr Xrender fontconfig freetype
+WANTLIB-bat+= glib-2.0 gthread-2.0 iconv intl png
MULTI_PACKAGES+= -bat
-LIB_DEPENDS-bat= qwt.>=5::x11/qwt
+LIB_DEPENDS-bat= QtCore,QtGui::x11/qt4
COMMENT-bat= network backup solution (gui-client)
.endif
+post-extract:
+ @cp ${FILESDIR}/README-{client,server}.OpenBSD ${WRKDIR}
+
pre-configure:
- perl -pi -e "s%!!BACULACONF!!%${BACULACONF}%" \
- ${WRKSRC}/manpages/bat.1 ${WRKSRC}/src/qt-console/main.cpp
+ ${SUBST_CMD} ${WRKSRC}/manpages/bat.1 ${WRKSRC}/src/qt-console/main.cpp
\
+ ${WRKDIR}/README-client.OpenBSD \
+ ${WRKDIR}/README-server.OpenBSD
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bacula
@@ -170,12 +176,8 @@ post-install:
${WRKINST}/etc/bacula/bconsole.conf \
${PREFIX}/share/examples/bacula/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bacula
- perl -pe
"s%!!TRUEPREFIX!!%${TRUEPREFIX}%g,s%!!BACULACONF!!%${BACULACONF}%g" \
- ${FILESDIR}/README-client.OpenBSD > \
- ${PREFIX}/share/doc/bacula/README-client.OpenBSD
- perl -pe
"s%!!TRUEPREFIX!!%${TRUEPREFIX}%g,s%!!BACULACONF!!%${BACULACONF}%g,s%!!SD_USER!!%${SD_USER}%g"
\
- ${FILESDIR}/README-server.OpenBSD > \
- ${PREFIX}/share/doc/bacula/README-server.OpenBSD
+ ${INSTALL_DATA} ${WRKDIR}/README-{client,server}.OpenBSD \
+ ${PREFIX}/share/doc/bacula/
.if !${FLAVOR:L:Mno_bat}
${INSTALL_PROGRAM} ${WRKSRC}/src/qt-console/bat ${PREFIX}/sbin/
${INSTALL_DATA} ${WRKINST}/etc/bacula/bat.conf \
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/bacula/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 7 Feb 2008 02:53:35 -0000 1.3
+++ distinfo 9 Jul 2008 20:20:36 -0000
@@ -1,5 +1,5 @@
-MD5 (bacula-2.2.8.tar.gz) = RUfQv5+XbV2epfIae9B47g==
-RMD160 (bacula-2.2.8.tar.gz) = uDrYjVmPHOit8B7jle6/aNC/BRc=
-SHA1 (bacula-2.2.8.tar.gz) = RBVeLyNktMmNwa/aZk2WArsoYuc=
-SHA256 (bacula-2.2.8.tar.gz) = CFnihb6Wk7zRjejntpuSK7wLZACn6t37SnssEWjjpMo=
-SIZE (bacula-2.2.8.tar.gz) = 3063481
+MD5 (bacula-2.4.1.tar.gz) = B3y4C1HME1hLCWDYY5Mq8g==
+RMD160 (bacula-2.4.1.tar.gz) = gU64GAH+iKD/vhE92XY1NC/527Q=
+SHA1 (bacula-2.4.1.tar.gz) = vBJikUW9vrfbqzXlQO33lZg0blc=
+SHA256 (bacula-2.4.1.tar.gz) = V1f1vR8G2zgxL4Hnydei38elquv0+RoG9/2ZTB+bFtc=
+SIZE (bacula-2.4.1.tar.gz) = 3092767
Index: files/README-client.OpenBSD
===================================================================
RCS file: /cvs/ports/sysutils/bacula/files/README-client.OpenBSD,v
retrieving revision 1.1
diff -u -p -r1.1 README-client.OpenBSD
--- files/README-client.OpenBSD 7 Feb 2008 02:53:35 -0000 1.1
+++ files/README-client.OpenBSD 10 Jul 2008 19:29:42 -0000
@@ -1,9 +1,9 @@
Example config files for Bacula have been installed in
-!!TRUEPREFIX!!/share/examples/bacula and copied also to
-!!BACULACONF!!, edit them to your site's needs.
+${LOCALBASE}/share/examples/bacula and copied also to
+${BACULACONF}, edit them to your site's needs.
To start, add the following to /etc/rc.local:
-if [ -x !!TRUEPREFIX!!/libexec/bacula/bacula-ctl-fd ]; then
- !!TRUEPREFIX!!/libexec/bacula/bacula-ctl-fd start
+if [ -x ${LOCALBASE}/libexec/bacula/bacula-ctl-fd ]; then
+ ${LOCALBASE}/libexec/bacula/bacula-ctl-fd start
echo -n ' bacula-fd'
fi
Index: files/README-server.OpenBSD
===================================================================
RCS file: /cvs/ports/sysutils/bacula/files/README-server.OpenBSD,v
retrieving revision 1.1
diff -u -p -r1.1 README-server.OpenBSD
--- files/README-server.OpenBSD 7 Feb 2008 02:53:35 -0000 1.1
+++ files/README-server.OpenBSD 10 Jul 2008 19:29:51 -0000
@@ -2,21 +2,21 @@ To take advantage of bacula's DVD/CD wri
dvd+rw-tools packages.
Example config files for Bacula have been installed in
-!!TRUEPREFIX!!/share/examples/bacula and copied also to
-!!BACULACONF!!, edit them to your site's needs.
+${LOCALBASE}/share/examples/bacula and copied also to
+${BACULACONF}, edit them to your site's needs.
Backend database creation/update scripts are located in
-!!TRUEPREFIX!!/libexec/bacula
+${LOCALBASE}/libexec/bacula
To allow the storage daemon user to access tape devices,
-be sure to add !!SD_USER!! to the operator group.
+be sure to add ${SD_USER} to the operator group.
To start, add the following to /etc/rc.local:
-if [ -x !!TRUEPREFIX!!/libexec/bacula/bacula-ctl-sd ]; then
- !!TRUEPREFIX!!/libexec/bacula/bacula-ctl-sd start
+if [ -x ${LOCALBASE}/libexec/bacula/bacula-ctl-sd ]; then
+ ${LOCALBASE}/libexec/bacula/bacula-ctl-sd start
echo -n ' bacula-sd'
fi
-if [ -x !!TRUEPREFIX!!/libexec/bacula/bacula-ctl-dir ]; then
- !!TRUEPREFIX!!/libexec/bacula/bacula-ctl-dir start
+if [ -x ${LOCALBASE}/libexec/bacula/bacula-ctl-dir ]; then
+ ${LOCALBASE}/libexec/bacula/bacula-ctl-dir start
echo -n ' bacula-dir'
fi
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/sysutils/bacula/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure 7 Feb 2008 02:53:35 -0000 1.2
+++ patches/patch-configure 9 Jul 2008 20:26:05 -0000
@@ -1,16 +1,16 @@
$OpenBSD: patch-configure,v 1.2 2008/02/07 02:53:35 merdely Exp $
---- configure.orig Fri Nov 30 16:32:48 2007
-+++ configure Sun Jan 27 12:46:08 2008
-@@ -3262,7 +3262,7 @@ else
- echo "${ECHO_T}no" >&6
+--- configure.orig Thu Jun 19 15:44:34 2008
++++ configure Tue Jul 1 19:28:12 2008
+@@ -4014,7 +4014,7 @@ echo "${ECHO_T}no" >&6; }
fi
+
-if test ! -e $CXX; then
+if test ! -e `which $CXX`; then
{ { echo "$as_me:$LINENO: error: Unable to find C++ compiler" >&5
echo "$as_me: error: Unable to find C++ compiler" >&2;}
{ (exit 1); exit 1; }; }
-@@ -30401,6 +30401,7 @@ openbsd)
+@@ -29982,6 +29982,7 @@ openbsd)
platforms/openbsd/bacula-fd \
platforms/openbsd/bacula-sd \
platforms/openbsd/bacula-dir"
@@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.2 2008/02/
;;
redhat)
if test -f /etc/whitebox-release ; then
-@@ -32221,7 +32222,7 @@ if test "${support_bat}" = "yes" ; then
+@@ -31766,7 +31767,7 @@ if test "${support_bat}" = "yes" ; then
QMAKEBIN="qmake"
if test "x$QMAKEQT4" != "xnone"; then
Index: patches/patch-manpages_bat_1
===================================================================
RCS file: /cvs/ports/sysutils/bacula/patches/patch-manpages_bat_1,v
retrieving revision 1.1
diff -u -p -r1.1 patch-manpages_bat_1
--- patches/patch-manpages_bat_1 7 Feb 2008 02:53:35 -0000 1.1
+++ patches/patch-manpages_bat_1 9 Jul 2008 20:30:13 -0000
@@ -6,7 +6,7 @@ $OpenBSD: patch-manpages_bat_1,v 1.1 200
.TP
.B \-c <config>
-Specify configuration file. Default is bat.conf.
-+Specify configuration file. Default is !!BACULACONF!!/bat.conf.
++Specify configuration file. Default is ${BACULACONF}/bat.conf.
.TP
.B \-d <nn>
Set debug level to \fInn\fP.
Index: patches/patch-scripts_bacula_in
===================================================================
RCS file: patches/patch-scripts_bacula_in
diff -N patches/patch-scripts_bacula_in
--- patches/patch-scripts_bacula_in 20 Jul 2007 11:02:14 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-scripts_bacula_in,v 1.1.1.1 2007/07/20 11:02:14 robert Exp $
---- scripts/bacula.in.orig Thu Jul 12 11:20:52 2007
-+++ scripts/bacula.in Thu Jul 12 11:21:23 2007
-@@ -13,9 +13,9 @@
- # easier to "steal" this code for the development
- # environment where they are different.
- #
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-
- case "$1" in
- start)
Index: patches/patch-scripts_mtx-changer_in
===================================================================
RCS file: /cvs/ports/sysutils/bacula/patches/patch-scripts_mtx-changer_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-scripts_mtx-changer_in
--- patches/patch-scripts_mtx-changer_in 7 Feb 2008 02:53:35 -0000
1.2
+++ patches/patch-scripts_mtx-changer_in 9 Jul 2008 20:28:01 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_mtx-changer_in,v 1.2 2008/02/07 02:53:35 merdely Exp $
---- scripts/mtx-changer.in.orig Thu Aug 16 09:01:19 2007
-+++ scripts/mtx-changer.in Wed Jan 9 16:17:45 2008
+--- scripts/mtx-changer.in.orig Wed Jul 2 16:49:44 2008
++++ scripts/mtx-changer.in Tue Jul 1 19:28:12 2008
@@ -2,3 +2,3 @@
#
-# Bacula interface to mtx autoloader
@@ -19,7 +19,7 @@ $OpenBSD: patch-scripts_mtx-changer_in,v
# exit code, Bacula will assume the request failed.
#
-@@ -161,17 +161,17 @@ debug "Parms: $ctl $cmd $slot $device $drive"
+@@ -173,17 +173,17 @@ debug "Parms: $ctl $cmd $slot $device $drive"
case $cmd in
unload)
@@ -41,7 +41,7 @@ $OpenBSD: patch-scripts_mtx-changer_in,v
rtn=$?
#
# Increase the sleep time if you have a slow device
-@@ -182,36 +182,37 @@ case $cmd in
+@@ -194,36 +194,37 @@ case $cmd in
;;
list)
Index: patches/patch-src_dird_bacula-dir_conf_in
===================================================================
RCS file: /cvs/ports/sysutils/bacula/patches/patch-src_dird_bacula-dir_conf_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_dird_bacula-dir_conf_in
--- patches/patch-src_dird_bacula-dir_conf_in 7 Feb 2008 02:53:35 -0000
1.3
+++ patches/patch-src_dird_bacula-dir_conf_in 9 Jul 2008 20:26:02 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_dird_bacula-dir_conf_in,v 1.3 2008/02/07 02:53:35 merdely
Exp $
---- src/dird/bacula-dir.conf.in.orig Wed Oct 3 12:22:07 2007
-+++ src/dird/bacula-dir.conf.in Mon Oct 22 11:55:00 2007
+--- src/dird/bacula-dir.conf.in.orig Thu Jun 19 15:44:34 2008
++++ src/dird/bacula-dir.conf.in Tue Jul 1 19:28:12 2008
@@ -13,7 +13,8 @@
#
@@ -29,7 +29,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf
# JobDefs = "DefaultJob"
# Write Bootstrap = "@working_dir@/Client2.bsr"
#}
-@@ -75,8 +76,8 @@ Job {
+@@ -79,8 +80,8 @@ Job {
Job {
Name = "RestoreFiles"
Type = Restore
@@ -40,7 +40,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf
Storage = File
Pool = Default
Messages = Standard
-@@ -101,11 +102,7 @@ FileSet {
+@@ -105,11 +106,7 @@ FileSet {
# if you have other partitons such as /usr or /home
# you will probably want to add them too.
#
@@ -53,7 +53,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf
}
#
-@@ -150,8 +147,8 @@ FileSet {
+@@ -154,8 +151,8 @@ FileSet {
# Client (File Services) to backup
Client {
@@ -64,7 +64,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf
FDPort = @fd_port@
Catalog = MyCatalog
Password = "@fd_password@" # password for FileDaemon
-@@ -165,8 +162,8 @@ Client {
+@@ -169,8 +166,8 @@ Client {
# You should change Name, Address, and Password before using
#
#Client {
@@ -75,7 +75,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf
# FDPort = @fd_port@
# Catalog = MyCatalog
# Password = "@[EMAIL PROTECTED]" # password for FileDaemon 2
-@@ -180,7 +177,7 @@ Client {
+@@ -184,7 +181,7 @@ Client {
Storage {
Name = File
# Do not use "localhost" here
@@ -84,7 +84,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf
SDPort = @sd_port@
Password = "@sd_password@"
Device = FileStorage
-@@ -193,7 +190,7 @@ Storage {
+@@ -197,7 +194,7 @@ Storage {
#Storage {
# Name = DDS-4
# Do not use "localhost" here
@@ -93,7 +93,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf
# SDPort = @sd_port@
# Password = "@sd_password@" # password for Storage daemon
# Device = DDS-4 # must be same as Device in Storage
daemon
-@@ -205,7 +202,7 @@ Storage {
+@@ -209,7 +206,7 @@ Storage {
#Storage {
# Name = "8mmDrive"
# Do not use "localhost" here
@@ -102,7 +102,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf
# SDPort = @sd_port@
# Password = "@sd_password@"
# Device = "Exabyte 8mm"
-@@ -216,7 +213,7 @@ Storage {
+@@ -220,7 +217,7 @@ Storage {
#Storage {
# Name = "DVD"
# Do not use "localhost" here
@@ -111,7 +111,7 @@ $OpenBSD: patch-src_dird_bacula-dir_conf
# SDPort = @sd_port@
# Password = "@sd_password@"
# Device = "DVD Writer"
-@@ -292,7 +289,7 @@ Pool {
+@@ -296,7 +293,7 @@ Pool {
# Restricted console used by tray-monitor to get the status of the director
#
Console {
Index: patches/patch-src_qt-console_main_cpp
===================================================================
RCS file: /cvs/ports/sysutils/bacula/patches/patch-src_qt-console_main_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_qt-console_main_cpp
--- patches/patch-src_qt-console_main_cpp 7 Feb 2008 02:53:35 -0000
1.1
+++ patches/patch-src_qt-console_main_cpp 9 Jul 2008 20:30:23 -0000
@@ -6,7 +6,7 @@ $OpenBSD: patch-src_qt-console_main_cpp,
static int check_resources();
-#define CONFIG_FILE "./bat.conf" /* default configuration file */
-+#define CONFIG_FILE "!!BACULACONF!!/bat.conf" /* default configuration file
*/
++#define CONFIG_FILE "${BACULACONF}/bat.conf" /* default configuration file
*/
/* Static variables */
static char *configfile = NULL;
Index: pkg/PLIST-bat
===================================================================
RCS file: /cvs/ports/sysutils/bacula/pkg/PLIST-bat,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-bat
--- pkg/PLIST-bat 16 Feb 2008 21:22:41 -0000 1.2
+++ pkg/PLIST-bat 11 Jun 2008 19:42:59 -0000
@@ -3,7 +3,7 @@
@newuser _bacula:591:_bacula:daemon:Bacula Director:/var/bacula:/sbin/nologin
@newuser _bacula-sd:599:_bacula:daemon:Bacula Storage
Daemon:/nonexistent:/sbin/nologin
@man man/man1/bat.1
-sbin/bat
[EMAIL PROTECTED] sbin/bat
share/examples/bacula/
@mode 750
@owner _bacula
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/sysutils/bacula/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-main
--- pkg/PLIST-main 16 Feb 2008 21:22:41 -0000 1.3
+++ pkg/PLIST-main 11 Jun 2008 21:04:23 -0000
@@ -8,7 +8,7 @@
libexec/bacula/
libexec/bacula/bacula-ctl-fd
@man man/man8/bacula-fd.8
-sbin/bacula-fd
[EMAIL PROTECTED] sbin/bacula-fd
share/doc/bacula/
share/doc/bacula/README-client.OpenBSD
share/examples/bacula/
Index: pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/sysutils/bacula/pkg/PLIST-server,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-server
--- pkg/PLIST-server 16 Feb 2008 21:22:41 -0000 1.3
+++ pkg/PLIST-server 11 Jun 2008 20:41:44 -0000
@@ -46,19 +46,19 @@ libexec/bacula/update_${BACKEND}_tables
@man man/man8/btape.8
@man man/man8/btraceback.8
@man man/man8/dbcheck.8
-sbin/bacula-dir
-sbin/bacula-sd
-sbin/bconsole
-sbin/bcopy
-sbin/bextract
-sbin/bls
-sbin/bregex
-sbin/bscan
-sbin/bsmtp
-sbin/btape
[EMAIL PROTECTED] sbin/bacula-dir
[EMAIL PROTECTED] sbin/bacula-sd
[EMAIL PROTECTED] sbin/bconsole
[EMAIL PROTECTED] sbin/bcopy
[EMAIL PROTECTED] sbin/bextract
[EMAIL PROTECTED] sbin/bls
[EMAIL PROTECTED] sbin/bregex
[EMAIL PROTECTED] sbin/bscan
[EMAIL PROTECTED] sbin/bsmtp
[EMAIL PROTECTED] sbin/btape
sbin/btraceback
-sbin/bwild
-sbin/dbcheck
[EMAIL PROTECTED] sbin/bwild
[EMAIL PROTECTED] sbin/dbcheck
share/doc/bacula/
share/doc/bacula/README-server.OpenBSD
share/examples/bacula/
