(sysutils/webmin,wbm-*) updated 1.953 to 1.955

(pkgsrc changes)
 - Utilize common DISTINFO_FILE
 - patches converted to SUBST. Make portable to version update
 - (two distinfo files will be recovered again after this commit, sorry)
 - PKGPATH variable does not hold the value yet in Makefile (right ?)

(upstream changes)
Version 1.955 (22nd August 2020)
More bugfixes, and an update to the theme.

Version 1.954 (2nd August 2020)
Minor bugfixes to 1.953

46 files changed, 32 insertions, 253 deletions

diff --git a/sysutils/wbm-apache/distinfo b/sysutils/wbm-apache/distinfo
deleted file mode 100644
index 182be2d2d8f..00000000000
--- a/sysutils/wbm-apache/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.12 2020/07/29 10:28:27 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-at/distinfo b/sysutils/wbm-at/distinfo
deleted file mode 100644
index 42530025c67..00000000000
--- a/sysutils/wbm-at/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:27 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-bandwidth/distinfo b/sysutils/wbm-bandwidth/distinfo
deleted file mode 100644
index 42530025c67..00000000000
--- a/sysutils/wbm-bandwidth/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:27 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-bind8/distinfo b/sysutils/wbm-bind8/distinfo
deleted file mode 100644
index 182be2d2d8f..00000000000
--- a/sysutils/wbm-bind8/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.12 2020/07/29 10:28:27 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-change-user/distinfo b/sysutils/wbm-change-user/distinfo
deleted file mode 100644
index 42530025c67..00000000000
--- a/sysutils/wbm-change-user/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:27 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-cluster-copy/distinfo b/sysutils/wbm-cluster-copy/distinfo
deleted file mode 100644
index b7186105f24..00000000000
--- a/sysutils/wbm-cluster-copy/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:28 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-cluster-cron/distinfo b/sysutils/wbm-cluster-cron/distinfo
deleted file mode 100644
index b7186105f24..00000000000
--- a/sysutils/wbm-cluster-cron/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:28 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-cluster-passwd/distinfo b/sysutils/wbm-cluster-passwd/distinfo
deleted file mode 100644
index b7186105f24..00000000000
--- a/sysutils/wbm-cluster-passwd/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:28 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-cluster-shell/distinfo b/sysutils/wbm-cluster-shell/distinfo
deleted file mode 100644
index b7186105f24..00000000000
--- a/sysutils/wbm-cluster-shell/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:28 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-cluster-useradmin/distinfo b/sysutils/wbm-cluster-useradmin/distinfo
deleted file mode 100644
index b7186105f24..00000000000
--- a/sysutils/wbm-cluster-useradmin/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:28 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-cluster-webmin/distinfo b/sysutils/wbm-cluster-webmin/distinfo
deleted file mode 100644
index b7186105f24..00000000000
--- a/sysutils/wbm-cluster-webmin/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:28 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-custom/distinfo b/sysutils/wbm-custom/distinfo
deleted file mode 100644
index b7186105f24..00000000000
--- a/sysutils/wbm-custom/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:28 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-cyrus-imapd/Makefile b/sysutils/wbm-cyrus-imapd/Makefile
index c9843e71b81..e602882ea67 100644
--- a/sysutils/wbm-cyrus-imapd/Makefile
+++ b/sysutils/wbm-cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/04/27 15:16:47 mef Exp $
+# $NetBSD: Makefile,v 1.15 2020/09/06 02:38:54 mef Exp $
 
 DISTNAME=	cyrus-imapd-mod-1.6.2
 WBM_NAME=	cyrus-imapd
@@ -13,6 +13,10 @@ DEPENDS+=	p5-Tree-Simple-[0-9]*:../../devel/p5-Tree-Simple
 HOMEPAGE=	http://www.tecchio.net/webmin/cyrus/
 COMMENT=	Webmin module for administering Cyrus IMAP
 
+#DISTINFO_FILE=	${PKGPATH}/distinfo
+# above does not work
+DISTINFO_FILE=	../../sysutils/wbm-cyrus-imapd/distinfo
+
 WBM_STD_MODULE=	NO
 
 .include "../../sysutils/webmin/wbm.mk"
