[121612] trunk/dports/sysutils/bacula/files

[mf2k at macports.org]

Revision: 121612
          https://trac.macports.org/changeset/121612
Author:   mf2k at macports.org
Date:     2014-07-02 06:01:21 -0700 (Wed, 02 Jul 2014)
Log Message:
-----------
bacula: Fix patches. (#44127)

Modified Paths:
--------------
    trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff

Removed Paths:
-------------
    trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff.patch

Modified: trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff
===================================================================
--- trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff	2014-07-02 09:27:52 UTC (rev 121611)
+++ trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff	2014-07-02 13:01:21 UTC (rev 121612)
@@ -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
\ No newline at end of file

Deleted: trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff.patch
===================================================================
--- trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff.patch	2014-07-02 09:27:52 UTC (rev 121611)
+++ trunk/dports/sysutils/bacula/files/patch-configure-mysql.diff.patch	2014-07-02 13:01:21 UTC (rev 121612)
@@ -1,36 +0,0 @@
---- 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
\ No newline at end of file
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140702/a213560b/attachment-0001.html>