From nobody Thu Oct 28 09:58:57 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 304FF183A648; Thu, 28 Oct 2021 09:58:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hg1H60v6Rz3Hym; Thu, 28 Oct 2021 09:58:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F293621BE4; Thu, 28 Oct 2021 09:58:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19S9wv1k063296; Thu, 28 Oct 2021 09:58:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19S9wvMw063295; Thu, 28 Oct 2021 09:58:57 GMT (envelope-from git) Date: Thu, 28 Oct 2021 09:58:57 GMT Message-Id: <202110280958.19S9wvMw063295@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: e1d1c6db7411 - main - mail/postfix-postfwd: Allow setting interface/port in rc.conf List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1d1c6db7411fce9c2c6697057cc4be617a95abe Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=e1d1c6db7411fce9c2c6697057cc4be617a95abe commit e1d1c6db7411fce9c2c6697057cc4be617a95abe Author: Andreas Jobs AuthorDate: 2021-10-28 09:53:52 +0000 Commit: Yasuhiro Kimura CommitDate: 2021-10-28 09:58:11 +0000 mail/postfix-postfwd: Allow setting interface/port in rc.conf * Switch to DISTVERSION * Pet portlint and portclippy * Reformat Makefile with portfmt PR: 257108 --- mail/postfix-postfwd/Makefile | 17 +++++++++-------- mail/postfix-postfwd/files/postfwd.in | 4 +++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/mail/postfix-postfwd/Makefile b/mail/postfix-postfwd/Makefile index 448dad812bb4..9f7b61cf5a00 100644 --- a/mail/postfix-postfwd/Makefile +++ b/mail/postfix-postfwd/Makefile @@ -1,8 +1,9 @@ # Created by: Sahil Tandon PORTNAME= postfwd -PORTVERSION= 2.03 DISTVERSIONPREFIX= v +DISTVERSION= 2.03 +PORTREVISION= 1 CATEGORIES= mail PKGNAMEPREFIX= postfix- @@ -16,20 +17,20 @@ RUN_DEPENDS= p5-Net-DNS>=0:dns/p5-Net-DNS \ p5-Net-Server>=0:net/p5-Net-Server USES= perl5 shebangfix - -NO_ARCH= yes -SUB_FILES= pkg-message - -USE_RC_SUBR= ${PORTNAME} USE_GITHUB= yes -SHEBANG_FILES= sbin/* tools/*.pl tools/hapolicy/* USE_PERL5= run +USE_RC_SUBR= ${PORTNAME} + +SHEBANG_FILES= sbin/* tools/*.pl tools/hapolicy/* + +NO_ARCH= yes NO_BUILD= yes +SUB_FILES= pkg-message PORTDOCS= * PORTEXAMPLES= * -OPTIONS_DEFINE= EXAMPLES DOCS +OPTIONS_DEFINE= DOCS EXAMPLES do-install: ${INSTALL_DATA} ${WRKSRC}/etc/${PORTNAME}.cf.sample ${STAGEDIR}${ETCDIR} diff --git a/mail/postfix-postfwd/files/postfwd.in b/mail/postfix-postfwd/files/postfwd.in index e4cb4a82f2bd..32bee652e4ea 100644 --- a/mail/postfix-postfwd/files/postfwd.in +++ b/mail/postfix-postfwd/files/postfwd.in @@ -23,12 +23,14 @@ load_rc_config $name : ${postfwd_enable:="NO"} : ${postfwd_flags="--shortlog --summary=600 --cache=600 --cache-rbl-timeout=3600 --cleanup-requests=1200 --cleanup-rbls=1800 --cleanup-rates=1200"} +: ${postfwd_interface="127.0.0.1"} +: ${postfwd_port="10040"} pidfile=${postfwd_pidfile:="/var/run/${name}.pid"} required_files=${postfwd_config:="%%PREFIX%%/etc/${name}.conf"} command=%%PREFIX%%/bin/${name} -command_args="--daemon --file=${required_files} --pidfile=${pidfile} --interface=127.0.0.1 --port=10040 --user=nobody --group=nobody" +command_args="--daemon --file=${required_files} --pidfile=${pidfile} --interface=${postfwd_interface} --port=${postfwd_port} --user=nobody --group=nobody" start_precmd="${name}_check" status_cmd="${name}_status"