<!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>[115689] 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/115689">115689</a></dd>
<dt>Author</dt> <dd>macsforever2000@macports.org</dd>
<dt>Date</dt> <dd>2014-01-08 15:10:17 -0800 (Wed, 08 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>bacula: Fix build with mysql variant. (#42036). Switch from mysql5 to mysql55.</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="#trunkdportssysutilsbaculafilespatchconfiguremysqldiff">trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssysutilsbaculafilespatchconfigurediff">trunk/dports/sysutils/bacula/files/patch-configure.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 (115688 => 115689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/bacula/Portfile 2014-01-08 23:03:08 UTC (rev 115688)
+++ trunk/dports/sysutils/bacula/Portfile 2014-01-08 23:10:17 UTC (rev 115689)
</span><span class="lines">@@ -30,12 +30,6 @@
</span><span class="cx"> port:tcp_wrappers \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><del>-# Comment out patchfiles in case they are needed in the future or for the non-client version which is completely untested at this point
-# patch-configure.diff \
-#post-patch {
-# reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/configure
-#}
-
</del><span class="cx"> configure.ccache no
</span><span class="cx"> configure.args --mandir=${prefix}/share/man \
</span><span class="cx"> --docdir=${prefix}/share/doc/bacula \
</span><span class="lines">@@ -78,7 +72,7 @@
</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 mysql5 postgresql83 postgresql84 sqlite2 sqlite3 description "Install bacula client (bacula-fd) only" {
</del><ins>+variant client_only conflicts mysql55 postgresql83 postgresql84 sqlite2 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">@@ -100,33 +94,39 @@
</span><span class="cx"> notes "To use the Bacula BAT GUI, you'll need to configure \"${prefix}/etc/bacula/bat.conf\"."
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant mysql5 conflicts client_only postgresql83 postgresql84 sqlite2 sqlite3 description "Install bacula client and server with mysql 5 backend" {
- depends_lib-append path:bin/mysql_config5:mysql5
- configure.args-append --with-mysql
</del><ins>+variant mysql55 conflicts client_only postgresql83 postgresql84 sqlite2 sqlite3 description "Install bacula client and server with mysql 5 backend" {
+ depends_lib-append port:mysql55
+ configure.args-append --with-mysql=${prefix}/include/mysql55/mysql
</ins><span class="cx"> configure.args-delete --without-mysql
</span><ins>+ configure.cppflags-append -I${prefix}/include/mysql55/mysql
+
+ patchfiles patch-configure-mysql.diff
+ post-patch {
+ reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/configure
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant postgresql83 conflicts mysql5 postgresql84 sqlite2 sqlite3 client_only description "Install bacula client and server with postgresql 8.3 backend" {
</del><ins>+variant postgresql83 conflicts mysql55 postgresql84 sqlite2 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><span class="cx"> configure.env-append PATH=${prefix}/lib/postgresql83/bin:$env(PATH)
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant postgresql84 conflicts mysql5 postgresql83 sqlite2 sqlite3 client_only description "Install bacula client and server with postgresql 8.4 backend" {
</del><ins>+variant postgresql84 conflicts mysql55 postgresql83 sqlite2 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><span class="cx"> configure.env-append PATH=${prefix}/lib/postgresql84/bin:$env(PATH)
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant sqlite2 conflicts client_only sqlite3 mysql5 postgresql83 postgresql84 description "Install bacula client and server with sqlite 2 backend" {
</del><ins>+variant sqlite2 conflicts client_only sqlite3 mysql55 postgresql83 postgresql84 description "Install bacula client and server with sqlite 2 backend" {
</ins><span class="cx"> depends_lib-append port:sqlite2
</span><span class="cx"> configure.args-append --with-sqlite=${prefix}
</span><span class="cx"> configure.args-delete --without-sqlite
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant sqlite3 conflicts client_only sqlite2 mysql5 postgresql83 postgresql84 description "Install bacula client and server with sqlite 3 backend" {
</del><ins>+variant sqlite3 conflicts client_only sqlite2 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><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx">
</span><span class="cx"> default_variants +console_bat
</span><span class="cx">
</span><del>-if {![variant_isset mysql5] && ![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset sqlite2] && ![variant_isset sqlite3]} {
</del><ins>+if {![variant_isset mysql55] && ![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset sqlite2] && ![variant_isset sqlite3]} {
</ins><span class="cx"> default_variants-append +client_only
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportssysutilsbaculafilespatchconfiguremysqldifffromrev115682trunkdportssysutilsbaculafilespatchconfigurediff"></a>
<div class="copfile"><h4>Copied: trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff (from rev 115682, trunk/dports/sysutils/bacula/files/patch-configure.diff) (0 => 115689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff (rev 0)
+++ trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff 2014-01-08 23:10:17 UTC (rev 115689)
</span><span class="lines">@@ -0,0 +1,116 @@
</span><ins>+--- configure.orig 2014-01-08 14:36:00.000000000 -0700
++++ configure 2014-01-08 14:37:59.000000000 -0700
+@@ -24328,110 +24328,9 @@
+ withval=$with_mysql;
+ if test "$withval" != "no"; then
+ if test "$withval" = "yes"; then
+-#
+-# This code is very broken on older systems
+-#
+-# MYSQL_CONFIG=`which mysql_config 2>/dev/null`
+-# if test "x${MYSQL_CONFIG}" != x; then
+-# MYSQL_BINDIR="${MYSQL_CONFIG%/*}"
+-# ${MYSQL_CONFIG} --variable=pkglibdir > /dev/null 2>&1
+-# if test $? = 0 ; then
+-# MYSQL_LIBDIR=`${MYSQL_CONFIG} --variable=pkglibdir`
+-# MYSQL_INCDIR=`${MYSQL_CONFIG} --variable=pkgincludedir`
+-# else
+-# MYSQL_LIBDIR=`${MYSQL_CONFIG} --libs | sed -e 's/.*-L//' -e 's/ .*//'`
+-# MYSQL_INCDIR=`${MYSQL_CONFIG} --include | sed -e 's/-I//'`
+-# fi
+-# elif test -f /usr/local/mysql/include/mysql/mysql.h; then
+- if test -f /usr/local/mysql/include/mysql/mysql.h; then
+- MYSQL_INCDIR=/usr/local/mysql/include/mysql
+- if test -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.a \
+- -o -f /usr/local/mysql/lib64/mysql/libmysqlclient_r.so; then
+- MYSQL_LIBDIR=/usr/local/mysql/lib64/mysql
+- else
+- MYSQL_LIBDIR=/usr/local/mysql/lib/mysql
+- fi
+- MYSQL_BINDIR=/usr/local/mysql/bin
+- elif test -f /usr/include/mysql/mysql.h; then
+- MYSQL_INCDIR=/usr/include/mysql
+- if test -f /usr/lib64/mysql/libmysqlclient_r.a \
+- -o -f /usr/lib64/mysql/libmysqlclient_r.so; then
+- MYSQL_LIBDIR=/usr/lib64/mysql
+- elif test -f /usr/lib64/libmysqlclient_r.a \
+- -o -f /usr/lib64/libmysqlclient_r.so; then
+- MYSQL_LIBDIR=/usr/lib64
+- elif test -f /usr/lib/x86_64-linux-gnu/libmysqlclient_r.a \
+- -o -f /usr/lib/x86_64-linux-gnu/libmysqlclient_r.so; then
+- MYSQL_LIBDIR=/usr/lib/x86_64-linux-gnu
+- elif test -f /usr/lib/mysql/libmysqlclient_r.a \
+- -o -f /usr/lib/mysql/libmysqlclient_r.so; then
+- MYSQL_LIBDIR=/usr/lib/mysql
+- else
+- MYSQL_LIBDIR=/usr/lib
+- fi
+- MYSQL_BINDIR=/usr/bin
+- elif test -f /usr/include/mysql.h; then
+- MYSQL_INCDIR=/usr/include
+- if test -f /usr/lib64/libmysqlclient_r.a \
+- -o -f /usr/lib64/libmysqlclient_r.so; then
+- MYSQL_LIBDIR=/usr/lib64
+- else
+- MYSQL_LIBDIR=/usr/lib
+- fi
+- MYSQL_BINDIR=/usr/bin
+- elif test -f /usr/local/include/mysql/mysql.h; then
+- MYSQL_INCDIR=/usr/local/include/mysql
+- if test -f /usr/local/lib64/mysql/libmysqlclient_r.a \
+- -o -f /usr/local/lib64/mysql/libmysqlclient_r.so; then
+- MYSQL_LIBDIR=/usr/local/lib64/mysql
+- else
+- MYSQL_LIBDIR=/usr/local/lib/mysql
+- fi
+- MYSQL_BINDIR=/usr/local/bin
+- elif test -f /usr/local/include/mysql.h; then
+- MYSQL_INCDIR=/usr/local/include
+- if test -f /usr/local/lib64/libmysqlclient_r.a \
+- -o -f /usr/local/lib64/libmysqlclient_r.so; then
+- MYSQL_LIBDIR=/usr/local/lib64
+- else
+- MYSQL_LIBDIR=/usr/local/lib
+- fi
+- MYSQL_BINDIR=/usr/local/bin
+- else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- as_fn_error $? "Unable to find mysql.h in standard locations" "$LINENO" 5
+- fi
+- else
+- if test -f $withval/include/mysql/mysql.h; then
+- MYSQL_INCDIR=$withval/include/mysql
+- if test -f $withval/lib64/mysql/libmysqlclient_r.a \
+- -o -f $withval/lib64/mysql/libmysqlclient_r.so; then
+- MYSQL_LIBDIR=$withval/lib64/mysql
+- elif test -f $withval/lib64/libmysqlclient_r.a \
+- -o -f $withval/lib64/libmysqlclient_r.so; then
+- MYSQL_LIBDIR=$withval/lib64
+- elif test -f $withval/lib/libmysqlclient_r.a \
+- -o -f $withval/lib/libmysqlclient_r.so; then
+- MYSQL_LIBDIR=$withval/lib
+- else
+- MYSQL_LIBDIR=$withval/lib/mysql
+- fi
+- MYSQL_BINDIR=$withval/bin
+- elif test -f $withval/include/mysql.h; then
+- MYSQL_INCDIR=$withval/include
+- if test -f $withval/lib64/libmysqlclient_r.a \
+- -o -f $withval/lib64/libmysqlclient_r.so; then
+- MYSQL_LIBDIR=$withval/lib64
+- else
+- MYSQL_LIBDIR=$withval/lib
+- fi
+- MYSQL_BINDIR=$withval/bin
+- else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$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
+ MYSQL_INCLUDE=-I$MYSQL_INCDIR
+ if test -f $MYSQL_LIBDIR/libmysqlclient_r.a \
</ins></span></pre></div>
<a id="trunkdportssysutilsbaculafilespatchconfigurediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/sysutils/bacula/files/patch-configure.diff (115688 => 115689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/bacula/files/patch-configure.diff 2014-01-08 23:03:08 UTC (rev 115688)
+++ trunk/dports/sysutils/bacula/files/patch-configure.diff 2014-01-08 23:10:17 UTC (rev 115689)
</span><span class="lines">@@ -1,22 +0,0 @@
</span><del>---- configure.orig 2008-06-19 13:44:34.000000000 -0600
-+++ configure 2008-09-23 16:28:11.000000000 -0600
-@@ -17486,15 +17486,10 @@
- MYSQL_LIBDIR=/usr/lib
- fi
- MYSQL_BINDIR=/usr/bin
-- elif test -f /usr/local/include/mysql/mysql.h; then
-- MYSQL_INCDIR=/usr/local/include/mysql
-- if test -f /usr/local/lib64/mysql/libmysqlclient_r.a \
-- -o -f /usr/local/lib64/mysql/libmysqlclient_r.so; then
-- MYSQL_LIBDIR=/usr/local/lib64/mysql
-- else
-- MYSQL_LIBDIR=/usr/local/lib/mysql
-- fi
-- MYSQL_BINDIR=/usr/local/bin
-+ elif test -f @@PREFIX@@/include/mysql5/mysql/mysql.h; then
-+ MYSQL_INCDIR=@@PREFIX@@/include/mysql5/mysql
-+ MYSQL_LIBDIR=@@PREFIX@@/lib/mysql5/mysql
-+ MYSQL_BINDIR=@@PREFIX@@/lib/mysql5/bin
- elif test -f /usr/local/include/mysql.h; then
- MYSQL_INCDIR=/usr/local/include
- if test -f /usr/local/lib64/libmysqlclient_r.a \
</del></span></pre>
</div>
</div>
</body>
</html>