diff --git a/mail/slimta/Makefile b/mail/slimta/Makefile index 20f8b5542891..87a1b8419d97 100644 --- a/mail/slimta/Makefile +++ b/mail/slimta/Makefile @@ -1,36 +1,36 @@ PORTNAME= slimta -PORTVERSION= 0.7.8 +PORTVERSION= 0.7.9 CATEGORIES= mail MASTER_SITES= CHEESESHOP MAINTAINER= nc@FreeBSD.org COMMENT= Configurable MTA based on the python-slimta libraries LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-slimta>0:mail/py-python-slimta@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils USE_RC_SUBR= ${PORTNAME} REINPLACE_ARGS= -i '' NO_ARCH= yes SUB_LIST= PYTHON_CMD=${PYTHON_CMD} PLIST_FILES= "@sample etc/slimta/logging.yaml.sample" \ "@sample etc/slimta/slimta.yaml.sample" post-patch: .for file in setup main state @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/${PORTNAME}/app/${file}.py .endfor post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME} .for file in logging ${PORTNAME} @${CP} ${WRKSRC}/${PORTNAME}/app/etc/${file}.yaml.sample ${STAGEDIR}${PREFIX}/etc/${PORTNAME} .endfor .include diff --git a/mail/slimta/distinfo b/mail/slimta/distinfo index 74fddca476a2..db34f6975248 100644 --- a/mail/slimta/distinfo +++ b/mail/slimta/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609989855 -SHA256 (slimta-0.7.8.tar.gz) = 506ee680f6accd14d48f85faf1ff8a64f53b64be19555077cdff54ba38a70501 -SIZE (slimta-0.7.8.tar.gz) = 17095 +TIMESTAMP = 1620837370 +SHA256 (slimta-0.7.9.tar.gz) = 3e59303b47a029a2b7abf235ddf3cf3abc2aa1bd8ac9f8d08f285de43d65a33a +SIZE (slimta-0.7.9.tar.gz) = 19061 diff --git a/mail/slimta/files/patch-slimta_app_main.py b/mail/slimta/files/patch-slimta_app_main.py index a1f3ac728fdb..5ccaf5e8ef84 100644 --- a/mail/slimta/files/patch-slimta_app_main.py +++ b/mail/slimta/files/patch-slimta_app_main.py @@ -1,11 +1,11 @@ ---- slimta/app/main.py.orig 2021-01-11 18:43:19 UTC +--- slimta/app/main.py.orig 2021-05-11 11:45:15 UTC +++ slimta/app/main.py -@@ -44,7 +44,7 @@ def parse_args(): - default_process_name = os.path.basename(sys.argv[0]) - group = argparser.add_argument_group('config options') +@@ -52,7 +52,7 @@ def parse_args(): group.add_argument('-c', '--config', metavar='FILE', default=None, -- help='Specifies a configuration file to read. If not given, the default locations ($HOME/.slimta/slimta.yaml, /etc/slimta/slimta.yaml) are checked.') -+ help='Specifies a configuration file to read. If not given, the default locations ($HOME/.slimta/slimta.yaml, %%PREFIX%%/etc/slimta/slimta.yaml) are checked.') - group.add_argument('-n', '--process-name', metavar='NAME', default=default_process_name, - help='Use the process sub-section NAME for configuration. (default: %(default)s)') - group.add_argument('--no-edge', action='store_true', + help='Specifies a configuration file to read. If not ' + 'given, the default locations ' +- '($HOME/.slimta/slimta.yaml, /etc/slimta/slimta.yaml) ' ++ '($HOME/.slimta/slimta.yaml, %%PREFIX%%/etc/slimta/slimta.yaml) ' + 'are checked.') + group.add_argument('-n', '--process-name', metavar='NAME', + default=default_process_name,