Date: Sat, 23 Dec 2017 09:17:49 +0000 (UTC) From: Hajimu UMEMOTO <ume@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r457030 - in head/mail/cyrus-imapd30: . files Message-ID: <201712230917.vBN9HnAt058708@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ume Date: Sat Dec 23 09:17:49 2017 New Revision: 457030 URL: https://svnweb.freebsd.org/changeset/ports/457030 Log: - Add XAPIAN option. [1] - Drop MySQL include path from configure option. [1] - Fix build when XAPIAN is enabled. - Enable AUTOCREATE option by default. Submitted by: Paul Blazejowski <paulb [...] blazebox.homeip.net> [1] Added: head/mail/cyrus-imapd30/files/patch-lib_assert.h (contents, props changed) Modified: head/mail/cyrus-imapd30/Makefile Modified: head/mail/cyrus-imapd30/Makefile ============================================================================== --- head/mail/cyrus-imapd30/Makefile Sat Dec 23 09:16:31 2017 (r457029) +++ head/mail/cyrus-imapd30/Makefile Sat Dec 23 09:17:49 2017 (r457030) @@ -2,7 +2,7 @@ PORTNAME= cyrus-imapd PORTVERSION= 3.0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ \ http://cyrusimap.org/releases/ @@ -45,9 +45,10 @@ CPE_VENDOR= cmu CPE_PRODUCT= cyrus_imap_server OPTIONS_DEFINE= AUTOCREATE BACKUP CLAMAV HTTP IDLED LDAP LMDB MURDER \ - MYSQL NNTP PGSQL REPLICATION SNMP SQLITE SQUAT DOCS + MYSQL NNTP PGSQL REPLICATION SNMP SQLITE SQUAT XAPIAN \ + DOCS #OPTIONS_DEFINE+= DRAC -OPTIONS_DEFAULT= CLAMAV IDLED SQLITE SQUAT +OPTIONS_DEFAULT= AUTOCREATE CLAMAV IDLED SQLITE SQUAT OPTIONS_SUB= yes AUTOCREATE_DESC= Enable autocreate support AUTOCREATE_CONFIGURE_ENABLE= autocreate @@ -81,9 +82,7 @@ MURDER_DESC= Enable IMAP Murder support MURDER_CONFIGURE_ENABLE=murder MURDER_MAKE_ENV= PTHREAD_LIBS="-lpthread" MYSQL_USES= mysql -MYSQL_CONFIGURE_ON= --with-mysql=yes \ - --with-mysql-libdir=${LOCALBASE}/lib/mysql \ - --with-mysql-incdir=${LOCALBASE}/include/mysql +MYSQL_CONFIGURE_WITH= mysql NNTP_DESC= Enable NNTP support NNTP_CONFIGURE_ENABLE= nntp PGSQL_USES= pgsql @@ -97,11 +96,9 @@ SQLITE_CONFIGURE_ON= --with-sqlite=${LOCALBASE} SQLITE_BROKEN_OFF= SQLITE is requited SQUAT_DESC= Enable Squat support SQUAT_CONFIGURE_OFF= --disable-squat -# Need additional patch to xapian -#OPTIONS_DEFINE+= XAPIAN -#XAPIAN_DESC= Enable Xapian support -#XAPIAN_CONFIGURE_ENABLE=xapian -#XAPIAN_LIB_DEPENDS= libxapian.so:databases/xapian-core +XAPIAN_DESC= Enable Xapian support +XAPIAN_CONFIGURE_ENABLE=xapian +XAPIAN_LIB_DEPENDS= libxapian.so:databases/xapian-core OPTIONS_RADIO= GSSAPI OPTIONS_RADIO_GSSAPI= GSSAPI_HEIMDAL GSSAPI_MIT Added: head/mail/cyrus-imapd30/files/patch-lib_assert.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/cyrus-imapd30/files/patch-lib_assert.h Sat Dec 23 09:17:49 2017 (r457030) @@ -0,0 +1,22 @@ +--- lib/assert.h.orig 2017-09-02 01:09:05 UTC ++++ lib/assert.h +@@ -43,6 +43,10 @@ + #ifndef INCLUDED_ASSERT_H + #define INCLUDED_ASSERT_H + ++#ifdef __cplusplus ++extern "C" { ++#endif ++ + #ifdef __STDC__ + #define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, #ex);} + void assertionfailed(const char *file, int line, const char *expr); +@@ -50,4 +54,8 @@ void assertionfailed(const char *file, i + #define assert(ex) {if (!(ex))assertionfailed(__FILE__, __LINE__, (char*)0);} + #endif + ++#ifdef __cplusplus ++} ++#endif ++ + #endif /* INCLUDED_ASSERT_H */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712230917.vBN9HnAt058708>