diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2015-04-03 11:26:48 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2015-04-03 11:26:48 +0000 |
| commit | 0438143249634ab5028e53cb468d99a894c62995 (patch) | |
| tree | 204c01c7973e83331fc29d8b09e59b3e9f219bd6 /mail/cyrus-imapd23/files/patch-configure | |
| parent | sysutils/jail-primer: update 0.1 -> 0.2 (diff) | |
Remove OSVERSION checks that do not make sense any more.
For example (${OSVERSION} >= 900000 && ${OSVERSION} < 900021) is always true,
as is (${OSVERSION} > 900002 || ${OSVERSION} < 900000 && ${OSVERSION} > 800107).
Regarding patches, when an EXTRA_PATCHES is no longer needed, I remove it, when
it is always needed, I renamed it, in one case, I merged two patches.
Differential Revision: https://reviews.freebsd.org/D2209
Diffstat (limited to 'mail/cyrus-imapd23/files/patch-configure')
| -rw-r--r-- | mail/cyrus-imapd23/files/patch-configure | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/mail/cyrus-imapd23/files/patch-configure b/mail/cyrus-imapd23/files/patch-configure index 32ccf2519645..a9c9bfb4a2d0 100644 --- a/mail/cyrus-imapd23/files/patch-configure +++ b/mail/cyrus-imapd23/files/patch-configure @@ -19,6 +19,24 @@ diff -u configure.orig configure LIBS="$LIBS -lpcre -lpcreposix"; $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h +@@ -9540,7 +9540,7 @@ + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS" ++LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} -lhx509 $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -9842,7 +9842,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" +- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err" ++ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err -lhx509" + 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 @@ -10781,7 +10784,7 @@ $as_echo "#define HAVE_UCDSNMP 1" >>confdefs.h |