3 files changed, 95 insertions, 19 deletions

diff --git a/sysutils/virtualmin/Makefile b/sysutils/virtualmin/Makefile
index 099d2b0f104c..c211166f5982 100644
--- a/sysutils/virtualmin/Makefile
+++ b/sysutils/virtualmin/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	virtualmin
-PORTVERSION=	2.611
+PORTVERSION=	3.42
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	webadmin
-DISTNAME=	virtual-server-${PORTVERSION}
+MASTER_SITES=	http://download.webmin.com/download/virtualmin/
+DISTNAME=	virtual-server-${PORTVERSION}.gpl
 EXTRACT_SUFX=	.wbm.gz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/sysutils/virtualmin/distinfo b/sysutils/virtualmin/distinfo
index 8724e4d389a8..78c2cf3428a8 100644
--- a/sysutils/virtualmin/distinfo
+++ b/sysutils/virtualmin/distinfo
@@ -1,3 +1,3 @@
-MD5 (virtual-server-2.611.wbm.gz) = 4afab434cff4054dc8af135a88146e5b
-SHA256 (virtual-server-2.611.wbm.gz) = 4bfb35247ba81ca4f19615120a99fc77c4c9843497d62cf3365e7e88091c9c23
-SIZE (virtual-server-2.611.wbm.gz) = 283114
+MD5 (virtual-server-3.42.gpl.wbm.gz) = 9a8bc440c32c09768d2780d65d0967e9
+SHA256 (virtual-server-3.42.gpl.wbm.gz) = 723a541037d020cc8d1f7ef3fb5f7e68c5b426c58bc27f2a4fc0bfe1f37c0511
+SIZE (virtual-server-3.42.gpl.wbm.gz) = 590806
diff --git a/sysutils/virtualmin/pkg-plist b/sysutils/virtualmin/pkg-plist
index ec26cc11543d..cb7074489717 100644
--- a/sysutils/virtualmin/pkg-plist
+++ b/sysutils/virtualmin/pkg-plist
@@ -2,7 +2,6 @@ lib/webmin/virtual-server/CHANGELOG
 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
@@ -13,24 +12,35 @@ 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/change_users.cgi
 lib/webmin/virtual-server/check.cgi
+lib/webmin/virtual-server/collect-lib.pl
+lib/webmin/virtual-server/collectinfo.pl
 lib/webmin/virtual-server/config
 lib/webmin/virtual-server/config-freebsd
 lib/webmin/virtual-server/config.info
-lib/webmin/virtual-server/config.info.de
 lib/webmin/virtual-server/config.info.fr
+lib/webmin/virtual-server/config_info.pl
 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.pl
+lib/webmin/virtual-server/delete_aliases.cgi
+lib/webmin/virtual-server/delete_databases.cgi
 lib/webmin/virtual-server/delete_domain.cgi
+lib/webmin/virtual-server/delete_tmpls.cgi
+lib/webmin/virtual-server/delete_users.cgi
+lib/webmin/virtual-server/disable-domain.pl
 lib/webmin/virtual-server/disable-feature.pl
 lib/webmin/virtual-server/disable-limit.pl
 lib/webmin/virtual-server/disable_domain.cgi
 lib/webmin/virtual-server/domain-template
 lib/webmin/virtual-server/domain_form.cgi
 lib/webmin/virtual-server/domain_setup.cgi
+lib/webmin/virtual-server/dynip-lib.pl
+lib/webmin/virtual-server/dynip.pl
 lib/webmin/virtual-server/edit_afile.cgi
 lib/webmin/virtual-server/edit_alias.cgi
 lib/webmin/virtual-server/edit_database.cgi
@@ -38,17 +48,24 @@ lib/webmin/virtual-server/edit_domain.cgi
 lib/webmin/virtual-server/edit_ffile.cgi
 lib/webmin/virtual-server/edit_limits.cgi
 lib/webmin/virtual-server/edit_newbw.cgi
+lib/webmin/virtual-server/edit_newdynip.cgi
 lib/webmin/virtual-server/edit_newfields.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_newquotacheck.cgi
+lib/webmin/virtual-server/edit_newsharedips.cgi
 lib/webmin/virtual-server/edit_newtmpl.cgi
+lib/webmin/virtual-server/edit_newupdate.cgi
+lib/webmin/virtual-server/edit_newupgrade.cgi
 lib/webmin/virtual-server/edit_newuser.cgi
+lib/webmin/virtual-server/edit_pass.cgi
 lib/webmin/virtual-server/edit_plugconfig.cgi
 lib/webmin/virtual-server/edit_rfile.cgi
+lib/webmin/virtual-server/edit_spf.cgi
 lib/webmin/virtual-server/edit_tmpl.cgi
 lib/webmin/virtual-server/edit_user.cgi
 lib/webmin/virtual-server/edit_vfile.cgi
+lib/webmin/virtual-server/enable-domain.pl
 lib/webmin/virtual-server/enable-feature.pl
 lib/webmin/virtual-server/enable-limit.pl
 lib/webmin/virtual-server/enable_domain.cgi
@@ -62,15 +79,21 @@ lib/webmin/virtual-server/feature-mysql.pl
 lib/webmin/virtual-server/feature-postgres.pl
 lib/webmin/virtual-server/feature-ssl.pl
 lib/webmin/virtual-server/feature-unix.pl
+lib/webmin/virtual-server/feature-virt.pl
 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/config_quota_commands.html
+lib/webmin/virtual-server/help/config_quota_list_groups_command.html
+lib/webmin/virtual-server/help/config_quota_list_users_command.html
+lib/webmin/virtual-server/help/config_quota_set_group_command.html
+lib/webmin/virtual-server/help/config_quota_set_user_command.html
+lib/webmin/virtual-server/help/config_quotas.html
 lib/webmin/virtual-server/help/createmailbox.de.html
 lib/webmin/virtual-server/help/createmailbox.html
 lib/webmin/virtual-server/help/dbname.html
@@ -82,6 +105,7 @@ 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/dynip.html
 lib/webmin/virtual-server/help/extraemail.html
 lib/webmin/virtual-server/help/framefwd.html
 lib/webmin/virtual-server/help/ftp.html
@@ -117,8 +141,17 @@ lib/webmin/virtual-server/help/qmailfiles.html
 lib/webmin/virtual-server/help/qmailquota.html
 lib/webmin/virtual-server/help/realname.de.html
 lib/webmin/virtual-server/help/realname.html
+lib/webmin/virtual-server/help/spf.html
+lib/webmin/virtual-server/help/spf_a.html
+lib/webmin/virtual-server/help/spf_all.html
+lib/webmin/virtual-server/help/spf_enabled.html
+lib/webmin/virtual-server/help/spf_ip4.html
+lib/webmin/virtual-server/help/spf_mx.html
 lib/webmin/virtual-server/help/ssl.html
+lib/webmin/virtual-server/help/subs.html
+lib/webmin/virtual-server/help/subs2.html
 lib/webmin/virtual-server/help/template.html
+lib/webmin/virtual-server/help/tmpls.html
 lib/webmin/virtual-server/help/uftp.html
 lib/webmin/virtual-server/help/unix.html
 lib/webmin/virtual-server/help/unixgroupname.de.html
@@ -130,7 +163,6 @@ lib/webmin/virtual-server/help/unixuserquota.html
 lib/webmin/virtual-server/help/userdest.html
 lib/webmin/virtual-server/help/userhome.html
 lib/webmin/virtual-server/help/usermailbox.html
-lib/webmin/virtual-server/help/username.de.html
 lib/webmin/virtual-server/help/username.html
 lib/webmin/virtual-server/help/virtualinterface.de.html
 lib/webmin/virtual-server/help/virtualinterface.html
@@ -148,22 +180,45 @@ 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/empty.gif
+lib/webmin/virtual-server/images/gap.gif
 lib/webmin/virtual-server/images/grey.gif
 lib/webmin/virtual-server/images/icon.gif
+lib/webmin/virtual-server/images/movedown.gif
+lib/webmin/virtual-server/images/moveup.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/newdynip.gif
 lib/webmin/virtual-server/images/newfields.gif
 lib/webmin/virtual-server/images/newframe.gif
 lib/webmin/virtual-server/images/newftp.gif
+lib/webmin/virtual-server/images/newips.gif
+lib/webmin/virtual-server/images/newlinks.gif
 lib/webmin/virtual-server/images/newlocal.gif
+lib/webmin/virtual-server/images/newmxs.gif
+lib/webmin/virtual-server/images/newnotify.gif
 lib/webmin/virtual-server/images/newplugin.gif
+lib/webmin/virtual-server/images/newquotacheck.gif
+lib/webmin/virtual-server/images/newquotas.gif
+lib/webmin/virtual-server/images/newrange.gif
+lib/webmin/virtual-server/images/newreseller.gif
+lib/webmin/virtual-server/images/newresels.gif
+lib/webmin/virtual-server/images/newscripts.gif
+lib/webmin/virtual-server/images/newsharedips.gif
 lib/webmin/virtual-server/images/newsubdom.gif
 lib/webmin/virtual-server/images/newtmpl.gif
+lib/webmin/virtual-server/images/newupdate.gif
+lib/webmin/virtual-server/images/newupgrade.gif
 lib/webmin/virtual-server/images/newuser.gif
+lib/webmin/virtual-server/images/newvalidate.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/staroff.gif
+lib/webmin/virtual-server/images/staron.gif
+lib/webmin/virtual-server/images/starover.gif
+lib/webmin/virtual-server/images/tick.gif
 lib/webmin/virtual-server/images/up.gif
 lib/webmin/virtual-server/images/usage-ftp.gif
 lib/webmin/virtual-server/images/usage-mail.gif
@@ -171,6 +226,7 @@ lib/webmin/virtual-server/images/usage-unix.gif
 lib/webmin/virtual-server/images/usage-web.gif
 lib/webmin/virtual-server/images/users.gif
 lib/webmin/virtual-server/images/v-icon.gif
+lib/webmin/virtual-server/images/view.gif
 lib/webmin/virtual-server/images/web.gif
 lib/webmin/virtual-server/images/white.gif
 lib/webmin/virtual-server/import.cgi
@@ -181,16 +237,30 @@ lib/webmin/virtual-server/lang/de
 lib/webmin/virtual-server/lang/en
 lib/webmin/virtual-server/lang/es
 lib/webmin/virtual-server/lang/fr
+lib/webmin/virtual-server/lang/tr
+lib/webmin/virtual-server/lang/zh_CN
+lib/webmin/virtual-server/lang/zh_TW.Big5
+lib/webmin/virtual-server/list-features.pl
 lib/webmin/virtual-server/list_aliases.cgi
 lib/webmin/virtual-server/list_databases.cgi
 lib/webmin/virtual-server/list_users.cgi
 lib/webmin/virtual-server/local-template
 lib/webmin/virtual-server/log_parser.pl
+lib/webmin/virtual-server/migrate.cgi
+lib/webmin/virtual-server/migrate_form.cgi
+lib/webmin/virtual-server/migration-cpanel.pl
+lib/webmin/virtual-server/migration-ensim.pl
+lib/webmin/virtual-server/modify-domain.pl
 lib/webmin/virtual-server/module.info
 lib/webmin/virtual-server/newkey.cgi
 lib/webmin/virtual-server/postinstall.pl
+lib/webmin/virtual-server/postsave.cgi
+lib/webmin/virtual-server/proxy_form.cgi
+lib/webmin/virtual-server/quotacheck.cgi
+lib/webmin/virtual-server/remote.cgi
 lib/webmin/virtual-server/rename.cgi
 lib/webmin/virtual-server/rename_form.cgi
+lib/webmin/virtual-server/restart_feature.cgi
 lib/webmin/virtual-server/restore-domain.pl
 lib/webmin/virtual-server/restore.cgi
 lib/webmin/virtual-server/restore_form.cgi
@@ -203,30 +273,37 @@ lib/webmin/virtual-server/save_ffile.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_newdynip.cgi
 lib/webmin/virtual-server/save_newfields.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_newsharedips.cgi
+lib/webmin/virtual-server/save_newupdate.cgi
 lib/webmin/virtual-server/save_newuser.cgi
+lib/webmin/virtual-server/save_pass.cgi
 lib/webmin/virtual-server/save_plugconfig.cgi
+lib/webmin/virtual-server/save_proxy.cgi
 lib/webmin/virtual-server/save_rfile.cgi
+lib/webmin/virtual-server/save_spf.cgi
 lib/webmin/virtual-server/save_tmpl.cgi
 lib/webmin/virtual-server/save_user.cgi
 lib/webmin/virtual-server/save_vfile.cgi
 lib/webmin/virtual-server/search.cgi
-lib/webmin/virtual-server/start_apache.cgi
-lib/webmin/virtual-server/start_bind.cgi
-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/showpass.cgi
+lib/webmin/virtual-server/start_feature.cgi
+lib/webmin/virtual-server/stop_feature.cgi
 lib/webmin/virtual-server/subdomain-template
 lib/webmin/virtual-server/uninstall.pl
+lib/webmin/virtual-server/update-template
+lib/webmin/virtual-server/upgrade.cgi
 lib/webmin/virtual-server/user-template
 lib/webmin/virtual-server/useradmin_update.pl
+lib/webmin/virtual-server/view_domain.cgi
 lib/webmin/virtual-server/view_log.cgi
+lib/webmin/virtual-server/virtual-server-lib-funcs.pl
 lib/webmin/virtual-server/virtual-server-lib.pl
 lib/webmin/virtual-server/virtual_feature_api.pl
+lib/webmin/virtual-server/vui-lib.pl
 lib/webmin/virtual-server/warnbw-template
 lib/webmin/virtual-server/writelogs.pl
 @dirrm lib/webmin/virtual-server/lang