From 16b9f461e8b7d84141ba9a1d72071209b297612b Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Mon, 10 Dec 2018 08:51:20 -0200
Subject: [PATCH] monit: follow upstream configuration locations and fix
 license=

license is AGPL-3.0-only

https://mmonit.com/monit/documentation/monit.html#FILES

closes #5640
---
 srcpkgs/monit/INSTALL         | 18 ++++++++++++++++++
 srcpkgs/monit/files/monit/run |  5 ++++-
 srcpkgs/monit/template        |  9 +++++----
 3 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/monit/INSTALL

diff --git a/srcpkgs/monit/INSTALL b/srcpkgs/monit/INSTALL
new file mode 100644
index 00000000000..b059c102d66
--- /dev/null
+++ b/srcpkgs/monit/INSTALL
@@ -0,0 +1,18 @@
+# INSTALL
+case "$ACTION" in
+post)
+	if [ "$UPDATE" = "yes" ]; then
+		cat <<EOF
+===============================================================================
+Location of the configuration file used by the monit service has changed
+from '/etc/monit/monitrc' to '/etc/monitrc', as this is in line with upstream.
+
+Consequently /etc/monit/monitrc has been deprecated and will stop working in a
+future version.
+
+Migration can be done by moving /etc/monit/monitrc to /etc/monitrc.
+===============================================================================
+EOF
+	fi
+	;;
+esac
diff --git a/srcpkgs/monit/files/monit/run b/srcpkgs/monit/files/monit/run
index 9d959f195aa..f80af51c539 100644
--- a/srcpkgs/monit/files/monit/run
+++ b/srcpkgs/monit/files/monit/run
@@ -1,2 +1,5 @@
 #!/bin/sh
-exec monit -I -c /etc/monit/monitrc 2>&1
+if [ -f /etc/monit/monitrc ]; then
+	CONF="-c /etc/monit/monitrc"
+fi
+exec monit -I ${CONF} 2>&1
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index a39f8db5103..25c4fe24fe5 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,22 +1,23 @@
 # Template file for 'monit'
 pkgname=monit
 version=5.25.2
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-ssl-dir=${XBPS_CROSS_BASE}/usr libmonit_cv_setjmp_available=yes
  libmonit_cv_vsnprintf_c99_conformant=yes"
-conf_files="/etc/monit/monitrc"
+conf_files="/etc/monitrc"
 hostmakedepends="perl"
 makedepends="pam-devel libressl-devel zlib-devel"
 short_desc="Utility for monitoring, processes, files, directories and devices"
 maintainer="Duncaen <duncaen@voidlinux.org>"
-license="GPL-3"
+license="AGPL-3.0-only"
 homepage="http://mmonit.com/monit/"
 #changelog="https://mmonit.com/monit/changes/"
 distfiles="http://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
 checksum=aa0ce6361d1155e43e30a86dcff00b2003d434f221c360981ced830275abc64a
 
 post_install() {
-	vinstall monitrc 700 etc/monit
+	vconf monitrc
 	vsv monit
+	vlicense COPYING
 }