diff --git a/sysutils/wbm-cyrus-imapd/distinfo b/sysutils/wbm-cyrus-imapd/distinfo
deleted file mode 100644
index f7f76e9b718..00000000000
--- a/sysutils/wbm-cyrus-imapd/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2017/02/01 23:47:47 mef Exp $
-
-SHA1 (cyrus-imapd-mod-1.6.2.wbm.gz) = daed53f50aab0b92e745671576b1e19694af3d4d
-RMD160 (cyrus-imapd-mod-1.6.2.wbm.gz) = 10e07961778a914ff6dcdd618bddff37cb92fee8
-SHA512 (cyrus-imapd-mod-1.6.2.wbm.gz) = 49d672f6a4f065b833fc40769f276e095d1e36ff67d9f49912f3087683a361b4b7dbc599695ee96f05d2d1ac52b1b5b17741249f5a0af2c8ee9ab991560791cb
-Size (cyrus-imapd-mod-1.6.2.wbm.gz) = 51247 bytes
diff --git a/sysutils/wbm-dhcpd/distinfo b/sysutils/wbm-dhcpd/distinfo
deleted file mode 100644
index b7186105f24..00000000000
--- a/sysutils/wbm-dhcpd/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:28 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-dovecot/distinfo b/sysutils/wbm-dovecot/distinfo
deleted file mode 100644
index b7186105f24..00000000000
--- a/sysutils/wbm-dovecot/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:28 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-fetchmail/distinfo b/sysutils/wbm-fetchmail/distinfo
deleted file mode 100644
index 0c986d4286e..00000000000
--- a/sysutils/wbm-fetchmail/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:29 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-htaccess-htpasswd/distinfo b/sysutils/wbm-htaccess-htpasswd/distinfo
deleted file mode 100644
index 0c986d4286e..00000000000
--- a/sysutils/wbm-htaccess-htpasswd/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:29 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-inetd/distinfo b/sysutils/wbm-inetd/distinfo
deleted file mode 100644
index 0c986d4286e..00000000000
--- a/sysutils/wbm-inetd/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:29 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-ipfilter/distinfo b/sysutils/wbm-ipfilter/distinfo
deleted file mode 100644
index 0346aa0c121..00000000000
--- a/sysutils/wbm-ipfilter/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.12 2020/07/29 10:28:29 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
-SHA1 (patch-ab) = ae6b2ddf17472a707e6bce49759fc3743c4410b0
diff --git a/sysutils/wbm-ldap-useradmin/distinfo b/sysutils/wbm-ldap-useradmin/distinfo
deleted file mode 100644
index 0c986d4286e..00000000000
--- a/sysutils/wbm-ldap-useradmin/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:29 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-lpadmin/distinfo b/sysutils/wbm-lpadmin/distinfo
deleted file mode 100644
index 0c986d4286e..00000000000
--- a/sysutils/wbm-lpadmin/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:29 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-mailboxes/distinfo b/sysutils/wbm-mailboxes/distinfo
deleted file mode 100644
index 0c986d4286e..00000000000
--- a/sysutils/wbm-mailboxes/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:29 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-mount/distinfo b/sysutils/wbm-mount/distinfo
deleted file mode 100644
index 0c986d4286e..00000000000
--- a/sysutils/wbm-mount/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:29 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-mysql/distinfo b/sysutils/wbm-mysql/distinfo
deleted file mode 100644
index 20641d15515..00000000000
--- a/sysutils/wbm-mysql/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:30 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-net/distinfo b/sysutils/wbm-net/distinfo
deleted file mode 100644
index 20641d15515..00000000000
--- a/sysutils/wbm-net/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:30 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-openslp/distinfo b/sysutils/wbm-openslp/distinfo
deleted file mode 100644
index 20641d15515..00000000000
--- a/sysutils/wbm-openslp/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:30 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-postfix/distinfo b/sysutils/wbm-postfix/distinfo
deleted file mode 100644
index 20641d15515..00000000000
--- a/sysutils/wbm-postfix/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:30 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-postgresql/distinfo b/sysutils/wbm-postgresql/distinfo
deleted file mode 100644
index 20641d15515..00000000000
--- a/sysutils/wbm-postgresql/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:30 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-qmailadmin/distinfo b/sysutils/wbm-qmailadmin/distinfo
deleted file mode 100644
index 20641d15515..00000000000
--- a/sysutils/wbm-qmailadmin/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:30 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-quota/distinfo b/sysutils/wbm-quota/distinfo
deleted file mode 100644
index 20641d15515..00000000000
--- a/sysutils/wbm-quota/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:30 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-sendmail/distinfo b/sysutils/wbm-sendmail/distinfo
deleted file mode 100644
index 20641d15515..00000000000
--- a/sysutils/wbm-sendmail/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:30 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-shell/distinfo b/sysutils/wbm-shell/distinfo
deleted file mode 100644
index 20641d15515..00000000000
--- a/sysutils/wbm-shell/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:30 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-sshd/distinfo b/sysutils/wbm-sshd/distinfo
deleted file mode 100644
index ea7b14fb900..00000000000
--- a/sysutils/wbm-sshd/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:31 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-status/distinfo b/sysutils/wbm-status/distinfo
deleted file mode 100644
index ea7b14fb900..00000000000
--- a/sysutils/wbm-status/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:31 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-syslog/distinfo b/sysutils/wbm-syslog/distinfo
deleted file mode 100644
index ea7b14fb900..00000000000
--- a/sysutils/wbm-syslog/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:31 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-telnet/distinfo b/sysutils/wbm-telnet/distinfo
deleted file mode 100644
index ea7b14fb900..00000000000
--- a/sysutils/wbm-telnet/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:31 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-time/distinfo b/sysutils/wbm-time/distinfo
deleted file mode 100644
index 168352bab4d..00000000000
--- a/sysutils/wbm-time/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.13 2020/07/29 10:28:31 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-tunnel/distinfo b/sysutils/wbm-tunnel/distinfo
deleted file mode 100644
index ea7b14fb900..00000000000
--- a/sysutils/wbm-tunnel/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:31 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-useradmin/distinfo b/sysutils/wbm-useradmin/distinfo
deleted file mode 100644
index ea7b14fb900..00000000000
--- a/sysutils/wbm-useradmin/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.11 2020/07/29 10:28:31 mef Exp $
-
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
diff --git a/sysutils/wbm-virtual-server/Makefile b/sysutils/wbm-virtual-server/Makefile
index 6788f6f3877..d2726da06cf 100644
--- a/sysutils/wbm-virtual-server/Makefile
+++ b/sysutils/wbm-virtual-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/11/04 21:28:58 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2020/09/06 02:38:57 mef Exp $
 
 PKGNAME=	wbm-${WBM_NAME}-${WBM_MOD_REV}
 DISTNAME=	${WBM_NAME}-${WBM_MOD_REV}.gpl
