Index: mail/dovecot-pigeonhole/Makefile =================================================================== --- mail/dovecot-pigeonhole/Makefile +++ mail/dovecot-pigeonhole/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= dovecot-pigeonhole -PORTVERSION= 0.5.9 -PORTREVISION= 1 +PORTVERSION= 0.5.10 CATEGORIES= mail MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/ DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION} @@ -20,7 +19,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --exec-prefix=${PREFIX} \ - --without-dovecot-install-dirs \ + --with-dovecot-install-dirs \ --docdir=${DOCSDIR} \ --with-dovecot="${LOCALBASE}/lib/dovecot" LDFLAGS+= -L${LOCALBASE}/lib @@ -57,6 +56,12 @@ PORTDOCS= sieve/extensions/* sieve/plugins/* sieve/locations/* +.include + +.if !defined(DOCS) +PLIST_SUB+= NODOCS="@comment " +.endif + post-patch: @${REINPLACE_CMD} -E '\ s!^(install-data-am:) install-sieve_docDATA!\1!; \ Index: mail/dovecot-pigeonhole/distinfo =================================================================== --- mail/dovecot-pigeonhole/distinfo +++ mail/dovecot-pigeonhole/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1575481505 -SHA256 (dovecot-2.3-pigeonhole-0.5.9.tar.gz) = 36da68aae5157b83e21383f711b8977e5b6f5477f369f71e7e22e76a738bbd05 -SIZE (dovecot-2.3-pigeonhole-0.5.9.tar.gz) = 1897060 +TIMESTAMP = 1583492605 +SHA256 (dovecot-2.3-pigeonhole-0.5.10.tar.gz) = 48c89cc9f3caa9c5f2454f9dcca74fe251a99749a38062bfab7e5017d329605e +SIZE (dovecot-2.3-pigeonhole-0.5.10.tar.gz) = 1899237 Index: mail/dovecot-pigeonhole/pkg-plist =================================================================== --- mail/dovecot-pigeonhole/pkg-plist +++ mail/dovecot-pigeonhole/pkg-plist @@ -1,68 +1,68 @@ -%%DOCSDIR%%/example-config/conf.d/20-managesieve.conf -%%DOCSDIR%%/example-config/conf.d/90-sieve-extprograms.conf -%%DOCSDIR%%/example-config/conf.d/90-sieve.conf -%%DOCSDIR%%/example-config/sieve-ldap.conf +%%NODOCS%%%%DOCSDIR%%/example-config/conf.d/20-managesieve.conf +%%NODOCS%%%%DOCSDIR%%/example-config/conf.d/90-sieve-extprograms.conf +%%NODOCS%%%%DOCSDIR%%/example-config/conf.d/90-sieve.conf +%%NODOCS%%%%DOCSDIR%%/example-config/sieve-ldap.conf bin/sieve-dump bin/sieve-filter bin/sieve-test bin/sievec -include/dovecot-2.3-pigeonhole/sieve/edit-mail.h -include/dovecot-2.3-pigeonhole/sieve/mail-raw.h -include/dovecot-2.3-pigeonhole/sieve/pigeonhole-config.h -include/dovecot-2.3-pigeonhole/sieve/pigeonhole-version.h -include/dovecot-2.3-pigeonhole/sieve/rfc2822.h -include/dovecot-2.3-pigeonhole/sieve/sieve-actions.h -include/dovecot-2.3-pigeonhole/sieve/sieve-address-parts.h -include/dovecot-2.3-pigeonhole/sieve/sieve-address-source.h -include/dovecot-2.3-pigeonhole/sieve/sieve-address.h -include/dovecot-2.3-pigeonhole/sieve/sieve-ast.h -include/dovecot-2.3-pigeonhole/sieve/sieve-binary-dumper.h -include/dovecot-2.3-pigeonhole/sieve/sieve-binary-private.h -include/dovecot-2.3-pigeonhole/sieve/sieve-binary.h -include/dovecot-2.3-pigeonhole/sieve/sieve-code-dumper.h -include/dovecot-2.3-pigeonhole/sieve/sieve-code.h -include/dovecot-2.3-pigeonhole/sieve/sieve-commands.h -include/dovecot-2.3-pigeonhole/sieve/sieve-common.h -include/dovecot-2.3-pigeonhole/sieve/sieve-comparators.h -include/dovecot-2.3-pigeonhole/sieve/sieve-config.h -include/dovecot-2.3-pigeonhole/sieve/sieve-dump.h -include/dovecot-2.3-pigeonhole/sieve/sieve-error-private.h -include/dovecot-2.3-pigeonhole/sieve/sieve-error.h -include/dovecot-2.3-pigeonhole/sieve/sieve-execute.h -include/dovecot-2.3-pigeonhole/sieve/sieve-ext-copy.h -include/dovecot-2.3-pigeonhole/sieve/sieve-ext-enotify.h -include/dovecot-2.3-pigeonhole/sieve/sieve-ext-environment.h -include/dovecot-2.3-pigeonhole/sieve/sieve-ext-imap4flags.h -include/dovecot-2.3-pigeonhole/sieve/sieve-ext-mailbox.h -include/dovecot-2.3-pigeonhole/sieve/sieve-ext-variables.h -include/dovecot-2.3-pigeonhole/sieve/sieve-extensions.h -include/dovecot-2.3-pigeonhole/sieve/sieve-generator.h -include/dovecot-2.3-pigeonhole/sieve/sieve-interpreter.h -include/dovecot-2.3-pigeonhole/sieve/sieve-lexer.h -include/dovecot-2.3-pigeonhole/sieve/sieve-limits.h -include/dovecot-2.3-pigeonhole/sieve/sieve-match-types.h -include/dovecot-2.3-pigeonhole/sieve/sieve-match.h -include/dovecot-2.3-pigeonhole/sieve/sieve-message.h -include/dovecot-2.3-pigeonhole/sieve/sieve-objects.h -include/dovecot-2.3-pigeonhole/sieve/sieve-parser.h -include/dovecot-2.3-pigeonhole/sieve/sieve-plugins.h -include/dovecot-2.3-pigeonhole/sieve/sieve-result.h -include/dovecot-2.3-pigeonhole/sieve/sieve-runtime-trace.h -include/dovecot-2.3-pigeonhole/sieve/sieve-runtime.h -include/dovecot-2.3-pigeonhole/sieve/sieve-script-private.h -include/dovecot-2.3-pigeonhole/sieve/sieve-script.h -include/dovecot-2.3-pigeonhole/sieve/sieve-settings.h -include/dovecot-2.3-pigeonhole/sieve/sieve-smtp.h -include/dovecot-2.3-pigeonhole/sieve/sieve-storage-private.h -include/dovecot-2.3-pigeonhole/sieve/sieve-storage.h -include/dovecot-2.3-pigeonhole/sieve/sieve-stringlist.h -include/dovecot-2.3-pigeonhole/sieve/sieve-types.h -include/dovecot-2.3-pigeonhole/sieve/sieve-validator.h -include/dovecot-2.3-pigeonhole/sieve/sieve.h -lib/dovecot-2.3-pigeonhole/libdovecot-sieve.a -lib/dovecot-2.3-pigeonhole/libdovecot-sieve.so -lib/dovecot-2.3-pigeonhole/libdovecot-sieve.so.0 -lib/dovecot-2.3-pigeonhole/libdovecot-sieve.so.0.0.0 +include/dovecot/sieve/edit-mail.h +include/dovecot/sieve/mail-raw.h +include/dovecot/sieve/pigeonhole-config.h +include/dovecot/sieve/pigeonhole-version.h +include/dovecot/sieve/rfc2822.h +include/dovecot/sieve/sieve-actions.h +include/dovecot/sieve/sieve-address-parts.h +include/dovecot/sieve/sieve-address-source.h +include/dovecot/sieve/sieve-address.h +include/dovecot/sieve/sieve-ast.h +include/dovecot/sieve/sieve-binary-dumper.h +include/dovecot/sieve/sieve-binary-private.h +include/dovecot/sieve/sieve-binary.h +include/dovecot/sieve/sieve-code-dumper.h +include/dovecot/sieve/sieve-code.h +include/dovecot/sieve/sieve-commands.h +include/dovecot/sieve/sieve-common.h +include/dovecot/sieve/sieve-comparators.h +include/dovecot/sieve/sieve-config.h +include/dovecot/sieve/sieve-dump.h +include/dovecot/sieve/sieve-error-private.h +include/dovecot/sieve/sieve-error.h +include/dovecot/sieve/sieve-execute.h +include/dovecot/sieve/sieve-ext-copy.h +include/dovecot/sieve/sieve-ext-enotify.h +include/dovecot/sieve/sieve-ext-environment.h +include/dovecot/sieve/sieve-ext-imap4flags.h +include/dovecot/sieve/sieve-ext-mailbox.h +include/dovecot/sieve/sieve-ext-variables.h +include/dovecot/sieve/sieve-extensions.h +include/dovecot/sieve/sieve-generator.h +include/dovecot/sieve/sieve-interpreter.h +include/dovecot/sieve/sieve-lexer.h +include/dovecot/sieve/sieve-limits.h +include/dovecot/sieve/sieve-match-types.h +include/dovecot/sieve/sieve-match.h +include/dovecot/sieve/sieve-message.h +include/dovecot/sieve/sieve-objects.h +include/dovecot/sieve/sieve-parser.h +include/dovecot/sieve/sieve-plugins.h +include/dovecot/sieve/sieve-result.h +include/dovecot/sieve/sieve-runtime-trace.h +include/dovecot/sieve/sieve-runtime.h +include/dovecot/sieve/sieve-script-private.h +include/dovecot/sieve/sieve-script.h +include/dovecot/sieve/sieve-settings.h +include/dovecot/sieve/sieve-smtp.h +include/dovecot/sieve/sieve-storage-private.h +include/dovecot/sieve/sieve-storage.h +include/dovecot/sieve/sieve-stringlist.h +include/dovecot/sieve/sieve-types.h +include/dovecot/sieve/sieve-validator.h +include/dovecot/sieve/sieve.h +lib/dovecot/libdovecot-sieve.a +lib/dovecot/libdovecot-sieve.so +lib/dovecot/libdovecot-sieve.so.0 +lib/dovecot/libdovecot-sieve.so.0.0.0 lib/dovecot/doveadm/lib10_doveadm_sieve_plugin.a lib/dovecot/doveadm/lib10_doveadm_sieve_plugin.so lib/dovecot/lib95_imap_filter_sieve_plugin.a Index: mail/dovecot/Makefile =================================================================== --- mail/dovecot/Makefile +++ mail/dovecot/Makefile @@ -8,7 +8,7 @@ ###################################################################### PORTNAME= dovecot -PORTVERSION= 2.3.9.3 +PORTVERSION= 2.3.10 CATEGORIES= mail MASTER_SITES= https://dovecot.org/releases/2.3/ Index: mail/dovecot/distinfo =================================================================== --- mail/dovecot/distinfo +++ mail/dovecot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1581553128 -SHA256 (dovecot-2.3.9.3.tar.gz) = f89fb69423fc5bdc05955c8fc0607eab9e33511f9a643b721763db6156c49651 -SIZE (dovecot-2.3.9.3.tar.gz) = 7181682 +TIMESTAMP = 1583492597 +SHA256 (dovecot-2.3.10.tar.gz) = 473184723d854a4d1dbd99c11a7b9f65156ca5fe6ecf85d9a44b5127e6f871c5 +SIZE (dovecot-2.3.10.tar.gz) = 7222241 Index: mail/dovecot/files/patch-src_lib_net.c =================================================================== --- mail/dovecot/files/patch-src_lib_net.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/lib/net.c.orig 2019-12-04 17:29:36 UTC -+++ src/lib/net.c -@@ -1068,13 +1068,17 @@ enum net_hosterror_type net_get_hosterror_type(int err - int error; - enum net_hosterror_type type; - } error_map[] = { -+#ifdef EAI_ADDRFAMILY - { EAI_ADDRFAMILY, NET_HOSTERROR_TYPE_NOT_FOUND }, -+#endif - { EAI_AGAIN, NET_HOSTERROR_TYPE_NAMESERVER }, - { EAI_BADFLAGS, NET_HOSTERROR_TYPE_INTERNAL_ERROR }, - { EAI_FAIL, NET_HOSTERROR_TYPE_NAMESERVER }, - { EAI_FAMILY, NET_HOSTERROR_TYPE_INTERNAL_ERROR }, - { EAI_MEMORY, NET_HOSTERROR_TYPE_INTERNAL_ERROR }, -+#ifdef EAI_NODATA - { EAI_NODATA, NET_HOSTERROR_TYPE_NOT_FOUND }, -+#endif - { EAI_NONAME, NET_HOSTERROR_TYPE_NOT_FOUND }, - { EAI_SERVICE, NET_HOSTERROR_TYPE_INTERNAL_ERROR }, - { EAI_SOCKTYPE, NET_HOSTERROR_TYPE_INTERNAL_ERROR },