5 files changed, 19 insertions, 13 deletions

diff --git a/sysutils/automounter/Makefile b/sysutils/automounter/Makefile
index 1771f0ecd886..a5fc4a2982b8 100644
--- a/sysutils/automounter/Makefile
+++ b/sysutils/automounter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	automounter
-PORTVERSION=	1.4
+PORTVERSION=	1.4.1
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/bsdadminscripts/${PORTNAME}
 
@@ -17,17 +17,17 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 NO_BUILD=	yes
 MANCOMPRESSED=	yes
 
-.if defined(NOPORTDOCS)
-NOPORTDOCS=	-nodoc
-.else
-MAN5=		automounter.conf.5
-MAN8=		automounter.8
-.endif
+MAN5=		${PORTNAME}.conf.5
+MAN8=		${PORTNAME}.8
 
 plist: patch
 		@cd ${WRKSRC}; ./plist.sh -nodoc > ${PLIST}
+		@${ECHO} "@dirrmtry etc/devd" >> ${PLIST}
 
 do-install:
-		@cd ${WRKSRC}; ./install.sh -prefix=${PREFIX} ${NOPORTDOCS}
+		@cd ${WRKSRC}; ./install.sh -prefix=${PREFIX}
+
+post-install:
+		@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/sysutils/automounter/distinfo b/sysutils/automounter/distinfo
index 4fc6e57fe97d..e368022f6572 100644
--- a/sysutils/automounter/distinfo
+++ b/sysutils/automounter/distinfo
@@ -1,3 +1,3 @@
-MD5 (automounter-1.4.tar.gz) = b429e403d45aec86c4285e27dd508b9c
-SHA256 (automounter-1.4.tar.gz) = 12bb576acbb1de11c9df0469d027b809c5cd586080a4ca87193ecef657cf1589
-SIZE (automounter-1.4.tar.gz) = 17093
+MD5 (automounter-1.4.1.tar.gz) = 544b55a7b9d6a1e2a69cce6f605eb2e7
+SHA256 (automounter-1.4.1.tar.gz) = 6cf4b8999d71f4833ffe9a34d141f1dc26280217a2f56612905005c57d7e1f15
+SIZE (automounter-1.4.1.tar.gz) = 20720
diff --git a/sysutils/automounter/pkg-descr b/sysutils/automounter/pkg-descr
index 8098829bf9c6..671b1342e2ec 100644
--- a/sysutils/automounter/pkg-descr
+++ b/sysutils/automounter/pkg-descr
@@ -1,6 +1,5 @@
 A script to dynamically configure amd and populate /media with appropriate
-links, when USB mass storage devices appear. It relies on geom labels, hence
-it only works for properly labeled devices.
+links, when USB mass storage devices appear.
 
 It also allows to automatically attach geli encrypted devices and images with
 keys polled from file systems it makes mountable.
diff --git a/sysutils/automounter/pkg-message b/sysutils/automounter/pkg-message
new file mode 100644
index 000000000000..e4486faa16b6
--- /dev/null
+++ b/sysutils/automounter/pkg-message
@@ -0,0 +1,5 @@
+-------------------------------------------------------------------------------
+It is no longer required to manually create devd.conf entries. Please remove
+your automounter related devd.conf entries and restart /etc/rc.d/devd after
+an update.
+-------------------------------------------------------------------------------
diff --git a/sysutils/automounter/pkg-plist b/sysutils/automounter/pkg-plist
index e59419e19447..30f253da42c4 100644
--- a/sysutils/automounter/pkg-plist
+++ b/sysutils/automounter/pkg-plist
@@ -1,3 +1,5 @@
 sbin/automounter
 etc/rc.d/automounter
 etc/automounter.conf.sample
+etc/devd/automounter.conf
+@dirrmtry etc/devd