[86592] trunk/dports/net/snort

[ryandesign at macports.org]

Revision: 86592
          http://trac.macports.org/changeset/86592
Author:   ryandesign at macports.org
Date:     2011-10-28 23:46:23 -0700 (Fri, 28 Oct 2011)
Log Message:
-----------
snort: fix +mysql5 variant; see #29951

Modified Paths:
--------------
    trunk/dports/net/snort/Portfile

Removed Paths:
-------------
    trunk/dports/net/snort/files/patch-configure

Modified: trunk/dports/net/snort/Portfile
===================================================================
--- trunk/dports/net/snort/Portfile	2011-10-29 06:30:58 UTC (rev 86591)
+++ trunk/dports/net/snort/Portfile	2011-10-29 06:46:23 UTC (rev 86592)
@@ -22,8 +22,8 @@
 
 variant mysql5 description {mysql 5 support} {
     depends_lib-append    path:bin/mysql_config5:mysql5
-    configure.args-append --with-mysql=${prefix}
-    patchfiles-append   patch-configure
+    configure.args-append   --with-mysql-includes=${prefix}/include/mysql5/mysql \
+                            --with-mysql-libraries=${prefix}/lib/mysql5/mysql
 }
 
 variant mysql4 description {mysql 4 support} {

Deleted: trunk/dports/net/snort/files/patch-configure
===================================================================
--- trunk/dports/net/snort/files/patch-configure	2011-10-29 06:30:58 UTC (rev 86591)
+++ trunk/dports/net/snort/files/patch-configure	2011-10-29 06:46:23 UTC (rev 86592)
@@ -1,24 +0,0 @@
---- configure.org       2006-06-02 19:08:25.000000000 -0700
-+++ configure   2006-06-23 01:40:51.000000000 -0700
-@@ -23065,9 +23065,9 @@
- echo $ECHO_N "checking for mysql... $ECHO_C" >&6
- 
-   for i in $mysql_directory; do
--    if test -r $i/include/mysql/mysql.h; then
-+    if test -r $i/include/mysql5/mysql/mysql.h; then
-       MYSQL_DIR=$i
--      MYSQL_INC_DIR=$i/include/mysql
-+      MYSQL_INC_DIR=$i/include/mysql5/mysql
-     elif test -r $i/include/mysql.h; then
-       MYSQL_DIR=$i
-       MYSQL_INC_DIR=$i/include
-@@ -23099,7 +23099,7 @@
-     fi
-   else
- 
--    for i in lib lib/mysql; do
-+    for i in lib lib/mysql5/mysql; do
-       str="$MYSQL_DIR/$i/libmysqlclient.*"
-       for j in `echo $str`; do
-         if test -r $j; then
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111028/c75cda57/attachment.html>