@@ -9,6 +9,8 @@ WBM_STD_MODULE=		no
 WBM_MOD_REV=		5.05
 WBM_DEPEND_MODULES=	net quota useradmin sendmail apache mysql
 
+DISTINFO_FILE=	../../sysutils/wbm-virtual-server/distinfo
+
 COMMENT=	Webmin module to allow users to control their own virtual servers
 
 #post-install:
diff --git a/sysutils/wbm-virtual-server/distinfo b/sysutils/wbm-virtual-server/distinfo
deleted file mode 100644
index d47d9dbec16..00000000000
--- a/sysutils/wbm-virtual-server/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2017/02/01 13:08:42 mef Exp $
-
-SHA1 (virtual-server-5.05.gpl.wbm.gz) = 770775b0eb207f5429c7ce177a0f669520ace5e5
-RMD160 (virtual-server-5.05.gpl.wbm.gz) = a6302a5b1f7991d80a32987ca8351f865d5e27f8
-SHA512 (virtual-server-5.05.gpl.wbm.gz) = 8847efcb19eb4a07727f8f2a6f0fd52e39f53612e7f0b7a1a94169dbc7dbea021e48b4e61d7f32f6e3772f3bd63b988234f9ed72c7cf77318d408cbf505951ff
-Size (virtual-server-5.05.gpl.wbm.gz) = 2322648 bytes
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index 339997ebd68..51872020854 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.54 2020/08/31 18:11:37 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2020/09/06 02:38:53 mef Exp $
 
-PKGREVISION= 1
 .include "version.mk"
 
 DISTNAME=	webmin-${WBM_VERSION}
@@ -32,6 +31,19 @@ FILES_SUBST+=		WEBMIN_VARDIR=${WEBMIN_VARDIR:Q}
 MESSAGE_SUBST+=		WEBMIN_DIR=${WEBMIN_DIR:Q}
 BUILD_DEFS+=		VARBASE
 
