diff options
| author | ume <ume@FreeBSD.org> | 2017-12-23 17:17:49 +0800 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2017-12-23 17:17:49 +0800 |
| commit | 3155f7c589aebc64e2bc30ebaf3ef9f4be046376 (patch) | |
| tree | 42b7ca32e3922168a366a341089c1c9c519089c6 /mail | |
| parent | 28bb1672ed7182f8759e54ae43f19f0c53b5442b (diff) | |
| download | freebsd-ports-gnome-3155f7c589aebc64e2bc30ebaf3ef9f4be046376.tar.gz freebsd-ports-gnome-3155f7c589aebc64e2bc30ebaf3ef9f4be046376.tar.zst freebsd-ports-gnome-3155f7c589aebc64e2bc30ebaf3ef9f4be046376.zip | |
- 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]
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/cyrus-imapd30/Makefile | 19 | ||||
| -rw-r--r-- | mail/cyrus-imapd30/files/patch-lib_assert.h | 22 |
2 files changed, 30 insertions, 11 deletions
diff --git a/mail/cyrus-imapd30/Makefile b/mail/cyrus-imapd30/Makefile index 742894e0db2a..0e82d2fbf14d 100644 --- a/mail/cyrus-imapd30/Makefile +++ b/mail/cyrus-imapd30/Makefile @@ -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 diff --git a/mail/cyrus-imapd30/files/patch-lib_assert.h b/mail/cyrus-imapd30/files/patch-lib_assert.h new file mode 100644 index 000000000000..28e06f17a2e7 --- /dev/null +++ b/mail/cyrus-imapd30/files/patch-lib_assert.h @@ -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 */ |