[46371] trunk/dports/net/bind9

[dluke at macports.org]

Revision: 46371
          http://trac.macports.org/changeset/46371
Author:   dluke at macports.org
Date:     2009-02-03 13:24:25 -0800 (Tue, 03 Feb 2009)
Log Message:
-----------
Add +dlz_mysql5 variant (thanks to Bradley Giesbrecht - fixes #17783)

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

Added Paths:
-----------
    trunk/dports/net/bind9/files/patch-configure
    trunk/dports/net/bind9/files/patch-contrib-dlz-config.dlz.in

Modified: trunk/dports/net/bind9/Portfile
===================================================================
--- trunk/dports/net/bind9/Portfile	2009-02-03 21:08:20 UTC (rev 46370)
+++ trunk/dports/net/bind9/Portfile	2009-02-03 21:24:25 UTC (rev 46371)
@@ -79,3 +79,16 @@
 }
 
 platform darwin 6 { depends_lib-append lib:libdl:dlcompat }
+
+variant dlz_mysql5 description {Dynamically Loaded Zones (dlz) stored in MySQL 5.x} {
+    depends_lib-append \
+        path:bin/mysql_config5:mysql5
+    patchfiles-append patch-configure
+    patchfiles-append patch-contrib-dlz-config.dlz.in
+    # Threads are not safe when bind9 is compiled with dlz
+    configure.args-delete \
+        --enable-threads
+    configure.args-append \
+        --with-dlz-mysql=${prefix}/bin/mysql_config5 \
+        --disable-threads
+}

Added: trunk/dports/net/bind9/files/patch-configure
===================================================================
--- trunk/dports/net/bind9/files/patch-configure	                        (rev 0)
+++ trunk/dports/net/bind9/files/patch-configure	2009-02-03 21:24:25 UTC (rev 46371)
@@ -0,0 +1,39 @@
+--- configure.orig	2009-01-29 14:42:07.000000000 -0800
++++ configure	2009-01-29 14:42:34.000000000 -0800
+@@ -6623,8 +6623,8 @@
+ 		    "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \
+ 		    "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \
+ 		    "-lgssapi" \
+-		    "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \
+-		    "-lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \
++		    "-lgssapi -lkrb5 -ldes -lasn1 -lroken -lcom_err" \
++		    "-lgssapi -lkrb5 -lcrypto -lasn1 -lroken -lcom_err" \
+ 		    "-lgss"
+ 		do
+ 		    # Note that this does not include $saved_libs, because
+@@ -31094,6 +31094,13 @@
+ 			break
+ 		fi
+ 	done
++elif test -f `$use_dlz_mysql --include | awk '{print substr($1,3)}'`/mysql.h
++then
++	mysql_include=`$use_dlz_mysql --include | awk '{print substr($1,3)}'`
++	if test -d `$use_dlz_mysql --libs | awk '{print substr($2,3)}'`
++	then
++		mysql_lib=`$use_dlz_mysql --libs | awk '{print substr($2,3)}'`
++	fi
+ elif test "$use_dlz_mysql" != "no"
+ then
+ 	d=$use_dlz_mysql
+@@ -31144,9 +31151,9 @@
+ 	then
+ 		DLZ_DRIVER_INCLUDES="$DLZ_DRIVER_INCLUDES -I${mysql_include}"
+ 	fi
+-	if test -n "-L${mysql_lib} -lmysqlclient -lz -lcrypt -lm"
++	if test -n "-L${mysql_lib} -lmysqlclient -lz -lm"
+ 	then
+-		DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L${mysql_lib} -lmysqlclient -lz -lcrypt -lm"
++		DLZ_DRIVER_LIBS="$DLZ_DRIVER_LIBS -L${mysql_lib} -lmysqlclient -lz -lm"
+ 	fi
+ 
+ 

Added: trunk/dports/net/bind9/files/patch-contrib-dlz-config.dlz.in
===================================================================
--- trunk/dports/net/bind9/files/patch-contrib-dlz-config.dlz.in	                        (rev 0)
+++ trunk/dports/net/bind9/files/patch-contrib-dlz-config.dlz.in	2009-02-03 21:24:25 UTC (rev 46371)
@@ -0,0 +1,26 @@
+--- contrib/dlz/config.dlz.in.orig	2009-01-29 14:42:22.000000000 -0800
++++ contrib/dlz/config.dlz.in	2009-01-29 14:42:34.000000000 -0800
+@@ -155,6 +155,14 @@
+ 			break
+ 		fi
+ 	done
++elif test -f `$use_dlz_mysql --include | awk '{print substr($1,3)}'`/mysql.h
++then
++	mysql_include=`$use_dlz_mysql --include | awk '{print substr($1,3)}'`
++	if test -d `$use_dlz_mysql --libs | awk '{print substr($2,3)}'`
++	then
++		mysql_lib=`$use_dlz_mysql --libs | awk '{print substr($2,3)}'`
++	fi
++elif test "$use_dlz_mysql" != "no"
+ elif test "$use_dlz_mysql" != "no"
+ then
+ 	d=$use_dlz_mysql
+@@ -193,7 +201,7 @@
+ 	*)
+ 		DLZ_ADD_DRIVER(MYSQL, dlz_mysql_driver,
+ 				[-I${mysql_include}],
+-				[-L${mysql_lib} -lmysqlclient -lz -lcrypt -lm])
++				[-L${mysql_lib} -lmysqlclient -lz -lm])
+ 
+ 		AC_MSG_RESULT(
+ [using mysql from ${mysql_lib} and ${mysql_include}])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090203/d6f78f61/attachment-0001.html>