diff options
author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2011-02-06 07:41:12 +0000 |
---|---|---|
committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2011-02-06 07:41:12 +0000 |
commit | cba09ab3e59df65e90fa1746733bdeba23a39fbf (patch) | |
tree | c349dcf6a7c899f923564f62e2f0adff88108740 /security/cyrus-sasl2 | |
parent | a45c281bafaa959e6fa0dc7cc5d1df7a8f57f13b (diff) | |
download | ports-cba09ab3e59df65e90fa1746733bdeba23a39fbf.tar.gz ports-cba09ab3e59df65e90fa1746733bdeba23a39fbf.zip |
Notes
Diffstat (limited to 'security/cyrus-sasl2')
-rw-r--r-- | security/cyrus-sasl2/Makefile | 2 | ||||
-rw-r--r-- | security/cyrus-sasl2/files/patch-configure | 40 |
2 files changed, 13 insertions, 29 deletions
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index 09d4ecfcda1c..81881d010ace 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -7,7 +7,7 @@ PORTNAME= cyrus-sasl PORTVERSION= 2.1.23 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%SUBDIR%/ \ ftp://ftp.westbend.net/pub/cyrus-mail/%SUBDIR%/ \ diff --git a/security/cyrus-sasl2/files/patch-configure b/security/cyrus-sasl2/files/patch-configure index dd0d4a01cb2b..763edce6abc5 100644 --- a/security/cyrus-sasl2/files/patch-configure +++ b/security/cyrus-sasl2/files/patch-configure @@ -1,5 +1,7 @@ ---- configure.orig 2009-05-07 16:24:25.000000000 +0200 -+++ configure 2010-11-09 10:26:27.000000000 +0100 +Index: configure +diff -u configure.orig configure +--- configure.orig Fri May 19 04:30:13 2006 ++++ configure Sat May 20 04:04:39 2006 @@ -1586,6 +1586,7 @@ fi echo "$as_me:$LINENO: result: yes" >&5 @@ -8,7 +10,7 @@ test "$program_prefix" != NONE && program_transform_name="s,^,$program_prefix,;$program_transform_name" # Use a double $ so make ignores it. -@@ -5147,7 +5148,7 @@ +@@ -5125,7 +5126,7 @@ fi saved_LIBS=$LIBS @@ -17,7 +19,7 @@ do LIBS="$saved_LIBS -l$dbname" cat >conftest.$ac_ext <<_ACEOF -@@ -5157,6 +5158,7 @@ +@@ -5135,6 +5136,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -25,7 +27,7 @@ #include <db.h> int main () -@@ -5904,7 +5906,7 @@ +@@ -5882,7 +5884,7 @@ fi saved_LIBS=$LIBS @@ -34,7 +36,7 @@ do LIBS="$saved_LIBS -l$dbname" cat >conftest.$ac_ext <<_ACEOF -@@ -5914,6 +5916,7 @@ +@@ -5892,6 +5894,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -42,7 +44,7 @@ #include <db.h> int main () -@@ -7215,6 +7218,8 @@ +@@ -7193,6 +7196,8 @@ SASLAUTHD_TRUE='#' SASLAUTHD_FALSE= fi @@ -51,7 +53,7 @@ echo "$as_me:$LINENO: checking if I should include saslauthd" >&5 echo $ECHO_N "checking if I should include saslauthd... $ECHO_C" >&6 -@@ -10672,7 +10677,7 @@ +@@ -10650,7 +10655,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -60,7 +62,7 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ -@@ -11082,7 +11087,7 @@ +@@ -11060,7 +11065,7 @@ GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}" elif test "$gss_impl" = "heimdal"; then CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL" @@ -69,25 +71,7 @@ GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}" elif test "$gss_impl" = "cybersafe03"; then # Version of CyberSafe with two libraries -@@ -11119,7 +11124,7 @@ - # in gssapi\rfckrb5.h - # - if test "$gssapi" != "no"; then -- if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then -+ if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03" -o "$gss_impl" = "heimdal"; then - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - /* confdefs.h. */ -@@ -11190,7 +11195,7 @@ - - fi - -- if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then -+ if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03" -o "$gss_impl" = "heimdal"; then - cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - /* confdefs.h. */ -@@ -11920,7 +11925,7 @@ +@@ -11898,7 +11903,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS |