Upgrade to version 2.31, fix pkg-plist issue (remove empty directory

on deinstall).

3 files changed, 54 insertions, 9 deletions

diff --git a/sysutils/virtualmin/Makefile b/sysutils/virtualmin/Makefile
index 3d9d23d60609..180c336d2a94 100644
--- a/sysutils/virtualmin/Makefile
+++ b/sysutils/virtualmin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	virtualmin
-PORTVERSION=	1.91
+PORTVERSION=	2.31
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.webmin.com/download/virtualmin/
 DISTNAME=	virtual-server-${PORTVERSION}
diff --git a/sysutils/virtualmin/distinfo b/sysutils/virtualmin/distinfo
index 80920767e428..df05bac486a4 100644
--- a/sysutils/virtualmin/distinfo
+++ b/sysutils/virtualmin/distinfo
@@ -1,2 +1,2 @@
-MD5 (virtual-server-1.91.wbm.gz) = ee0742619c42e7a18df58f5480135d1e
-SIZE (virtual-server-1.91.wbm.gz) = 118704
+MD5 (virtual-server-2.31.wbm.gz) = ebb3798d202ed0dff66263c2b4809a72
+SIZE (virtual-server-2.31.wbm.gz) = 177487
diff --git a/sysutils/virtualmin/pkg-plist b/sysutils/virtualmin/pkg-plist
index 285a453817dd..26d4725c4676 100644
--- a/sysutils/virtualmin/pkg-plist
+++ b/sysutils/virtualmin/pkg-plist
@@ -3,10 +3,15 @@ lib/webmin/virtual-server/RELEASE
 lib/webmin/virtual-server/acl_security.pl
 lib/webmin/virtual-server/all_webmin.cgi
 lib/webmin/virtual-server/autoreply.pl
+lib/webmin/virtual-server/backup-domain.pl
 lib/webmin/virtual-server/backup.cgi
 lib/webmin/virtual-server/backup.pl
 lib/webmin/virtual-server/backup_form.cgi
 lib/webmin/virtual-server/backup_sched.cgi
+lib/webmin/virtual-server/bw-template
+lib/webmin/virtual-server/bw.pl
+lib/webmin/virtual-server/bwgraph.cgi
+lib/webmin/virtual-server/cert_form.cgi
 lib/webmin/virtual-server/check.cgi
 lib/webmin/virtual-server/config
 lib/webmin/virtual-server/config-freebsd
@@ -15,6 +20,8 @@ lib/webmin/virtual-server/config.info.de
 lib/webmin/virtual-server/config.info.fr
 lib/webmin/virtual-server/create-domain.pl
 lib/webmin/virtual-server/create-user.pl
+lib/webmin/virtual-server/createvirtualminmodule.sh
+lib/webmin/virtual-server/csr.cgi
 lib/webmin/virtual-server/defaultacl
 lib/webmin/virtual-server/delete_domain.cgi
 lib/webmin/virtual-server/disable_domain.cgi
@@ -25,15 +32,22 @@ lib/webmin/virtual-server/edit_afile.cgi
 lib/webmin/virtual-server/edit_alias.cgi
 lib/webmin/virtual-server/edit_domain.cgi
 lib/webmin/virtual-server/edit_ffile.cgi
-lib/webmin/virtual-server/edit_newdns.cgi
-lib/webmin/virtual-server/edit_newdom.cgi
+lib/webmin/virtual-server/edit_limits.cgi
+lib/webmin/virtual-server/edit_newbw.cgi
 lib/webmin/virtual-server/edit_newlocal.cgi
+lib/webmin/virtual-server/edit_newplugin.cgi
+lib/webmin/virtual-server/edit_newsubdom.cgi
+lib/webmin/virtual-server/edit_newtmpl.cgi
 lib/webmin/virtual-server/edit_newuser.cgi
-lib/webmin/virtual-server/edit_newweb.cgi
 lib/webmin/virtual-server/edit_rfile.cgi
