Index: mail/dovecot-fts-xapian/Makefile =================================================================== --- mail/dovecot-fts-xapian/Makefile +++ mail/dovecot-fts-xapian/Makefile @@ -1,9 +1,10 @@ PORTNAME= fts-xapian DISTVERSION= 1.4.11 +PORTREVISION?= 1 CATEGORIES= mail MASTER_SITES= https://github.com/grosjo/fts-xapian/releases/download/${DISTVERSION}/ PKGNAMEPREFIX= dovecot- -DISTNAME= ${PKGNAME} +DISTNAME= dovecot-fts-xapian-${DISTVERSION} MAINTAINER= otis@FreeBSD.org COMMENT= Dovecot FTS plugin based on Xapian Index: mail/dovecot-pigeonhole/Makefile =================================================================== --- mail/dovecot-pigeonhole/Makefile +++ mail/dovecot-pigeonhole/Makefile @@ -1,7 +1,7 @@ # Created by: Nils Vogels PORTNAME= dovecot-pigeonhole -PORTVERSION= 0.5.15 +PORTVERSION= 0.5.16 CATEGORIES= mail MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/ DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION} Index: mail/dovecot-pigeonhole/distinfo =================================================================== --- mail/dovecot-pigeonhole/distinfo +++ mail/dovecot-pigeonhole/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1624433329 -SHA256 (dovecot-2.3-pigeonhole-0.5.15.tar.gz) = e1498f50cef74c351a57474cc423b008627ab1ab60724b859283ead6d00550d0 -SIZE (dovecot-2.3-pigeonhole-0.5.15.tar.gz) = 1935601 +TIMESTAMP = 1628253489 +SHA256 (dovecot-2.3-pigeonhole-0.5.16.tar.gz) = 5ca36780e23b99e6206440f1b3fe3c6598eda5b699b99cebb15d418ba3c6e938 +SIZE (dovecot-2.3-pigeonhole-0.5.16.tar.gz) = 1944573 Index: mail/dovecot/Makefile =================================================================== --- mail/dovecot/Makefile +++ mail/dovecot/Makefile @@ -7,7 +7,7 @@ ###################################################################### PORTNAME= dovecot -PORTVERSION= 2.3.15 +PORTVERSION= 2.3.16 CATEGORIES= mail MASTER_SITES= https://dovecot.org/releases/2.3/ @@ -20,77 +20,86 @@ LIB_DEPENDS= libzstd.so:archivers/zstd USES= cpe iconv libtool pkgconfig ssl +USE_LDCONFIG= ${PREFIX}/lib/dovecot USE_RC_SUBR= dovecot GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var \ --with-docs \ + --with-shadow=no \ --with-ssl=openssl \ --with-statedir=/var/db/dovecot \ - --with-shadow=no \ --with-systemd=no -USE_LDCONFIG= ${PREFIX}/lib/dovecot INSTALL_TARGET= install-strip +CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} +LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} + +SUB_FILES+= pkg-message +SUB_LIST+= REQUIRE="${_REQUIRE}" + USERS= dovecot dovenull GROUPS= ${USERS} -OPTIONS_DEFINE= LIBSODIUM LIBUNWIND LIBWRAP LUA LZ4 DOCS EXAMPLES -OPTIONS_DEFAULT=GSSAPI_NONE LIBWRAP -OPTIONS_SUB= yes +PORTDOCS= * +PORTEXAMPLES= * +OPTIONS_DEFINE= DOCS EXAMPLES LIBSODIUM LIBUNWIND LIBWRAP LUA LZ4 +OPTIONS_DEFAULT= GSSAPI_NONE LIBWRAP OPTIONS_GROUP= DB FTS OPTIONS_GROUP_DB= CDB LDAP MYSQL PGSQL SQLITE OPTIONS_GROUP_FTS= ICU LUCENE SOLR TEXTCAT - OPTIONS_SINGLE= GSSAPI -OPTIONS_SINGLE_GSSAPI= GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT +OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE +OPTIONS_SUB= yes -DB_DESC= Database support CDB_DESC= CDB database support +DB_DESC= Database support -FTS_DESC= Full text search plugins -ICU_DESC= Use libicu for FTS unicode normalization -LUCENE_DESC= CLucene FTS support -SOLR_DESC= Solr FTS support -TEXTCAT_DESC= Libexttextcat FTS support - -GSSAPI_NONE_DESC= Build without GSSAPI support +FTS_DESC= Full text search plugins GSSAPI_BASE_DESC= Use GSSAPI from base GSSAPI_HEIMDAL_DESC= Use Heimdal GSSAPI from security/heimdal GSSAPI_MIT_DESC= Use MIT GSSAPI from security/krb5 +GSSAPI_NONE_DESC= Build without GSSAPI support +ICU_DESC= Use libicu for FTS unicode normalization +LIBSODIUM_DESC= Support libsodium based crypts (ARGON2I/ARGON2ID) +LIBUNWIND_DESC= Get backtraces using libunwind +LUCENE_DESC= CLucene FTS support +SOLR_DESC= Solr FTS support +TEXTCAT_DESC= Libexttextcat FTS support # General options -LIBSODIUM_DESC= Support libsodium based crypts (ARGON2I/ARGON2ID) -LIBSODIUM_LIB_DEPENDS= libsodium.so:security/libsodium +LIBSODIUM_LIB_DEPENDS= libsodium.so:security/libsodium LIBSODIUM_CONFIGURE_WITH= sodium +LIBUNWIND_LIB_DEPENDS= libunwind.so:devel/libunwind LIBUNWIND_CONFIGURE_ON= --with-libunwind=yes LIBUNWIND_CONFIGURE_OFF= --with-libunwind=no -LIBUNWIND_DESC= Get backtraces using libunwind -LIBUNWIND_LIB_DEPENDS= libunwind.so:devel/libunwind LIBWRAP_CONFIGURE_WITH= libwrap -LUA_CONFIGURE_WITH= lua LUA_USES= lua:51,53 +LUA_CONFIGURE_WITH= lua -LZ4_CONFIGURE_WITH= lz4 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 +LZ4_CONFIGURE_WITH= lz4 # Databases CDB_CONFIGURE_WITH= cdb CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb LDAP_USE= OPENLDAP=yes +LDAP_VARS= _REQUIRE+=slapd LDAP_CONFIGURE_WITH= ldap -MYSQL_USES= mysql +MYSQL_USES= mysql MYSQL_CONFIGURE_WITH= mysql +MYSQL_VARS= _REQUIRE+=mysql PGSQL_USES= pgsql PGSQL_CONFIGURE_WITH= pgsql +PGSQL_VARS= _REQUIRE+=postgresql SQLITE_USES= sqlite SQLITE_CONFIGURE_WITH= sqlite @@ -111,28 +120,17 @@ # GSSAPI GSSAPI_NONE_CONFIGURE_ON= --without-gssapi -GSSAPI_NONE_CONFIGURE_OFF= --with-gssapi ${GSSAPI_CONFIGURE_ARGS} +GSSAPI_NONE_CONFIGURE_OFF= ${GSSAPI_CONFIGURE_ARGS} \ + --with-gssapi GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit -DOCS= AUTHORS COPYING INSTALL NEWS TODO README -PORTDOCS= * -PORTEXAMPLES= * +_DOCS= AUTHORS COPYING INSTALL NEWS TODO README # Default requirement for dovecot rc script _REQUIRE= LOGIN -LDAP_VARS= _REQUIRE+=slapd -MYSQL_VARS= _REQUIRE+=mysql -PGSQL_VARS= _REQUIRE+=postgresql - -SUB_LIST+= REQUIRE="${_REQUIRE}" -SUB_FILES+= pkg-message - -CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} -LDFLAGS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} - post-patch: @${REINPLACE_CMD} -e 's,/etc/dovecot,${PREFIX}/etc/dovecot,g; \ s,sysconfdir=/etc,sysconfdir=${PREFIX}/etc,g' \ @@ -156,6 +154,6 @@ post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC} && ${INSTALL_DATA} ${_DOCS} ${STAGEDIR}${DOCSDIR}) .include Index: mail/dovecot/distinfo =================================================================== --- mail/dovecot/distinfo +++ mail/dovecot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1624366601 -SHA256 (dovecot-2.3.15.tar.gz) = 21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590 -SIZE (dovecot-2.3.15.tar.gz) = 7608561 +TIMESTAMP = 1628253089 +SHA256 (dovecot-2.3.16.tar.gz) = 03a71d53055bd9ec528d55e07afaf15c09dec9856cba734904bfd05acbc6cf12 +SIZE (dovecot-2.3.16.tar.gz) = 7650008