3 files changed, 41 insertions, 33 deletions

diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index 96b58531be14..8f651960b8dc 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	webmin
-PORTVERSION=	1.850
+PORTVERSION=	1.860
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.webmin.com/updates/:up \
 		SF/webadmin/${PORTNAME}/${PORTVERSION}:sf
diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo
index 45f83f18bda3..8962ad37a115 100644
--- a/sysutils/webmin/distinfo
+++ b/sysutils/webmin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500822540
-SHA256 (webmin-1.850.tar.gz) = c66caa9e4cb50d5447bc8aceb7989d2284dde060278f404b13e171c7ce1690e1
-SIZE (webmin-1.850.tar.gz) = 28977608
+TIMESTAMP = 1508401582
+SHA256 (webmin-1.860.tar.gz) = 5668e9543b38941fe843efa9add6594621530eb386a97af01c980f67a7601af0
+SIZE (webmin-1.860.tar.gz) = 28996693
diff --git a/sysutils/webmin/pkg-plist b/sysutils/webmin/pkg-plist
index 905811a95aae..cebdf3e8e974 100644
--- a/sysutils/webmin/pkg-plist
+++ b/sysutils/webmin/pkg-plist
@@ -1022,11 +1022,13 @@ lib/webmin/authentic-theme/extensions/file-manager/search.cgi
 lib/webmin/authentic-theme/extensions/sql.js
 lib/webmin/authentic-theme/extensions/sql.min.js
 lib/webmin/authentic-theme/help/editor.ca.UTF-8.html
+lib/webmin/authentic-theme/help/editor.ca.html
 lib/webmin/authentic-theme/help/editor.de.UTF-8.html
 lib/webmin/authentic-theme/help/editor.html
 lib/webmin/authentic-theme/help/editor.id.UTF-8.html
 lib/webmin/authentic-theme/help/editor.ro_RO.UTF-8.html
 lib/webmin/authentic-theme/help/editor.zh_CN.UTF-8.html
+lib/webmin/authentic-theme/help/file-manager.ca.html
 lib/webmin/authentic-theme/help/file-manager.de.UTF-8.html
 lib/webmin/authentic-theme/help/file-manager.html
 lib/webmin/authentic-theme/help/file-manager.id.UTF-8.html
@@ -1857,6 +1859,8 @@ lib/webmin/authentic-theme/lang/ro_RO
 lib/webmin/authentic-theme/lang/ro_RO.UTF-8
 lib/webmin/authentic-theme/lang/ru
 lib/webmin/authentic-theme/lang/ru.UTF-8
+lib/webmin/authentic-theme/lang/sq
+lib/webmin/authentic-theme/lang/sq.UTF-8
 lib/webmin/authentic-theme/lang/sv
 lib/webmin/authentic-theme/lang/sv.UTF-8
 lib/webmin/authentic-theme/lang/zh_CN
@@ -3096,6 +3100,7 @@ lib/webmin/bind8/enable_zonekey.cgi
 lib/webmin/bind8/feedback_files.pl
 lib/webmin/bind8/find_free.cgi
 lib/webmin/bind8/find_zones.cgi
+lib/webmin/bind8/fix_trusted.cgi
 lib/webmin/bind8/forward_form.cgi
 lib/webmin/bind8/free_chooser.cgi
 lib/webmin/bind8/freeze_zone.cgi
@@ -3250,7 +3255,6 @@ lib/webmin/bind8/save_text.cgi
 lib/webmin/bind8/save_trusted.cgi
 lib/webmin/bind8/save_view.cgi
 lib/webmin/bind8/save_zonedef.cgi
-lib/webmin/bind8/setup_trusted.cgi
 lib/webmin/bind8/sign_zone.cgi
 lib/webmin/bind8/slave_add.cgi
 lib/webmin/bind8/slave_delete.cgi
@@ -3259,6 +3263,7 @@ lib/webmin/bind8/start.cgi
 lib/webmin/bind8/stop.cgi
 lib/webmin/bind8/stub_form.cgi
 lib/webmin/bind8/syslog_logs.pl
+lib/webmin/bind8/system_info.pl
 lib/webmin/bind8/unfreeze_zone.cgi
 lib/webmin/bind8/view_form.cgi
 lib/webmin/bind8/view_text.cgi
@@ -3921,7 +3926,6 @@ lib/webmin/blue-theme/tunnel/images/icon.gif
 lib/webmin/blue-theme/unauthenticated/gray-reset-fonts-base.css
 lib/webmin/blue-theme/unauthenticated/gray-reset-fonts-grids-base.css
 lib/webmin/blue-theme/unauthenticated/gray-virtual-server-style.css
-lib/webmin/blue-theme/unauthenticated/images/Thumbs.db
 lib/webmin/blue-theme/unauthenticated/images/audio.gif
 lib/webmin/blue-theme/unauthenticated/images/binary.gif
 lib/webmin/blue-theme/unauthenticated/images/blue.gif
@@ -6987,21 +6991,6 @@ lib/webmin/fdisk/help/X.zh_TW.Big5.html
 lib/webmin/fdisk/help/X.zh_TW.UTF-8.html
 lib/webmin/fdisk/help/a.ca.UTF-8.html
 lib/webmin/fdisk/help/a.ca.html
