[115689] trunk/dports/sysutils/bacula
macsforever2000 at macports.org
macsforever2000 at macports.org
Wed Jan 8 15:10:17 PST 2014
Revision: 115689
https://trac.macports.org/changeset/115689
Author: macsforever2000 at macports.org
Date: 2014-01-08 15:10:17 -0800 (Wed, 08 Jan 2014)
Log Message:
-----------
bacula: Fix build with mysql variant. (#42036). Switch from mysql5 to mysql55.
Modified Paths:
--------------
trunk/dports/sysutils/bacula/Portfile
Added Paths:
-----------
trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff
Removed Paths:
-------------
trunk/dports/sysutils/bacula/files/patch-configure.diff
Modified: trunk/dports/sysutils/bacula/Portfile
===================================================================
--- 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)
@@ -30,12 +30,6 @@
port:tcp_wrappers \
port:zlib
-# 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
-#}
-
configure.ccache no
configure.args --mandir=${prefix}/share/man \
--docdir=${prefix}/share/doc/bacula \
@@ -78,7 +72,7 @@
startupitem.start "\[ -x \${BIN} \] && \${BIN} -c ${prefix}/etc/bacula/bacula-fd.conf"
startupitem.stop "\[ -r \${PID} \] && /bin/kill \$(cat \${PID})"
-variant client_only conflicts mysql5 postgresql83 postgresql84 sqlite2 sqlite3 description "Install bacula client (bacula-fd) only" {
+variant client_only conflicts mysql55 postgresql83 postgresql84 sqlite2 sqlite3 description "Install bacula client (bacula-fd) only" {
configure.args-append --enable-client-only
}
@@ -100,33 +94,39 @@
notes "To use the Bacula BAT GUI, you'll need to configure \"${prefix}/etc/bacula/bat.conf\"."
}
-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
+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
configure.args-delete --without-mysql
+ configure.cppflags-append -I${prefix}/include/mysql55/mysql
+
+ patchfiles patch-configure-mysql.diff
+ post-patch {
+ reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/configure
+ }
}
-variant postgresql83 conflicts mysql5 postgresql84 sqlite2 sqlite3 client_only description "Install bacula client and server with postgresql 8.3 backend" {
+variant postgresql83 conflicts mysql55 postgresql84 sqlite2 sqlite3 client_only description "Install bacula client and server with postgresql 8.3 backend" {
depends_lib-append port:postgresql83
configure.args-append --with-postgresql
configure.args-delete --without-postgresql
configure.env-append PATH=${prefix}/lib/postgresql83/bin:$env(PATH)
}
-variant postgresql84 conflicts mysql5 postgresql83 sqlite2 sqlite3 client_only description "Install bacula client and server with postgresql 8.4 backend" {
+variant postgresql84 conflicts mysql55 postgresql83 sqlite2 sqlite3 client_only description "Install bacula client and server with postgresql 8.4 backend" {
depends_lib-append port:postgresql84
configure.args-append --with-postgresql
configure.args-delete --without-postgresql
configure.env-append PATH=${prefix}/lib/postgresql84/bin:$env(PATH)
}
-variant sqlite2 conflicts client_only sqlite3 mysql5 postgresql83 postgresql84 description "Install bacula client and server with sqlite 2 backend" {
+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
}
-variant sqlite3 conflicts client_only sqlite2 mysql5 postgresql83 postgresql84 description "Install bacula client and server with sqlite 3 backend" {
+variant sqlite3 conflicts client_only sqlite2 mysql55 postgresql83 postgresql84 description "Install bacula client and server with sqlite 3 backend" {
depends_lib-append port:sqlite3
configure.args-append --with-sqlite3=${prefix}
configure.args-delete --without-sqlite3
@@ -134,7 +134,7 @@
default_variants +console_bat
-if {![variant_isset mysql5] && ![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset sqlite2] && ![variant_isset sqlite3]} {
+if {![variant_isset mysql55] && ![variant_isset postgresql83] && ![variant_isset postgresql84] && ![variant_isset sqlite2] && ![variant_isset sqlite3]} {
default_variants-append +client_only
}
Copied: trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff (from rev 115682, trunk/dports/sysutils/bacula/files/patch-configure.diff)
===================================================================
--- 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)
@@ -0,0 +1,116 @@
+--- 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 \
Deleted: trunk/dports/sysutils/bacula/files/patch-configure.diff
===================================================================
--- 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)
@@ -1,22 +0,0 @@
---- 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 \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140108/1be2c7ba/attachment-0001.html>
More information about the macports-changes
mailing list