From c1e006f35bf30410612c7568c3dd71e27b3de22e Mon Sep 17 00:00:00 2001
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Fri, 16 Sep 2022 06:58:28 +0000
Subject: [PATCH] mail/mailfromd: the port had been updated to version 8.14

Also, fix `calloutd' startup script (it works under unprivileged
user and thus cannot write to /var/run directly) and reduce some
gratuitous differences between startup script templates.

Prodded by:	maintainer
---
 mail/mailfromd/Makefile           | 2 +-
 mail/mailfromd/distinfo           | 6 +++---
 mail/mailfromd/files/calloutd.in  | 5 +++--
 mail/mailfromd/files/mailfromd.in | 8 ++++----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/mail/mailfromd/Makefile b/mail/mailfromd/Makefile
index f4238214f57ef..e4a5705f088d2 100644
--- a/mail/mailfromd/Makefile
+++ b/mail/mailfromd/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	mailfromd
-PORTVERSION=	8.13
+PORTVERSION=	8.14
 CATEGORIES=	mail
 MASTER_SITES=	http://download.gnu.org.ua/pub/release/${PORTNAME}/ \
 		http://download.gnu.org.ua/pub/alpha/${PORTNAME}/
diff --git a/mail/mailfromd/distinfo b/mail/mailfromd/distinfo
index 9ddf6e212be1f..a2181241bb6d3 100644
--- a/mail/mailfromd/distinfo
+++ b/mail/mailfromd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641130380
-SHA256 (mailfromd-8.13.tar.xz) = 3d578a7efae8477471daf57d41959cd94e5f6f59802578f6d2fc3c625f7b7585
-SIZE (mailfromd-8.13.tar.xz) = 1163284
+TIMESTAMP = 1660381483
+SHA256 (mailfromd-8.14.tar.xz) = 428caf1f7356b7da3a7614f5f5f47f108bf94149ab1db8c0023f1593b837bd31
+SIZE (mailfromd-8.14.tar.xz) = 1180996
diff --git a/mail/mailfromd/files/calloutd.in b/mail/mailfromd/files/calloutd.in
index 0b6b5be9602d3..d1832b792c06e 100644
--- a/mail/mailfromd/files/calloutd.in
+++ b/mail/mailfromd/files/calloutd.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-
+#
 # PROVIDE: calloutd
 # REQUIRE: DAEMON
 # BEFORE: mail
@@ -12,9 +12,10 @@ name="calloutd"
 rcvar=calloutd_enable
 
 : ${calloutd_enable="NO"}
+: ${mailfromd_runpath="%%MFD_RUN_DIR%%"}
 
 command="%%PREFIX%%/sbin/${name}"
-pidfile="/var/run/${name}.pid"
+pidfile="${mailfromd_runpath}/${name}.pid"
 
 required_files="%%PREFIX%%/etc/mailfromd.conf"
 
diff --git a/mail/mailfromd/files/mailfromd.in b/mail/mailfromd/files/mailfromd.in
index 56e6bddeaf4db..f3078c82fef75 100644
--- a/mail/mailfromd/files/mailfromd.in
+++ b/mail/mailfromd/files/mailfromd.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-
+#
 # PROVIDE: mailfromd
 # REQUIRE: DAEMON
 # BEFORE: mail
@@ -10,13 +10,13 @@
 
 name="mailfromd"
 rcvar=mailfromd_enable
-command="%%PREFIX%%/sbin/${name}"
-
-load_rc_config ${name}
 
 : ${mailfromd_enable="NO"}
 : ${mailfromd_flags}
 : ${mailfromd_runpath="%%MFD_RUN_DIR%%"}
+
+command="%%PREFIX%%/sbin/${name}"
 pidfile="${mailfromd_runpath}/${name}.pid"
 
+load_rc_config ${name}
 run_rc_command "$1"