[101989] trunk/dports/net/bind9
jeremyhu at macports.org
jeremyhu at macports.org
Wed Jan 23 16:38:24 PST 2013
Revision: 101989
https://trac.macports.org/changeset/101989
Author: jeremyhu at macports.org
Date: 2013-01-23 16:38:24 -0800 (Wed, 23 Jan 2013)
Log Message:
-----------
bind9: Fix inlining
Modified Paths:
--------------
trunk/dports/net/bind9/Portfile
Added Paths:
-----------
trunk/dports/net/bind9/files/fix_static_inline_check.patch
trunk/dports/net/bind9/files/gssapi-link.patch
trunk/dports/net/bind9/files/mysql-link.patch
Removed Paths:
-------------
trunk/dports/net/bind9/files/patch-configure.diff
trunk/dports/net/bind9/files/patch-contrib-dlz-config.dlz.in.diff
Modified: trunk/dports/net/bind9/Portfile
===================================================================
--- trunk/dports/net/bind9/Portfile 2013-01-24 00:13:54 UTC (rev 101988)
+++ trunk/dports/net/bind9/Portfile 2013-01-24 00:38:24 UTC (rev 101989)
@@ -4,7 +4,7 @@
name bind9
version 9.9.2-P1
-revision 1
+revision 2
categories net
maintainers geeklair.net:dluke
platforms darwin freebsd sunos
@@ -34,6 +34,13 @@
depends_lib port:openssl port:libxml2
+patchfiles-append fix_static_inline_check.patch \
+ gssapi-link.patch \
+ mysql-link.patch
+
+use_autoreconf yes
+autoreconf.args -fvi
+
use_parallel_build no
universal_variant no
@@ -97,9 +104,6 @@
variant dlz_mysql5 description {Dynamically Loaded Zones (dlz) stored in MySQL 5.x} {
depends_lib-append \
path:bin/mysql_config5:mysql5
- patch.pre_args -p1
- patchfiles-append patch-configure.diff \
- patch-contrib-dlz-config.dlz.in.diff
# Threads are not safe when bind9 is compiled with dlz
configure.args-delete \
--enable-threads
Added: trunk/dports/net/bind9/files/fix_static_inline_check.patch
===================================================================
--- trunk/dports/net/bind9/files/fix_static_inline_check.patch (rev 0)
+++ trunk/dports/net/bind9/files/fix_static_inline_check.patch 2013-01-24 00:38:24 UTC (rev 101989)
@@ -0,0 +1,23 @@
+--- configure.in.orig 2013-01-23 16:21:42.000000000 -0800
++++ configure.in 2013-01-23 16:23:14.000000000 -0800
+@@ -385,17 +385,15 @@ AC_CHECK_FUNCS(setegid setresgid)
+ # is reported to not support "static inline" (RT #1212).
+ #
+ AC_MSG_CHECKING(for static inline breakage)
+-AC_TRY_COMPILE(, [
+- foo1();
+- }
+-
++AC_TRY_COMPILE([
+ static inline int foo1() {
+ return 0;
+ }
+
+ static inline int foo2() {
+ return foo1();
+- ],
++ }
++ ], [foo1();],
+ [AC_MSG_RESULT(no)],
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE(inline, ,[Define to empty if your compiler does not support "static inline".])])
Added: trunk/dports/net/bind9/files/gssapi-link.patch
===================================================================
--- trunk/dports/net/bind9/files/gssapi-link.patch (rev 0)
+++ trunk/dports/net/bind9/files/gssapi-link.patch 2013-01-24 00:38:24 UTC (rev 101989)
@@ -0,0 +1,10 @@
+--- configure.in.orig 2013-01-23 16:25:41.000000000 -0800
++++ configure.in 2013-01-23 16:26:44.000000000 -0800
+@@ -1032,6 +1032,7 @@ case "$use_gssapi" in
+ # 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" \
Added: trunk/dports/net/bind9/files/mysql-link.patch
===================================================================
--- trunk/dports/net/bind9/files/mysql-link.patch (rev 0)
+++ trunk/dports/net/bind9/files/mysql-link.patch 2013-01-24 00:38:24 UTC (rev 101989)
@@ -0,0 +1,25 @@
+--- contrib/dlz/config.dlz.in.orig 2013-01-23 16:28:54.000000000 -0800
++++ contrib/dlz/config.dlz.in 2013-01-23 16:29:57.000000000 -0800
+@@ -155,6 +155,13 @@ then
+ 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
+@@ -193,7 +200,7 @@ case "$use_dlz_mysql" in
+ *)
+ 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}])
Deleted: trunk/dports/net/bind9/files/patch-configure.diff
===================================================================
--- trunk/dports/net/bind9/files/patch-configure.diff 2013-01-24 00:13:54 UTC (rev 101988)
+++ trunk/dports/net/bind9/files/patch-configure.diff 2013-01-24 00:38:24 UTC (rev 101989)
@@ -1,36 +0,0 @@
---- 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.diff
===================================================================
--- trunk/dports/net/bind9/files/patch-contrib-dlz-config.dlz.in.diff 2013-01-24 00:13:54 UTC (rev 101988)
+++ trunk/dports/net/bind9/files/patch-contrib-dlz-config.dlz.in.diff 2013-01-24 00:38:24 UTC (rev 101989)
@@ -1,26 +0,0 @@
---- 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/20130123/9115f1ef/attachment.html>
More information about the macports-changes
mailing list