aboutsummaryrefslogtreecommitdiffstats
path: root/mail/cyrus-imapd24
diff options
context:
space:
mode:
authorrnoland <rnoland@FreeBSD.org>2008-10-02 01:59:46 +0800
committerrnoland <rnoland@FreeBSD.org>2008-10-02 01:59:46 +0800
commitbee3a020a144170415753276b4881bdd237e42a6 (patch)
treec21787f64545dfa7df579736a6098835f3b6e218 /mail/cyrus-imapd24
parenta993bdb02c386e8a340b95194daee0919f922378 (diff)
downloadfreebsd-ports-gnome-bee3a020a144170415753276b4881bdd237e42a6.tar.gz
freebsd-ports-gnome-bee3a020a144170415753276b4881bdd237e42a6.tar.zst
freebsd-ports-gnome-bee3a020a144170415753276b4881bdd237e42a6.zip
Fix build on -CURRENT due to library shuffle.
Approved by: garga (mentor), maintainer timeout (2 weeks)
Diffstat (limited to 'mail/cyrus-imapd24')
-rw-r--r--mail/cyrus-imapd24/Makefile2
-rw-r--r--mail/cyrus-imapd24/files/extra-patch-configure20
2 files changed, 21 insertions, 1 deletions
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 1bc6d68350fb..53e57bed0495 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -137,7 +137,7 @@ CONFIGURE_ARGS+=--disable-gssapi
.endif
.if ${OSVERSION} >= 800037
-BROKEN= does not compile
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure
.endif
CYRUS_USER?= cyrus
diff --git a/mail/cyrus-imapd24/files/extra-patch-configure b/mail/cyrus-imapd24/files/extra-patch-configure
new file mode 100644
index 000000000000..8e283ee68870
--- /dev/null
+++ b/mail/cyrus-imapd24/files/extra-patch-configure
@@ -0,0 +1,20 @@
+--- configure.orig 2008-04-25 14:34:53.000000000 -0400
++++ configure 2008-09-17 18:46:12.000000000 -0400
+@@ -14921,7 +14922,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&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 >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -15391,7 +15392,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