<!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>[122167] trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff</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/122167">122167</a></dd>
<dt>Author</dt> <dd>mf2k@macports.org</dd>
<dt>Date</dt> <dd>2014-07-16 07:34:46 -0700 (Wed, 16 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>bacula: Do not hardcode Macports directory. Fix for installed version of mysql.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssysutilsbaculafilespatchconfiguremysqldiff">trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssysutilsbaculafilespatchconfiguremysqldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff (122166 => 122167)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff 2014-07-16 14:32:12 UTC (rev 122166)
+++ trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff 2014-07-16 14:34:46 UTC (rev 122167)
</span><span class="lines">@@ -1,122 +1,26 @@
</span><del>---- 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
--#
--# 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
-- 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
</del><span class="cx">\ No newline at end of file
</span><ins>+--- configure.org 2014-07-15 23:08:18.000000000 +0200
++++ configure 2014-07-15 23:22:03.000000000 +0200
+@@ -24139,6 +24139,23 @@
+ MYSQL_LIBDIR=$withval/lib
+ fi
+ MYSQL_BINDIR=$withval/bin
++ ## added by macports start
++ elif test -f $withval/mysql.h; then
++ MYSQL_INCDIR=$withval
++ if [[ ${withval} == *"mysql55"* ]]; then
++ if test -f @@PREFIX@@/lib/mysql55/mysql/libmysqlclient_r.a \
++ -o -f @@PREFIX@@/lib/mysql55/mysql/libmysqlclient_r.so; then
++ MYSQL_LIBDIR=@@PREFIX@@/lib/mysql55/mysql
++ fi
++ MYSQL_BINDIR=@@PREFIX@@/lib/mysql55/bin
++ elif [[ ${withval} == *"mysql51"* ]]; then
++ if test -f @@PREFIX@@/lib/mysql51/mysql/libmysqlclient_r.a \
++ -o -f @@PREFIX@@/lib/mysql51/mysql/libmysqlclient_r.so; then
++ MYSQL_LIBDIR=@@PREFIX@@/lib/mysql51/mysql
++ fi
++ MYSQL_BINDIR=@@PREFIX@@/lib/mysql51/bin
++ fi
++ ## added by macports end
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
</ins></span></pre>
</div>
</div>
</body>
</html>