+lib/webmin/virtual-server/edit_tmpl.cgi
 lib/webmin/virtual-server/edit_user.cgi
 lib/webmin/virtual-server/enable_domain.cgi
+lib/webmin/virtual-server/expframe_form.cgi
+lib/webmin/virtual-server/feature-dir.pl
 lib/webmin/virtual-server/feature-dns.pl
+lib/webmin/virtual-server/feature-ftp.pl
+lib/webmin/virtual-server/feature-logrotate.pl
 lib/webmin/virtual-server/feature-mail.pl
 lib/webmin/virtual-server/feature-mysql.pl
 lib/webmin/virtual-server/feature-postgres.pl
@@ -43,8 +57,11 @@ lib/webmin/virtual-server/feature-web.pl
 lib/webmin/virtual-server/feature-webalizer.pl
 lib/webmin/virtual-server/feature-webmin.pl
 lib/webmin/virtual-server/filter.pl
+lib/webmin/virtual-server/frame_form.cgi
+lib/webmin/virtual-server/framefwd-template
 lib/webmin/virtual-server/help/aliasdest.html
 lib/webmin/virtual-server/help/aliasname.html
+lib/webmin/virtual-server/help/bwlimit.html
 lib/webmin/virtual-server/help/createmailbox.de.html
 lib/webmin/virtual-server/help/createmailbox.html
 lib/webmin/virtual-server/help/diskquota.de.html
@@ -53,7 +70,9 @@ lib/webmin/virtual-server/help/dns.de.html
 lib/webmin/virtual-server/help/dns.html
 lib/webmin/virtual-server/help/domainname.de.html
 lib/webmin/virtual-server/help/domainname.html
+lib/webmin/virtual-server/help/domslimit.html
 lib/webmin/virtual-server/help/extraemail.html
+lib/webmin/virtual-server/help/framefwd.html
 lib/webmin/virtual-server/help/ftp.html
 lib/webmin/virtual-server/help/iface.html
 lib/webmin/virtual-server/help/index.de.html
@@ -69,17 +88,21 @@ lib/webmin/virtual-server/help/mailfile.html
 lib/webmin/virtual-server/help/mailgroupname.html
 lib/webmin/virtual-server/help/mysql.de.html
 lib/webmin/virtual-server/help/mysql.html
+lib/webmin/virtual-server/help/newmail.html
 lib/webmin/virtual-server/help/ownersemail.html
 lib/webmin/virtual-server/help/ownersname.de.html
 lib/webmin/virtual-server/help/ownersname.html
+lib/webmin/virtual-server/help/parentdom.html
 lib/webmin/virtual-server/help/password.de.html
 lib/webmin/virtual-server/help/password.html
 lib/webmin/virtual-server/help/postgres.de.html
 lib/webmin/virtual-server/help/postgres.html
+lib/webmin/virtual-server/help/prefixname.html
 lib/webmin/virtual-server/help/proxypass.html
 lib/webmin/virtual-server/help/realname.de.html
 lib/webmin/virtual-server/help/realname.html
 lib/webmin/virtual-server/help/ssl.html
+lib/webmin/virtual-server/help/template.html
 lib/webmin/virtual-server/help/unixgroupname.de.html
 lib/webmin/virtual-server/help/unixgroupname.html
 lib/webmin/virtual-server/help/unixusername.de.html
@@ -102,18 +125,28 @@ lib/webmin/virtual-server/help/webservertype.html
 lib/webmin/virtual-server/help/websitequota.de.html
 lib/webmin/virtual-server/help/websitequota.html
 lib/webmin/virtual-server/images/aliases.gif
+lib/webmin/virtual-server/images/blue.gif
 lib/webmin/virtual-server/images/down.gif
+lib/webmin/virtual-server/images/grey.gif
 lib/webmin/virtual-server/images/icon.gif
+lib/webmin/virtual-server/images/newbw.gif
 lib/webmin/virtual-server/images/newdns.gif
 lib/webmin/virtual-server/images/newdom.gif