+# patching always fails due to version is written closed the patching line,
+SUBST_CLASSES+=         os
+SUBST_STAGE.os=         pre-configure
+SUBST_FILES.os=         man/module.info init/module.info
+SUBST_MESSAGE.os=       Add DragonFly
+SUBST_SED.os=           -e 's/macos netbsd/macos netbsd dragonfly/'
+
+SUBST_CLASSES+=         dragonfly
+SUBST_STAGE.os=         pre-configure
+SUBST_FILES.os=         cron/module.info
+SUBST_MESSAGE.os=       Add DragonFly
+SUBST_SED.os=           -e 's/macos openbsd/macos openbsd dragonfly/'
+
 WEBMIN_MINIMAL_MODULES=	acl cron init inittab man proc servers webmin webminlog
 
 PKG_SYSCONFSUBDIR=	webmin
diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo
index eb9a5cbdc32..6805006e8e7 100644
--- a/sysutils/webmin/distinfo
+++ b/sysutils/webmin/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.26 2020/07/29 10:28:27 mef Exp $
+$NetBSD: distinfo,v 1.27 2020/09/06 02:38:53 mef Exp $
 
-SHA1 (webmin-1.953.tar.gz) = e3189004368663ded0fefb4904f0169e3b8d4a58
-RMD160 (webmin-1.953.tar.gz) = 023f36b705d34ce63bc2f04e539fe4f7c2e0acfe
-SHA512 (webmin-1.953.tar.gz) = b992acdfda74ac75661f1cddeca2637a7382832d3669ed4a5220297ded264e2e12244f73f9fc580a78feec7221c0c68e725f528bec0433706478bf637ff072aa
-Size (webmin-1.953.tar.gz) = 46898438 bytes
+SHA1 (webmin-1.955.tar.gz) = db4ed7590eb23ad8608110816c9f18b6d46874c2
+RMD160 (webmin-1.955.tar.gz) = 20fb35b0d1af39982085b3c32e2649f95d5b0579
+SHA512 (webmin-1.955.tar.gz) = f287ff2cb39b9d1fcb2d22ea10dae1571583d250d64ccdd83ce57215055c8370bbbb32f57f504bfa82c4d2dab8693914c888f7ad7c9cc3a911c14b1e87a1982c
+Size (webmin-1.955.tar.gz) = 46859996 bytes
 SHA1 (patch-aa) = 74a647da70fcd5afc9fa878554bc1288ec5ba979
 SHA1 (patch-ab) = 890f57542f17e891ae80bf5f3b0158c71baaa479
 SHA1 (patch-ac) = 327ecd47b4926eb3b9c6dc5f986d5f6232364030
diff --git a/sysutils/webmin/version.mk b/sysutils/webmin/version.mk
index 206acddef79..e1340a9bfe5 100644
--- a/sysutils/webmin/version.mk
+++ b/sysutils/webmin/version.mk
@@ -1,3 +1,3 @@
-# $NetBSD: version.mk,v 1.9 2020/07/29 10:28:27 mef Exp $
+# $NetBSD: version.mk,v 1.10 2020/09/06 02:38:53 mef Exp $
 
-WBM_VERSION=	1.953
+WBM_VERSION=	1.955
diff --git a/sysutils/webmin/wbm.mk b/sysutils/webmin/wbm.mk
index 7824f8d81e5..a4ee46cd939 100644
--- a/sysutils/webmin/wbm.mk
+++ b/sysutils/webmin/wbm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: wbm.mk,v 1.16 2020/06/01 23:07:27 mef Exp $
+# $NetBSD: wbm.mk,v 1.17 2020/09/06 02:38:53 mef Exp $
 #
 # Makefile fragment for Webmin modules
 #
@@ -44,6 +44,8 @@ HOMEPAGE?=	http://www.webmin.com/standard.html
 USE_TOOLS+=	perl:run perl
 DEPENDS+=	webmin>=${WBM_VERSION}:../../sysutils/webmin
 
+DISTINFO_FILE?=	../../sysutils/webmin/distinfo
+
 .for m in ${WBM_DEPEND_MODULES}
 DEPENDS+=	wbm-${m}>=${WBM_VERSION}:../../sysutils/wbm-${m}
 .endfor