[40173] trunk/dports/sysutils/bacula

[macsforever2000 at macports.org]

Revision: 40173
          http://trac.macports.org/changeset/40173
Author:   macsforever2000 at macports.org
Date:     2008-09-23 15:44:54 -0700 (Tue, 23 Sep 2008)
Log Message:
-----------
Fixed the postgresql83, mysql5 and mysql4 variants. Thanks to blb for nearly all of the code. Closes ticket #16629.

Modified Paths:
--------------
    trunk/dports/sysutils/bacula/Portfile

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

Modified: trunk/dports/sysutils/bacula/Portfile
===================================================================
--- trunk/dports/sysutils/bacula/Portfile	2008-09-23 20:33:14 UTC (rev 40172)
+++ trunk/dports/sysutils/bacula/Portfile	2008-09-23 22:44:54 UTC (rev 40173)
@@ -5,6 +5,7 @@
 
 name             bacula
 version          2.4.2
+revision         1
 categories       sysutils
 platforms        darwin
 maintainers      macsforever2000
@@ -23,6 +24,12 @@
 depends_build    port:gawk
 depends_lib      port:zlib port:openssl port:libiconv port:gettext port:ncurses
 
+patchfiles       patch-configure.diff
+
+post-patch {
+                 reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/configure
+}
+
 configure.args   --mandir=${prefix}/share/man \
                  --datarootdir=${prefix}/share \
                  --with-pid-dir=${prefix}/var/run \
@@ -42,7 +49,7 @@
                  --without-mysql \
                  --disable-gnome \
                  --disable-wx-console \
-                 --disable-tray-monitor
+                 --enable-tray-monitor
 configure.cppflags-append   -I${prefix}/ncurses
 configure.ldflags           ""
 
@@ -63,20 +70,21 @@
 
 variant mysql4 conflicts client_only mysql5 postgresql83 sqlite2 sqlite3 description "Install bacula client and server with mysql 4 backend" {
   depends_lib-append    port:mysql4
-  configure.args-append --with-mysql=${prefix}
+  configure.args-append --with-mysql
   configure.args-delete --without-mysql
 }
 
 variant mysql5 conflicts client_only mysql4 postgresql83 sqlite2 sqlite3 description "Install bacula client and server with mysql 5 backend" {
   depends_lib-append    port:mysql5
-  configure.args-append --with-mysql=${prefix}
+  configure.args-append --with-mysql
   configure.args-delete --without-mysql
 }
 
 variant postgresql83 conflicts mysql4 mysql5 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=${prefix}
+  configure.args-append --with-postgresql
   configure.args-delete --without-postgresql
+  configure.env-append PATH=${prefix}/lib/postgresql83/bin:$env(PATH)
 }
 
 variant sqlite2 conflicts client_only sqlite3 mysql4 mysql5 postgresql83 description "Install bacula client and server with sqlite 2 backend" {

Added: trunk/dports/sysutils/bacula/files/patch-configure.diff
===================================================================
--- trunk/dports/sysutils/bacula/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/sysutils/bacula/files/patch-configure.diff	2008-09-23 22:44:54 UTC (rev 40173)
@@ -0,0 +1,22 @@
+--- 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: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080923/544054fa/attachment-0001.html