[93848] trunk/dports/net/bind9/files

[dluke at macports.org]

Revision: 93848
          https://trac.macports.org/changeset/93848
Author:   dluke at macports.org
Date:     2012-06-01 07:07:45 -0700 (Fri, 01 Jun 2012)
Log Message:
-----------
bind9: corrctly commit +dlz_mysql patchfile changes

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

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

Deleted: trunk/dports/net/bind9/files/patch-configure
===================================================================
Added: trunk/dports/net/bind9/files/patch-configure.diff
===================================================================
--- trunk/dports/net/bind9/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/net/bind9/files/patch-configure.diff	2012-06-01 14:07:45 UTC (rev 93848)
@@ -0,0 +1,36 @@
+--- a/configure	2012-05-29 19:45:36.000000000 -0700
++++ b/configure	2012-05-29 19:55:16.000000000 -0700
+@@ -21919,6 +21919,7 @@
+ 		# problems start to show up.
+ 		saved_libs="$LIBS"
+ 		for TRY_LIBS in \
++		    "-lgssapi -lkrb5 -lcrypto -lasn1 -lroken -lcom_err" \
+ 		    "-lgssapi_krb5" \
+ 		    "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \
+ 		    "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \
+@@ -27205,6 +27206,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
+@@ -27253,9 +27261,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
+ 
+ 

Deleted: trunk/dports/net/bind9/files/patch-contrib-dlz-config.dlz.in
===================================================================
Added: trunk/dports/net/bind9/files/patch-contrib-dlz-config.dlz.in.diff
===================================================================
--- trunk/dports/net/bind9/files/patch-contrib-dlz-config.dlz.in.diff	                        (rev 0)
+++ trunk/dports/net/bind9/files/patch-contrib-dlz-config.dlz.in.diff	2012-06-01 14:07:45 UTC (rev 93848)
@@ -0,0 +1,26 @@
+--- a/contrib/dlz/config.dlz.in	2012-05-29 19:45:36.000000000 -0700
++++ b/contrib/dlz/config.dlz.in	2012-05-29 19:55:16.000000000 -0700
+@@ -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/20120601/fa8ce0a4/attachment.html>