From 9ada3eb868c1bb4ce31fdcf256d1c51320f60762 Mon Sep 17 00:00:00 2001
From: "Jason W. Bacon" <jwb@FreeBSD.org>
Date: Thu, 30 Apr 2020 19:33:24 +0000
Subject: [PATCH] sysutils/automount: Upgrade to 1.7.2

Fixes mount permissions issues in previous version
Fixes hang during pkg install
Removed pkg-install script which violated policy against starting services and
replaced with a pkg-message instructing user to restart devd

PR:             ports/246026
Submitted by:   vermaden@interia.pl
---
 sysutils/automount/Makefile             | 14 ++++++++------
 sysutils/automount/distinfo             |  6 +++---
 sysutils/automount/files/pkg-install.in | 15 ---------------
 sysutils/automount/pkg-message          | 12 ++++++++++++
 4 files changed, 23 insertions(+), 24 deletions(-)
 delete mode 100644 sysutils/automount/files/pkg-install.in
 create mode 100644 sysutils/automount/pkg-message

diff --git a/sysutils/automount/Makefile b/sysutils/automount/Makefile
index 5920a0dcc902..7b3e0dde708a 100644
--- a/sysutils/automount/Makefile
+++ b/sysutils/automount/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	automount
-PORTVERSION=	1.7.1
+DISTVERSION=	1.7.2
 CATEGORIES=	sysutils
 MASTER_SITES=	https://raw.github.com/vermaden/automount/master/
 
@@ -13,7 +13,6 @@ LICENSE=	BSD2CLAUSE
 
 PLIST_FILES=	sbin/automount etc/devd/automount_devd.conf etc/automount.conf.sample
 
-SUB_FILES=	pkg-install
 NO_BUILD=	yes
 NO_ARCH=	yes
 
@@ -24,11 +23,14 @@ NTFS3G_RUN_DEPENDS=	fusefs-ntfs>=0:sysutils/fusefs-ntfs
 EXT4_DESC=		Support EXT2/3/4 filesystem
 EXT4_RUN_DEPENDS=	fusefs-ext2>=0:sysutils/fusefs-ext2
 EXFAT_DESC=		Support Microsoft exFAT filesystem
-EXFAT_RUN_DEPENDS=	fusefs-exfat>=0:sysutils/fusefs-exfat
+EXFAT_RUN_DEPENDS=	fusefs-exfat>=0:sysutils/fusefs-exfat \
+			exfat-utils>=0:sysutils/exfat-utils
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/automount             ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_DATA}   ${WRKDIR}/automount_devd.conf   ${STAGEDIR}${PREFIX}/etc/devd/automount_devd.conf
-	${INSTALL_DATA}   ${WRKDIR}/automount.conf	  ${STAGEDIR}${PREFIX}/etc/automount.conf.sample
+	${INSTALL_SCRIPT} ${WRKDIR}/automount ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_DATA} ${WRKDIR}/automount_devd.conf \
+		${STAGEDIR}${PREFIX}/etc/devd
+	${INSTALL_DATA} ${WRKDIR}/automount.conf \
+		${STAGEDIR}${PREFIX}/etc/automount.conf.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/automount/distinfo b/sysutils/automount/distinfo
index fae58df95da2..178bae731428 100644
--- a/sysutils/automount/distinfo
+++ b/sysutils/automount/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567078461
-SHA256 (automount-1.7.1.tar.gz) = e6c2110b8c6099f9924a6f4c49be6aa93f65b69ba1ee98576d8fb60846f1a5c2
-SIZE (automount-1.7.1.tar.gz) = 6532
+TIMESTAMP = 1588193474
+SHA256 (automount-1.7.2.tar.gz) = 99b424086016639dfc92a77a719e7f30aa04fabd2664cae77c486bdade91ec85
+SIZE (automount-1.7.2.tar.gz) = 6670
diff --git a/sysutils/automount/files/pkg-install.in b/sysutils/automount/files/pkg-install.in
deleted file mode 100644
index d8b2f9b9ae51..000000000000
--- a/sysutils/automount/files/pkg-install.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-case ${2} in
-  (POST-INSTALL)
-    service devd restart
-    echo
-    echo
-    echo "Check %%PREFIX%%/bin/automount --help for available options."
-    echo
-    echo
-    ;;
-  (PRE-INSTALL)
-    :
-    ;;
-esac
diff --git a/sysutils/automount/pkg-message b/sysutils/automount/pkg-message
new file mode 100644
index 000000000000..79de4b6fe739
--- /dev/null
+++ b/sysutils/automount/pkg-message
@@ -0,0 +1,12 @@
+[
+{ type: install
+  message: <<EOM
+
+You must run
+
+    service devd restart
+
+to activate the new automount.
+EOM
+}
+]