-lib/webmin/fdisk/help/a.es.UTF-8.html
-lib/webmin/fdisk/help/a.es.html
-lib/webmin/fdisk/help/a.fr.UTF-8.html
-lib/webmin/fdisk/help/a.fr.html
-lib/webmin/fdisk/help/a.html
-lib/webmin/fdisk/help/a.nl.UTF-8.html
-lib/webmin/fdisk/help/a.nl.html
-lib/webmin/fdisk/help/a.pl.UTF-8.html
-lib/webmin/fdisk/help/a.pl.html
-lib/webmin/fdisk/help/a.ru_RU.html
-lib/webmin/fdisk/help/a.ru_SU.html
-lib/webmin/fdisk/help/a.sv.UTF-8.html
-lib/webmin/fdisk/help/a.sv.html
-lib/webmin/fdisk/help/a.zh_TW.Big5.html
-lib/webmin/fdisk/help/a.zh_TW.UTF-8.html
 lib/webmin/fdisk/help/c.ca.UTF-8.html
 lib/webmin/fdisk/help/c.ca.html
 lib/webmin/fdisk/help/c.es.UTF-8.html
@@ -7060,17 +7049,19 @@ lib/webmin/fdisk/help/index.zh_TW.Big5.html
 lib/webmin/fdisk/help/index.zh_TW.UTF-8.html
 lib/webmin/fdisk/help/k.ca.UTF-8.html
 lib/webmin/fdisk/help/k.ca.html
-lib/webmin/fdisk/help/k.es.UTF-8.html
-lib/webmin/fdisk/help/k.es.html
-lib/webmin/fdisk/help/k.fr.UTF-8.html
-lib/webmin/fdisk/help/k.fr.html
-lib/webmin/fdisk/help/k.html
-lib/webmin/fdisk/help/k.pl.UTF-8.html
-lib/webmin/fdisk/help/k.pl.html
-lib/webmin/fdisk/help/k.sv.UTF-8.html
-lib/webmin/fdisk/help/k.sv.html
-lib/webmin/fdisk/help/k.zh_TW.Big5.html
-lib/webmin/fdisk/help/k.zh_TW.UTF-8.html
+lib/webmin/fdisk/help/keep_settings.ca.UTF-8.html
+lib/webmin/fdisk/help/keep_settings.ca.html
+lib/webmin/fdisk/help/keep_settings.es.UTF-8.html
+lib/webmin/fdisk/help/keep_settings.es.html
+lib/webmin/fdisk/help/keep_settings.fr.UTF-8.html
+lib/webmin/fdisk/help/keep_settings.fr.html
+lib/webmin/fdisk/help/keep_settings.html
+lib/webmin/fdisk/help/keep_settings.pl.UTF-8.html
+lib/webmin/fdisk/help/keep_settings.pl.html
+lib/webmin/fdisk/help/keep_settings.sv.UTF-8.html
+lib/webmin/fdisk/help/keep_settings.sv.html
+lib/webmin/fdisk/help/keep_settings.zh_TW.Big5.html
+lib/webmin/fdisk/help/keep_settings.zh_TW.UTF-8.html
 lib/webmin/fdisk/help/m.ca.UTF-8.html
 lib/webmin/fdisk/help/m.ca.html
 lib/webmin/fdisk/help/m.es.UTF-8.html
@@ -7103,6 +7094,23 @@ lib/webmin/fdisk/help/r.sv.UTF-8.html
 lib/webmin/fdisk/help/r.sv.html
 lib/webmin/fdisk/help/r.zh_TW.Big5.html
 lib/webmin/fdisk/help/r.zh_TW.UTF-8.html
+lib/webmin/fdisk/help/sector_count.ca.UTF-8.html
+lib/webmin/fdisk/help/sector_count.ca.html
+lib/webmin/fdisk/help/sector_count.es.UTF-8.html
+lib/webmin/fdisk/help/sector_count.es.html
+lib/webmin/fdisk/help/sector_count.fr.UTF-8.html
+lib/webmin/fdisk/help/sector_count.fr.html
+lib/webmin/fdisk/help/sector_count.html
+lib/webmin/fdisk/help/sector_count.nl.UTF-8.html
+lib/webmin/fdisk/help/sector_count.nl.html
+lib/webmin/fdisk/help/sector_count.pl.UTF-8.html
+lib/webmin/fdisk/help/sector_count.pl.html
+lib/webmin/fdisk/help/sector_count.ru_RU.html
+lib/webmin/fdisk/help/sector_count.ru_SU.html
+lib/webmin/fdisk/help/sector_count.sv.UTF-8.html
+lib/webmin/fdisk/help/sector_count.sv.html
+lib/webmin/fdisk/help/sector_count.zh_TW.Big5.html
+lib/webmin/fdisk/help/sector_count.zh_TW.UTF-8.html
 lib/webmin/fdisk/help/u.ca.UTF-8.html
 lib/webmin/fdisk/help/u.ca.html
 lib/webmin/fdisk/help/u.es.UTF-8.html
@@ -10164,7 +10172,6 @@ lib/webmin/gray-theme/tunnel/images/icon.gif
 lib/webmin/gray-theme/unauthenticated/gray-reset-fonts-base.css
 lib/webmin/gray-theme/unauthenticated/gray-reset-fonts-grids-base.css
 lib/webmin/gray-theme/unauthenticated/gray-virtual-server-style.css
-lib/webmin/gray-theme/unauthenticated/images/Thumbs.db
 lib/webmin/gray-theme/unauthenticated/images/audio.gif
 lib/webmin/gray-theme/unauthenticated/images/binary.gif
 lib/webmin/gray-theme/unauthenticated/images/blue.gif
@@ -12064,6 +12071,7 @@ lib/webmin/lang/si
 lib/webmin/lang/si.UTF-8
 lib/webmin/lang/sk
 lib/webmin/lang/sk.UTF-8
+lib/webmin/lang/sq
 lib/webmin/lang/sv
 lib/webmin/lang/sv.UTF-8
 lib/webmin/lang/th