Ignore:
Timestamp:
Jul 2, 2014, 1:03:41 PM (5 years ago)
Author:
mf2k@…
Message:

bacula5: Fix patches. (#44127)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/sysutils/bacula5/files/patch-configure-mysql.diff

    r115689 r121613  
    1 --- configure.orig      2014-01-08 14:36:00.000000000 -0700
    2 +++ configure   2014-01-08 14:37:59.000000000 -0700
    3 @@ -24328,110 +24328,9 @@
     1--- configure.orig      2014-06-03 01:28:41.000000000 -0700
     2+++ configure   2014-06-26 06:42:01.000000000 -0700
     3@@ -24039,112 +24039,13 @@
     4 if test "${with_mysql+set}" = set; then :
    45   withval=$with_mysql;
    56   if test "$withval" != "no"; then
    6          if test "$withval" = "yes"; then
     7-        if test "$withval" = "yes"; then
    78-#
    89-# This code is very broken on older systems
     
    109110-              as_fn_error $? "Invalid MySQL directory $withval - unable to find mysql.h under $withval" "$LINENO" 5
    110111-           fi
    111 +           MYSQL_INCDIR=@@PREFIX@@/include/mysql55/mysql
    112 +           MYSQL_LIBDIR=@@PREFIX@@/lib/mysql55/mysql
    113 +           MYSQL_BINDIR=@@PREFIX@@/lib/mysql55/bin
    114          fi
     112-        fi
     113+
     114+     ## replaced by macports start
     115+     MYSQL_INCDIR=/opt/local/include/mysql55/mysql
     116+     MYSQL_LIBDIR=/opt/local/lib/mysql55/mysql
     117+     MYSQL_BINDIR=/opt/local/lib/mysql55/bin
     118+     ## replaced by macports end
     119+
    115120      MYSQL_INCLUDE=-I$MYSQL_INCDIR
    116121      if test -f $MYSQL_LIBDIR/libmysqlclient_r.a \
     122           -o -f $MYSQL_LIBDIR/libmysqlclient_r.so; then
Note: See TracChangeset for help on using the changeset viewer.