<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[121587] trunk/dports/sysutils/bacula</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/121587">121587</a></dd>
<dt>Author</dt> <dd>mf2k@macports.org</dd>
<dt>Date</dt> <dd>2014-07-01 10:11:42 -0700 (Tue, 01 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>bacula: Update to version 7.0.4. Use conio instead of readline. Add mysql51 variant. Remove sqlite2 variant. Add notes for configuration. add server startupitems. (#44127)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssysutilsbaculaPortfile">trunk/dports/sysutils/bacula/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssysutilsbaculafilespatchconfiguremysqldiffpatch">trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff.patch</a></li>
<li><a href="#trunkdportssysutilsbaculafilespatchcreate_postgresql_databasediff">trunk/dports/sysutils/bacula/files/patch-create_postgresql_database.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssysutilsbaculaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/bacula/Portfile (121586 => 121587)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/bacula/Portfile 2014-07-01 17:09:25 UTC (rev 121586)
+++ trunk/dports/sysutils/bacula/Portfile 2014-07-01 17:11:42 UTC (rev 121587)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name bacula
</span><del>-version 5.2.13
</del><ins>+version 7.0.4
</ins><span class="cx"> categories sysutils
</span><span class="cx"> platforms darwin
</span><span class="cx"> license {AGPL-3 OpenSSLException}
</span><span class="lines">@@ -18,8 +18,8 @@
</span><span class="cx"> homepage http://www.bacula.org/
</span><span class="cx"> master_sites sourceforge
</span><span class="cx">
</span><del>-checksums rmd160 bcc168143c0eec5cb5e983f765935534379f4fcf \
- sha256 a4bed458bf001889bd06bf31671b5d9908055a1d1e8113fd750ae4d326607ad8
</del><ins>+checksums rmd160 09d033f4ea3431f57d8018647af41c1ae417652d \
+ sha256 ebf802b843a95f6526e82dd181dff7cd7dc7d1fdc55cec8636e0fe3af69acf7e
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx"> depends_lib port:gawk \
</span><span class="lines">@@ -28,7 +28,8 @@
</span><span class="cx"> port:ncurses \
</span><span class="cx"> port:openssl \
</span><span class="cx"> port:tcp_wrappers \
</span><del>- port:zlib
</del><ins>+ port:zlib \
+ port:lzo2
</ins><span class="cx">
</span><span class="cx"> configure.ccache no
</span><span class="cx"> configure.args --mandir=${prefix}/share/man \
</span><span class="lines">@@ -40,19 +41,15 @@
</span><span class="cx"> --with-libintl-prefix=${prefix} \
</span><span class="cx"> --with-openssl=${prefix} \
</span><span class="cx"> --with-libiconv-prefix=${prefix} \
</span><del>- --with-readline=${prefix} \
</del><span class="cx"> --with-archivedir=/var/tmp \
</span><span class="cx"> --with-working-dir=${prefix}/var/bacula/working \
</span><span class="cx"> --with-included-gettext=${prefix} \
</span><span class="cx"> --enable-smartalloc \
</span><span class="cx"> --enable-largefile \
</span><del>- --without-sqlite \
</del><ins>+ --enable-conio \
</ins><span class="cx"> --without-sqlite3 \
</span><span class="cx"> --without-postgresql \
</span><span class="cx"> --without-mysql \
</span><del>- --disable-gnome \
- --disable-wx-console \
- --disable-tray-monitor \
</del><span class="cx"> --with-tcp-wrappers
</span><span class="cx">
</span><span class="cx"> configure.cppflags-append -I${prefix}/ncurses
</span><span class="lines">@@ -73,7 +70,10 @@
</span><span class="cx"> startupitem.start "\[ -x \${BIN} \] && \${BIN} -c ${prefix}/etc/bacula/bacula-fd.conf"
</span><span class="cx"> startupitem.stop "\[ -r \${PID} \] && /bin/kill \$(cat \${PID})"
</span><span class="cx">
</span><del>-variant client_only conflicts mysql55 postgresql83 postgresql84 sqlite2 sqlite3 description "Install bacula client (bacula-fd) only" {
</del><ins>+notes "To use the Bacula FD client, you'll need to configure \"${prefix}/etc/bacula/bacula-fd.conf\"."
+notes-append "To use bconsole, you'll need to configure \"${prefix}/etc/bacula/bconsole.conf\"."
+
+variant client_only conflicts mysql51 mysql55 postgresql83 postgresql84 sqlite3 description "Install bacula client (bacula-fd) only" {
</ins><span class="cx"> configure.args-append --enable-client-only
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -92,53 +92,131 @@
</span><span class="cx"> xinstall -m 755 -d ${destroot}${applications_dir}
</span><span class="cx"> copy ${worksrcpath}/src/qt-console/bat.app ${destroot}${applications_dir}/Bacula-BAT.app
</span><span class="cx"> }
</span><del>- notes "To use the Bacula BAT GUI, you'll need to configure \"${prefix}/etc/bacula/bat.conf\"."
</del><ins>+ notes-append "To use the Bacula BAT GUI, you'll need to configure \"${prefix}/etc/bacula/bat.conf\"."
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant mysql55 conflicts client_only postgresql83 postgresql84 sqlite2 sqlite3 description "Install bacula client and server with mysql 5 backend" {
</del><ins>+variant mysql51 conflicts client_only mysql55 postgresql83 postgresql84 sqlite3 description "Install bacula client and server with mysql 5.1 backend" {
+ depends_lib-append port:mysql51
+ configure.args-append --with-mysql=${prefix}/include/mysql51/mysql
+ configure.args-delete --without-mysql
+ configure.args-append --enable-batch-insert
+ configure.cppflags-append -I${prefix}/include/mysql51/mysql
+
+ patchfiles patch-configure-mysql.diff
+ post-patch {
+ reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/configure
+ }
+ notes-append "
+ To use the Bacula Director, you'll need to perform the following steps:
+ 1. create user \"bacula\" on a mysql database
+ 2. execute \"${prefix}/etc/bacula/create_bacula_database -h <mysql_server> -u <db_admin_user> -p\"
+ 3. execute \"${prefix}/etc/bacula/make_bacula_tables -h <mysql_server> -u <db_admin_user> -p\"
+ 4. execute \"${prefix}/etc/bacula/grant_bacula_privileges -h <mysql_server> -u <db_admin_user> -p\"
+ 5. configure \"${prefix}/etc/bacula/bacula-dir.conf\" and set the catalog database settings for the bacula db user.
+ "
+}
+
+variant mysql55 conflicts client_only mysql51 postgresql83 postgresql84 sqlite3 description "Install bacula client and server with mysql 5.5 backend" {
</ins><span class="cx"> depends_lib-append port:mysql55
</span><span class="cx"> configure.args-append --with-mysql=${prefix}/include/mysql55/mysql
</span><span class="cx"> configure.args-delete --without-mysql
</span><ins>+ configure.args-append --enable-batch-insert
</ins><span class="cx"> configure.cppflags-append -I${prefix}/include/mysql55/mysql
</span><span class="cx">
</span><span class="cx"> patchfiles patch-configure-mysql.diff
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/configure
</span><span class="cx"> }
</span><ins>+ notes-append "
+ To use the Bacula Director, you'll need to perform the following steps:
+ 1. create user \"bacula\" on a mysql database
+ 2. execute \"${prefix}/etc/bacula/create_bacula_database -h <mysql_server> -u <db_admin_user> -p\"
+ 3. execute \"${prefix}/etc/bacula/make_bacula_tables -h <mysql_server> -u <db_admin_user> -p\"
+ 4. execute \"${prefix}/etc/bacula/grant_bacula_privileges -h <mysql_server> -u <db_admin_user> -p\"
+ 5. configure \"${prefix}/etc/bacula/bacula-dir.conf\" and set the catalog database settings for the bacula db user.
+ "
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant postgresql83 conflicts mysql55 postgresql84 sqlite2 sqlite3 client_only description "Install bacula client and server with postgresql 8.3 backend" {
</del><ins>+variant postgresql83 conflicts mysql51 mysql55 postgresql84 sqlite3 client_only description "Install bacula client and server with postgresql 8.3 backend" {
</ins><span class="cx"> depends_lib-append port:postgresql83
</span><span class="cx"> configure.args-append --with-postgresql
</span><span class="cx"> configure.args-delete --without-postgresql
</span><ins>+ configure.args-append --enable-batch-insert
</ins><span class="cx"> configure.env-append PATH=${prefix}/lib/postgresql83/bin:$env(PATH)
</span><ins>+
+ patchfiles patch-create_postgresql_database.diff
+
+ notes-append "
+ To use the Bacula Director, you'll need to perform the following steps:
+ 1. create user \"bacula\" on a PostgreSQL database
+ 2. execute \"${prefix}/etc/bacula/create_bacula_database -h <postgresql-server> -U <db_admin_user>\"
+ 3. execute \"${prefix}/etc/bacula/make_bacula_tables -h <postgresql-server> -U <db_admin_user>\"
+ 4. execute \"${prefix}/etc/bacula/grant_bacula_privileges -h <postgresql-server> -U <db_admin_user> -p\"
+ 5. configure \"${prefix}/etc/bacula/bacula-dir.conf\" and set the catalog database settings for the bacula db user.
+ "
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant postgresql84 conflicts mysql55 postgresql83 sqlite2 sqlite3 client_only description "Install bacula client and server with postgresql 8.4 backend" {
</del><ins>+variant postgresql84 conflicts mysql51 mysql55 postgresql83 sqlite3 client_only description "Install bacula client and server with postgresql 8.4 backend" {
</ins><span class="cx"> depends_lib-append port:postgresql84
</span><span class="cx"> configure.args-append --with-postgresql
</span><span class="cx"> configure.args-delete --without-postgresql
</span><ins>+ configure.args-append --enable-batch-insert
</ins><span class="cx"> configure.env-append PATH=${prefix}/lib/postgresql84/bin:$env(PATH)
</span><del>-}
</del><span class="cx">
</span><del>-variant sqlite2 conflicts client_only sqlite3 mysql55 postgresql83 postgresql84 description "Install bacula client and server with sqlite 2 backend" {
- depends_lib-append port:sqlite2
- configure.args-append --with-sqlite=${prefix}
- configure.args-delete --without-sqlite
</del><ins>+ patchfiles patch-create_postgresql_database.diff
+
+ notes-append "
+ To use the Bacula Director, you'll need to perform the following steps:
+ 1. create user \"bacula\" on a PostgreSQL database
+ 2. execute \"${prefix}/etc/bacula/create_bacula_database -h <postgresql-server> -U <db_admin_user>\"
+ 3. execute \"${prefix}/etc/bacula/make_bacula_tables -h <postgresql-server> -U <db_admin_user>\"
+ 4. execute \"${prefix}/etc/bacula/grant_bacula_privileges -h <postgresql-server> -U <db_admin_user> -p\"
+ 5. configure \"${prefix}/etc/bacula/bacula-dir.conf\" and set the catalog database settings for the bacula db user.
+ "
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant sqlite3 conflicts client_only sqlite2 mysql55 postgresql83 postgresql84 description "Install bacula client and server with sqlite 3 backend" {
</del><ins>+variant sqlite3 conflicts client_only mysql51 mysql55 postgresql83 postgresql84 description "Install bacula client and server with sqlite 3 backend" {
</ins><span class="cx"> depends_lib-append port:sqlite3
</span><span class="cx"> configure.args-append --with-sqlite3=${prefix}
</span><span class="cx"> configure.args-delete --without-sqlite3
</span><ins>+ configure.args-append --enable-batch-insert
+ notes-append "
+ To use the Bacula Director, you'll need to perform the following steps:
+ 1. execute \"${prefix}/etc/bacula/create_bacula_database\"
+ 2. execute \"${prefix}/etc/bacula/make_bacula_tables\"
+ 3. configure \"${prefix}/etc/bacula/bacula-dir.conf\" and set the catalog database settings for the bacula db user.
+ "
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default_variants +console_bat
</span><span class="cx">
</span><del>-if {![variant_isset mysql55] && ![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset sqlite2] && ![variant_isset sqlite3]} {
</del><ins>+if {![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset sqlite3]} {
</ins><span class="cx"> default_variants-append +client_only
</span><ins>+} else {
+ # is a server installation
+
+ # Add the server daemons to the startupitem wrapper
+ startupitem.init-append "BIN_DIR=${prefix}/sbin/bacula-dir\nPID_DIR=${prefix}/var/run/bacula-dir.*.pid\n"
+ startupitem.init-append "BIN_SD=${prefix}/sbin/bacula-sd\nPID_SD=${prefix}/var/run/bacula-sd.*.pid\n"
+ startupitem.start-append "\[ -x \${BIN_DIR} -a -f ${prefix}/etc/bacula/bacula-dir.conf \] && \${BIN_DIR} -c ${prefix}/etc/bacula/bacula-dir.conf"
+ startupitem.start-append "\[ -x \${BIN_SD} -a -f ${prefix}/etc/bacula/bacula-sd.conf \] && \${BIN_SD} -c ${prefix}/etc/bacula/bacula-sd.conf"
+ startupitem.stop-append "\[ -r \${PID_DIR} \] && /bin/kill \$(cat \${PID_DIR})"
+ startupitem.stop-append "\[ -r \${PID_SD} \] && /bin/kill \$(cat \${PID_SD})"
+
+ # Don't overwrite existing preference files
+ post-destroot {
+ file rename ${destroot}${prefix}/etc/bacula/bacula-dir.conf ${destroot}${prefix}/etc/bacula/bacula-dir.conf.example
+ file rename ${destroot}${prefix}/etc/bacula/bacula-sd.conf ${destroot}${prefix}/etc/bacula/bacula-sd.conf.example
+ }
+ notes-append "To use the Bacula Storage Daemon, you'll need to configure \"${prefix}/etc/bacula/bacula-sd.conf\"."
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+pre-deactivate {
+ if {[file exists /Library/LaunchDaemons/org.macports.bacula.plist]} {
+ system "launchctl unload /Library/LaunchDaemons/org.macports.bacula.plist"
+ }
+}
+
</ins><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url ${homepage}
</span><span class="cx"> livecheck.regex {Bacula ([0-9\.]+)}
</span></span></pre></div>
<a id="trunkdportssysutilsbaculafilespatchconfiguremysqldiffpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff.patch (0 => 121587)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff.patch (rev 0)
+++ trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff.patch 2014-07-01 17:11:42 UTC (rev 121587)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+--- files/patch-configure-mysql.diff.orig 2014-06-26 06:46:48.000000000 -0700
++++ files/patch-configure-mysql.diff 2014-06-26 06:46:57.000000000 -0700
+@@ -1,9 +1,10 @@
+---- configure.orig 2014-01-08 14:36:00.000000000 -0700
+-+++ configure 2014-01-08 14:37:59.000000000 -0700
+-@@ -24328,110 +24328,9 @@
++--- configure.orig 2014-06-03 01:28:41.000000000 -0700
+++++ configure 2014-06-26 06:42:01.000000000 -0700
++@@ -24039,112 +24039,13 @@
++ if test "${with_mysql+set}" = set; then :
+ withval=$with_mysql;
+ if test "$withval" != "no"; then
+- if test "$withval" = "yes"; then
++- if test "$withval" = "yes"; then
+ -#
+ -# This code is very broken on older systems
+ -#
+@@ -108,9 +109,14 @@
+ -$as_echo "no" >&6; }
+ - as_fn_error $? "Invalid MySQL directory $withval - unable to find mysql.h under $withval" "$LINENO" 5
+ - fi
+-+ MYSQL_INCDIR=@@PREFIX@@/include/mysql55/mysql
+-+ MYSQL_LIBDIR=@@PREFIX@@/lib/mysql55/mysql
+-+ MYSQL_BINDIR=@@PREFIX@@/lib/mysql55/bin
+- fi
++- fi
+++
+++ ## replaced by macports start
+++ MYSQL_INCDIR=/opt/local/include/mysql55/mysql
+++ MYSQL_LIBDIR=/opt/local/lib/mysql55/mysql
+++ MYSQL_BINDIR=/opt/local/lib/mysql55/bin
+++ ## replaced by macports end
+++
+ MYSQL_INCLUDE=-I$MYSQL_INCDIR
+ if test -f $MYSQL_LIBDIR/libmysqlclient_r.a \
++ -o -f $MYSQL_LIBDIR/libmysqlclient_r.so; then
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkdportssysutilsbaculafilespatchcreate_postgresql_databasediff"></a>
<div class="addfile"><h4>Added: trunk/dports/sysutils/bacula/files/patch-create_postgresql_database.diff (0 => 121587)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/bacula/files/patch-create_postgresql_database.diff (rev 0)
+++ trunk/dports/sysutils/bacula/files/patch-create_postgresql_database.diff 2014-07-01 17:11:42 UTC (rev 121587)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- src/cats/create_postgresql_database.in.org 2014-06-29 10:28:42.000000000 +0200
++++ src/cats/create_postgresql_database.in 2014-06-29 10:29:34.000000000 +0200
+@@ -67,7 +67,7 @@
+ echo "!!!! Creation of ${db_name} database failed. !!!!"
+ echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+ fi
+-if psql -l ${dbname} | grep " ${db_name}.*SQL_ASCII" >/dev/null; then
++if psql -l ${dbname} $* | grep " ${db_name}.*SQL_ASCII" >/dev/null; then
+ echo "Database encoding OK"
+ else
+ echo " "
</ins></span></pre>
</div>
</div>
</body>
</html>