+lib/webmin/virtual-server/images/newframe.gif
+lib/webmin/virtual-server/images/newftp.gif
 lib/webmin/virtual-server/images/newlocal.gif
+lib/webmin/virtual-server/images/newplugin.gif
+lib/webmin/virtual-server/images/newsubdom.gif
+lib/webmin/virtual-server/images/newtmpl.gif
 lib/webmin/virtual-server/images/newuser.gif
 lib/webmin/virtual-server/images/newweb.gif
+lib/webmin/virtual-server/images/red.gif
 lib/webmin/virtual-server/images/smallicon.gif
 lib/webmin/virtual-server/images/up.gif
 lib/webmin/virtual-server/images/users.gif
 lib/webmin/virtual-server/images/v-icon.gif
 lib/webmin/virtual-server/images/web.gif
+lib/webmin/virtual-server/images/white.gif
 lib/webmin/virtual-server/import.cgi
 lib/webmin/virtual-server/import_form.cgi
 lib/webmin/virtual-server/index.cgi
@@ -125,18 +158,26 @@ lib/webmin/virtual-server/list_users.cgi
 lib/webmin/virtual-server/local-template
 lib/webmin/virtual-server/log_parser.pl
 lib/webmin/virtual-server/module.info
+lib/webmin/virtual-server/newkey.cgi
+lib/webmin/virtual-server/rename.cgi
+lib/webmin/virtual-server/rename_form.cgi
+lib/webmin/virtual-server/restore-domain.pl
 lib/webmin/virtual-server/restore.cgi
 lib/webmin/virtual-server/restore_form.cgi
 lib/webmin/virtual-server/save_afile.cgi
 lib/webmin/virtual-server/save_alias.cgi
 lib/webmin/virtual-server/save_domain.cgi
+lib/webmin/virtual-server/save_expframe.cgi
 lib/webmin/virtual-server/save_ffile.cgi
-lib/webmin/virtual-server/save_newdns.cgi
-lib/webmin/virtual-server/save_newdom.cgi
+lib/webmin/virtual-server/save_frame.cgi
+lib/webmin/virtual-server/save_limits.cgi
+lib/webmin/virtual-server/save_newbw.cgi
 lib/webmin/virtual-server/save_newlocal.cgi
+lib/webmin/virtual-server/save_newplugin.cgi
+lib/webmin/virtual-server/save_newsubdom.cgi
 lib/webmin/virtual-server/save_newuser.cgi
-lib/webmin/virtual-server/save_newweb.cgi
 lib/webmin/virtual-server/save_rfile.cgi
+lib/webmin/virtual-server/save_tmpl.cgi
 lib/webmin/virtual-server/save_user.cgi
 lib/webmin/virtual-server/search.cgi
 lib/webmin/virtual-server/start_apache.cgi
@@ -145,12 +186,16 @@ lib/webmin/virtual-server/start_mail.cgi
 lib/webmin/virtual-server/stop_apache.cgi
 lib/webmin/virtual-server/stop_bind.cgi
 lib/webmin/virtual-server/stop_mail.cgi
+lib/webmin/virtual-server/subdomain-template
 lib/webmin/virtual-server/uninstall.pl
 lib/webmin/virtual-server/user-template
 lib/webmin/virtual-server/useradmin_update.pl
 lib/webmin/virtual-server/virtual-server-lib.pl
+lib/webmin/virtual-server/virtual_feature_api.pl
+lib/webmin/virtual-server/warnbw-template
 @dirrm lib/webmin/virtual-server/lang
 @dirrm lib/webmin/virtual-server/images
 @dirrm lib/webmin/virtual-server/help
 @dirrm lib/webmin/virtual-server
 @exec [ -e %D/etc/webmin/virtual-server ] || mkdir %D/etc/webmin/virtual-server
+@unexec rmdir %D/etc/webmin/virtual-server 2>/dev/null || true