Fix PLIST for base package update.

28 files changed, 1616 insertions, 106 deletions

diff --git a/sysutils/wbm-apache/Makefile b/sysutils/wbm-apache/Makefile
index 0dcdc39be39..af897c0a225 100644
--- a/sysutils/wbm-apache/Makefile
+++ b/sysutils/wbm-apache/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2012/10/23 19:51:30 asau Exp $
+# $NetBSD: Makefile,v 1.11 2012/12/22 00:52:34 dholland Exp $
 
 WBM_NAME=	apache
+PKGREVISION=	1
 
 COMMENT=	Webmin module for configuring Apache servers
 
diff --git a/sysutils/wbm-apache/PLIST b/sysutils/wbm-apache/PLIST
index eec4846ab8c..fab30ef203e 100644
--- a/sysutils/wbm-apache/PLIST
+++ b/sysutils/wbm-apache/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:16:16 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2012/12/22 00:52:34 dholland Exp $
 share/examples/webmin/apache/config
 share/examples/webmin/apache/site
 share/webmin/apache/CHANGELOG
@@ -11,6 +11,7 @@ share/webmin/apache/autoindex.pl
 share/webmin/apache/backup_config.pl
 share/webmin/apache/browsermatch.pl
 share/webmin/apache/cache.pl
+share/webmin/apache/cgi_args.pl
 share/webmin/apache/change_dir.cgi
 share/webmin/apache/change_files.cgi
 share/webmin/apache/config-aix
@@ -41,12 +42,14 @@ share/webmin/apache/config-openbsd
 share/webmin/apache/config-openmamba-linux
 share/webmin/apache/config-openserver
 share/webmin/apache/config-osf1
+share/webmin/apache/config-pardus-linux
 share/webmin/apache/config-redhat-linux
+share/webmin/apache/config-redhat-linux-12.1-*
+share/webmin/apache/config-redhat-linux-13.0-23.0
+share/webmin/apache/config-redhat-linux-24.0-*
 share/webmin/apache/config-redhat-linux-7.0-7.4
 share/webmin/apache/config-redhat-linux-8.0
 share/webmin/apache/config-redhat-linux-8.1
-share/webmin/apache/config-redhat-linux-12.1-*
-share/webmin/apache/config-redhat-linux-13.0-*
 share/webmin/apache/config-redhat-linux-9.0-12.0
 share/webmin/apache/config-slackware-linux
 share/webmin/apache/config-slackware-linux-12.0-*
@@ -54,9 +57,9 @@ share/webmin/apache/config-slackware-linux-7.0-7.1
 share/webmin/apache/config-slackware-linux-8.0-*
 share/webmin/apache/config-sol-linux
 share/webmin/apache/config-solaris
-share/webmin/apache/config-solaris-9
 share/webmin/apache/config-solaris-10
 share/webmin/apache/config-solaris-11-*
+share/webmin/apache/config-solaris-9
 share/webmin/apache/config-suse-linux
 share/webmin/apache/config-suse-linux-7.1-8.0
 share/webmin/apache/config-suse-linux-8.2
@@ -70,22 +73,35 @@ share/webmin/apache/config-windows
 share/webmin/apache/config.info
 share/webmin/apache/config.info.bg
 share/webmin/apache/config.info.ca
+share/webmin/apache/config.info.ca.UTF-8
 share/webmin/apache/config.info.cz
+share/webmin/apache/config.info.cz.UTF-8
 share/webmin/apache/config.info.da
+share/webmin/apache/config.info.da.UTF-8
 share/webmin/apache/config.info.de
+share/webmin/apache/config.info.de.UTF-8
 share/webmin/apache/config.info.es
+share/webmin/apache/config.info.es.UTF-8
 share/webmin/apache/config.info.fa
 share/webmin/apache/config.info.fr
+share/webmin/apache/config.info.fr.UTF-8
 share/webmin/apache/config.info.hr
 share/webmin/apache/config.info.hu
+share/webmin/apache/config.info.hu.UTF-8
 share/webmin/apache/config.info.ja_JP.UTF-8
 share/webmin/apache/config.info.ja_JP.euc
 share/webmin/apache/config.info.nl
+share/webmin/apache/config.info.nl.UTF-8
+share/webmin/apache/config.info.no
 share/webmin/apache/config.info.pl
+share/webmin/apache/config.info.pl.UTF-8
 share/webmin/apache/config.info.pt_BR
+share/webmin/apache/config.info.pt_BR.UTF-8
+share/webmin/apache/config.info.ru.UTF-8
 share/webmin/apache/config.info.ru_RU
 share/webmin/apache/config.info.ru_SU
 share/webmin/apache/config.info.sv
+share/webmin/apache/config.info.sv.UTF-8
 share/webmin/apache/config.info.tr
 share/webmin/apache/config.info.uk_UA
 share/webmin/apache/config.info.zh_CN
@@ -154,27 +170,43 @@ share/webmin/apache/index.cgi
 share/webmin/apache/install_check.pl
 share/webmin/apache/lang/bg
 share/webmin/apache/lang/ca
+share/webmin/apache/lang/ca.UTF-8
 share/webmin/apache/lang/cz
+share/webmin/apache/lang/cz.UTF-8
 share/webmin/apache/lang/da
+share/webmin/apache/lang/da.UTF-8
 share/webmin/apache/lang/de
+share/webmin/apache/lang/de.UTF-8
 share/webmin/apache/lang/en
+share/webmin/apache/lang/en.UTF-8
 share/webmin/apache/lang/es
+share/webmin/apache/lang/es.UTF-8
 share/webmin/apache/lang/fa
 share/webmin/apache/lang/fr
+share/webmin/apache/lang/fr.UTF-8
 share/webmin/apache/lang/hr
 share/webmin/apache/lang/hu
+share/webmin/apache/lang/hu.UTF-8
 share/webmin/apache/lang/it
+share/webmin/apache/lang/it.UTF-8
 share/webmin/apache/lang/ja_JP.UTF-8
 share/webmin/apache/lang/ja_JP.euc
 share/webmin/apache/lang/ko_KR.UTF-8
 share/webmin/apache/lang/ko_KR.euc
 share/webmin/apache/lang/nl
+share/webmin/apache/lang/nl.UTF-8
+share/webmin/apache/lang/no
 share/webmin/apache/lang/pl
+share/webmin/apache/lang/pl.UTF-8
 share/webmin/apache/lang/pt
+share/webmin/apache/lang/pt.UTF-8
 share/webmin/apache/lang/pt_BR
+share/webmin/apache/lang/pt_BR.UTF-8
+share/webmin/apache/lang/ru.UTF-8
 share/webmin/apache/lang/ru_RU
 share/webmin/apache/lang/ru_SU
 share/webmin/apache/lang/sv
+share/webmin/apache/lang/sv.UTF-8
 share/webmin/apache/lang/tr
 share/webmin/apache/lang/uk_UA
 share/webmin/apache/lang/zh_CN
diff --git a/sysutils/wbm-bind8/Makefile b/sysutils/wbm-bind8/Makefile
index 3d0edf48b56..75f5fe939b2 100644
--- a/sysutils/wbm-bind8/Makefile
+++ b/sysutils/wbm-bind8/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2012/10/23 19:51:30 asau Exp $
+# $NetBSD: Makefile,v 1.9 2012/12/22 00:55:30 dholland Exp $
 
 WBM_NAME=	bind8
 
 COMMENT=	Webmin module for managing ISC BIND 8.x DNS servers
 
-PKGREVISION=	1
+PKGREVISION=	2
 
 .include "../../sysutils/webmin/wbm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-bind8/PLIST b/sysutils/wbm-bind8/PLIST
index aa85e041134..eb6bba879b2 100644
--- a/sysutils/wbm-bind8/PLIST
+++ b/sysutils/wbm-bind8/PLIST
@@ -1,14 +1,16 @@
-@comment $NetBSD: PLIST,v 1.9 2009/09/18 11:04:07 obache Exp $
+@comment $NetBSD: PLIST,v 1.10 2012/12/22 00:55:30 dholland Exp $
 share/examples/webmin/bind8/config
 share/webmin/bind8/CHANGELOG
 share/webmin/bind8/acl_security.pl
 share/webmin/bind8/backup_config.pl
 share/webmin/bind8/bind8-lib.pl
+share/webmin/bind8/cgi_args.pl
 share/webmin/bind8/check_zone.cgi
 share/webmin/bind8/close.cgi
 share/webmin/bind8/conf_acls.cgi
 share/webmin/bind8/conf_controls.cgi
 share/webmin/bind8/conf_dnssec.cgi
+share/webmin/bind8/conf_dnssectools.cgi
 share/webmin/bind8/conf_files.cgi
 share/webmin/bind8/conf_forwarding.cgi
 share/webmin/bind8/conf_keys.cgi
@@ -21,6 +23,9 @@ share/webmin/bind8/conf_rndc.cgi
 share/webmin/bind8/conf_servers.cgi
 share/webmin/bind8/conf_trusted.cgi
 share/webmin/bind8/conf_zonedef.cgi
+share/webmin/bind8/config-CentOS-Linux-6.0-*
+share/webmin/bind8/config-Redhat-Enterprise-Linux-6.0-*
+share/webmin/bind8/config-Scientific-Linux-6.0-*
 share/webmin/bind8/config-aix
 share/webmin/bind8/config-cobalt-linux
 share/webmin/bind8/config-coherent-linux
@@ -49,9 +54,11 @@ share/webmin/bind8/config-openbsd-3.2-*
 share/webmin/bind8/config-openmamba-linux
 share/webmin/bind8/config-openserver
 share/webmin/bind8/config-osf1
+share/webmin/bind8/config-pardus-linux
 share/webmin/bind8/config-redhat-linux
 share/webmin/bind8/config-redhat-linux-10.0
-share/webmin/bind8/config-redhat-linux-11.0-*
+share/webmin/bind8/config-redhat-linux-11.0-23.0
+share/webmin/bind8/config-redhat-linux-24.0-*
 share/webmin/bind8/config-redhat-linux-7.1-9.0
 share/webmin/bind8/config-slackware-linux
 share/webmin/bind8/config-slackware-linux-8.0-*
@@ -73,19 +80,30 @@ share/webmin/bind8/config-windows
 share/webmin/bind8/config.info
 share/webmin/bind8/config.info.bg
 share/webmin/bind8/config.info.ca
+share/webmin/bind8/config.info.ca.UTF-8
 share/webmin/bind8/config.info.cz
+share/webmin/bind8/config.info.cz.UTF-8
 share/webmin/bind8/config.info.de
+share/webmin/bind8/config.info.de.UTF-8
 share/webmin/bind8/config.info.es
+share/webmin/bind8/config.info.es.UTF-8
 share/webmin/bind8/config.info.fa
 share/webmin/bind8/config.info.fr
+share/webmin/bind8/config.info.fr.UTF-8
 share/webmin/bind8/config.info.ja_JP.UTF-8
 share/webmin/bind8/config.info.ja_JP.euc
 share/webmin/bind8/config.info.nl
+share/webmin/bind8/config.info.nl.UTF-8
+share/webmin/bind8/config.info.no
 share/webmin/bind8/config.info.pl
+share/webmin/bind8/config.info.pl.UTF-8
 share/webmin/bind8/config.info.pt_BR
+share/webmin/bind8/config.info.pt_BR.UTF-8
+share/webmin/bind8/config.info.ru.UTF-8
 share/webmin/bind8/config.info.ru_RU
 share/webmin/bind8/config.info.ru_SU
 share/webmin/bind8/config.info.sv
+share/webmin/bind8/config.info.sv.UTF-8
 share/webmin/bind8/config.info.tr
 share/webmin/bind8/config.info.uk_UA
 share/webmin/bind8/config.info.zh_CN
@@ -106,6 +124,7 @@ share/webmin/bind8/delegation_form.cgi
 share/webmin/bind8/delete_recs.cgi
 share/webmin/bind8/delete_view.cgi
 share/webmin/bind8/delete_zone.cgi
+share/webmin/bind8/disable_zonedt.cgi
 share/webmin/bind8/disable_zonekey.cgi
 share/webmin/bind8/dns_boot.cgi
 share/webmin/bind8/edit_delegation.cgi
@@ -121,7 +140,9 @@ share/webmin/bind8/edit_soptions.cgi
 share/webmin/bind8/edit_stub.cgi
 share/webmin/bind8/edit_text.cgi
 share/webmin/bind8/edit_view.cgi
+share/webmin/bind8/edit_zonedt.cgi
 share/webmin/bind8/edit_zonekey.cgi
+share/webmin/bind8/enable_zonedt.cgi
 share/webmin/bind8/enable_zonekey.cgi
 share/webmin/bind8/feedback_files.pl
 share/webmin/bind8/find_free.cgi
@@ -150,6 +171,7 @@ share/webmin/bind8/images/close.gif
 share/webmin/bind8/images/controls.gif
 share/webmin/bind8/images/delegation.gif
 share/webmin/bind8/images/dnssec.gif
+share/webmin/bind8/images/dnssectools.gif
 share/webmin/bind8/images/extra.gif
 share/webmin/bind8/images/files.gif
 share/webmin/bind8/images/findfree.gif
@@ -180,31 +202,46 @@ share/webmin/bind8/images/text.gif
 share/webmin/bind8/images/trusted.gif
 share/webmin/bind8/images/view.gif
 share/webmin/bind8/images/whois.gif
+share/webmin/bind8/images/xfer.gif
 share/webmin/bind8/images/zonedef.gif
 share/webmin/bind8/images/zonekey.gif
 share/webmin/bind8/index.cgi
 share/webmin/bind8/install_check.pl
 share/webmin/bind8/lang/bg
 share/webmin/bind8/lang/ca
+share/webmin/bind8/lang/ca.UTF-8
 share/webmin/bind8/lang/cz
+share/webmin/bind8/lang/cz.UTF-8
 share/webmin/bind8/lang/de
+share/webmin/bind8/lang/de.UTF-8
 share/webmin/bind8/lang/en
+share/webmin/bind8/lang/en.UTF-8
 share/webmin/bind8/lang/es
+share/webmin/bind8/lang/es.UTF-8
 share/webmin/bind8/lang/fa
 share/webmin/bind8/lang/fr
+share/webmin/bind8/lang/fr.UTF-8
 share/webmin/bind8/lang/it
+share/webmin/bind8/lang/it.UTF-8
 share/webmin/bind8/lang/ja_JP.UTF-8
 share/webmin/bind8/lang/ja_JP.euc
 share/webmin/bind8/lang/ja_JP.jis
 share/webmin/bind8/lang/ko_KR.UTF-8
 share/webmin/bind8/lang/ko_KR.euc
 share/webmin/bind8/lang/nl
+share/webmin/bind8/lang/nl.UTF-8
+share/webmin/bind8/lang/no
 share/webmin/bind8/lang/pl
+share/webmin/bind8/lang/pl.UTF-8
 share/webmin/bind8/lang/pt
+share/webmin/bind8/lang/pt.UTF-8
 share/webmin/bind8/lang/pt_BR
+share/webmin/bind8/lang/pt_BR.UTF-8
+share/webmin/bind8/lang/ru.UTF-8
 share/webmin/bind8/lang/ru_RU
 share/webmin/bind8/lang/ru_SU
 share/webmin/bind8/lang/sv
+share/webmin/bind8/lang/sv.UTF-8
 share/webmin/bind8/lang/tr
 share/webmin/bind8/lang/uk_UA
 share/webmin/bind8/lang/zh_CN
@@ -219,6 +256,8 @@ share/webmin/bind8/mass_delete.cgi
 share/webmin/bind8/mass_form.cgi
 share/webmin/bind8/mass_rcreate.cgi
 share/webmin/bind8/mass_rcreate_form.cgi
+share/webmin/bind8/mass_rdelete.cgi
+share/webmin/bind8/mass_rdelete_form.cgi
 share/webmin/bind8/mass_update.cgi
 share/webmin/bind8/mass_update_form.cgi
 share/webmin/bind8/master_form.cgi
@@ -236,6 +275,7 @@ share/webmin/bind8/save_acls.cgi
 share/webmin/bind8/save_controls.cgi
 share/webmin/bind8/save_delegation.cgi
 share/webmin/bind8/save_dnssec.cgi
+share/webmin/bind8/save_dnssectools.cgi
 share/webmin/bind8/save_files.cgi
 share/webmin/bind8/save_forward.cgi
 share/webmin/bind8/save_forwarding.cgi
@@ -264,8 +304,11 @@ share/webmin/bind8/start.cgi
 share/webmin/bind8/stop.cgi
 share/webmin/bind8/stub_form.cgi
 share/webmin/bind8/syslog_logs.pl
+share/webmin/bind8/unfreeze_zone.cgi
 share/webmin/bind8/view_form.cgi
 share/webmin/bind8/view_text.cgi
-share/webmin/bind8/unfreeze_zone.cgi
 share/webmin/bind8/whois-servers
 share/webmin/bind8/whois.cgi
+share/webmin/bind8/xfer.cgi
+share/webmin/bind8/zone_dnssecmgt_dt.cgi
+share/webmin/bind8/zone_dnssecmigrate_dt.cgi
diff --git a/sysutils/wbm-custom/Makefile b/sysutils/wbm-custom/Makefile
index a987118067d..007b58cfcad 100644
--- a/sysutils/wbm-custom/Makefile
+++ b/sysutils/wbm-custom/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2012/10/23 19:51:31 asau Exp $
+# $NetBSD: Makefile,v 1.6 2012/12/22 00:59:14 dholland Exp $
 
 WBM_NAME=	custom
+PKGREVISION=	1
 
 COMMENT=	Webmin module for creating custom action buttons
 
diff --git a/sysutils/wbm-custom/PLIST b/sysutils/wbm-custom/PLIST
index beb58665127..d4bc48aa3a3 100644
--- a/sysutils/wbm-custom/PLIST
+++ b/sysutils/wbm-custom/PLIST
@@ -1,22 +1,32 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:16:17 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/12/22 00:59:14 dholland Exp $
 share/examples/webmin/custom/config
 share/webmin/custom/CHANGELOG
 share/webmin/custom/acl_security.pl
+share/webmin/custom/cgi_args.pl
 share/webmin/custom/config
 share/webmin/custom/config-*-linux
 share/webmin/custom/config.info
 share/webmin/custom/config.info.ca
+share/webmin/custom/config.info.ca.UTF-8
 share/webmin/custom/config.info.cz
+share/webmin/custom/config.info.cz.UTF-8
 share/webmin/custom/config.info.de
+share/webmin/custom/config.info.de.UTF-8
 share/webmin/custom/config.info.es
+share/webmin/custom/config.info.es.UTF-8
 share/webmin/custom/config.info.fr
+share/webmin/custom/config.info.fr.UTF-8
 share/webmin/custom/config.info.hr
 share/webmin/custom/config.info.it
-share/webmin/custom/config.info.ja_JP.UTF-8
+share/webmin/custom/config.info.it.UTF-8
 share/webmin/custom/config.info.ko_KR.UTF-8
 share/webmin/custom/config.info.ko_KR.euc
 share/webmin/custom/config.info.nl
+share/webmin/custom/config.info.nl.UTF-8
+share/webmin/custom/config.info.no
 share/webmin/custom/config.info.pl
+share/webmin/custom/config.info.pl.UTF-8
+share/webmin/custom/config.info.ru.UTF-8
 share/webmin/custom/config.info.ru_RU
 share/webmin/custom/config.info.ru_SU
 share/webmin/custom/config.info.sk
@@ -29,252 +39,450 @@ share/webmin/custom/edit_file.cgi
 share/webmin/custom/edit_sql.cgi
 share/webmin/custom/feedback_files.pl
 share/webmin/custom/form.cgi
+share/webmin/custom/help/after.ca.UTF-8.html
 share/webmin/custom/help/after.ca.html
+share/webmin/custom/help/after.de.UTF-8.html
 share/webmin/custom/help/after.de.html
+share/webmin/custom/help/after.es.UTF-8.html
 share/webmin/custom/help/after.es.html
 share/webmin/custom/help/after.html
+share/webmin/custom/help/after.it.UTF-8.html
 share/webmin/custom/help/after.it.html
 share/webmin/custom/help/after.ko_KR.UTF-8.html
 share/webmin/custom/help/after.ko_KR.euc.html
+share/webmin/custom/help/after.nl.UTF-8.html
 share/webmin/custom/help/after.nl.html
+share/webmin/custom/help/after.no.html
+share/webmin/custom/help/after.pl.UTF-8.html
 share/webmin/custom/help/after.pl.html
+share/webmin/custom/help/before.ca.UTF-8.html
 share/webmin/custom/help/before.ca.html
+share/webmin/custom/help/before.de.UTF-8.html
 share/webmin/custom/help/before.de.html
+share/webmin/custom/help/before.es.UTF-8.html
 share/webmin/custom/help/before.es.html
 share/webmin/custom/help/before.html
+share/webmin/custom/help/before.it.UTF-8.html
 share/webmin/custom/help/before.it.html
 share/webmin/custom/help/before.ko_KR.UTF-8.html
 share/webmin/custom/help/before.ko_KR.euc.html
+share/webmin/custom/help/before.nl.UTF-8.html
 share/webmin/custom/help/before.nl.html
+share/webmin/custom/help/before.pl.UTF-8.html
 share/webmin/custom/help/before.pl.html
+share/webmin/custom/help/beforeedit.ca.UTF-8.html
+share/webmin/custom/help/beforeedit.ca.html
+share/webmin/custom/help/beforeedit.html
+share/webmin/custom/help/beforeedit.nl.UTF-8.html
+share/webmin/custom/help/beforeedit.nl.html
+share/webmin/custom/help/clear.ca.UTF-8.html
 share/webmin/custom/help/clear.ca.html
 share/webmin/custom/help/clear.html
+share/webmin/custom/help/clear.it.UTF-8.html
 share/webmin/custom/help/clear.it.html
 share/webmin/custom/help/clear.ko_KR.UTF-8.html
 share/webmin/custom/help/clear.ko_KR.euc.html
+share/webmin/custom/help/clear.nl.UTF-8.html
+share/webmin/custom/help/clear.nl.html
+share/webmin/custom/help/cmd.ca.UTF-8.html
 share/webmin/custom/help/cmd.ca.html
+share/webmin/custom/help/cmd.de.UTF-8.html
 share/webmin/custom/help/cmd.de.html
+share/webmin/custom/help/cmd.es.UTF-8.html
 share/webmin/custom/help/cmd.es.html
+share/webmin/custom/help/cmd.fr.UTF-8.html
 share/webmin/custom/help/cmd.fr.html
 share/webmin/custom/help/cmd.html
+share/webmin/custom/help/cmd.it.UTF-8.html
 share/webmin/custom/help/cmd.it.html
 share/webmin/custom/help/cmd.ko_KR.UTF-8.html
 share/webmin/custom/help/cmd.ko_KR.euc.html
+share/webmin/custom/help/cmd.nl.UTF-8.html
 share/webmin/custom/help/cmd.nl.html
+share/webmin/custom/help/cmd.pl.UTF-8.html
 share/webmin/custom/help/cmd.pl.html
+share/webmin/custom/help/cmd.sv.UTF-8.html
 share/webmin/custom/help/cmd.sv.html
 share/webmin/custom/help/cmd.zh_TW.Big5.html
 share/webmin/custom/help/cmd.zh_TW.UTF-8.html
+share/webmin/custom/help/command.ca.UTF-8.html
 share/webmin/custom/help/command.ca.html
+share/webmin/custom/help/command.de.UTF-8.html
 share/webmin/custom/help/command.de.html
+share/webmin/custom/help/command.es.UTF-8.html
 share/webmin/custom/help/command.es.html
+share/webmin/custom/help/command.fr.UTF-8.html
 share/webmin/custom/help/command.fr.html
 share/webmin/custom/help/command.html
+share/webmin/custom/help/command.it.UTF-8.html
 share/webmin/custom/help/command.it.html
 share/webmin/custom/help/command.ko_KR.UTF-8.html
 share/webmin/custom/help/command.ko_KR.euc.html
+share/webmin/custom/help/command.nl.UTF-8.html
 share/webmin/custom/help/command.nl.html
+share/webmin/custom/help/command.pl.UTF-8.html
 share/webmin/custom/help/command.pl.html
+share/webmin/custom/help/command.sv.UTF-8.html
 share/webmin/custom/help/command.sv.html
 share/webmin/custom/help/command.zh_TW.Big5.html
 share/webmin/custom/help/command.zh_TW.UTF-8.html
+share/webmin/custom/help/create.ca.UTF-8.html
 share/webmin/custom/help/create.ca.html
+share/webmin/custom/help/create.de.UTF-8.html
 share/webmin/custom/help/create.de.html
+share/webmin/custom/help/create.es.UTF-8.html
 share/webmin/custom/help/create.es.html
+share/webmin/custom/help/create.fr.UTF-8.html
 share/webmin/custom/help/create.fr.html
 share/webmin/custom/help/create.html
+share/webmin/custom/help/create.it.UTF-8.html
 share/webmin/custom/help/create.it.html
 share/webmin/custom/help/create.ko_KR.UTF-8.html
 share/webmin/custom/help/create.ko_KR.euc.html
+share/webmin/custom/help/create.nl.UTF-8.html
 share/webmin/custom/help/create.nl.html
+share/webmin/custom/help/create.pl.UTF-8.html
 share/webmin/custom/help/create.pl.html
+share/webmin/custom/help/create.sv.UTF-8.html
 share/webmin/custom/help/create.sv.html
 share/webmin/custom/help/create.zh_TW.Big5.html
 share/webmin/custom/help/create.zh_TW.UTF-8.html
+share/webmin/custom/help/desc.ca.UTF-8.html
 share/webmin/custom/help/desc.ca.html
+share/webmin/custom/help/desc.de.UTF-8.html
 share/webmin/custom/help/desc.de.html
+share/webmin/custom/help/desc.es.UTF-8.html
 share/webmin/custom/help/desc.es.html
+share/webmin/custom/help/desc.fr.UTF-8.html
 share/webmin/custom/help/desc.fr.html
 share/webmin/custom/help/desc.html
+share/webmin/custom/help/desc.it.UTF-8.html
 share/webmin/custom/help/desc.it.html
 share/webmin/custom/help/desc.ko_KR.UTF-8.html
 share/webmin/custom/help/desc.ko_KR.euc.html
+share/webmin/custom/help/desc.nl.UTF-8.html
 share/webmin/custom/help/desc.nl.html
+share/webmin/custom/help/desc.pl.UTF-8.html
 share/webmin/custom/help/desc.pl.html
+share/webmin/custom/help/desc.sv.UTF-8.html
 share/webmin/custom/help/desc.sv.html
 share/webmin/custom/help/desc.zh_TW.Big5.html
 share/webmin/custom/help/desc.zh_TW.UTF-8.html
+share/webmin/custom/help/desc2.ca.UTF-8.html
+share/webmin/custom/help/desc2.ca.html
+share/webmin/custom/help/desc2.html
+share/webmin/custom/help/desc2.nl.UTF-8.html
+share/webmin/custom/help/desc2.nl.html
+share/webmin/custom/help/dir.ca.UTF-8.html
 share/webmin/custom/help/dir.ca.html
+share/webmin/custom/help/dir.de.UTF-8.html
 share/webmin/custom/help/dir.de.html
 share/webmin/custom/help/dir.html
+share/webmin/custom/help/dir.it.UTF-8.html
 share/webmin/custom/help/dir.it.html
 share/webmin/custom/help/dir.ko_KR.UTF-8.html
 share/webmin/custom/help/dir.ko_KR.euc.html
+share/webmin/custom/help/dir.nl.UTF-8.html
+share/webmin/custom/help/dir.nl.html
+share/webmin/custom/help/edit.ca.UTF-8.html
 share/webmin/custom/help/edit.ca.html
+share/webmin/custom/help/edit.de.UTF-8.html
 share/webmin/custom/help/edit.de.html
+share/webmin/custom/help/edit.es.UTF-8.html
 share/webmin/custom/help/edit.es.html
+share/webmin/custom/help/edit.fr.UTF-8.html
 share/webmin/custom/help/edit.fr.html
 share/webmin/custom/help/edit.html
+share/webmin/custom/help/edit.it.UTF-8.html
 share/webmin/custom/help/edit.it.html
 share/webmin/custom/help/edit.ko_KR.UTF-8.html
 share/webmin/custom/help/edit.ko_KR.euc.html
+share/webmin/custom/help/edit.nl.UTF-8.html
 share/webmin/custom/help/edit.nl.html
+share/webmin/custom/help/edit.pl.UTF-8.html
 share/webmin/custom/help/edit.pl.html
+share/webmin/custom/help/edit.sv.UTF-8.html
 share/webmin/custom/help/edit.sv.html
 share/webmin/custom/help/edit.zh_TW.Big5.html
 share/webmin/custom/help/edit.zh_TW.UTF-8.html
+share/webmin/custom/help/editor.ca.UTF-8.html
 share/webmin/custom/help/editor.ca.html
+share/webmin/custom/help/editor.de.UTF-8.html
 share/webmin/custom/help/editor.de.html
+share/webmin/custom/help/editor.es.UTF-8.html
 share/webmin/custom/help/editor.es.html
 share/webmin/custom/help/editor.html
+share/webmin/custom/help/editor.it.UTF-8.html
 share/webmin/custom/help/editor.it.html
 share/webmin/custom/help/editor.ko_KR.UTF-8.html
 share/webmin/custom/help/editor.ko_KR.euc.html
+share/webmin/custom/help/editor.nl.UTF-8.html
 share/webmin/custom/help/editor.nl.html
+share/webmin/custom/help/editor.pl.UTF-8.html
 share/webmin/custom/help/editor.pl.html
+share/webmin/custom/help/fcreate.ca.UTF-8.html
 share/webmin/custom/help/fcreate.ca.html
+share/webmin/custom/help/fcreate.de.UTF-8.html
 share/webmin/custom/help/fcreate.de.html
+share/webmin/custom/help/fcreate.es.UTF-8.html
 share/webmin/custom/help/fcreate.es.html
 share/webmin/custom/help/fcreate.html
+share/webmin/custom/help/fcreate.it.UTF-8.html
 share/webmin/custom/help/fcreate.it.html
 share/webmin/custom/help/fcreate.ko_KR.UTF-8.html
 share/webmin/custom/help/fcreate.ko_KR.euc.html
+share/webmin/custom/help/fcreate.nl.UTF-8.html
+share/webmin/custom/help/fcreate.nl.html
+share/webmin/custom/help/fcreate.pl.UTF-8.html
 share/webmin/custom/help/fcreate.pl.html
+share/webmin/custom/help/fdesc.ca.UTF-8.html
 share/webmin/custom/help/fdesc.ca.html
+share/webmin/custom/help/fdesc.de.UTF-8.html
 share/webmin/custom/help/fdesc.de.html
+share/webmin/custom/help/fdesc.es.UTF-8.html
 share/webmin/custom/help/fdesc.es.html
 share/webmin/custom/help/fdesc.html
+share/webmin/custom/help/fdesc.it.UTF-8.html
 share/webmin/custom/help/fdesc.it.html
 share/webmin/custom/help/fdesc.ko_KR.UTF-8.html
 share/webmin/custom/help/fdesc.ko_KR.euc.html
+share/webmin/custom/help/fdesc.nl.UTF-8.html
 share/webmin/custom/help/fdesc.nl.html
+share/webmin/custom/help/fdesc.pl.UTF-8.html
 share/webmin/custom/help/fdesc.pl.html
+share/webmin/custom/help/fedit.ca.UTF-8.html
 share/webmin/custom/help/fedit.ca.html
+share/webmin/custom/help/fedit.de.UTF-8.html
 share/webmin/custom/help/fedit.de.html
+share/webmin/custom/help/fedit.es.UTF-8.html
 share/webmin/custom/help/fedit.es.html
 share/webmin/custom/help/fedit.html
+share/webmin/custom/help/fedit.it.UTF-8.html
 share/webmin/custom/help/fedit.it.html
+share/webmin/custom/help/fedit.nl.UTF-8.html
+share/webmin/custom/help/fedit.nl.html
+share/webmin/custom/help/fedit.pl.UTF-8.html
 share/webmin/custom/help/fedit.pl.html
+share/webmin/custom/help/file.ca.UTF-8.html
 share/webmin/custom/help/file.ca.html
+share/webmin/custom/help/file.de.UTF-8.html
 share/webmin/custom/help/file.de.html
+share/webmin/custom/help/file.es.UTF-8.html
 share/webmin/custom/help/file.es.html
 share/webmin/custom/help/file.html
+share/webmin/custom/help/file.it.UTF-8.html
 share/webmin/custom/help/file.it.html
+share/webmin/custom/help/file.nl.UTF-8.html
 share/webmin/custom/help/file.nl.html
+share/webmin/custom/help/file.pl.UTF-8.html
 share/webmin/custom/help/file.pl.html
+share/webmin/custom/help/fileid.ca.UTF-8.html
 share/webmin/custom/help/fileid.ca.html
 share/webmin/custom/help/fileid.html
+share/webmin/custom/help/fileid.it.UTF-8.html
 share/webmin/custom/help/fileid.it.html
+share/webmin/custom/help/fileid.nl.UTF-8.html
+share/webmin/custom/help/fileid.nl.html
+share/webmin/custom/help/fintro.ca.UTF-8.html
 share/webmin/custom/help/fintro.ca.html
+share/webmin/custom/help/fintro.de.UTF-8.html
 share/webmin/custom/help/fintro.de.html
+share/webmin/custom/help/fintro.es.UTF-8.html
 share/webmin/custom/help/fintro.es.html
 share/webmin/custom/help/fintro.html
+share/webmin/custom/help/fintro.it.UTF-8.html
 share/webmin/custom/help/fintro.it.html
+share/webmin/custom/help/fintro.nl.UTF-8.html
 share/webmin/custom/help/fintro.nl.html
+share/webmin/custom/help/fintro.pl.UTF-8.html
 share/webmin/custom/help/fintro.pl.html
+share/webmin/custom/help/id.ca.UTF-8.html
 share/webmin/custom/help/id.ca.html
 share/webmin/custom/help/id.html
+share/webmin/custom/help/id.it.UTF-8.html
 share/webmin/custom/help/id.it.html
+share/webmin/custom/help/id.nl.UTF-8.html
+share/webmin/custom/help/id.nl.html
+share/webmin/custom/help/intro.ca.UTF-8.html
 share/webmin/custom/help/intro.ca.html
+share/webmin/custom/help/intro.de.UTF-8.html
 share/webmin/custom/help/intro.de.html
+share/webmin/custom/help/intro.es.UTF-8.html
 share/webmin/custom/help/intro.es.html
+share/webmin/custom/help/intro.fr.UTF-8.html
 share/webmin/custom/help/intro.fr.html
 share/webmin/custom/help/intro.html
+share/webmin/custom/help/intro.it.UTF-8.html
 share/webmin/custom/help/intro.it.html
+share/webmin/custom/help/intro.nl.UTF-8.html
 share/webmin/custom/help/intro.nl.html
+share/webmin/custom/help/intro.pl.UTF-8.html
 share/webmin/custom/help/intro.pl.html
+share/webmin/custom/help/intro.sv.UTF-8.html
 share/webmin/custom/help/intro.sv.html
 share/webmin/custom/help/intro.zh_TW.Big5.html
 share/webmin/custom/help/intro.zh_TW.UTF-8.html
+share/webmin/custom/help/noshow.ca.UTF-8.html
 share/webmin/custom/help/noshow.ca.html
+share/webmin/custom/help/noshow.de.UTF-8.html
 share/webmin/custom/help/noshow.de.html
+share/webmin/custom/help/noshow.es.UTF-8.html
 share/webmin/custom/help/noshow.es.html
 share/webmin/custom/help/noshow.html
+share/webmin/custom/help/noshow.it.UTF-8.html
 share/webmin/custom/help/noshow.it.html
+share/webmin/custom/help/noshow.nl.UTF-8.html
+share/webmin/custom/help/noshow.nl.html
+share/webmin/custom/help/order.ca.UTF-8.html
 share/webmin/custom/help/order.ca.html
+share/webmin/custom/help/order.de.UTF-8.html
 share/webmin/custom/help/order.de.html
+share/webmin/custom/help/order.es.UTF-8.html
 share/webmin/custom/help/order.es.html
 share/webmin/custom/help/order.html
+share/webmin/custom/help/order.it.UTF-8.html
 share/webmin/custom/help/order.it.html
+share/webmin/custom/help/order.nl.UTF-8.html
 share/webmin/custom/help/order.nl.html
+share/webmin/custom/help/owner.ca.UTF-8.html
 share/webmin/custom/help/owner.ca.html
+share/webmin/custom/help/owner.de.UTF-8.html
 share/webmin/custom/help/owner.de.html
+share/webmin/custom/help/owner.es.UTF-8.html
 share/webmin/custom/help/owner.es.html
 share/webmin/custom/help/owner.html
+share/webmin/custom/help/owner.it.UTF-8.html
 share/webmin/custom/help/owner.it.html
+share/webmin/custom/help/owner.nl.UTF-8.html
 share/webmin/custom/help/owner.nl.html
+share/webmin/custom/help/owner.pl.UTF-8.html
 share/webmin/custom/help/owner.pl.html
+share/webmin/custom/help/perms.ca.UTF-8.html
 share/webmin/custom/help/perms.ca.html
+share/webmin/custom/help/perms.de.UTF-8.html
 share/webmin/custom/help/perms.de.html
+share/webmin/custom/help/perms.es.UTF-8.html
 share/webmin/custom/help/perms.es.html
 share/webmin/custom/help/perms.html
+share/webmin/custom/help/perms.it.UTF-8.html
 share/webmin/custom/help/perms.it.html
+share/webmin/custom/help/perms.nl.UTF-8.html
 share/webmin/custom/help/perms.nl.html
+share/webmin/custom/help/perms.pl.UTF-8.html
 share/webmin/custom/help/perms.pl.html
+share/webmin/custom/help/raw.ca.UTF-8.html
 share/webmin/custom/help/raw.ca.html
+share/webmin/custom/help/raw.de.UTF-8.html
 share/webmin/custom/help/raw.de.html
+share/webmin/custom/help/raw.es.UTF-8.html
 share/webmin/custom/help/raw.es.html
+share/webmin/custom/help/raw.fr.UTF-8.html
 share/webmin/custom/help/raw.fr.html
 share/webmin/custom/help/raw.html
+share/webmin/custom/help/raw.it.UTF-8.html
 share/webmin/custom/help/raw.it.html
+share/webmin/custom/help/raw.nl.UTF-8.html
 share/webmin/custom/help/raw.nl.html
+share/webmin/custom/help/raw.pl.UTF-8.html
 share/webmin/custom/help/raw.pl.html
+share/webmin/custom/help/raw.sv.UTF-8.html
 share/webmin/custom/help/raw.sv.html
 share/webmin/custom/help/raw.zh_TW.Big5.html
 share/webmin/custom/help/raw.zh_TW.UTF-8.html
+share/webmin/custom/help/run.ca.UTF-8.html
 share/webmin/custom/help/run.ca.html
+share/webmin/custom/help/run.de.UTF-8.html
 share/webmin/custom/help/run.de.html
+share/webmin/custom/help/run.es.UTF-8.html
 share/webmin/custom/help/run.es.html
+share/webmin/custom/help/run.fr.UTF-8.html
 share/webmin/custom/help/run.fr.html
 share/webmin/custom/help/run.html
+share/webmin/custom/help/run.it.UTF-8.html
 share/webmin/custom/help/run.it.html
+share/webmin/custom/help/run.nl.UTF-8.html
 share/webmin/custom/help/run.nl.html
+share/webmin/custom/help/run.pl.UTF-8.html
 share/webmin/custom/help/run.pl.html
+share/webmin/custom/help/run.sv.UTF-8.html
 share/webmin/custom/help/run.sv.html
 share/webmin/custom/help/run.zh_TW.Big5.html
 share/webmin/custom/help/run.zh_TW.UTF-8.html
+share/webmin/custom/help/timeout.ca.UTF-8.html
 share/webmin/custom/help/timeout.ca.html
+share/webmin/custom/help/timeout.de.UTF-8.html
 share/webmin/custom/help/timeout.de.html
 share/webmin/custom/help/timeout.html
+share/webmin/custom/help/timeout.it.UTF-8.html
 share/webmin/custom/help/timeout.it.html
+share/webmin/custom/help/timeout.nl.UTF-8.html
+share/webmin/custom/help/timeout.nl.html
+share/webmin/custom/help/user.ca.UTF-8.html
 share/webmin/custom/help/user.ca.html
+share/webmin/custom/help/user.de.UTF-8.html
 share/webmin/custom/help/user.de.html
+share/webmin/custom/help/user.es.UTF-8.html
 share/webmin/custom/help/user.es.html
+share/webmin/custom/help/user.fr.UTF-8.html
 share/webmin/custom/help/user.fr.html
 share/webmin/custom/help/user.html
+share/webmin/custom/help/user.it.UTF-8.html
 share/webmin/custom/help/user.it.html
+share/webmin/custom/help/user.nl.UTF-8.html
 share/webmin/custom/help/user.nl.html
+share/webmin/custom/help/user.pl.UTF-8.html
 share/webmin/custom/help/user.pl.html
+share/webmin/custom/help/user.sv.UTF-8.html
 share/webmin/custom/help/user.sv.html
 share/webmin/custom/help/user.zh_TW.Big5.html
 share/webmin/custom/help/user.zh_TW.UTF-8.html
+share/webmin/custom/help/usermin.ca.UTF-8.html
 share/webmin/custom/help/usermin.ca.html
+share/webmin/custom/help/usermin.de.UTF-8.html
 share/webmin/custom/help/usermin.de.html
 share/webmin/custom/help/usermin.html
+share/webmin/custom/help/usermin.it.UTF-8.html
 share/webmin/custom/help/usermin.it.html
+share/webmin/custom/help/usermin.nl.UTF-8.html
+share/webmin/custom/help/usermin.nl.html
 share/webmin/custom/images/icon.gif
 share/webmin/custom/images/smallicon.gif
 share/webmin/custom/index.cgi
 share/webmin/custom/lang/ca
+share/webmin/custom/lang/ca.UTF-8
 share/webmin/custom/lang/cz
+share/webmin/custom/lang/cz.UTF-8
 share/webmin/custom/lang/de
+share/webmin/custom/lang/de.UTF-8
 share/webmin/custom/lang/en
+share/webmin/custom/lang/en.UTF-8
 share/webmin/custom/lang/es
+share/webmin/custom/lang/es.UTF-8
 share/webmin/custom/lang/fr
+share/webmin/custom/lang/fr.UTF-8
 share/webmin/custom/lang/hr
 share/webmin/custom/lang/hu
+share/webmin/custom/lang/hu.UTF-8
 share/webmin/custom/lang/it
+share/webmin/custom/lang/it.UTF-8
 share/webmin/custom/lang/ja_JP.UTF-8
 share/webmin/custom/lang/ja_JP.euc
 share/webmin/custom/lang/ko_KR.UTF-8
 share/webmin/custom/lang/ko_KR.euc
 share/webmin/custom/lang/nl
+share/webmin/custom/lang/nl.UTF-8
+share/webmin/custom/lang/no
 share/webmin/custom/lang/pl
+share/webmin/custom/lang/pl.UTF-8
 share/webmin/custom/lang/pt
+share/webmin/custom/lang/pt.UTF-8
+share/webmin/custom/lang/ru.UTF-8
 share/webmin/custom/lang/ru_RU
 share/webmin/custom/lang/ru_SU
 share/webmin/custom/lang/sk
+share/webmin/custom/lang/sk.UTF-8
 share/webmin/custom/lang/sv
+share/webmin/custom/lang/sv.UTF-8
 share/webmin/custom/lang/tr
 share/webmin/custom/lang/uk_UA
 share/webmin/custom/lang/zh_CN
diff --git a/sysutils/wbm-dhcpd/Makefile b/sysutils/wbm-dhcpd/Makefile
index f5fe7d45d28..6df72fbd35a 100644
--- a/sysutils/wbm-dhcpd/Makefile
+++ b/sysutils/wbm-dhcpd/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2012/10/23 19:51:31 asau Exp $
+# $NetBSD: Makefile,v 1.6 2012/12/22 01:01:36 dholland Exp $
 
 WBM_NAME=	dhcpd
+PKGREVISION=	1
 
 COMMENT=	Webmin module for managing ISC DHCPd
 
diff --git a/sysutils/wbm-dhcpd/PLIST b/sysutils/wbm-dhcpd/PLIST
index 46ca5f75283..554fb4a716a 100644
--- a/sysutils/wbm-dhcpd/PLIST
+++ b/sysutils/wbm-dhcpd/PLIST
@@ -1,16 +1,21 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:16:17 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/12/22 01:01:36 dholland Exp $
 share/examples/webmin/dhcpd/config
 share/webmin/dhcpd/CHANGELOG
 share/webmin/dhcpd/acl_security.pl
 share/webmin/dhcpd/backup_config.pl
+share/webmin/dhcpd/cgi_args.pl
 share/webmin/dhcpd/config-CentOS-Linux-5
+share/webmin/dhcpd/config-CentOS-Linux-6.0-*
+share/webmin/dhcpd/config-Redhat-Enterprise-Linux-6.0-*
+share/webmin/dhcpd/config-Scientific-Linux-6.0-*
 share/webmin/dhcpd/config-Ubuntu-Linux-8.10-*
 share/webmin/dhcpd/config-cobalt-linux
 share/webmin/dhcpd/config-coherent-linux
 share/webmin/dhcpd/config-corel-linux
 share/webmin/dhcpd/config-debian-linux
 share/webmin/dhcpd/config-debian-linux-3.0
-share/webmin/dhcpd/config-debian-linux-3.1-*
+share/webmin/dhcpd/config-debian-linux-3.1-5.9
+share/webmin/dhcpd/config-debian-linux-6.0-*
 share/webmin/dhcpd/config-freebsd
 share/webmin/dhcpd/config-generic-linux
 share/webmin/dhcpd/config-gentoo-linux
@@ -27,8 +32,11 @@ share/webmin/dhcpd/config-openbsd-3.6-*
 share/webmin/dhcpd/config-openmamba-linux
 share/webmin/dhcpd/config-openserver
 share/webmin/dhcpd/config-osf1
+share/webmin/dhcpd/config-pardus-linux
 share/webmin/dhcpd/config-redhat-linux
-share/webmin/dhcpd/config-redhat-linux-14.0-*
+share/webmin/dhcpd/config-redhat-linux-13.1-19.0
+share/webmin/dhcpd/config-redhat-linux-20.0-23.0
+share/webmin/dhcpd/config-redhat-linux-24.0-*
 share/webmin/dhcpd/config-redhat-linux-6.0-6.2
 share/webmin/dhcpd/config-redhat-linux-7.0-13.0
 share/webmin/dhcpd/config-slackware-linux
@@ -47,21 +55,34 @@ share/webmin/dhcpd/config-united-linux
 share/webmin/dhcpd/config-unixware
 share/webmin/dhcpd/config.info
 share/webmin/dhcpd/config.info.ca
+share/webmin/dhcpd/config.info.ca.UTF-8
 share/webmin/dhcpd/config.info.cz
+share/webmin/dhcpd/config.info.cz.UTF-8
 share/webmin/dhcpd/config.info.da
+share/webmin/dhcpd/config.info.da.UTF-8
 share/webmin/dhcpd/config.info.de
+share/webmin/dhcpd/config.info.de.UTF-8
 share/webmin/dhcpd/config.info.es
+share/webmin/dhcpd/config.info.es.UTF-8
 share/webmin/dhcpd/config.info.fa
 share/webmin/dhcpd/config.info.fr
+share/webmin/dhcpd/config.info.fr.UTF-8
 share/webmin/dhcpd/config.info.ja_JP.UTF-8
 share/webmin/dhcpd/config.info.ja_JP.euc
 share/webmin/dhcpd/config.info.nl
+share/webmin/dhcpd/config.info.nl.UTF-8
+share/webmin/dhcpd/config.info.no
 share/webmin/dhcpd/config.info.pl
+share/webmin/dhcpd/config.info.pl.UTF-8
 share/webmin/dhcpd/config.info.pt_BR
+share/webmin/dhcpd/config.info.pt_BR.UTF-8
+share/webmin/dhcpd/config.info.ru.UTF-8
 share/webmin/dhcpd/config.info.ru_RU
 share/webmin/dhcpd/config.info.ru_SU
 share/webmin/dhcpd/config.info.sk
+share/webmin/dhcpd/config.info.sk.UTF-8
 share/webmin/dhcpd/config.info.sv
+share/webmin/dhcpd/config.info.sv.UTF-8
 share/webmin/dhcpd/config.info.tr
 share/webmin/dhcpd/config.info.uk_UA
 share/webmin/dhcpd/config.info.zh_CN
@@ -72,7 +93,7 @@ share/webmin/dhcpd/confirm_delete.cgi
 share/webmin/dhcpd/defaultacl
 share/webmin/dhcpd/delete_all.cgi
 share/webmin/dhcpd/delete_hosts.cgi
-share/webmin/dhcpd/delete_lease.cgi
+share/webmin/dhcpd/delete_leases.cgi
 share/webmin/dhcpd/delete_subnets.cgi
 share/webmin/dhcpd/dhcpd-lib.pl
 share/webmin/dhcpd/edit_group.cgi
@@ -85,16 +106,25 @@ share/webmin/dhcpd/edit_shared.cgi
 share/webmin/dhcpd/edit_subnet.cgi
 share/webmin/dhcpd/edit_text.cgi
 share/webmin/dhcpd/edit_zones.cgi
+share/webmin/dhcpd/help/acl.ca.UTF-8.html
 share/webmin/dhcpd/help/acl.ca.html
+share/webmin/dhcpd/help/acl.es.UTF-8.html
 share/webmin/dhcpd/help/acl.es.html
 share/webmin/dhcpd/help/acl.html
 share/webmin/dhcpd/help/acl.ja_JP.UTF-8.html
 share/webmin/dhcpd/help/acl.ja_JP.euc.html
+share/webmin/dhcpd/help/acl.nl.UTF-8.html
+share/webmin/dhcpd/help/acl.nl.html
+share/webmin/dhcpd/help/acl.pt_BR.UTF-8.html
 share/webmin/dhcpd/help/acl.pt_BR.html
+share/webmin/dhcpd/help/acl_info.ca.UTF-8.html
 share/webmin/dhcpd/help/acl_info.ca.html
+share/webmin/dhcpd/help/acl_info.es.UTF-8.html
 share/webmin/dhcpd/help/acl_info.es.html
 share/webmin/dhcpd/help/acl_info.html
+share/webmin/dhcpd/help/acl_info.nl.UTF-8.html
 share/webmin/dhcpd/help/acl_info.nl.html
+share/webmin/dhcpd/help/acl_info.pl.UTF-8.html
 share/webmin/dhcpd/help/acl_info.pl.html
 share/webmin/dhcpd/images/ctree0.gif
 share/webmin/dhcpd/images/ctree1.gif
@@ -111,26 +141,41 @@ share/webmin/dhcpd/images/subnet.gif
 share/webmin/dhcpd/index.cgi
 share/webmin/dhcpd/install_check.pl
 share/webmin/dhcpd/lang/ca
+share/webmin/dhcpd/lang/ca.UTF-8
 share/webmin/dhcpd/lang/cz
+share/webmin/dhcpd/lang/cz.UTF-8
 share/webmin/dhcpd/lang/da
+share/webmin/dhcpd/lang/da.UTF-8
 share/webmin/dhcpd/lang/de
+share/webmin/dhcpd/lang/de.UTF-8
 share/webmin/dhcpd/lang/en
+share/webmin/dhcpd/lang/en.UTF-8
 share/webmin/dhcpd/lang/es
+share/webmin/dhcpd/lang/es.UTF-8
 share/webmin/dhcpd/lang/fa
 share/webmin/dhcpd/lang/fr
+share/webmin/dhcpd/lang/fr.UTF-8
 share/webmin/dhcpd/lang/ja_JP.UTF-8
 share/webmin/dhcpd/lang/ja_JP.euc
 share/webmin/dhcpd/lang/ja_JP.jis
 share/webmin/dhcpd/lang/ko_KR.UTF-8
 share/webmin/dhcpd/lang/ko_KR.euc
 share/webmin/dhcpd/lang/nl
+share/webmin/dhcpd/lang/nl.UTF-8
+share/webmin/dhcpd/lang/no
 share/webmin/dhcpd/lang/pl
+share/webmin/dhcpd/lang/pl.UTF-8
 share/webmin/dhcpd/lang/pt
+share/webmin/dhcpd/lang/pt.UTF-8
 share/webmin/dhcpd/lang/pt_BR
+share/webmin/dhcpd/lang/pt_BR.UTF-8
+share/webmin/dhcpd/lang/ru.UTF-8
 share/webmin/dhcpd/lang/ru_RU
 share/webmin/dhcpd/lang/ru_SU
 share/webmin/dhcpd/lang/sk
+share/webmin/dhcpd/lang/sk.UTF-8
 share/webmin/dhcpd/lang/sv
+share/webmin/dhcpd/lang/sv.UTF-8
 share/webmin/dhcpd/lang/tr
 share/webmin/dhcpd/lang/uk_UA
 share/webmin/dhcpd/lang/zh_CN
diff --git a/sysutils/wbm-dovecot/Makefile b/sysutils/wbm-dovecot/Makefile
index 9975a855077..38e41139b75 100644
--- a/sysutils/wbm-dovecot/Makefile
+++ b/sysutils/wbm-dovecot/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2012/10/23 19:51:31 asau Exp $
+# $NetBSD: Makefile,v 1.6 2012/12/22 01:03:56 dholland Exp $
 
 WBM_NAME=	dovecot
+PKGREVISION=	1
 
 COMMENT=	Webmin module for configuring the Dovecot IMAP/POP3 server
 
diff --git a/sysutils/wbm-dovecot/PLIST b/sysutils/wbm-dovecot/PLIST
index 8688de04ec5..7c53088c61f 100644
--- a/sysutils/wbm-dovecot/PLIST
+++ b/sysutils/wbm-dovecot/PLIST
@@ -1,22 +1,36 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:16:17 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/12/22 01:03:56 dholland Exp $
 share/examples/webmin/dovecot/config
 share/webmin/dovecot/CHANGELOG
 share/webmin/dovecot/apply.cgi
+share/webmin/dovecot/backup_config.pl
 share/webmin/dovecot/bootup.cgi
+share/webmin/dovecot/cgi_args.pl
 share/webmin/dovecot/config
+share/webmin/dovecot/config-Amazon-Linux
 share/webmin/dovecot/config-debian-linux
 share/webmin/dovecot/config-gentoo-linux
 share/webmin/dovecot/config-mandrake-linux
 share/webmin/dovecot/config-openmamba-linux
-share/webmin/dovecot/config-redhat-linux-11.0-*
+share/webmin/dovecot/config-pardus-linux
+share/webmin/dovecot/config-redhat-linux-11.0-23.0
+share/webmin/dovecot/config-redhat-linux-24.0-*
 share/webmin/dovecot/config-suse-linux
 share/webmin/dovecot/config.info
 share/webmin/dovecot/config.info.ca
+share/webmin/dovecot/config.info.ca.UTF-8
 share/webmin/dovecot/config.info.cz
+share/webmin/dovecot/config.info.cz.UTF-8
 share/webmin/dovecot/config.info.de
+share/webmin/dovecot/config.info.de.UTF-8
 share/webmin/dovecot/config.info.es
+share/webmin/dovecot/config.info.es.UTF-8
+share/webmin/dovecot/config.info.fr
 share/webmin/dovecot/config.info.hr
+share/webmin/dovecot/config.info.it
+share/webmin/dovecot/config.info.it.UTF-8
 share/webmin/dovecot/config.info.nl
+share/webmin/dovecot/config.info.nl.UTF-8
+share/webmin/dovecot/config.info.no
 share/webmin/dovecot/config.info.ru_RU
 share/webmin/dovecot/config.info.zh_TW.Big5
 share/webmin/dovecot/config.info.zh_TW.UTF-8
@@ -39,12 +53,23 @@ share/webmin/dovecot/images/ssl.gif
 share/webmin/dovecot/index.cgi
 share/webmin/dovecot/install_check.pl
 share/webmin/dovecot/lang/ca
+share/webmin/dovecot/lang/ca.UTF-8
 share/webmin/dovecot/lang/cz
+share/webmin/dovecot/lang/cz.UTF-8
 share/webmin/dovecot/lang/de
+share/webmin/dovecot/lang/de.UTF-8
 share/webmin/dovecot/lang/en
+share/webmin/dovecot/lang/en.UTF-8
 share/webmin/dovecot/lang/es
+share/webmin/dovecot/lang/es.UTF-8
+share/webmin/dovecot/lang/fr
+share/webmin/dovecot/lang/fr.UTF-8
 share/webmin/dovecot/lang/hr
+share/webmin/dovecot/lang/it
+share/webmin/dovecot/lang/it.UTF-8
 share/webmin/dovecot/lang/nl
+share/webmin/dovecot/lang/nl.UTF-8
+share/webmin/dovecot/lang/no
 share/webmin/dovecot/lang/ru_RU
 share/webmin/dovecot/lang/zh_TW.Big5
 share/webmin/dovecot/lang/zh_TW.UTF-8
diff --git a/sysutils/wbm-file/Makefile b/sysutils/wbm-file/Makefile
index f889c5b8e95..96f2f3ac2f4 100644
--- a/sysutils/wbm-file/Makefile
+++ b/sysutils/wbm-file/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2012/10/23 19:51:31 asau Exp $
+# $NetBSD: Makefile,v 1.6 2012/12/22 01:15:13 dholland Exp $
 
 WBM_NAME=	file
+PKGREVISION=	1
 
 COMMENT=	Webmin module for managing file and directory permissions
 
diff --git a/sysutils/wbm-file/PLIST b/sysutils/wbm-file/PLIST
index 56640ec1626..80cac0fd766 100644
--- a/sysutils/wbm-file/PLIST
+++ b/sysutils/wbm-file/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:16:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/12/22 01:15:13 dholland Exp $
 share/examples/webmin/file/config
 share/webmin/file/ACLEditor.class
 share/webmin/file/ACLEntry.class
@@ -94,6 +94,7 @@ share/webmin/file/ToolbarLayout.java
 share/webmin/file/Util.class
 share/webmin/file/Util.java
 share/webmin/file/acl_security.pl
+share/webmin/file/cgi_args.pl
 share/webmin/file/chmod.cgi
 share/webmin/file/config
 share/webmin/file/config-*-linux
@@ -102,15 +103,22 @@ share/webmin/file/config-irix
 share/webmin/file/config-solaris
 share/webmin/file/config.info
 share/webmin/file/config.info.ca
+share/webmin/file/config.info.ca.UTF-8
 share/webmin/file/config.info.cz
+share/webmin/file/config.info.cz.UTF-8
 share/webmin/file/config.info.de
+share/webmin/file/config.info.de.UTF-8
 share/webmin/file/config.info.el
 share/webmin/file/config.info.es
+share/webmin/file/config.info.es.UTF-8
 share/webmin/file/config.info.fa
 share/webmin/file/config.info.it
+share/webmin/file/config.info.it.UTF-8
 share/webmin/file/config.info.ko_KR.UTF-8
 share/webmin/file/config.info.ko_KR.euc
 share/webmin/file/config.info.nl
+share/webmin/file/config.info.nl.UTF-8
+share/webmin/file/config.info.no
 share/webmin/file/config.info.tr
 share/webmin/file/contents.cgi
 share/webmin/file/copy.cgi
@@ -124,7 +132,6 @@ share/webmin/file/filesystems.cgi
 share/webmin/file/getattrs.cgi
 share/webmin/file/getext.cgi
 share/webmin/file/getfacl.cgi
-share/webmin/file/images/Thumbs.db
 share/webmin/file/images/acl.gif
 share/webmin/file/images/add.gif
 share/webmin/file/images/all.gif
@@ -182,26 +189,41 @@ share/webmin/file/irix-setfacl.pl
 share/webmin/file/lang.cgi
 share/webmin/file/lang/bg
 share/webmin/file/lang/ca
+share/webmin/file/lang/ca.UTF-8
 share/webmin/file/lang/cz
+share/webmin/file/lang/cz.UTF-8
 share/webmin/file/lang/de
+share/webmin/file/lang/de.UTF-8
 share/webmin/file/lang/el
 share/webmin/file/lang/en
+share/webmin/file/lang/en.UTF-8
 share/webmin/file/lang/es
+share/webmin/file/lang/es.UTF-8
 share/webmin/file/lang/fa
 share/webmin/file/lang/fr
+share/webmin/file/lang/fr.UTF-8
 share/webmin/file/lang/it
+share/webmin/file/lang/it.UTF-8
 share/webmin/file/lang/ja_JP.UTF-8
 share/webmin/file/lang/ja_JP.euc
 share/webmin/file/lang/ko_KR.UTF-8
 share/webmin/file/lang/ko_KR.euc
 share/webmin/file/lang/nl
+share/webmin/file/lang/nl.UTF-8
+share/webmin/file/lang/no
 share/webmin/file/lang/pl
+share/webmin/file/lang/pl.UTF-8
 share/webmin/file/lang/pt
+share/webmin/file/lang/pt.UTF-8
 share/webmin/file/lang/pt_BR
+share/webmin/file/lang/pt_BR.UTF-8
+share/webmin/file/lang/ru.UTF-8
 share/webmin/file/lang/ru_RU
 share/webmin/file/lang/ru_SU
 share/webmin/file/lang/sk
+share/webmin/file/lang/sk.UTF-8
 share/webmin/file/lang/sv
+share/webmin/file/lang/sv.UTF-8
 share/webmin/file/lang/tr
 share/webmin/file/lang/uk_UA
 share/webmin/file/lang/zh_CN
@@ -237,21 +259,31 @@ share/webmin/file/upload.cgi
 share/webmin/file/upload2.cgi
 share/webmin/file/xinha/Xinha.css
 share/webmin/file/xinha/XinhaCore.js
-share/webmin/file/xinha/contrib/lc_parse_strings.php
 share/webmin/file/xinha/contrib/php-xinha.php
-share/webmin/file/xinha/examples/Extended.html
-share/webmin/file/xinha/examples/custom.css
-share/webmin/file/xinha/examples/dynamic.css
-share/webmin/file/xinha/examples/ext_example-body.html
-share/webmin/file/xinha/examples/ext_example-dest.php
-share/webmin/file/xinha/examples/ext_example-menu.php
-share/webmin/file/xinha/examples/ext_example.html
-share/webmin/file/xinha/examples/full_example.css
-share/webmin/file/xinha/examples/full_example.js
+share/webmin/file/xinha/examples/ExtendedDemo.html
+share/webmin/file/xinha/examples/Newbie.html
+share/webmin/file/xinha/examples/XinhaConfig.js
+share/webmin/file/xinha/examples/files/Extended.html
+share/webmin/file/xinha/examples/files/custom.css
+share/webmin/file/xinha/examples/files/dynamic.css
+share/webmin/file/xinha/examples/files/ext_example-body.html
+share/webmin/file/xinha/examples/files/ext_example-dest.php
+share/webmin/file/xinha/examples/files/ext_example-menu.php
+share/webmin/file/xinha/examples/files/full_example.css
+share/webmin/file/xinha/examples/files/stylist.css
 share/webmin/file/xinha/examples/simple_example.html
-share/webmin/file/xinha/examples/stylist.css
 share/webmin/file/xinha/examples/testbed.html
 share/webmin/file/xinha/htmlarea.js
+share/webmin/file/xinha/iconsets/Classic/de/bold.gif
+share/webmin/file/xinha/iconsets/Classic/de/italic.gif
+share/webmin/file/xinha/iconsets/Classic/de/underline.gif
+share/webmin/file/xinha/iconsets/Classic/ed_buttons_main.gif
+share/webmin/file/xinha/iconsets/Classic/ed_charmap.gif
+share/webmin/file/xinha/iconsets/Classic/ed_selectall.gif
+share/webmin/file/xinha/iconsets/Classic/fr/bold.gif
+share/webmin/file/xinha/iconsets/Classic/fr/strikethrough.gif
+share/webmin/file/xinha/iconsets/Classic/fr/underline.gif
+share/webmin/file/xinha/iconsets/Classic/iconset.xml
 share/webmin/file/xinha/images/de/bold.gif
 share/webmin/file/xinha/images/de/italic.gif
 share/webmin/file/xinha/images/de/underline.gif
@@ -263,6 +295,7 @@ share/webmin/file/xinha/images/ed_align_left.gif
 share/webmin/file/xinha/images/ed_align_right.gif
 share/webmin/file/xinha/images/ed_blank.gif
 share/webmin/file/xinha/images/ed_buttons_main.gif
+share/webmin/file/xinha/images/ed_buttons_main.png
 share/webmin/file/xinha/images/ed_charmap.gif
 share/webmin/file/xinha/images/ed_clearfonts.gif
 share/webmin/file/xinha/images/ed_color_bg.gif
@@ -311,8 +344,51 @@ share/webmin/file/xinha/images/fullscreen_minimize.gif
 share/webmin/file/xinha/images/insert_table.gif
 share/webmin/file/xinha/images/insertfilelink.gif
 share/webmin/file/xinha/images/insertmacro.png
+share/webmin/file/xinha/images/tango/16x16/actions/document-new.png
+share/webmin/file/xinha/images/tango/16x16/actions/document-open.png
+share/webmin/file/xinha/images/tango/16x16/actions/document-print.png
+share/webmin/file/xinha/images/tango/16x16/actions/document-save.png
+share/webmin/file/xinha/images/tango/16x16/actions/edit-copy.png
+share/webmin/file/xinha/images/tango/16x16/actions/edit-redo.png
+share/webmin/file/xinha/images/tango/16x16/actions/edit-select-all.png
+share/webmin/file/xinha/images/tango/16x16/actions/edit-undo.png
+share/webmin/file/xinha/images/tango/16x16/actions/folder-new.png
+share/webmin/file/xinha/images/tango/16x16/actions/format-direction-left-to-right.png
+share/webmin/file/xinha/images/tango/16x16/actions/format-direction-right-to-left.png
+share/webmin/file/xinha/images/tango/16x16/actions/format-indent-less.png
+share/webmin/file/xinha/images/tango/16x16/actions/format-indent-more.png
+share/webmin/file/xinha/images/tango/16x16/actions/format-justify-center.png
+share/webmin/file/xinha/images/tango/16x16/actions/format-justify-fill.png
+share/webmin/file/xinha/images/tango/16x16/actions/format-justify-left.png
+share/webmin/file/xinha/images/tango/16x16/actions/format-justify-right.png
+share/webmin/file/xinha/images/tango/16x16/actions/format-text-background-color.png
+share/webmin/file/xinha/images/tango/16x16/actions/format-text-bold.png
+share/webmin/file/xinha/images/tango/16x16/actions/format-text-color.png
+share/webmin/file/xinha/images/tango/16x16/actions/format-text-italic.png
+share/webmin/file/xinha/images/tango/16x16/actions/format-text-strikethrough.png
+share/webmin/file/xinha/images/tango/16x16/actions/format-text-subscript.png
+share/webmin/file/xinha/images/tango/16x16/actions/format-text-superscript.png
+share/webmin/file/xinha/images/tango/16x16/actions/format-text-underline.png
+share/webmin/file/xinha/images/tango/16x16/actions/go-up.png
+share/webmin/file/xinha/images/tango/16x16/actions/insert-link.png
+share/webmin/file/xinha/images/tango/16x16/actions/insert-table.png
+share/webmin/file/xinha/images/tango/16x16/actions/toggle-borders.png
+share/webmin/file/xinha/images/tango/16x16/actions/view-fullscreen.png
+share/webmin/file/xinha/images/tango/16x16/actions/view-restore.png
+share/webmin/file/xinha/images/tango/16x16/apps/accessories-character-map.png
+share/webmin/file/xinha/images/tango/16x16/apps/help-browser.png
+share/webmin/file/xinha/images/tango/16x16/mimetypes/image-x-generic.png
+share/webmin/file/xinha/images/tango/16x16/places/user-trash.png
+share/webmin/file/xinha/images/tango/32x32/apps/internet-web-browser.png
+share/webmin/file/xinha/images/tango/32x32/mimetypes/text-html.png
+share/webmin/file/xinha/images/tango/32x32/mimetypes/text-x-generic.png
+share/webmin/file/xinha/images/tango/32x32/mimetypes/x-office-document.png
+share/webmin/file/xinha/images/tango/32x32/places/folder.png
+share/webmin/file/xinha/images/tango/32x32/places/network-server.png
+share/webmin/file/xinha/images/tango/COPYING
 share/webmin/file/xinha/images/tidy.gif
 share/webmin/file/xinha/images/toggle_borders.gif
+share/webmin/file/xinha/images/xinha-small-icon.gif
 share/webmin/file/xinha/images/xinha_logo.gif
 share/webmin/file/xinha/lang/b5.js
 share/webmin/file/xinha/lang/ch.js
@@ -322,6 +398,7 @@ share/webmin/file/xinha/lang/de.js
 share/webmin/file/xinha/lang/ee.js
 share/webmin/file/xinha/lang/el.js
 share/webmin/file/xinha/lang/es.js
+share/webmin/file/xinha/lang/eu.js
 share/webmin/file/xinha/lang/fa.js
 share/webmin/file/xinha/lang/fi.js
 share/webmin/file/xinha/lang/fr.js
@@ -342,37 +419,95 @@ share/webmin/file/xinha/lang/sh.js
 share/webmin/file/xinha/lang/si.js
 share/webmin/file/xinha/lang/sr.js
 share/webmin/file/xinha/lang/sv.js
+share/webmin/file/xinha/lang/th.js
 share/webmin/file/xinha/lang/vn.js
 share/webmin/file/xinha/license.txt
+share/webmin/file/xinha/modules/AboutBox/AboutBox.js
+share/webmin/file/xinha/modules/AboutBox/about.css
+share/webmin/file/xinha/modules/AboutBox/dialog.html
 share/webmin/file/xinha/modules/ColorPicker/ColorPicker.js
+share/webmin/file/xinha/modules/ColorPicker/lang/pt_br.js
+share/webmin/file/xinha/modules/CreateLink/dialog.html
+share/webmin/file/xinha/modules/CreateLink/lang/pt_br.js
 share/webmin/file/xinha/modules/CreateLink/link.html
 share/webmin/file/xinha/modules/CreateLink/link.js
+share/webmin/file/xinha/modules/CreateLink/pluginMethods.js
+share/webmin/file/xinha/modules/Dialogs/XinhaDialog.js
 share/webmin/file/xinha/modules/Dialogs/dialog.js
-share/webmin/file/xinha/modules/Dialogs/inline-dialog.js
 share/webmin/file/xinha/modules/Dialogs/panel-dialog.js
 share/webmin/file/xinha/modules/Dialogs/popupwin.js
 share/webmin/file/xinha/modules/FullScreen/full-screen.js
 share/webmin/file/xinha/modules/FullScreen/lang/de.js
+share/webmin/file/xinha/modules/FullScreen/lang/es.js
 share/webmin/file/xinha/modules/FullScreen/lang/fr.js
 share/webmin/file/xinha/modules/FullScreen/lang/ja.js
 share/webmin/file/xinha/modules/FullScreen/lang/nb.js
+share/webmin/file/xinha/modules/FullScreen/lang/nl.js
 share/webmin/file/xinha/modules/FullScreen/lang/pl.js
+share/webmin/file/xinha/modules/FullScreen/lang/pt_br.js
 share/webmin/file/xinha/modules/FullScreen/lang/ru.js
 share/webmin/file/xinha/modules/FullScreen/lang/sv.js
 share/webmin/file/xinha/modules/Gecko/Gecko.js
 share/webmin/file/xinha/modules/Gecko/paraHandlerBest.js
-share/webmin/file/xinha/modules/Gecko/paraHandlerDirty.js
 share/webmin/file/xinha/modules/GetHtml/DOMwalk.js
 share/webmin/file/xinha/modules/GetHtml/TransformInnerHTML.js
+share/webmin/file/xinha/modules/GetHtml/lang/pt_br.js
+share/webmin/file/xinha/modules/InlineStyler/InlineStyler.js
+share/webmin/file/xinha/modules/InsertImage/dialog.html
 share/webmin/file/xinha/modules/InsertImage/insert_image.html
 share/webmin/file/xinha/modules/InsertImage/insert_image.js
+share/webmin/file/xinha/modules/InsertImage/pluginMethods.js
+share/webmin/file/xinha/modules/InsertTable/dialog.html
 share/webmin/file/xinha/modules/InsertTable/insert_table.html
 share/webmin/file/xinha/modules/InsertTable/insert_table.js
+share/webmin/file/xinha/modules/InsertTable/pluginMethods.js
 share/webmin/file/xinha/modules/InternetExplorer/InternetExplorer.js
-share/webmin/file/xinha/popups/about.html
+share/webmin/file/xinha/modules/Opera/Opera.js
+share/webmin/file/xinha/modules/WebKit/WebKit.js
 share/webmin/file/xinha/popups/blank.html
 share/webmin/file/xinha/popups/editor_help.html
 share/webmin/file/xinha/popups/popup.css
 share/webmin/file/xinha/popups/popup.js
 share/webmin/file/xinha/popups/select_color.html
 share/webmin/file/xinha/release-notes.txt
+share/webmin/file/xinha/skins/blue-look/button-background.png
+share/webmin/file/xinha/skins/blue-look/separator.gif
+share/webmin/file/xinha/skins/blue-look/skin.css
+share/webmin/file/xinha/skins/blue-metallic/button-background.png
+share/webmin/file/xinha/skins/blue-metallic/separator.gif
+share/webmin/file/xinha/skins/blue-metallic/skin.css
+share/webmin/file/xinha/skins/green-look/button-background.gif
+share/webmin/file/xinha/skins/green-look/separator.gif
+share/webmin/file/xinha/skins/green-look/skin.css
+share/webmin/file/xinha/skins/inditreuse/README
+share/webmin/file/xinha/skins/inditreuse/back.png
+share/webmin/file/xinha/skins/inditreuse/button-background.png
+share/webmin/file/xinha/skins/inditreuse/hover.png
+share/webmin/file/xinha/skins/inditreuse/selected.png
+share/webmin/file/xinha/skins/inditreuse/separator.png
+share/webmin/file/xinha/skins/inditreuse/skin.css
+share/webmin/file/xinha/skins/silva/dialog.jpg
+share/webmin/file/xinha/skins/silva/html.gif
+share/webmin/file/xinha/skins/silva/skin.css
+share/webmin/file/xinha/skins/silva/skin.xml
+share/webmin/file/xinha/skins/silva/statusbar.png
+share/webmin/file/xinha/skins/silva/toolbar.png
+share/webmin/file/xinha/skins/titan/README
+share/webmin/file/xinha/skins/titan/back.png
+share/webmin/file/xinha/skins/titan/button-background.png
+share/webmin/file/xinha/skins/titan/hover.png
+share/webmin/file/xinha/skins/titan/selected.png
+share/webmin/file/xinha/skins/titan/separator.png
+share/webmin/file/xinha/skins/titan/skin.css
+share/webmin/file/xinha/skins/xp-blue/back.png
+share/webmin/file/xinha/skins/xp-blue/button-background.png
+share/webmin/file/xinha/skins/xp-blue/hover.png
+share/webmin/file/xinha/skins/xp-blue/selected.png
+share/webmin/file/xinha/skins/xp-blue/separator.png
+share/webmin/file/xinha/skins/xp-blue/skin.css
+share/webmin/file/xinha/skins/xp-green/back.png
+share/webmin/file/xinha/skins/xp-green/button-background.png
+share/webmin/file/xinha/skins/xp-green/hover.png
+share/webmin/file/xinha/skins/xp-green/selected.png
+share/webmin/file/xinha/skins/xp-green/separator.png
+share/webmin/file/xinha/skins/xp-green/skin.css
diff --git a/sysutils/wbm-lpadmin/Makefile b/sysutils/wbm-lpadmin/Makefile
index db45430d5d9..88e6c325b67 100644
--- a/sysutils/wbm-lpadmin/Makefile
+++ b/sysutils/wbm-lpadmin/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2012/10/23 19:51:32 asau Exp $
+# $NetBSD: Makefile,v 1.6 2012/12/22 01:16:57 dholland Exp $
 
 WBM_NAME=	lpadmin
+PKGREVISION=	1
 
 COMMENT=	Webmin module to manage local and remote printers
 
diff --git a/sysutils/wbm-lpadmin/PLIST b/sysutils/wbm-lpadmin/PLIST
index 95e50383555..2b15ef4e46d 100644
--- a/sysutils/wbm-lpadmin/PLIST
+++ b/sysutils/wbm-lpadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:16:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/12/22 01:16:57 dholland Exp $
 share/examples/webmin/lpadmin/config
 share/webmin/lpadmin/CHANGELOG
 share/webmin/lpadmin/acl_security.pl
@@ -10,6 +10,7 @@ share/webmin/lpadmin/bw.ps
 share/webmin/lpadmin/caldera-driver.pl
 share/webmin/lpadmin/cancel_all.cgi
 share/webmin/lpadmin/catalog.devices
+share/webmin/lpadmin/cgi_args.pl
 share/webmin/lpadmin/cluster.cgi
 share/webmin/lpadmin/cluster_add.cgi
 share/webmin/lpadmin/cluster_delete.cgi
@@ -19,7 +20,8 @@ share/webmin/lpadmin/config-aix
 share/webmin/lpadmin/config-coherent-linux
 share/webmin/lpadmin/config-corel-linux
 share/webmin/lpadmin/config-debian-linux
-share/webmin/lpadmin/config-debian-linux-3.1-*
+share/webmin/lpadmin/config-debian-linux-3.1-3.9
+share/webmin/lpadmin/config-debian-linux-4.0-*
 share/webmin/lpadmin/config-freebsd
 share/webmin/lpadmin/config-generic-linux
 share/webmin/lpadmin/config-gentoo-linux
@@ -34,11 +36,13 @@ share/webmin/lpadmin/config-open-linux
 share/webmin/lpadmin/config-open-linux-3.1e
 share/webmin/lpadmin/config-openbsd
 share/webmin/lpadmin/config-openmamba-linux
+share/webmin/lpadmin/config-pardus-linux
 share/webmin/lpadmin/config-redhat-linux
+share/webmin/lpadmin/config-redhat-linux-24.0-*
 share/webmin/lpadmin/config-redhat-linux-7.0
 share/webmin/lpadmin/config-redhat-linux-7.1
 share/webmin/lpadmin/config-redhat-linux-7.2-8.1
-share/webmin/lpadmin/config-redhat-linux-9.0-*
+share/webmin/lpadmin/config-redhat-linux-9.0-23.0
 share/webmin/lpadmin/config-slackware-linux
 share/webmin/lpadmin/config-slackware-linux-8.1-*
 share/webmin/lpadmin/config-solaris
@@ -52,18 +56,31 @@ share/webmin/lpadmin/config-united-linux
 share/webmin/lpadmin/config-unixware
 share/webmin/lpadmin/config.info
 share/webmin/lpadmin/config.info.ca
+share/webmin/lpadmin/config.info.ca.UTF-8
 share/webmin/lpadmin/config.info.cz
+share/webmin/lpadmin/config.info.cz.UTF-8
 share/webmin/lpadmin/config.info.de
+share/webmin/lpadmin/config.info.de.UTF-8
 share/webmin/lpadmin/config.info.es
+share/webmin/lpadmin/config.info.es.UTF-8
 share/webmin/lpadmin/config.info.fr
+share/webmin/lpadmin/config.info.fr.UTF-8
 share/webmin/lpadmin/config.info.hu
+share/webmin/lpadmin/config.info.hu.UTF-8
 share/webmin/lpadmin/config.info.ja_JP.UTF-8
 share/webmin/lpadmin/config.info.ja_JP.euc
 share/webmin/lpadmin/config.info.nl
+share/webmin/lpadmin/config.info.nl.UTF-8
+share/webmin/lpadmin/config.info.no
 share/webmin/lpadmin/config.info.pl
+share/webmin/lpadmin/config.info.pl.UTF-8
+share/webmin/lpadmin/config.info.pt_BR
+share/webmin/lpadmin/config.info.pt_BR.UTF-8
+share/webmin/lpadmin/config.info.ru.UTF-8
 share/webmin/lpadmin/config.info.ru_RU
 share/webmin/lpadmin/config.info.ru_SU
 share/webmin/lpadmin/config.info.sv
+share/webmin/lpadmin/config.info.sv.UTF-8
 share/webmin/lpadmin/config.info.tr
 share/webmin/lpadmin/config.info.uk_UA
 share/webmin/lpadmin/config.info.zh_CN
@@ -86,25 +103,41 @@ share/webmin/lpadmin/index.cgi
 share/webmin/lpadmin/irix-driver.pl
 share/webmin/lpadmin/irix-lib.pl
 share/webmin/lpadmin/lang/ca
+share/webmin/lpadmin/lang/ca.UTF-8
 share/webmin/lpadmin/lang/cz
+share/webmin/lpadmin/lang/cz.UTF-8
 share/webmin/lpadmin/lang/de
+share/webmin/lpadmin/lang/de.UTF-8
 share/webmin/lpadmin/lang/en
+share/webmin/lpadmin/lang/en.UTF-8
 share/webmin/lpadmin/lang/en_GB
+share/webmin/lpadmin/lang/en_GB.UTF-8
 share/webmin/lpadmin/lang/es
+share/webmin/lpadmin/lang/es.UTF-8
 share/webmin/lpadmin/lang/fr
+share/webmin/lpadmin/lang/fr.UTF-8
 share/webmin/lpadmin/lang/hu
+share/webmin/lpadmin/lang/hu.UTF-8
 share/webmin/lpadmin/lang/it
+share/webmin/lpadmin/lang/it.UTF-8
 share/webmin/lpadmin/lang/ja_JP.UTF-8
 share/webmin/lpadmin/lang/ja_JP.euc
 share/webmin/lpadmin/lang/ko_KR.UTF-8
 share/webmin/lpadmin/lang/ko_KR.euc
 share/webmin/lpadmin/lang/nl
+share/webmin/lpadmin/lang/nl.UTF-8
+share/webmin/lpadmin/lang/no
 share/webmin/lpadmin/lang/pl
+share/webmin/lpadmin/lang/pl.UTF-8
 share/webmin/lpadmin/lang/pt
+share/webmin/lpadmin/lang/pt.UTF-8
 share/webmin/lpadmin/lang/pt_BR
+share/webmin/lpadmin/lang/pt_BR.UTF-8
+share/webmin/lpadmin/lang/ru.UTF-8
 share/webmin/lpadmin/lang/ru_RU
 share/webmin/lpadmin/lang/ru_SU
 share/webmin/lpadmin/lang/sv
+share/webmin/lpadmin/lang/sv.UTF-8
 share/webmin/lpadmin/lang/tr
 share/webmin/lpadmin/lang/uk_UA
 share/webmin/lpadmin/lang/zh_CN
diff --git a/sysutils/wbm-mailboxes/Makefile b/sysutils/wbm-mailboxes/Makefile
index 5fc50d7a27c..b7b69218818 100644
--- a/sysutils/wbm-mailboxes/Makefile
+++ b/sysutils/wbm-mailboxes/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2012/10/23 19:51:32 asau Exp $
+# $NetBSD: Makefile,v 1.6 2012/12/22 01:19:46 dholland Exp $
 
 WBM_NAME=	mailboxes
+PKGREVISION=	1
 
 COMMENT=	Webmin module to read email in users' mailboxes
 
diff --git a/sysutils/wbm-mailboxes/PLIST b/sysutils/wbm-mailboxes/PLIST
index f98438bc5b4..ac2d2866fe0 100644
--- a/sysutils/wbm-mailboxes/PLIST
+++ b/sysutils/wbm-mailboxes/PLIST
@@ -1,24 +1,32 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:16:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/12/22 01:19:46 dholland Exp $
 share/examples/webmin/mailboxes/config
 share/webmin/mailboxes/CHANGELOG
 share/webmin/mailboxes/Makefile
 share/webmin/mailboxes/acl_security.pl
 share/webmin/mailboxes/boxes-lib.pl
+share/webmin/mailboxes/cgi_args.pl
 share/webmin/mailboxes/config
 share/webmin/mailboxes/config.info
 share/webmin/mailboxes/config.info.ca
+share/webmin/mailboxes/config.info.ca.UTF-8
 share/webmin/mailboxes/config.info.cz
+share/webmin/mailboxes/config.info.cz.UTF-8
 share/webmin/mailboxes/config.info.de
+share/webmin/mailboxes/config.info.de.UTF-8
 share/webmin/mailboxes/config.info.el
+share/webmin/mailboxes/config.info.fi
 share/webmin/mailboxes/config.info.it
+share/webmin/mailboxes/config.info.it.UTF-8
 share/webmin/mailboxes/config.info.ja_JP.UTF-8
 share/webmin/mailboxes/config.info.ja_JP.euc
 share/webmin/mailboxes/config.info.ko_KR.UTF-8
 share/webmin/mailboxes/config.info.ko_KR.euc
 share/webmin/mailboxes/config.info.nl
-share/webmin/mailboxes/config_info.pl
+share/webmin/mailboxes/config.info.nl.UTF-8
+share/webmin/mailboxes/config.info.no
+share/webmin/mailboxes/config.info.pt_BR
 share/webmin/mailboxes/config.info.ru_RU
-share/webmin/mailboxes/config.info.fi
+share/webmin/mailboxes/config_info.pl
 share/webmin/mailboxes/defaultacl
 share/webmin/mailboxes/delete_all.cgi
 share/webmin/mailboxes/delete_mail.cgi
@@ -37,24 +45,39 @@ share/webmin/mailboxes/images/smallicon.gif
 share/webmin/mailboxes/images/special.gif
 share/webmin/mailboxes/index.cgi
 share/webmin/mailboxes/lang/ca
+share/webmin/mailboxes/lang/ca.UTF-8
 share/webmin/mailboxes/lang/cz
+share/webmin/mailboxes/lang/cz.UTF-8
 share/webmin/mailboxes/lang/de
+share/webmin/mailboxes/lang/de.UTF-8
 share/webmin/mailboxes/lang/el
 share/webmin/mailboxes/lang/en
+share/webmin/mailboxes/lang/en.UTF-8
 share/webmin/mailboxes/lang/es
+share/webmin/mailboxes/lang/es.UTF-8
 share/webmin/mailboxes/lang/fi
+share/webmin/mailboxes/lang/fi.UTF-8
 share/webmin/mailboxes/lang/fr
+share/webmin/mailboxes/lang/fr.UTF-8
 share/webmin/mailboxes/lang/it
+share/webmin/mailboxes/lang/it.UTF-8
 share/webmin/mailboxes/lang/ja_JP.UTF-8
 share/webmin/mailboxes/lang/ja_JP.euc
 share/webmin/mailboxes/lang/ja_JP.jis
 share/webmin/mailboxes/lang/ko_KR.UTF-8
 share/webmin/mailboxes/lang/ko_KR.euc
 share/webmin/mailboxes/lang/nl
+share/webmin/mailboxes/lang/nl.UTF-8
+share/webmin/mailboxes/lang/no
 share/webmin/mailboxes/lang/pl
+share/webmin/mailboxes/lang/pl.UTF-8
 share/webmin/mailboxes/lang/pt
+share/webmin/mailboxes/lang/pt.UTF-8
+share/webmin/mailboxes/lang/pt_BR
+share/webmin/mailboxes/lang/pt_BR.UTF-8
 share/webmin/mailboxes/lang/ru_RU
 share/webmin/mailboxes/lang/sv
+share/webmin/mailboxes/lang/sv.UTF-8
 share/webmin/mailboxes/lang/tr
 share/webmin/mailboxes/lang/zh_CN
 share/webmin/mailboxes/lang/zh_CN.UTF-8
@@ -74,21 +97,31 @@ share/webmin/mailboxes/useradmin_update.pl
 share/webmin/mailboxes/view_mail.cgi
 share/webmin/mailboxes/xinha/Xinha.css
 share/webmin/mailboxes/xinha/XinhaCore.js
-share/webmin/mailboxes/xinha/contrib/lc_parse_strings.php
 share/webmin/mailboxes/xinha/contrib/php-xinha.php
-share/webmin/mailboxes/xinha/examples/Extended.html
-share/webmin/mailboxes/xinha/examples/custom.css
-share/webmin/mailboxes/xinha/examples/dynamic.css
-share/webmin/mailboxes/xinha/examples/ext_example-body.html
-share/webmin/mailboxes/xinha/examples/ext_example-dest.php
-share/webmin/mailboxes/xinha/examples/ext_example-menu.php
-share/webmin/mailboxes/xinha/examples/ext_example.html
-share/webmin/mailboxes/xinha/examples/full_example.css
-share/webmin/mailboxes/xinha/examples/full_example.js
+share/webmin/mailboxes/xinha/examples/ExtendedDemo.html
+share/webmin/mailboxes/xinha/examples/Newbie.html
+share/webmin/mailboxes/xinha/examples/XinhaConfig.js
+share/webmin/mailboxes/xinha/examples/files/Extended.html
+share/webmin/mailboxes/xinha/examples/files/custom.css
+share/webmin/mailboxes/xinha/examples/files/dynamic.css
+share/webmin/mailboxes/xinha/examples/files/ext_example-body.html
+share/webmin/mailboxes/xinha/examples/files/ext_example-dest.php
+share/webmin/mailboxes/xinha/examples/files/ext_example-menu.php
+share/webmin/mailboxes/xinha/examples/files/full_example.css
+share/webmin/mailboxes/xinha/examples/files/stylist.css
 share/webmin/mailboxes/xinha/examples/simple_example.html
-share/webmin/mailboxes/xinha/examples/stylist.css
 share/webmin/mailboxes/xinha/examples/testbed.html
 share/webmin/mailboxes/xinha/htmlarea.js
+share/webmin/mailboxes/xinha/iconsets/Classic/de/bold.gif
+share/webmin/mailboxes/xinha/iconsets/Classic/de/italic.gif
+share/webmin/mailboxes/xinha/iconsets/Classic/de/underline.gif
+share/webmin/mailboxes/xinha/iconsets/Classic/ed_buttons_main.gif
+share/webmin/mailboxes/xinha/iconsets/Classic/ed_charmap.gif
+share/webmin/mailboxes/xinha/iconsets/Classic/ed_selectall.gif
+share/webmin/mailboxes/xinha/iconsets/Classic/fr/bold.gif
+share/webmin/mailboxes/xinha/iconsets/Classic/fr/strikethrough.gif
+share/webmin/mailboxes/xinha/iconsets/Classic/fr/underline.gif
+share/webmin/mailboxes/xinha/iconsets/Classic/iconset.xml
 share/webmin/mailboxes/xinha/images/de/bold.gif
 share/webmin/mailboxes/xinha/images/de/italic.gif
 share/webmin/mailboxes/xinha/images/de/underline.gif
@@ -100,6 +133,7 @@ share/webmin/mailboxes/xinha/images/ed_align_left.gif
 share/webmin/mailboxes/xinha/images/ed_align_right.gif
 share/webmin/mailboxes/xinha/images/ed_blank.gif
 share/webmin/mailboxes/xinha/images/ed_buttons_main.gif
+share/webmin/mailboxes/xinha/images/ed_buttons_main.png
 share/webmin/mailboxes/xinha/images/ed_charmap.gif
 share/webmin/mailboxes/xinha/images/ed_clearfonts.gif
 share/webmin/mailboxes/xinha/images/ed_color_bg.gif
@@ -148,8 +182,51 @@ share/webmin/mailboxes/xinha/images/fullscreen_minimize.gif
 share/webmin/mailboxes/xinha/images/insert_table.gif
 share/webmin/mailboxes/xinha/images/insertfilelink.gif
 share/webmin/mailboxes/xinha/images/insertmacro.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/document-new.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/document-open.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/document-print.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/document-save.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/edit-copy.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/edit-redo.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/edit-select-all.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/edit-undo.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/folder-new.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/format-direction-left-to-right.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/format-direction-right-to-left.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/format-indent-less.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/format-indent-more.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/format-justify-center.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/format-justify-fill.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/format-justify-left.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/format-justify-right.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/format-text-background-color.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/format-text-bold.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/format-text-color.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/format-text-italic.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/format-text-strikethrough.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/format-text-subscript.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/format-text-superscript.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/format-text-underline.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/go-up.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/insert-link.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/insert-table.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/toggle-borders.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/view-fullscreen.png
+share/webmin/mailboxes/xinha/images/tango/16x16/actions/view-restore.png
+share/webmin/mailboxes/xinha/images/tango/16x16/apps/accessories-character-map.png
+share/webmin/mailboxes/xinha/images/tango/16x16/apps/help-browser.png
+share/webmin/mailboxes/xinha/images/tango/16x16/mimetypes/image-x-generic.png
+share/webmin/mailboxes/xinha/images/tango/16x16/places/user-trash.png
+share/webmin/mailboxes/xinha/images/tango/32x32/apps/internet-web-browser.png
+share/webmin/mailboxes/xinha/images/tango/32x32/mimetypes/text-html.png
+share/webmin/mailboxes/xinha/images/tango/32x32/mimetypes/text-x-generic.png
+share/webmin/mailboxes/xinha/images/tango/32x32/mimetypes/x-office-document.png
+share/webmin/mailboxes/xinha/images/tango/32x32/places/folder.png
+share/webmin/mailboxes/xinha/images/tango/32x32/places/network-server.png
+share/webmin/mailboxes/xinha/images/tango/COPYING
 share/webmin/mailboxes/xinha/images/tidy.gif
 share/webmin/mailboxes/xinha/images/toggle_borders.gif
+share/webmin/mailboxes/xinha/images/xinha-small-icon.gif
 share/webmin/mailboxes/xinha/images/xinha_logo.gif
 share/webmin/mailboxes/xinha/lang/b5.js
 share/webmin/mailboxes/xinha/lang/ch.js
@@ -159,6 +236,7 @@ share/webmin/mailboxes/xinha/lang/de.js
 share/webmin/mailboxes/xinha/lang/ee.js
 share/webmin/mailboxes/xinha/lang/el.js
 share/webmin/mailboxes/xinha/lang/es.js
+share/webmin/mailboxes/xinha/lang/eu.js
 share/webmin/mailboxes/xinha/lang/fa.js
 share/webmin/mailboxes/xinha/lang/fi.js
 share/webmin/mailboxes/xinha/lang/fr.js
@@ -179,37 +257,95 @@ share/webmin/mailboxes/xinha/lang/sh.js
 share/webmin/mailboxes/xinha/lang/si.js
 share/webmin/mailboxes/xinha/lang/sr.js
 share/webmin/mailboxes/xinha/lang/sv.js
+share/webmin/mailboxes/xinha/lang/th.js
 share/webmin/mailboxes/xinha/lang/vn.js
 share/webmin/mailboxes/xinha/license.txt
+share/webmin/mailboxes/xinha/modules/AboutBox/AboutBox.js
+share/webmin/mailboxes/xinha/modules/AboutBox/about.css
+share/webmin/mailboxes/xinha/modules/AboutBox/dialog.html
 share/webmin/mailboxes/xinha/modules/ColorPicker/ColorPicker.js
+share/webmin/mailboxes/xinha/modules/ColorPicker/lang/pt_br.js
+share/webmin/mailboxes/xinha/modules/CreateLink/dialog.html
+share/webmin/mailboxes/xinha/modules/CreateLink/lang/pt_br.js
 share/webmin/mailboxes/xinha/modules/CreateLink/link.html
 share/webmin/mailboxes/xinha/modules/CreateLink/link.js
+share/webmin/mailboxes/xinha/modules/CreateLink/pluginMethods.js
+share/webmin/mailboxes/xinha/modules/Dialogs/XinhaDialog.js
 share/webmin/mailboxes/xinha/modules/Dialogs/dialog.js
-share/webmin/mailboxes/xinha/modules/Dialogs/inline-dialog.js
 share/webmin/mailboxes/xinha/modules/Dialogs/panel-dialog.js
 share/webmin/mailboxes/xinha/modules/Dialogs/popupwin.js
 share/webmin/mailboxes/xinha/modules/FullScreen/full-screen.js
 share/webmin/mailboxes/xinha/modules/FullScreen/lang/de.js
+share/webmin/mailboxes/xinha/modules/FullScreen/lang/es.js
 share/webmin/mailboxes/xinha/modules/FullScreen/lang/fr.js
 share/webmin/mailboxes/xinha/modules/FullScreen/lang/ja.js
 share/webmin/mailboxes/xinha/modules/FullScreen/lang/nb.js
+share/webmin/mailboxes/xinha/modules/FullScreen/lang/nl.js
 share/webmin/mailboxes/xinha/modules/FullScreen/lang/pl.js
+share/webmin/mailboxes/xinha/modules/FullScreen/lang/pt_br.js
 share/webmin/mailboxes/xinha/modules/FullScreen/lang/ru.js
 share/webmin/mailboxes/xinha/modules/FullScreen/lang/sv.js
 share/webmin/mailboxes/xinha/modules/Gecko/Gecko.js
 share/webmin/mailboxes/xinha/modules/Gecko/paraHandlerBest.js
-share/webmin/mailboxes/xinha/modules/Gecko/paraHandlerDirty.js
 share/webmin/mailboxes/xinha/modules/GetHtml/DOMwalk.js
 share/webmin/mailboxes/xinha/modules/GetHtml/TransformInnerHTML.js
+share/webmin/mailboxes/xinha/modules/GetHtml/lang/pt_br.js
+share/webmin/mailboxes/xinha/modules/InlineStyler/InlineStyler.js
+share/webmin/mailboxes/xinha/modules/InsertImage/dialog.html
 share/webmin/mailboxes/xinha/modules/InsertImage/insert_image.html
 share/webmin/mailboxes/xinha/modules/InsertImage/insert_image.js
+share/webmin/mailboxes/xinha/modules/InsertImage/pluginMethods.js
+share/webmin/mailboxes/xinha/modules/InsertTable/dialog.html
 share/webmin/mailboxes/xinha/modules/InsertTable/insert_table.html
 share/webmin/mailboxes/xinha/modules/InsertTable/insert_table.js
+share/webmin/mailboxes/xinha/modules/InsertTable/pluginMethods.js
 share/webmin/mailboxes/xinha/modules/InternetExplorer/InternetExplorer.js
-share/webmin/mailboxes/xinha/popups/about.html
+share/webmin/mailboxes/xinha/modules/Opera/Opera.js
+share/webmin/mailboxes/xinha/modules/WebKit/WebKit.js
 share/webmin/mailboxes/xinha/popups/blank.html
 share/webmin/mailboxes/xinha/popups/editor_help.html
 share/webmin/mailboxes/xinha/popups/popup.css
 share/webmin/mailboxes/xinha/popups/popup.js
 share/webmin/mailboxes/xinha/popups/select_color.html
 share/webmin/mailboxes/xinha/release-notes.txt
+share/webmin/mailboxes/xinha/skins/blue-look/button-background.png
+share/webmin/mailboxes/xinha/skins/blue-look/separator.gif
+share/webmin/mailboxes/xinha/skins/blue-look/skin.css
+share/webmin/mailboxes/xinha/skins/blue-metallic/button-background.png
+share/webmin/mailboxes/xinha/skins/blue-metallic/separator.gif
+share/webmin/mailboxes/xinha/skins/blue-metallic/skin.css
+share/webmin/mailboxes/xinha/skins/green-look/button-background.gif
+share/webmin/mailboxes/xinha/skins/green-look/separator.gif
+share/webmin/mailboxes/xinha/skins/green-look/skin.css
+share/webmin/mailboxes/xinha/skins/inditreuse/README
+share/webmin/mailboxes/xinha/skins/inditreuse/back.png
+share/webmin/mailboxes/xinha/skins/inditreuse/button-background.png
+share/webmin/mailboxes/xinha/skins/inditreuse/hover.png
+share/webmin/mailboxes/xinha/skins/inditreuse/selected.png
+share/webmin/mailboxes/xinha/skins/inditreuse/separator.png
+share/webmin/mailboxes/xinha/skins/inditreuse/skin.css
+share/webmin/mailboxes/xinha/skins/silva/dialog.jpg
+share/webmin/mailboxes/xinha/skins/silva/html.gif
+share/webmin/mailboxes/xinha/skins/silva/skin.css
+share/webmin/mailboxes/xinha/skins/silva/skin.xml
+share/webmin/mailboxes/xinha/skins/silva/statusbar.png
+share/webmin/mailboxes/xinha/skins/silva/toolbar.png
+share/webmin/mailboxes/xinha/skins/titan/README
+share/webmin/mailboxes/xinha/skins/titan/back.png
+share/webmin/mailboxes/xinha/skins/titan/button-background.png
+share/webmin/mailboxes/xinha/skins/titan/hover.png
+share/webmin/mailboxes/xinha/skins/titan/selected.png
+share/webmin/mailboxes/xinha/skins/titan/separator.png
+share/webmin/mailboxes/xinha/skins/titan/skin.css
+share/webmin/mailboxes/xinha/skins/xp-blue/back.png
+share/webmin/mailboxes/xinha/skins/xp-blue/button-background.png
+share/webmin/mailboxes/xinha/skins/xp-blue/hover.png
+share/webmin/mailboxes/xinha/skins/xp-blue/selected.png
+share/webmin/mailboxes/xinha/skins/xp-blue/separator.png
+share/webmin/mailboxes/xinha/skins/xp-blue/skin.css
+share/webmin/mailboxes/xinha/skins/xp-green/back.png
+share/webmin/mailboxes/xinha/skins/xp-green/button-background.png
+share/webmin/mailboxes/xinha/skins/xp-green/hover.png
+share/webmin/mailboxes/xinha/skins/xp-green/selected.png
+share/webmin/mailboxes/xinha/skins/xp-green/separator.png
+share/webmin/mailboxes/xinha/skins/xp-green/skin.css
diff --git a/sysutils/wbm-mount/Makefile b/sysutils/wbm-mount/Makefile
index 625da97de4e..0be254ad1cc 100644
--- a/sysutils/wbm-mount/Makefile
+++ b/sysutils/wbm-mount/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2012/10/23 19:51:32 asau Exp $
+# $NetBSD: Makefile,v 1.6 2012/12/22 01:22:04 dholland Exp $
 
 WBM_NAME=	mount
+PKGREVISION=	1
 
 COMMENT=	Webmin module to mount filesystems
 
diff --git a/sysutils/wbm-mount/PLIST b/sysutils/wbm-mount/PLIST
index 15cec24a445..d54163de17e 100644
--- a/sysutils/wbm-mount/PLIST
+++ b/sysutils/wbm-mount/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:16:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/12/22 01:22:04 dholland Exp $
 share/examples/webmin/mount/config
 share/webmin/mount/CHANGELOG
 share/webmin/mount/acl_security.pl
 share/webmin/mount/backup_config.pl
+share/webmin/mount/cgi_args.pl
 share/webmin/mount/config-cobalt-linux
 share/webmin/mount/config-coherent-linux
 share/webmin/mount/config-corel-linux
@@ -11,7 +12,6 @@ share/webmin/mount/config-freebsd
 share/webmin/mount/config-generic-linux
 share/webmin/mount/config-gentoo-linux
 share/webmin/mount/config-hpux
-share/webmin/mount/config-irix
 share/webmin/mount/config-lfs-linux
 share/webmin/mount/config-macos
 share/webmin/mount/config-mandrake-linux
@@ -22,6 +22,7 @@ share/webmin/mount/config-open-linux-3.1e
 share/webmin/mount/config-openbsd
 share/webmin/mount/config-openmamba-linux
 share/webmin/mount/config-osf1
+share/webmin/mount/config-pardus-linux
 share/webmin/mount/config-redhat-linux
 share/webmin/mount/config-redhat-linux-5.0-6.0
 share/webmin/mount/config-redhat-linux-6.1-*
@@ -33,23 +34,34 @@ share/webmin/mount/config-trustix-linux
 share/webmin/mount/config-turbo-linux
 share/webmin/mount/config-turbo-linux-4.0
 share/webmin/mount/config-united-linux
-share/webmin/mount/config-unixware
 share/webmin/mount/config.info
 share/webmin/mount/config.info.ca
+share/webmin/mount/config.info.ca.UTF-8
 share/webmin/mount/config.info.cz
+share/webmin/mount/config.info.cz.UTF-8
 share/webmin/mount/config.info.de
+share/webmin/mount/config.info.de.UTF-8
 share/webmin/mount/config.info.es
+share/webmin/mount/config.info.es.UTF-8
 share/webmin/mount/config.info.fa
 share/webmin/mount/config.info.fr
+share/webmin/mount/config.info.fr.UTF-8
 share/webmin/mount/config.info.ja_JP.UTF-8
 share/webmin/mount/config.info.ja_JP.euc
 share/webmin/mount/config.info.ko_KR.UTF-8
 share/webmin/mount/config.info.ko_KR.euc
 share/webmin/mount/config.info.nl
+share/webmin/mount/config.info.nl.UTF-8
+share/webmin/mount/config.info.no
 share/webmin/mount/config.info.pl
+share/webmin/mount/config.info.pl.UTF-8
+share/webmin/mount/config.info.pt_BR
+share/webmin/mount/config.info.pt_BR.UTF-8
+share/webmin/mount/config.info.ru.UTF-8
 share/webmin/mount/config.info.ru_RU
 share/webmin/mount/config.info.ru_SU
 share/webmin/mount/config.info.sv
+share/webmin/mount/config.info.sv.UTF-8
 share/webmin/mount/config.info.tr
 share/webmin/mount/config.info.uk_UA
 share/webmin/mount/config.info.zh_CN
@@ -69,108 +81,182 @@ share/webmin/mount/freebsd-mounts-4.c
 share/webmin/mount/freebsd-mounts-5
 share/webmin/mount/freebsd-mounts-5.c
 share/webmin/mount/freebsd-mounts-7.c
+share/webmin/mount/help/edit_dir.ca.UTF-8.html
 share/webmin/mount/help/edit_dir.ca.html
 share/webmin/mount/help/edit_dir.fa.html
+share/webmin/mount/help/edit_dir.fr.UTF-8.html
 share/webmin/mount/help/edit_dir.fr.html
+share/webmin/mount/help/edit_dir.html
 share/webmin/mount/help/edit_dir.ko_KR.UTF-8.html
 share/webmin/mount/help/edit_dir.ko_KR.euc.html
-share/webmin/mount/help/edit_dir.html
-share/webmin/mount/help/help.ca.html
-share/webmin/mount/help/help.es.html
-share/webmin/mount/help/help.sv.html
-share/webmin/mount/help/help.zh_TW.Big5.html
-share/webmin/mount/help/help.zh_TW.UTF-8.html
+share/webmin/mount/help/edit_dir.nl.UTF-8.html
+share/webmin/mount/help/edit_dir.nl.html
+share/webmin/mount/help/linux_auth.ca.UTF-8.html
 share/webmin/mount/help/linux_auth.ca.html
+share/webmin/mount/help/linux_auth.fr.UTF-8.html
 share/webmin/mount/help/linux_auth.fr.html
 share/webmin/mount/help/linux_auth.html
+share/webmin/mount/help/linux_auth.nl.UTF-8.html
+share/webmin/mount/help/linux_auth.nl.html
+share/webmin/mount/help/linux_bg.ca.UTF-8.html
 share/webmin/mount/help/linux_bg.ca.html
 share/webmin/mount/help/linux_bg.fa.html
+share/webmin/mount/help/linux_bg.fr.UTF-8.html
 share/webmin/mount/help/linux_bg.fr.html
+share/webmin/mount/help/linux_bg.html
 share/webmin/mount/help/linux_bg.ko_KR.UTF-8.html
 share/webmin/mount/help/linux_bg.ko_KR.euc.html
-share/webmin/mount/help/linux_bg.html
+share/webmin/mount/help/linux_bg.nl.UTF-8.html
+share/webmin/mount/help/linux_bg.nl.html
+share/webmin/mount/help/linux_intr.ca.UTF-8.html
 share/webmin/mount/help/linux_intr.ca.html
+share/webmin/mount/help/linux_intr.fr.UTF-8.html
 share/webmin/mount/help/linux_intr.fr.html
 share/webmin/mount/help/linux_intr.html
+share/webmin/mount/help/linux_intr.nl.UTF-8.html
+share/webmin/mount/help/linux_intr.nl.html
+share/webmin/mount/help/linux_noatime.ca.UTF-8.html
+share/webmin/mount/help/linux_noatime.ca.html
+share/webmin/mount/help/linux_noatime.html
+share/webmin/mount/help/linux_noatime.nl.UTF-8.html
+share/webmin/mount/help/linux_noatime.nl.html
+share/webmin/mount/help/linux_nodev.ca.UTF-8.html
 share/webmin/mount/help/linux_nodev.ca.html
-share/webmin/mount/help/linux_nodev.fa.html
-share/webmin/mount/help/linux_nodev.fr.html
-share/webmin/mount/help/linux_nodev.ko_KR.UTF-8.html
-share/webmin/mount/help/linux_nodev.ko_KR.euc.html
 share/webmin/mount/help/linux_nodev.html
+share/webmin/mount/help/linux_nodev.nl.UTF-8.html
+share/webmin/mount/help/linux_nodev.nl.html
+share/webmin/mount/help/linux_noexec.ca.UTF-8.html
 share/webmin/mount/help/linux_noexec.ca.html
-share/webmin/mount/help/linux_noexec.fa.html
-share/webmin/mount/help/linux_noexec.fr.html
-share/webmin/mount/help/linux_noexec.ko_KR.UTF-8.html
-share/webmin/mount/help/linux_noexec.ko_KR.euc.html
 share/webmin/mount/help/linux_noexec.html
+share/webmin/mount/help/linux_noexec.nl.UTF-8.html
+share/webmin/mount/help/linux_noexec.nl.html
+share/webmin/mount/help/linux_nosuid.ca.UTF-8.html
 share/webmin/mount/help/linux_nosuid.ca.html
 share/webmin/mount/help/linux_nosuid.fa.html
+share/webmin/mount/help/linux_nosuid.fr.UTF-8.html
 share/webmin/mount/help/linux_nosuid.fr.html
+share/webmin/mount/help/linux_nosuid.html
 share/webmin/mount/help/linux_nosuid.ko_KR.UTF-8.html
 share/webmin/mount/help/linux_nosuid.ko_KR.euc.html
-share/webmin/mount/help/linux_nosuid.html
+share/webmin/mount/help/linux_nosuid.nl.UTF-8.html
+share/webmin/mount/help/linux_nosuid.nl.html
+share/webmin/mount/help/linux_port.ca.UTF-8.html
 share/webmin/mount/help/linux_port.ca.html
 share/webmin/mount/help/linux_port.fa.html
+share/webmin/mount/help/linux_port.fr.UTF-8.html
 share/webmin/mount/help/linux_port.fr.html
 share/webmin/mount/help/linux_port.html
+share/webmin/mount/help/linux_port.nl.UTF-8.html
+share/webmin/mount/help/linux_port.nl.html
+share/webmin/mount/help/linux_retrans.ca.UTF-8.html
 share/webmin/mount/help/linux_retrans.ca.html
 share/webmin/mount/help/linux_retrans.fa.html
+share/webmin/mount/help/linux_retrans.fr.UTF-8.html
 share/webmin/mount/help/linux_retrans.fr.html
 share/webmin/mount/help/linux_retrans.html
+share/webmin/mount/help/linux_retrans.nl.UTF-8.html
+share/webmin/mount/help/linux_retrans.nl.html
+share/webmin/mount/help/linux_ro.ca.UTF-8.html
 share/webmin/mount/help/linux_ro.ca.html
 share/webmin/mount/help/linux_ro.fa.html
+share/webmin/mount/help/linux_ro.fr.UTF-8.html
 share/webmin/mount/help/linux_ro.fr.html
+share/webmin/mount/help/linux_ro.html
 share/webmin/mount/help/linux_ro.ko_KR.UTF-8.html
 share/webmin/mount/help/linux_ro.ko_KR.euc.html
-share/webmin/mount/help/linux_ro.html
+share/webmin/mount/help/linux_ro.nl.UTF-8.html
+share/webmin/mount/help/linux_ro.nl.html
+share/webmin/mount/help/linux_rsize.ca.UTF-8.html
 share/webmin/mount/help/linux_rsize.ca.html
+share/webmin/mount/help/linux_rsize.fr.UTF-8.html
 share/webmin/mount/help/linux_rsize.fr.html
 share/webmin/mount/help/linux_rsize.html
+share/webmin/mount/help/linux_rsize.nl.UTF-8.html
+share/webmin/mount/help/linux_rsize.nl.html
+share/webmin/mount/help/linux_sec.ca.UTF-8.html
 share/webmin/mount/help/linux_sec.ca.html
 share/webmin/mount/help/linux_sec.fa.html
+share/webmin/mount/help/linux_sec.fr.UTF-8.html
 share/webmin/mount/help/linux_sec.fr.html
 share/webmin/mount/help/linux_sec.html
+share/webmin/mount/help/linux_sec.nl.UTF-8.html
+share/webmin/mount/help/linux_sec.nl.html
+share/webmin/mount/help/linux_soft.ca.UTF-8.html
 share/webmin/mount/help/linux_soft.ca.html
 share/webmin/mount/help/linux_soft.fa.html
+share/webmin/mount/help/linux_soft.fr.UTF-8.html
 share/webmin/mount/help/linux_soft.fr.html
 share/webmin/mount/help/linux_soft.html
+share/webmin/mount/help/linux_soft.nl.UTF-8.html
+share/webmin/mount/help/linux_soft.nl.html
+share/webmin/mount/help/linux_sync.ca.UTF-8.html
 share/webmin/mount/help/linux_sync.ca.html
 share/webmin/mount/help/linux_sync.fa.html
+share/webmin/mount/help/linux_sync.fr.UTF-8.html
 share/webmin/mount/help/linux_sync.fr.html
+share/webmin/mount/help/linux_sync.html
 share/webmin/mount/help/linux_sync.ko_KR.UTF-8.html
 share/webmin/mount/help/linux_sync.ko_KR.euc.html
-share/webmin/mount/help/linux_sync.html
+share/webmin/mount/help/linux_sync.nl.UTF-8.html
+share/webmin/mount/help/linux_sync.nl.html
+share/webmin/mount/help/linux_timeo.ca.UTF-8.html
 share/webmin/mount/help/linux_timeo.ca.html
 share/webmin/mount/help/linux_timeo.fa.html
+share/webmin/mount/help/linux_timeo.fr.UTF-8.html
 share/webmin/mount/help/linux_timeo.fr.html
 share/webmin/mount/help/linux_timeo.html
+share/webmin/mount/help/linux_timeo.nl.UTF-8.html
+share/webmin/mount/help/linux_timeo.nl.html
+share/webmin/mount/help/linux_transfert.ca.UTF-8.html
 share/webmin/mount/help/linux_transfert.ca.html
 share/webmin/mount/help/linux_transfert.fa.html
+share/webmin/mount/help/linux_transfert.fr.UTF-8.html
 share/webmin/mount/help/linux_transfert.fr.html
 share/webmin/mount/help/linux_transfert.html
+share/webmin/mount/help/linux_transfert.nl.UTF-8.html
+share/webmin/mount/help/linux_transfert.nl.html
+share/webmin/mount/help/linux_user.ca.UTF-8.html
 share/webmin/mount/help/linux_user.ca.html
 share/webmin/mount/help/linux_user.fa.html
+share/webmin/mount/help/linux_user.fr.UTF-8.html
 share/webmin/mount/help/linux_user.fr.html
+share/webmin/mount/help/linux_user.html
 share/webmin/mount/help/linux_user.ko_KR.UTF-8.html
 share/webmin/mount/help/linux_user.ko_KR.euc.html
-share/webmin/mount/help/linux_user.html
+share/webmin/mount/help/linux_user.nl.UTF-8.html
+share/webmin/mount/help/linux_user.nl.html
+share/webmin/mount/help/linux_vers.ca.UTF-8.html
 share/webmin/mount/help/linux_vers.ca.html
 share/webmin/mount/help/linux_vers.fa.html
+share/webmin/mount/help/linux_vers.fr.UTF-8.html
 share/webmin/mount/help/linux_vers.fr.html
 share/webmin/mount/help/linux_vers.html
+share/webmin/mount/help/linux_vers.nl.UTF-8.html
+share/webmin/mount/help/linux_vers.nl.html
+share/webmin/mount/help/linux_wsize.ca.UTF-8.html
 share/webmin/mount/help/linux_wsize.ca.html
 share/webmin/mount/help/linux_wsize.fa.html
+share/webmin/mount/help/linux_wsize.fr.UTF-8.html
 share/webmin/mount/help/linux_wsize.fr.html
 share/webmin/mount/help/linux_wsize.html
+share/webmin/mount/help/linux_wsize.nl.UTF-8.html
+share/webmin/mount/help/linux_wsize.nl.html
+share/webmin/mount/help/nfsdir.ca.UTF-8.html
 share/webmin/mount/help/nfsdir.ca.html
 share/webmin/mount/help/nfsdir.fa.html
+share/webmin/mount/help/nfsdir.fr.UTF-8.html
 share/webmin/mount/help/nfsdir.fr.html
 share/webmin/mount/help/nfsdir.html
+share/webmin/mount/help/nfsdir.nl.UTF-8.html
+share/webmin/mount/help/nfsdir.nl.html
+share/webmin/mount/help/nfshost.ca.UTF-8.html
 share/webmin/mount/help/nfshost.ca.html
 share/webmin/mount/help/nfshost.fa.html
+share/webmin/mount/help/nfshost.fr.UTF-8.html
 share/webmin/mount/help/nfshost.fr.html
 share/webmin/mount/help/nfshost.html
+share/webmin/mount/help/nfshost.nl.UTF-8.html
+share/webmin/mount/help/nfshost.nl.html
 share/webmin/mount/hpux-lib.pl
 share/webmin/mount/images/auto.gif
 share/webmin/mount/images/autofs.gif
@@ -201,25 +287,39 @@ share/webmin/mount/images/umsdos.gif
 share/webmin/mount/images/vfat.gif
 share/webmin/mount/images/xmemfs.gif
 share/webmin/mount/index.cgi
-share/webmin/mount/irix-lib.pl
 share/webmin/mount/lang/ca
+share/webmin/mount/lang/ca.UTF-8
 share/webmin/mount/lang/cz
+share/webmin/mount/lang/cz.UTF-8
 share/webmin/mount/lang/de
+share/webmin/mount/lang/de.UTF-8
 share/webmin/mount/lang/en
+share/webmin/mount/lang/en.UTF-8
 share/webmin/mount/lang/es
+share/webmin/mount/lang/es.UTF-8
 share/webmin/mount/lang/fa
 share/webmin/mount/lang/fr
+share/webmin/mount/lang/fr.UTF-8
 share/webmin/mount/lang/hu
+share/webmin/mount/lang/hu.UTF-8
 share/webmin/mount/lang/it
+share/webmin/mount/lang/it.UTF-8
 share/webmin/mount/lang/ja_JP.UTF-8
 share/webmin/mount/lang/ja_JP.euc
 share/webmin/mount/lang/ko_KR.UTF-8
 share/webmin/mount/lang/ko_KR.euc
 share/webmin/mount/lang/nl
+share/webmin/mount/lang/nl.UTF-8
+share/webmin/mount/lang/no
 share/webmin/mount/lang/pl
+share/webmin/mount/lang/pl.UTF-8
+share/webmin/mount/lang/pt_BR
+share/webmin/mount/lang/pt_BR.UTF-8
+share/webmin/mount/lang/ru.UTF-8
 share/webmin/mount/lang/ru_RU
 share/webmin/mount/lang/ru_SU
 share/webmin/mount/lang/sv
+share/webmin/mount/lang/sv.UTF-8
 share/webmin/mount/lang/tr
 share/webmin/mount/lang/uk_UA
 share/webmin/mount/lang/zh_CN
@@ -228,13 +328,11 @@ share/webmin/mount/lang/zh_TW.Big5
 share/webmin/mount/lang/zh_TW.UTF-8
 share/webmin/mount/linux-lib.pl
 share/webmin/mount/log_parser.pl
-share/webmin/mount/low.skill
 share/webmin/mount/macos-lib.pl
 share/webmin/mount/macos-mounts
 share/webmin/mount/macos-mounts-intel
 share/webmin/mount/macos-mounts-intel.c
 share/webmin/mount/macos-mounts.c
-share/webmin/mount/medium.skill
 share/webmin/mount/module.info
 share/webmin/mount/mount-lib.pl
 share/webmin/mount/mount.cgi
@@ -250,11 +348,11 @@ share/webmin/mount/openbsd-mounts-2.c
 share/webmin/mount/openbsd-mounts-3
 share/webmin/mount/openbsd-mounts-3.c
 share/webmin/mount/openbsd-mounts-4.c
+share/webmin/mount/openbsd-mounts-5.c
 share/webmin/mount/osf1-lib.pl
 share/webmin/mount/rbac-mapping
 share/webmin/mount/save_mount.cgi
 share/webmin/mount/smb_server.cgi
 share/webmin/mount/smb_share.cgi
 share/webmin/mount/solaris-lib.pl
-share/webmin/mount/unixware-lib.pl
 share/webmin/mount/unmount.cgi
diff --git a/sysutils/wbm-mysql/Makefile b/sysutils/wbm-mysql/Makefile
index 10a0d258b35..5975d4257d1 100644
--- a/sysutils/wbm-mysql/Makefile
+++ b/sysutils/wbm-mysql/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2012/10/23 19:51:32 asau Exp $
+# $NetBSD: Makefile,v 1.6 2012/12/22 01:23:28 dholland Exp $
 
 WBM_NAME=	mysql
+PKGREVISION=	1
 
 COMMENT=	Webmin module for managing MySQL databases
 
diff --git a/sysutils/wbm-mysql/PLIST b/sysutils/wbm-mysql/PLIST
index ab11a56c8d1..8f501b074cc 100644
--- a/sysutils/wbm-mysql/PLIST
+++ b/sysutils/wbm-mysql/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:16:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/12/22 01:23:28 dholland Exp $
 share/examples/webmin/mysql/config
 share/webmin/mysql/CHANGELOG
 share/webmin/mysql/acl_security.pl
 share/webmin/mysql/backup.pl
+share/webmin/mysql/backup_config.pl
 share/webmin/mysql/backup_db.cgi
 share/webmin/mysql/backup_form.cgi
+share/webmin/mysql/cgi_args.pl
 share/webmin/mysql/config
 share/webmin/mysql/config-aix
 share/webmin/mysql/config-cobalt-linux
@@ -19,8 +21,10 @@ share/webmin/mysql/config-msc-linux
 share/webmin/mysql/config-netbsd
 share/webmin/mysql/config-open-linux
 share/webmin/mysql/config-openmamba-linux
+share/webmin/mysql/config-pardus-linux
 share/webmin/mysql/config-redhat-linux
-share/webmin/mysql/config-redhat-linux-7.0-*
+share/webmin/mysql/config-redhat-linux-24.0-*
+share/webmin/mysql/config-redhat-linux-7.0-23.0
 share/webmin/mysql/config-slackware-linux-8.0-*
 share/webmin/mysql/config-sol-linux
 share/webmin/mysql/config-solaris-10
@@ -32,28 +36,42 @@ share/webmin/mysql/config-trustix-linux
 share/webmin/mysql/config-turbo-linux
 share/webmin/mysql/config-united-linux
 share/webmin/mysql/config-windows
-share/webmin/mysql/config_info.pl
 share/webmin/mysql/config.info
 share/webmin/mysql/config.info.ca
+share/webmin/mysql/config.info.ca.UTF-8
 share/webmin/mysql/config.info.cz
+share/webmin/mysql/config.info.cz.UTF-8
 share/webmin/mysql/config.info.de
+share/webmin/mysql/config.info.de.UTF-8
 share/webmin/mysql/config.info.es
+share/webmin/mysql/config.info.es.UTF-8
 share/webmin/mysql/config.info.fi
+share/webmin/mysql/config.info.fr
 share/webmin/mysql/config.info.hu
+share/webmin/mysql/config.info.hu.UTF-8
 share/webmin/mysql/config.info.it
+share/webmin/mysql/config.info.it.UTF-8
 share/webmin/mysql/config.info.ja_JP.UTF-8
 share/webmin/mysql/config.info.ja_JP.euc
 share/webmin/mysql/config.info.nl
+share/webmin/mysql/config.info.nl.UTF-8
+share/webmin/mysql/config.info.no
 share/webmin/mysql/config.info.pl
+share/webmin/mysql/config.info.pl.UTF-8
+share/webmin/mysql/config.info.pt_BR
+share/webmin/mysql/config.info.pt_BR.UTF-8
+share/webmin/mysql/config.info.ru.UTF-8
 share/webmin/mysql/config.info.ru_RU
 share/webmin/mysql/config.info.ru_SU
 share/webmin/mysql/config.info.sv
+share/webmin/mysql/config.info.sv.UTF-8
 share/webmin/mysql/config.info.tr
 share/webmin/mysql/config.info.uk_UA
 share/webmin/mysql/config.info.zh_CN
 share/webmin/mysql/config.info.zh_CN.UTF-8
 share/webmin/mysql/config.info.zh_TW.Big5
 share/webmin/mysql/config.info.zh_TW.UTF-8
+share/webmin/mysql/config_info.pl
 share/webmin/mysql/cpan_modules.pl
 share/webmin/mysql/create_table.cgi
 share/webmin/mysql/csv.cgi
@@ -84,223 +102,419 @@ share/webmin/mysql/edit_view.cgi
 share/webmin/mysql/exec.cgi
 share/webmin/mysql/exec_file.cgi
 share/webmin/mysql/exec_form.cgi
+share/webmin/mysql/help/backup_form.ca.UTF-8.html
 share/webmin/mysql/help/backup_form.ca.html
+share/webmin/mysql/help/backup_form.es.UTF-8.html
 share/webmin/mysql/help/backup_form.es.html
 share/webmin/mysql/help/backup_form.html
+share/webmin/mysql/help/backup_form.hu.UTF-8.html
 share/webmin/mysql/help/backup_form.hu.html
+share/webmin/mysql/help/backup_form.it.UTF-8.html
 share/webmin/mysql/help/backup_form.it.html
+share/webmin/mysql/help/backup_form.no.html
+share/webmin/mysql/help/cnf.ca.UTF-8.html
 share/webmin/mysql/help/cnf.ca.html
 share/webmin/mysql/help/cnf.html
+share/webmin/mysql/help/cnf.it.UTF-8.html
 share/webmin/mysql/help/cnf.it.html
+share/webmin/mysql/help/cnf.nl.UTF-8.html
+share/webmin/mysql/help/cnf.nl.html
+share/webmin/mysql/help/cpriv.ca.UTF-8.html
 share/webmin/mysql/help/cpriv.ca.html
+share/webmin/mysql/help/cpriv.es.UTF-8.html
 share/webmin/mysql/help/cpriv.es.html
 share/webmin/mysql/help/cpriv.html
+share/webmin/mysql/help/cpriv.hu.UTF-8.html
 share/webmin/mysql/help/cpriv.hu.html
+share/webmin/mysql/help/cpriv.it.UTF-8.html
 share/webmin/mysql/help/cpriv.it.html
+share/webmin/mysql/help/cpriv.nl.UTF-8.html
+share/webmin/mysql/help/cpriv.nl.html
+share/webmin/mysql/help/cpriv.sv.UTF-8.html
 share/webmin/mysql/help/cpriv.sv.html
 share/webmin/mysql/help/cpriv.zh_TW.Big5.html
 share/webmin/mysql/help/cpriv.zh_TW.UTF-8.html
+share/webmin/mysql/help/cprivs.ca.UTF-8.html
 share/webmin/mysql/help/cprivs.ca.html
+share/webmin/mysql/help/cprivs.es.UTF-8.html
 share/webmin/mysql/help/cprivs.es.html
 share/webmin/mysql/help/cprivs.html
+share/webmin/mysql/help/cprivs.hu.UTF-8.html
 share/webmin/mysql/help/cprivs.hu.html
+share/webmin/mysql/help/cprivs.it.UTF-8.html
 share/webmin/mysql/help/cprivs.it.html
+share/webmin/mysql/help/cprivs.nl.UTF-8.html
+share/webmin/mysql/help/cprivs.nl.html
+share/webmin/mysql/help/cprivs.sv.UTF-8.html
 share/webmin/mysql/help/cprivs.sv.html
 share/webmin/mysql/help/cprivs.zh_TW.Big5.html
 share/webmin/mysql/help/cprivs.zh_TW.UTF-8.html
+share/webmin/mysql/help/create_cpriv.ca.UTF-8.html
 share/webmin/mysql/help/create_cpriv.ca.html
+share/webmin/mysql/help/create_cpriv.es.UTF-8.html
 share/webmin/mysql/help/create_cpriv.es.html
 share/webmin/mysql/help/create_cpriv.html
+share/webmin/mysql/help/create_cpriv.hu.UTF-8.html
 share/webmin/mysql/help/create_cpriv.hu.html
+share/webmin/mysql/help/create_cpriv.it.UTF-8.html
 share/webmin/mysql/help/create_cpriv.it.html
+share/webmin/mysql/help/create_cpriv.nl.UTF-8.html
+share/webmin/mysql/help/create_cpriv.nl.html
+share/webmin/mysql/help/create_cpriv.sv.UTF-8.html
 share/webmin/mysql/help/create_cpriv.sv.html
 share/webmin/mysql/help/create_cpriv.zh_TW.Big5.html
 share/webmin/mysql/help/create_cpriv.zh_TW.UTF-8.html
+share/webmin/mysql/help/create_db.ca.UTF-8.html
 share/webmin/mysql/help/create_db.ca.html
+share/webmin/mysql/help/create_db.es.UTF-8.html
 share/webmin/mysql/help/create_db.es.html
 share/webmin/mysql/help/create_db.html
+share/webmin/mysql/help/create_db.hu.UTF-8.html
 share/webmin/mysql/help/create_db.hu.html
+share/webmin/mysql/help/create_db.it.UTF-8.html
 share/webmin/mysql/help/create_db.it.html
+share/webmin/mysql/help/create_db.nl.UTF-8.html
+share/webmin/mysql/help/create_db.nl.html
+share/webmin/mysql/help/create_db.sv.UTF-8.html
 share/webmin/mysql/help/create_db.sv.html
 share/webmin/mysql/help/create_db.zh_TW.Big5.html
 share/webmin/mysql/help/create_db.zh_TW.UTF-8.html
+share/webmin/mysql/help/create_field.ca.UTF-8.html
 share/webmin/mysql/help/create_field.ca.html
+share/webmin/mysql/help/create_field.es.UTF-8.html
 share/webmin/mysql/help/create_field.es.html
 share/webmin/mysql/help/create_field.html
+share/webmin/mysql/help/create_field.hu.UTF-8.html
 share/webmin/mysql/help/create_field.hu.html
+share/webmin/mysql/help/create_field.it.UTF-8.html
 share/webmin/mysql/help/create_field.it.html
+share/webmin/mysql/help/create_field.nl.UTF-8.html
+share/webmin/mysql/help/create_field.nl.html
+share/webmin/mysql/help/create_field.sv.UTF-8.html
 share/webmin/mysql/help/create_field.sv.html
 share/webmin/mysql/help/create_field.zh_TW.Big5.html
 share/webmin/mysql/help/create_field.zh_TW.UTF-8.html
+share/webmin/mysql/help/create_tpriv.ca.UTF-8.html
 share/webmin/mysql/help/create_tpriv.ca.html
+share/webmin/mysql/help/create_tpriv.es.UTF-8.html
 share/webmin/mysql/help/create_tpriv.es.html
 share/webmin/mysql/help/create_tpriv.html
+share/webmin/mysql/help/create_tpriv.hu.UTF-8.html
 share/webmin/mysql/help/create_tpriv.hu.html
+share/webmin/mysql/help/create_tpriv.it.UTF-8.html
 share/webmin/mysql/help/create_tpriv.it.html
+share/webmin/mysql/help/create_tpriv.nl.UTF-8.html
+share/webmin/mysql/help/create_tpriv.nl.html
+share/webmin/mysql/help/create_tpriv.sv.UTF-8.html
 share/webmin/mysql/help/create_tpriv.sv.html
 share/webmin/mysql/help/create_tpriv.zh_TW.Big5.html
 share/webmin/mysql/help/create_tpriv.zh_TW.UTF-8.html
+share/webmin/mysql/help/create_user.ca.UTF-8.html
 share/webmin/mysql/help/create_user.ca.html
+share/webmin/mysql/help/create_user.es.UTF-8.html
 share/webmin/mysql/help/create_user.es.html
 share/webmin/mysql/help/create_user.html
+share/webmin/mysql/help/create_user.hu.UTF-8.html
 share/webmin/mysql/help/create_user.hu.html
+share/webmin/mysql/help/create_user.it.UTF-8.html
 share/webmin/mysql/help/create_user.it.html
+share/webmin/mysql/help/create_user.nl.UTF-8.html
+share/webmin/mysql/help/create_user.nl.html
+share/webmin/mysql/help/create_user.sv.UTF-8.html
 share/webmin/mysql/help/create_user.sv.html
 share/webmin/mysql/help/create_user.zh_TW.Big5.html
 share/webmin/mysql/help/create_user.zh_TW.UTF-8.html
+share/webmin/mysql/help/csv.ca.UTF-8.html
 share/webmin/mysql/help/csv.ca.html
 share/webmin/mysql/help/csv.html
+share/webmin/mysql/help/csv.it.UTF-8.html
 share/webmin/mysql/help/csv.it.html
+share/webmin/mysql/help/csv.nl.UTF-8.html
+share/webmin/mysql/help/csv.nl.html
+share/webmin/mysql/help/db.ca.UTF-8.html
 share/webmin/mysql/help/db.ca.html
+share/webmin/mysql/help/db.es.UTF-8.html
 share/webmin/mysql/help/db.es.html
 share/webmin/mysql/help/db.html
+share/webmin/mysql/help/db.hu.UTF-8.html
 share/webmin/mysql/help/db.hu.html
+share/webmin/mysql/help/db.it.UTF-8.html
 share/webmin/mysql/help/db.it.html
+share/webmin/mysql/help/db.nl.UTF-8.html
+share/webmin/mysql/help/db.nl.html
+share/webmin/mysql/help/db.sv.UTF-8.html
 share/webmin/mysql/help/db.sv.html
 share/webmin/mysql/help/db.zh_TW.Big5.html
 share/webmin/mysql/help/db.zh_TW.UTF-8.html
+share/webmin/mysql/help/dbs.ca.UTF-8.html
 share/webmin/mysql/help/dbs.ca.html
+share/webmin/mysql/help/dbs.es.UTF-8.html
 share/webmin/mysql/help/dbs.es.html
 share/webmin/mysql/help/dbs.html
+share/webmin/mysql/help/dbs.hu.UTF-8.html
 share/webmin/mysql/help/dbs.hu.html
+share/webmin/mysql/help/dbs.it.UTF-8.html
 share/webmin/mysql/help/dbs.it.html
+share/webmin/mysql/help/dbs.nl.UTF-8.html
+share/webmin/mysql/help/dbs.nl.html
+share/webmin/mysql/help/dbs.sv.UTF-8.html
 share/webmin/mysql/help/dbs.sv.html
 share/webmin/mysql/help/dbs.zh_TW.Big5.html
 share/webmin/mysql/help/dbs.zh_TW.UTF-8.html
+share/webmin/mysql/help/edit_cpriv.ca.UTF-8.html
 share/webmin/mysql/help/edit_cpriv.ca.html
+share/webmin/mysql/help/edit_cpriv.es.UTF-8.html
 share/webmin/mysql/help/edit_cpriv.es.html
 share/webmin/mysql/help/edit_cpriv.html
+share/webmin/mysql/help/edit_cpriv.hu.UTF-8.html
 share/webmin/mysql/help/edit_cpriv.hu.html
+share/webmin/mysql/help/edit_cpriv.it.UTF-8.html
 share/webmin/mysql/help/edit_cpriv.it.html
+share/webmin/mysql/help/edit_cpriv.nl.UTF-8.html
+share/webmin/mysql/help/edit_cpriv.nl.html
+share/webmin/mysql/help/edit_cpriv.sv.UTF-8.html
 share/webmin/mysql/help/edit_cpriv.sv.html
 share/webmin/mysql/help/edit_cpriv.zh_TW.Big5.html
 share/webmin/mysql/help/edit_cpriv.zh_TW.UTF-8.html
+share/webmin/mysql/help/edit_db.ca.UTF-8.html
 share/webmin/mysql/help/edit_db.ca.html
+share/webmin/mysql/help/edit_db.es.UTF-8.html
 share/webmin/mysql/help/edit_db.es.html
 share/webmin/mysql/help/edit_db.html
+share/webmin/mysql/help/edit_db.hu.UTF-8.html
 share/webmin/mysql/help/edit_db.hu.html
+share/webmin/mysql/help/edit_db.it.UTF-8.html
 share/webmin/mysql/help/edit_db.it.html
+share/webmin/mysql/help/edit_db.nl.UTF-8.html
+share/webmin/mysql/help/edit_db.nl.html
+share/webmin/mysql/help/edit_db.sv.UTF-8.html
 share/webmin/mysql/help/edit_db.sv.html
 share/webmin/mysql/help/edit_db.zh_TW.Big5.html
 share/webmin/mysql/help/edit_db.zh_TW.UTF-8.html
+share/webmin/mysql/help/edit_dbase.ca.UTF-8.html
 share/webmin/mysql/help/edit_dbase.ca.html
+share/webmin/mysql/help/edit_dbase.es.UTF-8.html
 share/webmin/mysql/help/edit_dbase.es.html
 share/webmin/mysql/help/edit_dbase.html
+share/webmin/mysql/help/edit_dbase.hu.UTF-8.html
 share/webmin/mysql/help/edit_dbase.hu.html
+share/webmin/mysql/help/edit_dbase.it.UTF-8.html
 share/webmin/mysql/help/edit_dbase.it.html
+share/webmin/mysql/help/edit_dbase.nl.UTF-8.html
+share/webmin/mysql/help/edit_dbase.nl.html
+share/webmin/mysql/help/edit_dbase.sv.UTF-8.html
 share/webmin/mysql/help/edit_dbase.sv.html
 share/webmin/mysql/help/edit_dbase.zh_TW.Big5.html
 share/webmin/mysql/help/edit_dbase.zh_TW.UTF-8.html
+share/webmin/mysql/help/edit_field.ca.UTF-8.html
 share/webmin/mysql/help/edit_field.ca.html
+share/webmin/mysql/help/edit_field.es.UTF-8.html
 share/webmin/mysql/help/edit_field.es.html
 share/webmin/mysql/help/edit_field.html
+share/webmin/mysql/help/edit_field.hu.UTF-8.html
 share/webmin/mysql/help/edit_field.hu.html
+share/webmin/mysql/help/edit_field.it.UTF-8.html
 share/webmin/mysql/help/edit_field.it.html
+share/webmin/mysql/help/edit_field.nl.UTF-8.html
+share/webmin/mysql/help/edit_field.nl.html
+share/webmin/mysql/help/edit_field.sv.UTF-8.html
 share/webmin/mysql/help/edit_field.sv.html
 share/webmin/mysql/help/edit_field.zh_TW.Big5.html
 share/webmin/mysql/help/edit_field.zh_TW.UTF-8.html
+share/webmin/mysql/help/edit_table.ca.UTF-8.html
 share/webmin/mysql/help/edit_table.ca.html
+share/webmin/mysql/help/edit_table.es.UTF-8.html
 share/webmin/mysql/help/edit_table.es.html
 share/webmin/mysql/help/edit_table.html
+share/webmin/mysql/help/edit_table.hu.UTF-8.html
 share/webmin/mysql/help/edit_table.hu.html
+share/webmin/mysql/help/edit_table.it.UTF-8.html
 share/webmin/mysql/help/edit_table.it.html
+share/webmin/mysql/help/edit_table.nl.UTF-8.html
+share/webmin/mysql/help/edit_table.nl.html
+share/webmin/mysql/help/edit_table.sv.UTF-8.html
 share/webmin/mysql/help/edit_table.sv.html
 share/webmin/mysql/help/edit_table.zh_TW.Big5.html
 share/webmin/mysql/help/edit_table.zh_TW.UTF-8.html
+share/webmin/mysql/help/edit_tpriv.ca.UTF-8.html
 share/webmin/mysql/help/edit_tpriv.ca.html
+share/webmin/mysql/help/edit_tpriv.es.UTF-8.html
 share/webmin/mysql/help/edit_tpriv.es.html
 share/webmin/mysql/help/edit_tpriv.html
+share/webmin/mysql/help/edit_tpriv.hu.UTF-8.html
 share/webmin/mysql/help/edit_tpriv.hu.html
+share/webmin/mysql/help/edit_tpriv.it.UTF-8.html
 share/webmin/mysql/help/edit_tpriv.it.html
+share/webmin/mysql/help/edit_tpriv.nl.UTF-8.html
+share/webmin/mysql/help/edit_tpriv.nl.html
+share/webmin/mysql/help/edit_tpriv.sv.UTF-8.html
 share/webmin/mysql/help/edit_tpriv.sv.html
 share/webmin/mysql/help/edit_tpriv.zh_TW.Big5.html
 share/webmin/mysql/help/edit_tpriv.zh_TW.UTF-8.html
+share/webmin/mysql/help/edit_user.ca.UTF-8.html
 share/webmin/mysql/help/edit_user.ca.html
+share/webmin/mysql/help/edit_user.es.UTF-8.html
 share/webmin/mysql/help/edit_user.es.html
 share/webmin/mysql/help/edit_user.html
+share/webmin/mysql/help/edit_user.hu.UTF-8.html
 share/webmin/mysql/help/edit_user.hu.html
+share/webmin/mysql/help/edit_user.it.UTF-8.html
 share/webmin/mysql/help/edit_user.it.html
+share/webmin/mysql/help/edit_user.nl.UTF-8.html
+share/webmin/mysql/help/edit_user.nl.html
+share/webmin/mysql/help/edit_user.sv.UTF-8.html
 share/webmin/mysql/help/edit_user.sv.html
 share/webmin/mysql/help/edit_user.zh_TW.Big5.html
 share/webmin/mysql/help/edit_user.zh_TW.UTF-8.html
+share/webmin/mysql/help/exec_form.ca.UTF-8.html
 share/webmin/mysql/help/exec_form.ca.html
+share/webmin/mysql/help/exec_form.es.UTF-8.html
 share/webmin/mysql/help/exec_form.es.html
 share/webmin/mysql/help/exec_form.html
+share/webmin/mysql/help/exec_form.hu.UTF-8.html
 share/webmin/mysql/help/exec_form.hu.html
+share/webmin/mysql/help/exec_form.it.UTF-8.html
 share/webmin/mysql/help/exec_form.it.html
+share/webmin/mysql/help/exec_form.nl.UTF-8.html
+share/webmin/mysql/help/exec_form.nl.html
+share/webmin/mysql/help/exec_form.sv.UTF-8.html
 share/webmin/mysql/help/exec_form.sv.html
 share/webmin/mysql/help/exec_form.zh_TW.Big5.html
 share/webmin/mysql/help/exec_form.zh_TW.UTF-8.html
+share/webmin/mysql/help/field.ca.UTF-8.html
 share/webmin/mysql/help/field.ca.html
+share/webmin/mysql/help/field.es.UTF-8.html
 share/webmin/mysql/help/field.es.html
 share/webmin/mysql/help/field.html
+share/webmin/mysql/help/field.hu.UTF-8.html
 share/webmin/mysql/help/field.hu.html
+share/webmin/mysql/help/field.it.UTF-8.html
 share/webmin/mysql/help/field.it.html
+share/webmin/mysql/help/field.nl.UTF-8.html
+share/webmin/mysql/help/field.nl.html
+share/webmin/mysql/help/field.sv.UTF-8.html
 share/webmin/mysql/help/field.sv.html
 share/webmin/mysql/help/field.zh_TW.Big5.html
 share/webmin/mysql/help/field.zh_TW.UTF-8.html
+share/webmin/mysql/help/intro.ca.UTF-8.html
 share/webmin/mysql/help/intro.ca.html
+share/webmin/mysql/help/intro.es.UTF-8.html
 share/webmin/mysql/help/intro.es.html
 share/webmin/mysql/help/intro.html
+share/webmin/mysql/help/intro.hu.UTF-8.html
 share/webmin/mysql/help/intro.hu.html
+share/webmin/mysql/help/intro.it.UTF-8.html
 share/webmin/mysql/help/intro.it.html
+share/webmin/mysql/help/intro.nl.UTF-8.html
+share/webmin/mysql/help/intro.nl.html
+share/webmin/mysql/help/intro.sv.UTF-8.html
 share/webmin/mysql/help/intro.sv.html
 share/webmin/mysql/help/intro.zh_TW.Big5.html
 share/webmin/mysql/help/intro.zh_TW.UTF-8.html
+share/webmin/mysql/help/newdb_form.ca.UTF-8.html
 share/webmin/mysql/help/newdb_form.ca.html
+share/webmin/mysql/help/newdb_form.es.UTF-8.html
 share/webmin/mysql/help/newdb_form.es.html
 share/webmin/mysql/help/newdb_form.html
+share/webmin/mysql/help/newdb_form.hu.UTF-8.html
 share/webmin/mysql/help/newdb_form.hu.html
+share/webmin/mysql/help/newdb_form.it.UTF-8.html
 share/webmin/mysql/help/newdb_form.it.html
+share/webmin/mysql/help/newdb_form.nl.UTF-8.html
+share/webmin/mysql/help/newdb_form.nl.html
+share/webmin/mysql/help/newdb_form.sv.UTF-8.html
 share/webmin/mysql/help/newdb_form.sv.html
 share/webmin/mysql/help/newdb_form.zh_TW.Big5.html
 share/webmin/mysql/help/newdb_form.zh_TW.UTF-8.html
+share/webmin/mysql/help/procs.ca.UTF-8.html
 share/webmin/mysql/help/procs.ca.html
 share/webmin/mysql/help/procs.html
+share/webmin/mysql/help/procs.it.UTF-8.html
 share/webmin/mysql/help/procs.it.html
+share/webmin/mysql/help/procs.nl.UTF-8.html
+share/webmin/mysql/help/procs.nl.html
+share/webmin/mysql/help/table_form.ca.UTF-8.html
 share/webmin/mysql/help/table_form.ca.html
+share/webmin/mysql/help/table_form.es.UTF-8.html
 share/webmin/mysql/help/table_form.es.html
 share/webmin/mysql/help/table_form.html
+share/webmin/mysql/help/table_form.hu.UTF-8.html
 share/webmin/mysql/help/table_form.hu.html
+share/webmin/mysql/help/table_form.it.UTF-8.html
 share/webmin/mysql/help/table_form.it.html
+share/webmin/mysql/help/table_form.nl.UTF-8.html
+share/webmin/mysql/help/table_form.nl.html
+share/webmin/mysql/help/table_form.sv.UTF-8.html
 share/webmin/mysql/help/table_form.sv.html
 share/webmin/mysql/help/table_form.zh_TW.Big5.html
 share/webmin/mysql/help/table_form.zh_TW.UTF-8.html
+share/webmin/mysql/help/tpriv.ca.UTF-8.html
 share/webmin/mysql/help/tpriv.ca.html
+share/webmin/mysql/help/tpriv.es.UTF-8.html
 share/webmin/mysql/help/tpriv.es.html
 share/webmin/mysql/help/tpriv.html
+share/webmin/mysql/help/tpriv.hu.UTF-8.html
 share/webmin/mysql/help/tpriv.hu.html
+share/webmin/mysql/help/tpriv.it.UTF-8.html
 share/webmin/mysql/help/tpriv.it.html
+share/webmin/mysql/help/tpriv.nl.UTF-8.html
+share/webmin/mysql/help/tpriv.nl.html
+share/webmin/mysql/help/tpriv.sv.UTF-8.html
 share/webmin/mysql/help/tpriv.sv.html
 share/webmin/mysql/help/tpriv.zh_TW.Big5.html
 share/webmin/mysql/help/tpriv.zh_TW.UTF-8.html
+share/webmin/mysql/help/tprivs.ca.UTF-8.html
 share/webmin/mysql/help/tprivs.ca.html
+share/webmin/mysql/help/tprivs.es.UTF-8.html
 share/webmin/mysql/help/tprivs.es.html
 share/webmin/mysql/help/tprivs.html
+share/webmin/mysql/help/tprivs.hu.UTF-8.html
 share/webmin/mysql/help/tprivs.hu.html
+share/webmin/mysql/help/tprivs.it.UTF-8.html
 share/webmin/mysql/help/tprivs.it.html
+share/webmin/mysql/help/tprivs.nl.UTF-8.html
+share/webmin/mysql/help/tprivs.nl.html
+share/webmin/mysql/help/tprivs.sv.UTF-8.html
 share/webmin/mysql/help/tprivs.sv.html
 share/webmin/mysql/help/tprivs.zh_TW.Big5.html
 share/webmin/mysql/help/tprivs.zh_TW.UTF-8.html
+share/webmin/mysql/help/user.ca.UTF-8.html
 share/webmin/mysql/help/user.ca.html
+share/webmin/mysql/help/user.es.UTF-8.html
 share/webmin/mysql/help/user.es.html
 share/webmin/mysql/help/user.html
+share/webmin/mysql/help/user.hu.UTF-8.html
 share/webmin/mysql/help/user.hu.html
+share/webmin/mysql/help/user.it.UTF-8.html
 share/webmin/mysql/help/user.it.html
+share/webmin/mysql/help/user.nl.UTF-8.html
+share/webmin/mysql/help/user.nl.html
+share/webmin/mysql/help/user.sv.UTF-8.html
 share/webmin/mysql/help/user.sv.html
 share/webmin/mysql/help/user.zh_TW.Big5.html
 share/webmin/mysql/help/user.zh_TW.UTF-8.html
+share/webmin/mysql/help/users.ca.UTF-8.html
 share/webmin/mysql/help/users.ca.html
+share/webmin/mysql/help/users.es.UTF-8.html
 share/webmin/mysql/help/users.es.html
 share/webmin/mysql/help/users.html
+share/webmin/mysql/help/users.hu.UTF-8.html
 share/webmin/mysql/help/users.hu.html
+share/webmin/mysql/help/users.it.UTF-8.html
 share/webmin/mysql/help/users.it.html
+share/webmin/mysql/help/users.nl.UTF-8.html
+share/webmin/mysql/help/users.nl.html
+share/webmin/mysql/help/users.sv.UTF-8.html
 share/webmin/mysql/help/users.sv.html
 share/webmin/mysql/help/users.zh_TW.Big5.html
 share/webmin/mysql/help/users.zh_TW.UTF-8.html
+share/webmin/mysql/help/vars.ca.UTF-8.html
 share/webmin/mysql/help/vars.ca.html
 share/webmin/mysql/help/vars.html
+share/webmin/mysql/help/vars.it.UTF-8.html
 share/webmin/mysql/help/vars.it.html
+share/webmin/mysql/help/vars.nl.UTF-8.html
+share/webmin/mysql/help/vars.nl.html
 share/webmin/mysql/images/cnf.gif
 share/webmin/mysql/images/cprivs.gif
 share/webmin/mysql/images/db.gif
@@ -325,23 +539,40 @@ share/webmin/mysql/install_check.pl
 share/webmin/mysql/kill_procs.cgi
 share/webmin/mysql/lang/bg
 share/webmin/mysql/lang/ca
+share/webmin/mysql/lang/ca.UTF-8
 share/webmin/mysql/lang/cz
+share/webmin/mysql/lang/cz.UTF-8
 share/webmin/mysql/lang/de
+share/webmin/mysql/lang/de.UTF-8
 share/webmin/mysql/lang/en
+share/webmin/mysql/lang/en.UTF-8
 share/webmin/mysql/lang/es
+share/webmin/mysql/lang/es.UTF-8
 share/webmin/mysql/lang/fi
+share/webmin/mysql/lang/fi.UTF-8
+share/webmin/mysql/lang/fr
+share/webmin/mysql/lang/fr.UTF-8
 share/webmin/mysql/lang/he
 share/webmin/mysql/lang/hu
+share/webmin/mysql/lang/hu.UTF-8
 share/webmin/mysql/lang/it
+share/webmin/mysql/lang/it.UTF-8
 share/webmin/mysql/lang/ja_JP.UTF-8
 share/webmin/mysql/lang/ja_JP.euc
 share/webmin/mysql/lang/ko_KR.UTF-8
 share/webmin/mysql/lang/ko_KR.euc
 share/webmin/mysql/lang/nl
+share/webmin/mysql/lang/nl.UTF-8
+share/webmin/mysql/lang/no
 share/webmin/mysql/lang/pl
+share/webmin/mysql/lang/pl.UTF-8
+share/webmin/mysql/lang/pt_BR
+share/webmin/mysql/lang/pt_BR.UTF-8
+share/webmin/mysql/lang/ru.UTF-8
 share/webmin/mysql/lang/ru_RU
 share/webmin/mysql/lang/ru_SU
 share/webmin/mysql/lang/sv
+share/webmin/mysql/lang/sv.UTF-8
 share/webmin/mysql/lang/tr
 share/webmin/mysql/lang/uk_UA
 share/webmin/mysql/lang/zh_CN
diff --git a/sysutils/wbm-postgresql/Makefile b/sysutils/wbm-postgresql/Makefile
index daac176a298..979449f60b3 100644
--- a/sysutils/wbm-postgresql/Makefile
+++ b/sysutils/wbm-postgresql/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2012/10/23 19:51:33 asau Exp $
+# $NetBSD: Makefile,v 1.6 2012/12/22 01:25:03 dholland Exp $
 
 WBM_NAME=	postgresql
+PKGREVISION=	1
 
 COMMENT=	Webmin module for managing PostgreSQL databases
 
diff --git a/sysutils/wbm-postgresql/PLIST b/sysutils/wbm-postgresql/PLIST
index 3efc6e91a0d..12f67bcdeed 100644
--- a/sysutils/wbm-postgresql/PLIST
+++ b/sysutils/wbm-postgresql/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:16:19 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2012/12/22 01:25:03 dholland Exp $
 share/examples/webmin/postgresql/config
 share/webmin/postgresql/CHANGELOG
 share/webmin/postgresql/acl_security.pl
@@ -6,6 +6,7 @@ share/webmin/postgresql/backup.cgi
 share/webmin/postgresql/backup.pl
 share/webmin/postgresql/backup_config.pl
 share/webmin/postgresql/backup_form.cgi
+share/webmin/postgresql/cgi_args.pl
 share/webmin/postgresql/config
 share/webmin/postgresql/config-cobalt-linux
 share/webmin/postgresql/config-coherent-linux
@@ -17,8 +18,10 @@ share/webmin/postgresql/config-mandrake-linux
 share/webmin/postgresql/config-msc-linux
 share/webmin/postgresql/config-netbsd
 share/webmin/postgresql/config-openmamba-linux
+share/webmin/postgresql/config-pardus-linux
 share/webmin/postgresql/config-redhat-linux
-share/webmin/postgresql/config-redhat-linux-10.0-*
+share/webmin/postgresql/config-redhat-linux-10.0-23.0
+share/webmin/postgresql/config-redhat-linux-24.0-*
 share/webmin/postgresql/config-redhat-linux-7.0-7.2
 share/webmin/postgresql/config-redhat-linux-7.3
 share/webmin/postgresql/config-redhat-linux-7.4-9.0
@@ -32,18 +35,28 @@ share/webmin/postgresql/config-united-linux
 share/webmin/postgresql/config-windows
 share/webmin/postgresql/config.info
 share/webmin/postgresql/config.info.ca
+share/webmin/postgresql/config.info.ca.UTF-8
 share/webmin/postgresql/config.info.cz
+share/webmin/postgresql/config.info.cz.UTF-8
 share/webmin/postgresql/config.info.de
+share/webmin/postgresql/config.info.de.UTF-8
 share/webmin/postgresql/config.info.es
+share/webmin/postgresql/config.info.es.UTF-8
 share/webmin/postgresql/config.info.fr
+share/webmin/postgresql/config.info.fr.UTF-8
 share/webmin/postgresql/config.info.ja_JP.UTF-8
 share/webmin/postgresql/config.info.ja_JP.euc
 share/webmin/postgresql/config.info.ko_KR.UTF-8
 share/webmin/postgresql/config.info.ko_KR.euc
+share/webmin/postgresql/config.info.nl
+share/webmin/postgresql/config.info.nl.UTF-8
 share/webmin/postgresql/config.info.pl
+share/webmin/postgresql/config.info.pl.UTF-8
+share/webmin/postgresql/config.info.ru.UTF-8
 share/webmin/postgresql/config.info.ru_RU
 share/webmin/postgresql/config.info.ru_SU
 share/webmin/postgresql/config.info.sv
+share/webmin/postgresql/config.info.sv.UTF-8
 share/webmin/postgresql/config.info.tr
 share/webmin/postgresql/config.info.uk_UA
 share/webmin/postgresql/config.info.zh_CN
@@ -79,118 +92,226 @@ share/webmin/postgresql/edit_view.cgi
 share/webmin/postgresql/exec.cgi
 share/webmin/postgresql/exec_file.cgi
 share/webmin/postgresql/exec_form.cgi
+share/webmin/postgresql/help/backup_form.ca.UTF-8.html
 share/webmin/postgresql/help/backup_form.ca.html
 share/webmin/postgresql/help/backup_form.html
+share/webmin/postgresql/help/backup_form.nl.UTF-8.html
+share/webmin/postgresql/help/backup_form.nl.html
+share/webmin/postgresql/help/create_field.ca.UTF-8.html
 share/webmin/postgresql/help/create_field.ca.html
+share/webmin/postgresql/help/create_field.es.UTF-8.html
 share/webmin/postgresql/help/create_field.es.html
 share/webmin/postgresql/help/create_field.html
+share/webmin/postgresql/help/create_field.hu.UTF-8.html
 share/webmin/postgresql/help/create_field.hu.html
+share/webmin/postgresql/help/create_field.it.UTF-8.html
 share/webmin/postgresql/help/create_field.it.html
 share/webmin/postgresql/help/create_field.ja_JP.UTF-8.html
 share/webmin/postgresql/help/create_field.ja_JP.euc.html
+share/webmin/postgresql/help/create_field.nl.UTF-8.html
+share/webmin/postgresql/help/create_field.nl.html
+share/webmin/postgresql/help/create_field.pl.UTF-8.html
 share/webmin/postgresql/help/create_field.pl.html
+share/webmin/postgresql/help/csv.ca.UTF-8.html
 share/webmin/postgresql/help/csv.ca.html
+share/webmin/postgresql/help/csv.de.UTF-8.html
+share/webmin/postgresql/help/csv.de.html
 share/webmin/postgresql/help/csv.html
+share/webmin/postgresql/help/csv.nl.UTF-8.html
+share/webmin/postgresql/help/csv.nl.html
+share/webmin/postgresql/help/drop_field.ca.UTF-8.html
 share/webmin/postgresql/help/drop_field.ca.html
 share/webmin/postgresql/help/drop_field.html
+share/webmin/postgresql/help/drop_field.hu.UTF-8.html
 share/webmin/postgresql/help/drop_field.hu.html
+share/webmin/postgresql/help/drop_field.nl.UTF-8.html
+share/webmin/postgresql/help/drop_field.nl.html
+share/webmin/postgresql/help/edit_dbase.ca.UTF-8.html
 share/webmin/postgresql/help/edit_dbase.ca.html
+share/webmin/postgresql/help/edit_dbase.es.UTF-8.html
 share/webmin/postgresql/help/edit_dbase.es.html
 share/webmin/postgresql/help/edit_dbase.html
+share/webmin/postgresql/help/edit_dbase.hu.UTF-8.html
 share/webmin/postgresql/help/edit_dbase.hu.html
+share/webmin/postgresql/help/edit_dbase.it.UTF-8.html
 share/webmin/postgresql/help/edit_dbase.it.html
 share/webmin/postgresql/help/edit_dbase.ja_JP.UTF-8.html
 share/webmin/postgresql/help/edit_dbase.ja_JP.euc.html
+share/webmin/postgresql/help/edit_dbase.nl.UTF-8.html
+share/webmin/postgresql/help/edit_dbase.nl.html
+share/webmin/postgresql/help/edit_dbase.pl.UTF-8.html
 share/webmin/postgresql/help/edit_dbase.pl.html
+share/webmin/postgresql/help/edit_field.ca.UTF-8.html
 share/webmin/postgresql/help/edit_field.ca.html
+share/webmin/postgresql/help/edit_field.es.UTF-8.html
 share/webmin/postgresql/help/edit_field.es.html
 share/webmin/postgresql/help/edit_field.html
+share/webmin/postgresql/help/edit_field.hu.UTF-8.html
 share/webmin/postgresql/help/edit_field.hu.html
+share/webmin/postgresql/help/edit_field.it.UTF-8.html
 share/webmin/postgresql/help/edit_field.it.html
 share/webmin/postgresql/help/edit_field.ja_JP.UTF-8.html
 share/webmin/postgresql/help/edit_field.ja_JP.euc.html
+share/webmin/postgresql/help/edit_field.nl.UTF-8.html
+share/webmin/postgresql/help/edit_field.nl.html
+share/webmin/postgresql/help/edit_field.pl.UTF-8.html
 share/webmin/postgresql/help/edit_field.pl.html
+share/webmin/postgresql/help/edit_table.ca.UTF-8.html
 share/webmin/postgresql/help/edit_table.ca.html
+share/webmin/postgresql/help/edit_table.es.UTF-8.html
 share/webmin/postgresql/help/edit_table.es.html
 share/webmin/postgresql/help/edit_table.html
+share/webmin/postgresql/help/edit_table.hu.UTF-8.html
 share/webmin/postgresql/help/edit_table.hu.html
+share/webmin/postgresql/help/edit_table.it.UTF-8.html
 share/webmin/postgresql/help/edit_table.it.html
 share/webmin/postgresql/help/edit_table.ja_JP.UTF-8.html
 share/webmin/postgresql/help/edit_table.ja_JP.euc.html
+share/webmin/postgresql/help/edit_table.nl.UTF-8.html
+share/webmin/postgresql/help/edit_table.nl.html
+share/webmin/postgresql/help/edit_table.pl.UTF-8.html
 share/webmin/postgresql/help/edit_table.pl.html
+share/webmin/postgresql/help/exec_form.ca.UTF-8.html
 share/webmin/postgresql/help/exec_form.ca.html
+share/webmin/postgresql/help/exec_form.de.UTF-8.html
+share/webmin/postgresql/help/exec_form.de.html
+share/webmin/postgresql/help/exec_form.es.UTF-8.html
 share/webmin/postgresql/help/exec_form.es.html
 share/webmin/postgresql/help/exec_form.html
+share/webmin/postgresql/help/exec_form.hu.UTF-8.html
 share/webmin/postgresql/help/exec_form.hu.html
+share/webmin/postgresql/help/exec_form.it.UTF-8.html
 share/webmin/postgresql/help/exec_form.it.html
 share/webmin/postgresql/help/exec_form.ja_JP.UTF-8.html
 share/webmin/postgresql/help/exec_form.ja_JP.euc.html
+share/webmin/postgresql/help/exec_form.nl.UTF-8.html
+share/webmin/postgresql/help/exec_form.nl.html
+share/webmin/postgresql/help/exec_form.pl.UTF-8.html
 share/webmin/postgresql/help/exec_form.pl.html
+share/webmin/postgresql/help/intro.ca.UTF-8.html
 share/webmin/postgresql/help/intro.ca.html
+share/webmin/postgresql/help/intro.es.UTF-8.html
 share/webmin/postgresql/help/intro.es.html
 share/webmin/postgresql/help/intro.html
+share/webmin/postgresql/help/intro.hu.UTF-8.html
 share/webmin/postgresql/help/intro.hu.html
+share/webmin/postgresql/help/intro.it.UTF-8.html
 share/webmin/postgresql/help/intro.it.html
 share/webmin/postgresql/help/intro.ja_JP.UTF-8.html
 share/webmin/postgresql/help/intro.ja_JP.euc.html
+share/webmin/postgresql/help/intro.nl.UTF-8.html
+share/webmin/postgresql/help/intro.nl.html
+share/webmin/postgresql/help/intro.pl.UTF-8.html
 share/webmin/postgresql/help/intro.pl.html
+share/webmin/postgresql/help/list_grants.ca.UTF-8.html
 share/webmin/postgresql/help/list_grants.ca.html
+share/webmin/postgresql/help/list_grants.es.UTF-8.html
 share/webmin/postgresql/help/list_grants.es.html
 share/webmin/postgresql/help/list_grants.html
+share/webmin/postgresql/help/list_grants.hu.UTF-8.html
 share/webmin/postgresql/help/list_grants.hu.html
+share/webmin/postgresql/help/list_grants.it.UTF-8.html
 share/webmin/postgresql/help/list_grants.it.html
 share/webmin/postgresql/help/list_grants.ja_JP.UTF-8.html
 share/webmin/postgresql/help/list_grants.ja_JP.euc.html
+share/webmin/postgresql/help/list_grants.nl.UTF-8.html
+share/webmin/postgresql/help/list_grants.nl.html
+share/webmin/postgresql/help/list_grants.pl.UTF-8.html
 share/webmin/postgresql/help/list_grants.pl.html
+share/webmin/postgresql/help/list_groups.ca.UTF-8.html
 share/webmin/postgresql/help/list_groups.ca.html
+share/webmin/postgresql/help/list_groups.es.UTF-8.html
 share/webmin/postgresql/help/list_groups.es.html
 share/webmin/postgresql/help/list_groups.html
+share/webmin/postgresql/help/list_groups.hu.UTF-8.html
 share/webmin/postgresql/help/list_groups.hu.html
+share/webmin/postgresql/help/list_groups.it.UTF-8.html
 share/webmin/postgresql/help/list_groups.it.html
 share/webmin/postgresql/help/list_groups.ja_JP.UTF-8.html
 share/webmin/postgresql/help/list_groups.ja_JP.euc.html
+share/webmin/postgresql/help/list_groups.nl.UTF-8.html
+share/webmin/postgresql/help/list_groups.nl.html
+share/webmin/postgresql/help/list_groups.pl.UTF-8.html
 share/webmin/postgresql/help/list_groups.pl.html
+share/webmin/postgresql/help/list_hosts.ca.UTF-8.html
 share/webmin/postgresql/help/list_hosts.ca.html
+share/webmin/postgresql/help/list_hosts.es.UTF-8.html
 share/webmin/postgresql/help/list_hosts.es.html
 share/webmin/postgresql/help/list_hosts.html
+share/webmin/postgresql/help/list_hosts.hu.UTF-8.html
 share/webmin/postgresql/help/list_hosts.hu.html
+share/webmin/postgresql/help/list_hosts.it.UTF-8.html
 share/webmin/postgresql/help/list_hosts.it.html
 share/webmin/postgresql/help/list_hosts.ja_JP.UTF-8.html
 share/webmin/postgresql/help/list_hosts.ja_JP.euc.html
+share/webmin/postgresql/help/list_hosts.nl.UTF-8.html
+share/webmin/postgresql/help/list_hosts.nl.html
+share/webmin/postgresql/help/list_hosts.pl.UTF-8.html
 share/webmin/postgresql/help/list_hosts.pl.html
+share/webmin/postgresql/help/list_users.ca.UTF-8.html
 share/webmin/postgresql/help/list_users.ca.html
+share/webmin/postgresql/help/list_users.de.UTF-8.html
+share/webmin/postgresql/help/list_users.de.html
+share/webmin/postgresql/help/list_users.es.UTF-8.html
 share/webmin/postgresql/help/list_users.es.html
 share/webmin/postgresql/help/list_users.html
+share/webmin/postgresql/help/list_users.hu.UTF-8.html
 share/webmin/postgresql/help/list_users.hu.html
+share/webmin/postgresql/help/list_users.it.UTF-8.html
 share/webmin/postgresql/help/list_users.it.html
 share/webmin/postgresql/help/list_users.ja_JP.UTF-8.html
 share/webmin/postgresql/help/list_users.ja_JP.euc.html
+share/webmin/postgresql/help/list_users.nl.UTF-8.html
+share/webmin/postgresql/help/list_users.nl.html
+share/webmin/postgresql/help/list_users.pl.UTF-8.html
 share/webmin/postgresql/help/list_users.pl.html
+share/webmin/postgresql/help/newdb_form.ca.UTF-8.html
 share/webmin/postgresql/help/newdb_form.ca.html
+share/webmin/postgresql/help/newdb_form.de.UTF-8.html
+share/webmin/postgresql/help/newdb_form.de.html
+share/webmin/postgresql/help/newdb_form.es.UTF-8.html
 share/webmin/postgresql/help/newdb_form.es.html
 share/webmin/postgresql/help/newdb_form.html
+share/webmin/postgresql/help/newdb_form.hu.UTF-8.html
 share/webmin/postgresql/help/newdb_form.hu.html
+share/webmin/postgresql/help/newdb_form.it.UTF-8.html
 share/webmin/postgresql/help/newdb_form.it.html
 share/webmin/postgresql/help/newdb_form.ja_JP.UTF-8.html
 share/webmin/postgresql/help/newdb_form.ja_JP.euc.html
+share/webmin/postgresql/help/newdb_form.nl.UTF-8.html
+share/webmin/postgresql/help/newdb_form.nl.html
+share/webmin/postgresql/help/newdb_form.pl.UTF-8.html
 share/webmin/postgresql/help/newdb_form.pl.html
+share/webmin/postgresql/help/table_form.ca.UTF-8.html
 share/webmin/postgresql/help/table_form.ca.html
+share/webmin/postgresql/help/table_form.es.UTF-8.html
 share/webmin/postgresql/help/table_form.es.html
 share/webmin/postgresql/help/table_form.html
+share/webmin/postgresql/help/table_form.hu.UTF-8.html
 share/webmin/postgresql/help/table_form.hu.html
+share/webmin/postgresql/help/table_form.it.UTF-8.html
 share/webmin/postgresql/help/table_form.it.html
 share/webmin/postgresql/help/table_form.ja_JP.UTF-8.html
 share/webmin/postgresql/help/table_form.ja_JP.euc.html
+share/webmin/postgresql/help/table_form.nl.UTF-8.html
+share/webmin/postgresql/help/table_form.nl.html
+share/webmin/postgresql/help/table_form.pl.UTF-8.html
 share/webmin/postgresql/help/table_form.pl.html
+share/webmin/postgresql/help/view_table.ca.UTF-8.html
 share/webmin/postgresql/help/view_table.ca.html
+share/webmin/postgresql/help/view_table.es.UTF-8.html
 share/webmin/postgresql/help/view_table.es.html
 share/webmin/postgresql/help/view_table.html
+share/webmin/postgresql/help/view_table.hu.UTF-8.html
 share/webmin/postgresql/help/view_table.hu.html
+share/webmin/postgresql/help/view_table.it.UTF-8.html
 share/webmin/postgresql/help/view_table.it.html
 share/webmin/postgresql/help/view_table.ja_JP.UTF-8.html
 share/webmin/postgresql/help/view_table.ja_JP.euc.html
+share/webmin/postgresql/help/view_table.nl.UTF-8.html
+share/webmin/postgresql/help/view_table.nl.html
+share/webmin/postgresql/help/view_table.pl.UTF-8.html
 share/webmin/postgresql/help/view_table.pl.html
-share/webmin/postgresql/images/Thumbs.db
 share/webmin/postgresql/images/db.gif
 share/webmin/postgresql/images/down.gif
 share/webmin/postgresql/images/gap.gif
@@ -210,22 +331,36 @@ share/webmin/postgresql/index.cgi
 share/webmin/postgresql/install_check.pl
 share/webmin/postgresql/lang/bg
 share/webmin/postgresql/lang/ca
+share/webmin/postgresql/lang/ca.UTF-8
 share/webmin/postgresql/lang/cz
+share/webmin/postgresql/lang/cz.UTF-8
 share/webmin/postgresql/lang/de
+share/webmin/postgresql/lang/de.UTF-8
 share/webmin/postgresql/lang/en
+share/webmin/postgresql/lang/en.UTF-8
 share/webmin/postgresql/lang/es
+share/webmin/postgresql/lang/es.UTF-8
 share/webmin/postgresql/lang/fr
+share/webmin/postgresql/lang/fr.UTF-8
 share/webmin/postgresql/lang/hu
+share/webmin/postgresql/lang/hu.UTF-8
 share/webmin/postgresql/lang/it
+share/webmin/postgresql/lang/it.UTF-8
 share/webmin/postgresql/lang/ja_JP.UTF-8
 share/webmin/postgresql/lang/ja_JP.euc
 share/webmin/postgresql/lang/ko_KR.UTF-8
 share/webmin/postgresql/lang/ko_KR.euc
+share/webmin/postgresql/lang/nl
+share/webmin/postgresql/lang/nl.UTF-8
 share/webmin/postgresql/lang/pl
+share/webmin/postgresql/lang/pl.UTF-8
 share/webmin/postgresql/lang/pt
+share/webmin/postgresql/lang/pt.UTF-8
+share/webmin/postgresql/lang/ru.UTF-8
 share/webmin/postgresql/lang/ru_RU
 share/webmin/postgresql/lang/ru_SU
 share/webmin/postgresql/lang/sv
+share/webmin/postgresql/lang/sv.UTF-8
 share/webmin/postgresql/lang/uk_UA
 share/webmin/postgresql/lang/zh_CN
 share/webmin/postgresql/lang/zh_CN.UTF-8
diff --git a/sysutils/wbm-sendmail/Makefile b/sysutils/wbm-sendmail/Makefile
index 83ef50bb577..42303162489 100644
--- a/sysutils/wbm-sendmail/Makefile
+++ b/sysutils/wbm-sendmail/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2012/10/23 19:51:33 asau Exp $
+# $NetBSD: Makefile,v 1.6 2012/12/22 01:26:34 dholland Exp $
 
 WBM_NAME=	sendmail
+PKGREVISION=	1
 
 COMMENT=	Webmin module to manage Sendmail
 
diff --git a/sysutils/wbm-sendmail/PLIST b/sysutils/wbm-sendmail/PLIST
index a12260fbf27..b53fce2e819 100644
--- a/sysutils/wbm-sendmail/PLIST
+++ b/sysutils/wbm-sendmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:16:19 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/12/22 01:26:34 dholland Exp $
 share/examples/webmin/sendmail/config
 share/webmin/sendmail/CHANGELOG
 share/webmin/sendmail/access-lib.pl
@@ -8,6 +8,7 @@ share/webmin/sendmail/autoreply.pl
 share/webmin/sendmail/backup_config.pl
 share/webmin/sendmail/boxes-lib.pl
 share/webmin/sendmail/build.cgi
+share/webmin/sendmail/cgi_args.pl
 share/webmin/sendmail/config-aix
 share/webmin/sendmail/config-cobalt-linux
 share/webmin/sendmail/config-coherent-linux
@@ -35,7 +36,8 @@ share/webmin/sendmail/config-openbsd
 share/webmin/sendmail/config-openserver
 share/webmin/sendmail/config-osf1
 share/webmin/sendmail/config-redhat-linux
-share/webmin/sendmail/config-redhat-linux-10.0-*
+share/webmin/sendmail/config-redhat-linux-10.0-23.0
+share/webmin/sendmail/config-redhat-linux-24.0-*
 share/webmin/sendmail/config-redhat-linux-7.1-7.3
 share/webmin/sendmail/config-redhat-linux-7.4-9.0
 share/webmin/sendmail/config-slackware-linux
@@ -53,15 +55,27 @@ share/webmin/sendmail/config-united-linux
 share/webmin/sendmail/config-unixware
 share/webmin/sendmail/config.info
 share/webmin/sendmail/config.info.ca
+share/webmin/sendmail/config.info.ca.UTF-8
 share/webmin/sendmail/config.info.cz
+share/webmin/sendmail/config.info.cz.UTF-8
 share/webmin/sendmail/config.info.de
+share/webmin/sendmail/config.info.de.UTF-8
 share/webmin/sendmail/config.info.es
+share/webmin/sendmail/config.info.es.UTF-8
 share/webmin/sendmail/config.info.fr
+share/webmin/sendmail/config.info.fr.UTF-8
 share/webmin/sendmail/config.info.nl
+share/webmin/sendmail/config.info.nl.UTF-8
+share/webmin/sendmail/config.info.no
 share/webmin/sendmail/config.info.pl
+share/webmin/sendmail/config.info.pl.UTF-8
+share/webmin/sendmail/config.info.pt_BR
+share/webmin/sendmail/config.info.pt_BR.UTF-8
+share/webmin/sendmail/config.info.ru.UTF-8
 share/webmin/sendmail/config.info.ru_RU
 share/webmin/sendmail/config.info.ru_SU
 share/webmin/sendmail/config.info.sv
+share/webmin/sendmail/config.info.sv.UTF-8
 share/webmin/sendmail/config.info.tr
 share/webmin/sendmail/config.info.uk_UA
 share/webmin/sendmail/config.info.zh_CN
@@ -97,276 +111,485 @@ share/webmin/sendmail/feedback_files.pl
 share/webmin/sendmail/filter.pl
 share/webmin/sendmail/flushq.cgi
 share/webmin/sendmail/generics-lib.pl
+share/webmin/sendmail/help/alias_cmt.ca.UTF-8.html
 share/webmin/sendmail/help/alias_cmt.ca.html
 share/webmin/sendmail/help/alias_cmt.html
+share/webmin/sendmail/help/alias_cmt.nl.UTF-8.html
+share/webmin/sendmail/help/alias_cmt.nl.html
+share/webmin/sendmail/help/alias_enabled.ca.UTF-8.html
 share/webmin/sendmail/help/alias_enabled.ca.html
+share/webmin/sendmail/help/alias_enabled.es.UTF-8.html
 share/webmin/sendmail/help/alias_enabled.es.html
+share/webmin/sendmail/help/alias_enabled.fr.UTF-8.html
 share/webmin/sendmail/help/alias_enabled.fr.html
 share/webmin/sendmail/help/alias_enabled.html
+share/webmin/sendmail/help/alias_enabled.nl.UTF-8.html
+share/webmin/sendmail/help/alias_enabled.nl.html
+share/webmin/sendmail/help/alias_enabled.pl.UTF-8.html
 share/webmin/sendmail/help/alias_enabled.pl.html
 share/webmin/sendmail/help/alias_enabled.ru_RU.html
 share/webmin/sendmail/help/alias_enabled.ru_SU.html
+share/webmin/sendmail/help/alias_enabled.sv.UTF-8.html
 share/webmin/sendmail/help/alias_enabled.sv.html
 share/webmin/sendmail/help/alias_enabled.zh_TW.Big5.html
 share/webmin/sendmail/help/alias_enabled.zh_TW.UTF-8.html
+share/webmin/sendmail/help/alias_file.ca.UTF-8.html
+share/webmin/sendmail/help/alias_file.ca.html
+share/webmin/sendmail/help/alias_file.html
+share/webmin/sendmail/help/alias_file.nl.UTF-8.html
+share/webmin/sendmail/help/alias_file.nl.html
+share/webmin/sendmail/help/alias_name.ca.UTF-8.html
 share/webmin/sendmail/help/alias_name.ca.html
+share/webmin/sendmail/help/alias_name.es.UTF-8.html
 share/webmin/sendmail/help/alias_name.es.html
+share/webmin/sendmail/help/alias_name.fr.UTF-8.html
 share/webmin/sendmail/help/alias_name.fr.html
 share/webmin/sendmail/help/alias_name.html
+share/webmin/sendmail/help/alias_name.nl.UTF-8.html
+share/webmin/sendmail/help/alias_name.nl.html
+share/webmin/sendmail/help/alias_name.pl.UTF-8.html
 share/webmin/sendmail/help/alias_name.pl.html
 share/webmin/sendmail/help/alias_name.ru_RU.html
 share/webmin/sendmail/help/alias_name.ru_SU.html
+share/webmin/sendmail/help/alias_name.sv.UTF-8.html
 share/webmin/sendmail/help/alias_name.sv.html
 share/webmin/sendmail/help/alias_name.zh_TW.Big5.html
 share/webmin/sendmail/help/alias_name.zh_TW.UTF-8.html
+share/webmin/sendmail/help/alias_to.ca.UTF-8.html
 share/webmin/sendmail/help/alias_to.ca.html
+share/webmin/sendmail/help/alias_to.es.UTF-8.html
 share/webmin/sendmail/help/alias_to.es.html
+share/webmin/sendmail/help/alias_to.fr.UTF-8.html
 share/webmin/sendmail/help/alias_to.fr.html
 share/webmin/sendmail/help/alias_to.html
+share/webmin/sendmail/help/alias_to.nl.UTF-8.html
+share/webmin/sendmail/help/alias_to.nl.html
+share/webmin/sendmail/help/alias_to.pl.UTF-8.html
 share/webmin/sendmail/help/alias_to.pl.html
 share/webmin/sendmail/help/alias_to.ru_RU.html
 share/webmin/sendmail/help/alias_to.ru_SU.html
+share/webmin/sendmail/help/alias_to.sv.UTF-8.html
 share/webmin/sendmail/help/alias_to.sv.html
 share/webmin/sendmail/help/alias_to.zh_TW.Big5.html
 share/webmin/sendmail/help/alias_to.zh_TW.UTF-8.html
+share/webmin/sendmail/help/aliases.ca.UTF-8.html
 share/webmin/sendmail/help/aliases.ca.html
+share/webmin/sendmail/help/aliases.es.UTF-8.html
 share/webmin/sendmail/help/aliases.es.html
+share/webmin/sendmail/help/aliases.fr.UTF-8.html
 share/webmin/sendmail/help/aliases.fr.html
 share/webmin/sendmail/help/aliases.html
+share/webmin/sendmail/help/aliases.nl.UTF-8.html
+share/webmin/sendmail/help/aliases.nl.html
+share/webmin/sendmail/help/aliases.pl.UTF-8.html
 share/webmin/sendmail/help/aliases.pl.html
 share/webmin/sendmail/help/aliases.ru_RU.html
 share/webmin/sendmail/help/aliases.ru_SU.html
+share/webmin/sendmail/help/aliases.sv.UTF-8.html
 share/webmin/sendmail/help/aliases.sv.html
 share/webmin/sendmail/help/aliases.zh_TW.Big5.html
 share/webmin/sendmail/help/aliases.zh_TW.UTF-8.html
+share/webmin/sendmail/help/edit_alias.ca.UTF-8.html
 share/webmin/sendmail/help/edit_alias.ca.html
+share/webmin/sendmail/help/edit_alias.es.UTF-8.html
 share/webmin/sendmail/help/edit_alias.es.html
+share/webmin/sendmail/help/edit_alias.fr.UTF-8.html
 share/webmin/sendmail/help/edit_alias.fr.html
 share/webmin/sendmail/help/edit_alias.html
+share/webmin/sendmail/help/edit_alias.nl.UTF-8.html
+share/webmin/sendmail/help/edit_alias.nl.html
+share/webmin/sendmail/help/edit_alias.pl.UTF-8.html
 share/webmin/sendmail/help/edit_alias.pl.html
 share/webmin/sendmail/help/edit_alias.ru_RU.html
 share/webmin/sendmail/help/edit_alias.ru_SU.html
+share/webmin/sendmail/help/edit_alias.sv.UTF-8.html
 share/webmin/sendmail/help/edit_alias.sv.html
 share/webmin/sendmail/help/edit_alias.zh_TW.Big5.html
 share/webmin/sendmail/help/edit_alias.zh_TW.UTF-8.html
+share/webmin/sendmail/help/intro.ca.UTF-8.html
 share/webmin/sendmail/help/intro.ca.html
+share/webmin/sendmail/help/intro.es.UTF-8.html
 share/webmin/sendmail/help/intro.es.html
+share/webmin/sendmail/help/intro.fr.UTF-8.html
 share/webmin/sendmail/help/intro.fr.html
 share/webmin/sendmail/help/intro.html
+share/webmin/sendmail/help/intro.nl.UTF-8.html
+share/webmin/sendmail/help/intro.nl.html
+share/webmin/sendmail/help/intro.pl.UTF-8.html
 share/webmin/sendmail/help/intro.pl.html
 share/webmin/sendmail/help/intro.ru_RU.html
 share/webmin/sendmail/help/intro.ru_SU.html
+share/webmin/sendmail/help/intro.sv.UTF-8.html
 share/webmin/sendmail/help/intro.sv.html
 share/webmin/sendmail/help/intro.zh_TW.Big5.html
 share/webmin/sendmail/help/intro.zh_TW.UTF-8.html
+share/webmin/sendmail/help/opt_BadRcptThrottle.ca.UTF-8.html
 share/webmin/sendmail/help/opt_BadRcptThrottle.ca.html
 share/webmin/sendmail/help/opt_BadRcptThrottle.html
+share/webmin/sendmail/help/opt_BadRcptThrottle.nl.UTF-8.html
+share/webmin/sendmail/help/opt_BadRcptThrottle.nl.html
+share/webmin/sendmail/help/opt_ConnectionRateThrottle.ca.UTF-8.html
 share/webmin/sendmail/help/opt_ConnectionRateThrottle.ca.html
+share/webmin/sendmail/help/opt_ConnectionRateThrottle.es.UTF-8.html
 share/webmin/sendmail/help/opt_ConnectionRateThrottle.es.html
+share/webmin/sendmail/help/opt_ConnectionRateThrottle.fr.UTF-8.html
 share/webmin/sendmail/help/opt_ConnectionRateThrottle.fr.html
 share/webmin/sendmail/help/opt_ConnectionRateThrottle.html
+share/webmin/sendmail/help/opt_ConnectionRateThrottle.nl.UTF-8.html
+share/webmin/sendmail/help/opt_ConnectionRateThrottle.nl.html
+share/webmin/sendmail/help/opt_ConnectionRateThrottle.pl.UTF-8.html
 share/webmin/sendmail/help/opt_ConnectionRateThrottle.pl.html
 share/webmin/sendmail/help/opt_ConnectionRateThrottle.ru_RU.html
 share/webmin/sendmail/help/opt_ConnectionRateThrottle.ru_SU.html
+share/webmin/sendmail/help/opt_ConnectionRateThrottle.sv.UTF-8.html
 share/webmin/sendmail/help/opt_ConnectionRateThrottle.sv.html
 share/webmin/sendmail/help/opt_ConnectionRateThrottle.zh_TW.Big5.html
 share/webmin/sendmail/help/opt_ConnectionRateThrottle.zh_TW.UTF-8.html
+share/webmin/sendmail/help/opt_DH.ca.UTF-8.html
 share/webmin/sendmail/help/opt_DH.ca.html
+share/webmin/sendmail/help/opt_DH.es.UTF-8.html
 share/webmin/sendmail/help/opt_DH.es.html
+share/webmin/sendmail/help/opt_DH.fr.UTF-8.html
 share/webmin/sendmail/help/opt_DH.fr.html
 share/webmin/sendmail/help/opt_DH.html
+share/webmin/sendmail/help/opt_DH.nl.UTF-8.html
+share/webmin/sendmail/help/opt_DH.nl.html
+share/webmin/sendmail/help/opt_DH.pl.UTF-8.html
 share/webmin/sendmail/help/opt_DH.pl.html
 share/webmin/sendmail/help/opt_DH.ru_RU.html
 share/webmin/sendmail/help/opt_DH.ru_SU.html
+share/webmin/sendmail/help/opt_DH.sv.UTF-8.html
 share/webmin/sendmail/help/opt_DH.sv.html
 share/webmin/sendmail/help/opt_DH.zh_TW.Big5.html
 share/webmin/sendmail/help/opt_DH.zh_TW.UTF-8.html
+share/webmin/sendmail/help/opt_DR.ca.UTF-8.html
 share/webmin/sendmail/help/opt_DR.ca.html
+share/webmin/sendmail/help/opt_DR.es.UTF-8.html
 share/webmin/sendmail/help/opt_DR.es.html
+share/webmin/sendmail/help/opt_DR.fr.UTF-8.html
 share/webmin/sendmail/help/opt_DR.fr.html
 share/webmin/sendmail/help/opt_DR.html
+share/webmin/sendmail/help/opt_DR.nl.UTF-8.html
+share/webmin/sendmail/help/opt_DR.nl.html
+share/webmin/sendmail/help/opt_DR.pl.UTF-8.html
 share/webmin/sendmail/help/opt_DR.pl.html
 share/webmin/sendmail/help/opt_DR.ru_RU.html
 share/webmin/sendmail/help/opt_DR.ru_SU.html
+share/webmin/sendmail/help/opt_DR.sv.UTF-8.html
 share/webmin/sendmail/help/opt_DR.sv.html
 share/webmin/sendmail/help/opt_DR.zh_TW.Big5.html
 share/webmin/sendmail/help/opt_DR.zh_TW.UTF-8.html
+share/webmin/sendmail/help/opt_DS.ca.UTF-8.html
 share/webmin/sendmail/help/opt_DS.ca.html
+share/webmin/sendmail/help/opt_DS.es.UTF-8.html
 share/webmin/sendmail/help/opt_DS.es.html
+share/webmin/sendmail/help/opt_DS.fr.UTF-8.html
 share/webmin/sendmail/help/opt_DS.fr.html
 share/webmin/sendmail/help/opt_DS.html
+share/webmin/sendmail/help/opt_DS.nl.UTF-8.html
+share/webmin/sendmail/help/opt_DS.nl.html
+share/webmin/sendmail/help/opt_DS.pl.UTF-8.html
 share/webmin/sendmail/help/opt_DS.pl.html
 share/webmin/sendmail/help/opt_DS.ru_RU.html
 share/webmin/sendmail/help/opt_DS.ru_SU.html
+share/webmin/sendmail/help/opt_DS.sv.UTF-8.html
 share/webmin/sendmail/help/opt_DS.sv.html
 share/webmin/sendmail/help/opt_DS.zh_TW.Big5.html
 share/webmin/sendmail/help/opt_DS.zh_TW.UTF-8.html
+share/webmin/sendmail/help/opt_DaemonPortOptions.ca.UTF-8.html
 share/webmin/sendmail/help/opt_DaemonPortOptions.ca.html
+share/webmin/sendmail/help/opt_DaemonPortOptions.es.UTF-8.html
 share/webmin/sendmail/help/opt_DaemonPortOptions.es.html
 share/webmin/sendmail/help/opt_DaemonPortOptions.html
+share/webmin/sendmail/help/opt_DaemonPortOptions.nl.UTF-8.html
+share/webmin/sendmail/help/opt_DaemonPortOptions.nl.html
+share/webmin/sendmail/help/opt_DontBlameSendmail.ca.UTF-8.html
 share/webmin/sendmail/help/opt_DontBlameSendmail.ca.html
 share/webmin/sendmail/help/opt_DontBlameSendmail.html
+share/webmin/sendmail/help/opt_DontBlameSendmail.nl.UTF-8.html
+share/webmin/sendmail/help/opt_DontBlameSendmail.nl.html
+share/webmin/sendmail/help/opt_ForwardPath.ca.UTF-8.html
 share/webmin/sendmail/help/opt_ForwardPath.ca.html
+share/webmin/sendmail/help/opt_ForwardPath.es.UTF-8.html
 share/webmin/sendmail/help/opt_ForwardPath.es.html
+share/webmin/sendmail/help/opt_ForwardPath.fr.UTF-8.html
 share/webmin/sendmail/help/opt_ForwardPath.fr.html
 share/webmin/sendmail/help/opt_ForwardPath.html
+share/webmin/sendmail/help/opt_ForwardPath.nl.UTF-8.html
+share/webmin/sendmail/help/opt_ForwardPath.nl.html
+share/webmin/sendmail/help/opt_ForwardPath.pl.UTF-8.html
 share/webmin/sendmail/help/opt_ForwardPath.pl.html
 share/webmin/sendmail/help/opt_ForwardPath.ru_RU.html
 share/webmin/sendmail/help/opt_ForwardPath.ru_SU.html
+share/webmin/sendmail/help/opt_ForwardPath.sv.UTF-8.html
 share/webmin/sendmail/help/opt_ForwardPath.sv.html
 share/webmin/sendmail/help/opt_ForwardPath.zh_TW.Big5.html
 share/webmin/sendmail/help/opt_ForwardPath.zh_TW.UTF-8.html
+share/webmin/sendmail/help/opt_LogLevel.ca.UTF-8.html
 share/webmin/sendmail/help/opt_LogLevel.ca.html
+share/webmin/sendmail/help/opt_LogLevel.es.UTF-8.html
 share/webmin/sendmail/help/opt_LogLevel.es.html
+share/webmin/sendmail/help/opt_LogLevel.fr.UTF-8.html
 share/webmin/sendmail/help/opt_LogLevel.fr.html
 share/webmin/sendmail/help/opt_LogLevel.html
+share/webmin/sendmail/help/opt_LogLevel.nl.UTF-8.html
+share/webmin/sendmail/help/opt_LogLevel.nl.html
+share/webmin/sendmail/help/opt_LogLevel.pl.UTF-8.html
 share/webmin/sendmail/help/opt_LogLevel.pl.html
 share/webmin/sendmail/help/opt_LogLevel.ru_RU.html
 share/webmin/sendmail/help/opt_LogLevel.ru_SU.html
+share/webmin/sendmail/help/opt_LogLevel.sv.UTF-8.html
 share/webmin/sendmail/help/opt_LogLevel.sv.html
 share/webmin/sendmail/help/opt_LogLevel.zh_TW.Big5.html
 share/webmin/sendmail/help/opt_LogLevel.zh_TW.UTF-8.html
+share/webmin/sendmail/help/opt_MatchGECOS.ca.UTF-8.html
 share/webmin/sendmail/help/opt_MatchGECOS.ca.html
+share/webmin/sendmail/help/opt_MatchGECOS.es.UTF-8.html
 share/webmin/sendmail/help/opt_MatchGECOS.es.html
 share/webmin/sendmail/help/opt_MatchGECOS.html
+share/webmin/sendmail/help/opt_MatchGECOS.nl.UTF-8.html
+share/webmin/sendmail/help/opt_MatchGECOS.nl.html
+share/webmin/sendmail/help/opt_MatchGECOS.pl.UTF-8.html
 share/webmin/sendmail/help/opt_MatchGECOS.pl.html
+share/webmin/sendmail/help/opt_MaxDaemonChildren.ca.UTF-8.html
 share/webmin/sendmail/help/opt_MaxDaemonChildren.ca.html
+share/webmin/sendmail/help/opt_MaxDaemonChildren.es.UTF-8.html
 share/webmin/sendmail/help/opt_MaxDaemonChildren.es.html
+share/webmin/sendmail/help/opt_MaxDaemonChildren.fr.UTF-8.html
 share/webmin/sendmail/help/opt_MaxDaemonChildren.fr.html
 share/webmin/sendmail/help/opt_MaxDaemonChildren.html
+share/webmin/sendmail/help/opt_MaxDaemonChildren.nl.UTF-8.html
+share/webmin/sendmail/help/opt_MaxDaemonChildren.nl.html
+share/webmin/sendmail/help/opt_MaxDaemonChildren.pl.UTF-8.html
 share/webmin/sendmail/help/opt_MaxDaemonChildren.pl.html
 share/webmin/sendmail/help/opt_MaxDaemonChildren.ru_RU.html
 share/webmin/sendmail/help/opt_MaxDaemonChildren.ru_SU.html
+share/webmin/sendmail/help/opt_MaxDaemonChildren.sv.UTF-8.html
 share/webmin/sendmail/help/opt_MaxDaemonChildren.sv.html
 share/webmin/sendmail/help/opt_MaxDaemonChildren.zh_TW.Big5.html
 share/webmin/sendmail/help/opt_MaxDaemonChildren.zh_TW.UTF-8.html
+share/webmin/sendmail/help/opt_MaxHopCount.ca.UTF-8.html
 share/webmin/sendmail/help/opt_MaxHopCount.ca.html
+share/webmin/sendmail/help/opt_MaxHopCount.es.UTF-8.html
 share/webmin/sendmail/help/opt_MaxHopCount.es.html
 share/webmin/sendmail/help/opt_MaxHopCount.html
+share/webmin/sendmail/help/opt_MaxHopCount.nl.UTF-8.html
+share/webmin/sendmail/help/opt_MaxHopCount.nl.html
+share/webmin/sendmail/help/opt_MaxHopCount.pl.UTF-8.html
 share/webmin/sendmail/help/opt_MaxHopCount.pl.html
+share/webmin/sendmail/help/opt_MaxMessageSize.ca.UTF-8.html
 share/webmin/sendmail/help/opt_MaxMessageSize.ca.html
+share/webmin/sendmail/help/opt_MaxMessageSize.es.UTF-8.html
 share/webmin/sendmail/help/opt_MaxMessageSize.es.html
+share/webmin/sendmail/help/opt_MaxMessageSize.fr.UTF-8.html
 share/webmin/sendmail/help/opt_MaxMessageSize.fr.html
 share/webmin/sendmail/help/opt_MaxMessageSize.html
+share/webmin/sendmail/help/opt_MaxMessageSize.nl.UTF-8.html
+share/webmin/sendmail/help/opt_MaxMessageSize.nl.html
+share/webmin/sendmail/help/opt_MaxMessageSize.pl.UTF-8.html
 share/webmin/sendmail/help/opt_MaxMessageSize.pl.html
 share/webmin/sendmail/help/opt_MaxMessageSize.ru_RU.html
 share/webmin/sendmail/help/opt_MaxMessageSize.ru_SU.html
+share/webmin/sendmail/help/opt_MaxMessageSize.sv.UTF-8.html
 share/webmin/sendmail/help/opt_MaxMessageSize.sv.html
 share/webmin/sendmail/help/opt_MaxMessageSize.zh_TW.Big5.html
 share/webmin/sendmail/help/opt_MaxMessageSize.zh_TW.UTF-8.html
+share/webmin/sendmail/help/opt_MaxQueueRunSize.ca.UTF-8.html
 share/webmin/sendmail/help/opt_MaxQueueRunSize.ca.html
+share/webmin/sendmail/help/opt_MaxQueueRunSize.es.UTF-8.html
 share/webmin/sendmail/help/opt_MaxQueueRunSize.es.html
+share/webmin/sendmail/help/opt_MaxQueueRunSize.fr.UTF-8.html
 share/webmin/sendmail/help/opt_MaxQueueRunSize.fr.html
 share/webmin/sendmail/help/opt_MaxQueueRunSize.html
+share/webmin/sendmail/help/opt_MaxQueueRunSize.nl.UTF-8.html
+share/webmin/sendmail/help/opt_MaxQueueRunSize.nl.html
+share/webmin/sendmail/help/opt_MaxQueueRunSize.pl.UTF-8.html
 share/webmin/sendmail/help/opt_MaxQueueRunSize.pl.html
 share/webmin/sendmail/help/opt_MaxQueueRunSize.ru_RU.html
 share/webmin/sendmail/help/opt_MaxQueueRunSize.ru_SU.html
+share/webmin/sendmail/help/opt_MaxQueueRunSize.sv.UTF-8.html
 share/webmin/sendmail/help/opt_MaxQueueRunSize.sv.html
 share/webmin/sendmail/help/opt_MaxQueueRunSize.zh_TW.Big5.html
 share/webmin/sendmail/help/opt_MaxQueueRunSize.zh_TW.UTF-8.html
+share/webmin/sendmail/help/opt_MinFreeBlocks.ca.UTF-8.html
 share/webmin/sendmail/help/opt_MinFreeBlocks.ca.html
+share/webmin/sendmail/help/opt_MinFreeBlocks.es.UTF-8.html
 share/webmin/sendmail/help/opt_MinFreeBlocks.es.html
+share/webmin/sendmail/help/opt_MinFreeBlocks.fr.UTF-8.html
 share/webmin/sendmail/help/opt_MinFreeBlocks.fr.html
 share/webmin/sendmail/help/opt_MinFreeBlocks.html
+share/webmin/sendmail/help/opt_MinFreeBlocks.nl.UTF-8.html
+share/webmin/sendmail/help/opt_MinFreeBlocks.nl.html
+share/webmin/sendmail/help/opt_MinFreeBlocks.pl.UTF-8.html
 share/webmin/sendmail/help/opt_MinFreeBlocks.pl.html
 share/webmin/sendmail/help/opt_MinFreeBlocks.ru_RU.html
 share/webmin/sendmail/help/opt_MinFreeBlocks.ru_SU.html
+share/webmin/sendmail/help/opt_MinFreeBlocks.sv.UTF-8.html
 share/webmin/sendmail/help/opt_MinFreeBlocks.sv.html
 share/webmin/sendmail/help/opt_MinFreeBlocks.zh_TW.Big5.html
 share/webmin/sendmail/help/opt_MinFreeBlocks.zh_TW.UTF-8.html
+share/webmin/sendmail/help/opt_MinQueueAge.ca.UTF-8.html
 share/webmin/sendmail/help/opt_MinQueueAge.ca.html
+share/webmin/sendmail/help/opt_MinQueueAge.es.UTF-8.html
 share/webmin/sendmail/help/opt_MinQueueAge.es.html
+share/webmin/sendmail/help/opt_MinQueueAge.fr.UTF-8.html
 share/webmin/sendmail/help/opt_MinQueueAge.fr.html
 share/webmin/sendmail/help/opt_MinQueueAge.html
+share/webmin/sendmail/help/opt_MinQueueAge.nl.UTF-8.html
+share/webmin/sendmail/help/opt_MinQueueAge.nl.html
+share/webmin/sendmail/help/opt_MinQueueAge.pl.UTF-8.html
 share/webmin/sendmail/help/opt_MinQueueAge.pl.html
 share/webmin/sendmail/help/opt_MinQueueAge.ru_RU.html
 share/webmin/sendmail/help/opt_MinQueueAge.ru_SU.html
+share/webmin/sendmail/help/opt_MinQueueAge.sv.UTF-8.html
 share/webmin/sendmail/help/opt_MinQueueAge.sv.html
 share/webmin/sendmail/help/opt_MinQueueAge.zh_TW.Big5.html
 share/webmin/sendmail/help/opt_MinQueueAge.zh_TW.UTF-8.html
+share/webmin/sendmail/help/opt_PostMasterCopy.ca.UTF-8.html
 share/webmin/sendmail/help/opt_PostMasterCopy.ca.html
+share/webmin/sendmail/help/opt_PostMasterCopy.es.UTF-8.html
 share/webmin/sendmail/help/opt_PostMasterCopy.es.html
+share/webmin/sendmail/help/opt_PostMasterCopy.fr.UTF-8.html
 share/webmin/sendmail/help/opt_PostMasterCopy.fr.html
 share/webmin/sendmail/help/opt_PostMasterCopy.html
+share/webmin/sendmail/help/opt_PostMasterCopy.nl.UTF-8.html
+share/webmin/sendmail/help/opt_PostMasterCopy.nl.html
+share/webmin/sendmail/help/opt_PostMasterCopy.pl.UTF-8.html
 share/webmin/sendmail/help/opt_PostMasterCopy.pl.html
 share/webmin/sendmail/help/opt_PostMasterCopy.ru_RU.html
 share/webmin/sendmail/help/opt_PostMasterCopy.ru_SU.html
+share/webmin/sendmail/help/opt_PostMasterCopy.sv.UTF-8.html
 share/webmin/sendmail/help/opt_PostMasterCopy.sv.html
 share/webmin/sendmail/help/opt_PostMasterCopy.zh_TW.Big5.html
 share/webmin/sendmail/help/opt_PostMasterCopy.zh_TW.UTF-8.html
+share/webmin/sendmail/help/opt_QueueDirectory.ca.UTF-8.html
 share/webmin/sendmail/help/opt_QueueDirectory.ca.html
+share/webmin/sendmail/help/opt_QueueDirectory.es.UTF-8.html
 share/webmin/sendmail/help/opt_QueueDirectory.es.html
+share/webmin/sendmail/help/opt_QueueDirectory.fr.UTF-8.html
 share/webmin/sendmail/help/opt_QueueDirectory.fr.html
 share/webmin/sendmail/help/opt_QueueDirectory.html
+share/webmin/sendmail/help/opt_QueueDirectory.nl.UTF-8.html
+share/webmin/sendmail/help/opt_QueueDirectory.nl.html
+share/webmin/sendmail/help/opt_QueueDirectory.pl.UTF-8.html
 share/webmin/sendmail/help/opt_QueueDirectory.pl.html
 share/webmin/sendmail/help/opt_QueueDirectory.ru_RU.html
 share/webmin/sendmail/help/opt_QueueDirectory.ru_SU.html
+share/webmin/sendmail/help/opt_QueueDirectory.sv.UTF-8.html
 share/webmin/sendmail/help/opt_QueueDirectory.sv.html
 share/webmin/sendmail/help/opt_QueueDirectory.zh_TW.Big5.html
 share/webmin/sendmail/help/opt_QueueDirectory.zh_TW.UTF-8.html
+share/webmin/sendmail/help/opt_QueueLA.ca.UTF-8.html
 share/webmin/sendmail/help/opt_QueueLA.ca.html
+share/webmin/sendmail/help/opt_QueueLA.es.UTF-8.html
 share/webmin/sendmail/help/opt_QueueLA.es.html
+share/webmin/sendmail/help/opt_QueueLA.fr.UTF-8.html
 share/webmin/sendmail/help/opt_QueueLA.fr.html
 share/webmin/sendmail/help/opt_QueueLA.html
+share/webmin/sendmail/help/opt_QueueLA.nl.UTF-8.html
+share/webmin/sendmail/help/opt_QueueLA.nl.html
+share/webmin/sendmail/help/opt_QueueLA.pl.UTF-8.html
 share/webmin/sendmail/help/opt_QueueLA.pl.html
 share/webmin/sendmail/help/opt_QueueLA.ru_RU.html
 share/webmin/sendmail/help/opt_QueueLA.ru_SU.html
+share/webmin/sendmail/help/opt_QueueLA.sv.UTF-8.html
 share/webmin/sendmail/help/opt_QueueLA.sv.html
 share/webmin/sendmail/help/opt_QueueLA.zh_TW.Big5.html
 share/webmin/sendmail/help/opt_QueueLA.zh_TW.UTF-8.html
+share/webmin/sendmail/help/opt_RefuseLA.ca.UTF-8.html
 share/webmin/sendmail/help/opt_RefuseLA.ca.html
+share/webmin/sendmail/help/opt_RefuseLA.es.UTF-8.html
 share/webmin/sendmail/help/opt_RefuseLA.es.html
+share/webmin/sendmail/help/opt_RefuseLA.fr.UTF-8.html
 share/webmin/sendmail/help/opt_RefuseLA.fr.html
 share/webmin/sendmail/help/opt_RefuseLA.html
+share/webmin/sendmail/help/opt_RefuseLA.nl.UTF-8.html
+share/webmin/sendmail/help/opt_RefuseLA.nl.html
+share/webmin/sendmail/help/opt_RefuseLA.pl.UTF-8.html
 share/webmin/sendmail/help/opt_RefuseLA.pl.html
 share/webmin/sendmail/help/opt_RefuseLA.ru_RU.html
 share/webmin/sendmail/help/opt_RefuseLA.ru_SU.html
+share/webmin/sendmail/help/opt_RefuseLA.sv.UTF-8.html
 share/webmin/sendmail/help/opt_RefuseLA.sv.html
 share/webmin/sendmail/help/opt_RefuseLA.zh_TW.Big5.html
 share/webmin/sendmail/help/opt_RefuseLA.zh_TW.UTF-8.html
+share/webmin/sendmail/help/opt_SendMimeErrors.ca.UTF-8.html
 share/webmin/sendmail/help/opt_SendMimeErrors.ca.html
+share/webmin/sendmail/help/opt_SendMimeErrors.es.UTF-8.html
 share/webmin/sendmail/help/opt_SendMimeErrors.es.html
+share/webmin/sendmail/help/opt_SendMimeErrors.fr.UTF-8.html
 share/webmin/sendmail/help/opt_SendMimeErrors.fr.html
 share/webmin/sendmail/help/opt_SendMimeErrors.html
+share/webmin/sendmail/help/opt_SendMimeErrors.nl.UTF-8.html
+share/webmin/sendmail/help/opt_SendMimeErrors.nl.html
+share/webmin/sendmail/help/opt_SendMimeErrors.pl.UTF-8.html
 share/webmin/sendmail/help/opt_SendMimeErrors.pl.html
 share/webmin/sendmail/help/opt_SendMimeErrors.ru_RU.html
 share/webmin/sendmail/help/opt_SendMimeErrors.ru_SU.html
+share/webmin/sendmail/help/opt_SendMimeErrors.sv.UTF-8.html
 share/webmin/sendmail/help/opt_SendMimeErrors.sv.html
 share/webmin/sendmail/help/opt_SendMimeErrors.zh_TW.Big5.html
 share/webmin/sendmail/help/opt_SendMimeErrors.zh_TW.UTF-8.html
+share/webmin/sendmail/help/opt_Timeout.nl.UTF-8.html
+share/webmin/sendmail/help/opt_Timeout.nl.html
+share/webmin/sendmail/help/opt_Timeout.queuereturn.ca.UTF-8.html
 share/webmin/sendmail/help/opt_Timeout.queuereturn.ca.html
+share/webmin/sendmail/help/opt_Timeout.queuereturn.es.UTF-8.html
 share/webmin/sendmail/help/opt_Timeout.queuereturn.es.html
+share/webmin/sendmail/help/opt_Timeout.queuereturn.fr.UTF-8.html
 share/webmin/sendmail/help/opt_Timeout.queuereturn.fr.html
 share/webmin/sendmail/help/opt_Timeout.queuereturn.html
+share/webmin/sendmail/help/opt_Timeout.queuereturn.pl.UTF-8.html
 share/webmin/sendmail/help/opt_Timeout.queuereturn.pl.html
 share/webmin/sendmail/help/opt_Timeout.queuereturn.ru_RU.html
 share/webmin/sendmail/help/opt_Timeout.queuereturn.ru_SU.html
+share/webmin/sendmail/help/opt_Timeout.queuereturn.sv.UTF-8.html
 share/webmin/sendmail/help/opt_Timeout.queuereturn.sv.html
 share/webmin/sendmail/help/opt_Timeout.queuereturn.zh_TW.Big5.html
 share/webmin/sendmail/help/opt_Timeout.queuereturn.zh_TW.UTF-8.html
+share/webmin/sendmail/help/opt_Timeout.queuewarn.ca.UTF-8.html
 share/webmin/sendmail/help/opt_Timeout.queuewarn.ca.html
+share/webmin/sendmail/help/opt_Timeout.queuewarn.es.UTF-8.html
 share/webmin/sendmail/help/opt_Timeout.queuewarn.es.html
+share/webmin/sendmail/help/opt_Timeout.queuewarn.fr.UTF-8.html
 share/webmin/sendmail/help/opt_Timeout.queuewarn.fr.html
 share/webmin/sendmail/help/opt_Timeout.queuewarn.html
+share/webmin/sendmail/help/opt_Timeout.queuewarn.pl.UTF-8.html
 share/webmin/sendmail/help/opt_Timeout.queuewarn.pl.html
 share/webmin/sendmail/help/opt_Timeout.queuewarn.ru_RU.html
 share/webmin/sendmail/help/opt_Timeout.queuewarn.ru_SU.html
+share/webmin/sendmail/help/opt_Timeout.queuewarn.sv.UTF-8.html
 share/webmin/sendmail/help/opt_Timeout.queuewarn.sv.html
 share/webmin/sendmail/help/opt_Timeout.queuewarn.zh_TW.Big5.html
 share/webmin/sendmail/help/opt_Timeout.queuewarn.zh_TW.UTF-8.html
+share/webmin/sendmail/help/opt_dmode.ca.UTF-8.html
 share/webmin/sendmail/help/opt_dmode.ca.html
+share/webmin/sendmail/help/opt_dmode.es.UTF-8.html
 share/webmin/sendmail/help/opt_dmode.es.html
 share/webmin/sendmail/help/opt_dmode.html
+share/webmin/sendmail/help/opt_dmode.nl.UTF-8.html
+share/webmin/sendmail/help/opt_dmode.nl.html
+share/webmin/sendmail/help/opt_dmode.pl.UTF-8.html
 share/webmin/sendmail/help/opt_dmode.pl.html
+share/webmin/sendmail/help/opt_qso.ca.UTF-8.html
 share/webmin/sendmail/help/opt_qso.ca.html
 share/webmin/sendmail/help/opt_qso.html
+share/webmin/sendmail/help/opt_qso.nl.UTF-8.html
+share/webmin/sendmail/help/opt_qso.nl.html
+share/webmin/sendmail/help/units.ca.UTF-8.html
 share/webmin/sendmail/help/units.ca.html
+share/webmin/sendmail/help/units.es.UTF-8.html
 share/webmin/sendmail/help/units.es.html
+share/webmin/sendmail/help/units.fr.UTF-8.html
 share/webmin/sendmail/help/units.fr.html
 share/webmin/sendmail/help/units.html
+share/webmin/sendmail/help/units.nl.UTF-8.html
+share/webmin/sendmail/help/units.nl.html
+share/webmin/sendmail/help/units.pl.UTF-8.html
 share/webmin/sendmail/help/units.pl.html
 share/webmin/sendmail/help/units.ru_RU.html
 share/webmin/sendmail/help/units.ru_SU.html
+share/webmin/sendmail/help/units.sv.UTF-8.html
 share/webmin/sendmail/help/units.sv.html
 share/webmin/sendmail/help/units.zh_TW.Big5.html
 share/webmin/sendmail/help/units.zh_TW.UTF-8.html
@@ -399,22 +622,36 @@ share/webmin/sendmail/images/virtusers.gif
 share/webmin/sendmail/index.cgi
 share/webmin/sendmail/install_check.pl
 share/webmin/sendmail/lang/ca
+share/webmin/sendmail/lang/ca.UTF-8
 share/webmin/sendmail/lang/cz
+share/webmin/sendmail/lang/cz.UTF-8
 share/webmin/sendmail/lang/de
+share/webmin/sendmail/lang/de.UTF-8
 share/webmin/sendmail/lang/en
+share/webmin/sendmail/lang/en.UTF-8
 share/webmin/sendmail/lang/es
+share/webmin/sendmail/lang/es.UTF-8
 share/webmin/sendmail/lang/fr
+share/webmin/sendmail/lang/fr.UTF-8
 share/webmin/sendmail/lang/ja_JP.UTF-8
 share/webmin/sendmail/lang/ja_JP.euc
 share/webmin/sendmail/lang/ja_JP.jis
 share/webmin/sendmail/lang/ko_KR.UTF-8
 share/webmin/sendmail/lang/ko_KR.euc
 share/webmin/sendmail/lang/nl
+share/webmin/sendmail/lang/nl.UTF-8
+share/webmin/sendmail/lang/no
 share/webmin/sendmail/lang/pl
+share/webmin/sendmail/lang/pl.UTF-8
 share/webmin/sendmail/lang/pt
+share/webmin/sendmail/lang/pt.UTF-8
+share/webmin/sendmail/lang/pt_BR
+share/webmin/sendmail/lang/pt_BR.UTF-8
+share/webmin/sendmail/lang/ru.UTF-8
 share/webmin/sendmail/lang/ru_RU
 share/webmin/sendmail/lang/ru_SU
 share/webmin/sendmail/lang/sv
+share/webmin/sendmail/lang/sv.UTF-8
 share/webmin/sendmail/lang/tr
 share/webmin/sendmail/lang/uk_UA
 share/webmin/sendmail/lang/zh_CN
diff --git a/sysutils/wbm-sshd/Makefile b/sysutils/wbm-sshd/Makefile
index 40de3203b09..312e0705c9e 100644
--- a/sysutils/wbm-sshd/Makefile
+++ b/sysutils/wbm-sshd/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2012/10/23 19:51:33 asau Exp $
+# $NetBSD: Makefile,v 1.6 2012/12/22 01:27:55 dholland Exp $
 
 WBM_NAME=	sshd
+PKGREVISION=	1
 
 COMMENT=	Webmin module to setup the Secure Shell server
 
diff --git a/sysutils/wbm-sshd/PLIST b/sysutils/wbm-sshd/PLIST
index 7ce64ae8337..17d0309d4c0 100644
--- a/sysutils/wbm-sshd/PLIST
+++ b/sysutils/wbm-sshd/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:16:20 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/12/22 01:27:55 dholland Exp $
 share/examples/webmin/sshd/config
 share/webmin/sshd/CHANGELOG
 share/webmin/sshd/apply.cgi
 share/webmin/sshd/backup_config.pl
+share/webmin/sshd/cgi_args.pl
 share/webmin/sshd/config
+share/webmin/sshd/config-Ubuntu-Linux-10.10-*
 share/webmin/sshd/config-coherent-linux
 share/webmin/sshd/config-debian-linux-2.2-*
 share/webmin/sshd/config-macos
@@ -11,7 +13,9 @@ share/webmin/sshd/config-macos-8.1-*
 share/webmin/sshd/config-mandrake-linux-7.1-*
 share/webmin/sshd/config-open-linux-3.1
 share/webmin/sshd/config-openmamba-linux
-share/webmin/sshd/config-redhat-linux-7.0-*
+share/webmin/sshd/config-pardus-linux
+share/webmin/sshd/config-redhat-linux-24.0-*
+share/webmin/sshd/config-redhat-linux-7.0-23.0
 share/webmin/sshd/config-slackware-linux-8.0-*
 share/webmin/sshd/config-sol-linux
 share/webmin/sshd/config-solaris-10-*
@@ -24,81 +28,171 @@ share/webmin/sshd/config-united-linux
 share/webmin/sshd/config-windows
 share/webmin/sshd/config.info
 share/webmin/sshd/config.info.ca
+share/webmin/sshd/config.info.ca.UTF-8
 share/webmin/sshd/config.info.cz
+share/webmin/sshd/config.info.cz.UTF-8
 share/webmin/sshd/config.info.de
+share/webmin/sshd/config.info.de.UTF-8
 share/webmin/sshd/config.info.es
+share/webmin/sshd/config.info.es.UTF-8
+share/webmin/sshd/config.info.eu
+share/webmin/sshd/config.info.eu.UTF-8
 share/webmin/sshd/config.info.fa
 share/webmin/sshd/config.info.fr
+share/webmin/sshd/config.info.fr.UTF-8
+share/webmin/sshd/config.info.it
+share/webmin/sshd/config.info.it.UTF-8
 share/webmin/sshd/config.info.ja_JP.UTF-8
 share/webmin/sshd/config.info.ja_JP.euc
 share/webmin/sshd/config.info.ko_KR.UTF-8
 share/webmin/sshd/config.info.ko_KR.euc
 share/webmin/sshd/config.info.nl
+share/webmin/sshd/config.info.nl.UTF-8
+share/webmin/sshd/config.info.no
 share/webmin/sshd/config.info.pl
+share/webmin/sshd/config.info.pl.UTF-8
+share/webmin/sshd/config.info.ru.UTF-8
 share/webmin/sshd/config.info.ru_RU
 share/webmin/sshd/config.info.ru_SU
 share/webmin/sshd/config.info.sk
+share/webmin/sshd/config.info.sk.UTF-8
 share/webmin/sshd/config.info.uk_UA
 share/webmin/sshd/edit_access.cgi
 share/webmin/sshd/edit_host.cgi
+share/webmin/sshd/edit_keys.cgi
 share/webmin/sshd/edit_manual.cgi
 share/webmin/sshd/edit_misc.cgi
-share/webmin/sshd/edit_keys.cgi
 share/webmin/sshd/edit_net.cgi
 share/webmin/sshd/edit_sync.cgi
 share/webmin/sshd/edit_users.cgi
+share/webmin/sshd/help/access.ca.UTF-8.html
 share/webmin/sshd/help/access.ca.html
+share/webmin/sshd/help/access.es.UTF-8.html
 share/webmin/sshd/help/access.es.html
 share/webmin/sshd/help/access.fa.html
 share/webmin/sshd/help/access.html
+share/webmin/sshd/help/access.hu.UTF-8.html
 share/webmin/sshd/help/access.hu.html
+share/webmin/sshd/help/access.it.UTF-8.html
+share/webmin/sshd/help/access.it.html
+share/webmin/sshd/help/access.nl.UTF-8.html
+share/webmin/sshd/help/access.nl.html
+share/webmin/sshd/help/access.pl.UTF-8.html
 share/webmin/sshd/help/access.pl.html
+share/webmin/sshd/help/chost.ca.UTF-8.html
 share/webmin/sshd/help/chost.ca.html
+share/webmin/sshd/help/chost.es.UTF-8.html
 share/webmin/sshd/help/chost.es.html
 share/webmin/sshd/help/chost.fa.html
+share/webmin/sshd/help/chost.fr.UTF-8.html
+share/webmin/sshd/help/chost.fr.html
 share/webmin/sshd/help/chost.html
+share/webmin/sshd/help/chost.hu.UTF-8.html
 share/webmin/sshd/help/chost.hu.html
+share/webmin/sshd/help/chost.it.UTF-8.html
+share/webmin/sshd/help/chost.it.html
+share/webmin/sshd/help/chost.nl.UTF-8.html
+share/webmin/sshd/help/chost.nl.html
+share/webmin/sshd/help/chost.pl.UTF-8.html
 share/webmin/sshd/help/chost.pl.html
+share/webmin/sshd/help/ehost.ca.UTF-8.html
 share/webmin/sshd/help/ehost.ca.html
+share/webmin/sshd/help/ehost.es.UTF-8.html
 share/webmin/sshd/help/ehost.es.html
 share/webmin/sshd/help/ehost.fa.html
+share/webmin/sshd/help/ehost.fr.UTF-8.html
+share/webmin/sshd/help/ehost.fr.html
 share/webmin/sshd/help/ehost.html
+share/webmin/sshd/help/ehost.hu.UTF-8.html
 share/webmin/sshd/help/ehost.hu.html
+share/webmin/sshd/help/ehost.it.UTF-8.html
+share/webmin/sshd/help/ehost.it.html
+share/webmin/sshd/help/ehost.nl.UTF-8.html
+share/webmin/sshd/help/ehost.nl.html
+share/webmin/sshd/help/ehost.pl.UTF-8.html
 share/webmin/sshd/help/ehost.pl.html
+share/webmin/sshd/help/host.ca.UTF-8.html
 share/webmin/sshd/help/host.ca.html
+share/webmin/sshd/help/host.es.UTF-8.html
 share/webmin/sshd/help/host.es.html
 share/webmin/sshd/help/host.fa.html
 share/webmin/sshd/help/host.html
+share/webmin/sshd/help/host.hu.UTF-8.html
 share/webmin/sshd/help/host.hu.html
+share/webmin/sshd/help/host.it.UTF-8.html
+share/webmin/sshd/help/host.it.html
+share/webmin/sshd/help/host.nl.UTF-8.html
+share/webmin/sshd/help/host.nl.html
+share/webmin/sshd/help/host.pl.UTF-8.html
 share/webmin/sshd/help/host.pl.html
+share/webmin/sshd/help/hosts.ca.UTF-8.html
 share/webmin/sshd/help/hosts.ca.html
+share/webmin/sshd/help/hosts.es.UTF-8.html
 share/webmin/sshd/help/hosts.es.html
 share/webmin/sshd/help/hosts.fa.html
 share/webmin/sshd/help/hosts.html
+share/webmin/sshd/help/hosts.hu.UTF-8.html
 share/webmin/sshd/help/hosts.hu.html
+share/webmin/sshd/help/hosts.it.UTF-8.html
+share/webmin/sshd/help/hosts.it.html
+share/webmin/sshd/help/hosts.nl.UTF-8.html
+share/webmin/sshd/help/hosts.nl.html
+share/webmin/sshd/help/hosts.pl.UTF-8.html
 share/webmin/sshd/help/hosts.pl.html
+share/webmin/sshd/help/intro.ca.UTF-8.html
 share/webmin/sshd/help/intro.ca.html
+share/webmin/sshd/help/intro.es.UTF-8.html
 share/webmin/sshd/help/intro.es.html
 share/webmin/sshd/help/intro.html
+share/webmin/sshd/help/intro.hu.UTF-8.html
 share/webmin/sshd/help/intro.hu.html
+share/webmin/sshd/help/intro.it.UTF-8.html
+share/webmin/sshd/help/intro.it.html
+share/webmin/sshd/help/intro.nl.UTF-8.html
+share/webmin/sshd/help/intro.nl.html
+share/webmin/sshd/help/intro.pl.UTF-8.html
 share/webmin/sshd/help/intro.pl.html
+share/webmin/sshd/help/misc.ca.UTF-8.html
 share/webmin/sshd/help/misc.ca.html
+share/webmin/sshd/help/misc.es.UTF-8.html
 share/webmin/sshd/help/misc.es.html
 share/webmin/sshd/help/misc.fa.html
 share/webmin/sshd/help/misc.html
+share/webmin/sshd/help/misc.hu.UTF-8.html
 share/webmin/sshd/help/misc.hu.html
+share/webmin/sshd/help/misc.it.UTF-8.html
+share/webmin/sshd/help/misc.it.html
+share/webmin/sshd/help/misc.nl.UTF-8.html
+share/webmin/sshd/help/misc.nl.html
+share/webmin/sshd/help/misc.pl.UTF-8.html
 share/webmin/sshd/help/misc.pl.html
+share/webmin/sshd/help/net.ca.UTF-8.html
 share/webmin/sshd/help/net.ca.html
+share/webmin/sshd/help/net.es.UTF-8.html
 share/webmin/sshd/help/net.es.html
 share/webmin/sshd/help/net.fa.html
 share/webmin/sshd/help/net.html
+share/webmin/sshd/help/net.hu.UTF-8.html
 share/webmin/sshd/help/net.hu.html
+share/webmin/sshd/help/net.it.UTF-8.html
+share/webmin/sshd/help/net.it.html
+share/webmin/sshd/help/net.nl.UTF-8.html
+share/webmin/sshd/help/net.nl.html
+share/webmin/sshd/help/net.pl.UTF-8.html
 share/webmin/sshd/help/net.pl.html
+share/webmin/sshd/help/users.ca.UTF-8.html
 share/webmin/sshd/help/users.ca.html
+share/webmin/sshd/help/users.es.UTF-8.html
 share/webmin/sshd/help/users.es.html
 share/webmin/sshd/help/users.fa.html
 share/webmin/sshd/help/users.html
+share/webmin/sshd/help/users.hu.UTF-8.html
 share/webmin/sshd/help/users.hu.html
+share/webmin/sshd/help/users.it.UTF-8.html
+share/webmin/sshd/help/users.it.html
+share/webmin/sshd/help/users.nl.UTF-8.html
+share/webmin/sshd/help/users.nl.html
+share/webmin/sshd/help/users.pl.UTF-8.html
 share/webmin/sshd/help/users.pl.html
 share/webmin/sshd/images/access.gif
 share/webmin/sshd/images/host.gif
@@ -114,22 +208,36 @@ share/webmin/sshd/images/users.gif
 share/webmin/sshd/index.cgi
 share/webmin/sshd/install_check.pl
 share/webmin/sshd/lang/ca
+share/webmin/sshd/lang/ca.UTF-8
 share/webmin/sshd/lang/cz
+share/webmin/sshd/lang/cz.UTF-8
 share/webmin/sshd/lang/de
+share/webmin/sshd/lang/de.UTF-8
 share/webmin/sshd/lang/en
+share/webmin/sshd/lang/en.UTF-8
 share/webmin/sshd/lang/es
+share/webmin/sshd/lang/es.UTF-8
+share/webmin/sshd/lang/eu
+share/webmin/sshd/lang/eu.UTF-8
 share/webmin/sshd/lang/fa
 share/webmin/sshd/lang/fr
+share/webmin/sshd/lang/fr.UTF-8
 share/webmin/sshd/lang/it
+share/webmin/sshd/lang/it.UTF-8
 share/webmin/sshd/lang/ja_JP.UTF-8
 share/webmin/sshd/lang/ja_JP.euc
 share/webmin/sshd/lang/ko_KR.UTF-8
 share/webmin/sshd/lang/ko_KR.euc
 share/webmin/sshd/lang/nl
+share/webmin/sshd/lang/nl.UTF-8
+share/webmin/sshd/lang/no
 share/webmin/sshd/lang/pl
+share/webmin/sshd/lang/pl.UTF-8
+share/webmin/sshd/lang/ru.UTF-8
 share/webmin/sshd/lang/ru_RU
 share/webmin/sshd/lang/ru_SU
 share/webmin/sshd/lang/sk
+share/webmin/sshd/lang/sk.UTF-8
 share/webmin/sshd/lang/uk_UA
 share/webmin/sshd/lang/zh_CN
 share/webmin/sshd/lang/zh_CN.UTF-8
diff --git a/sysutils/wbm-syslog/Makefile b/sysutils/wbm-syslog/Makefile
index 690af6cb77f..ea9ddf542ca 100644
--- a/sysutils/wbm-syslog/Makefile
+++ b/sysutils/wbm-syslog/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2012/10/23 19:51:33 asau Exp $
+# $NetBSD: Makefile,v 1.6 2012/12/22 01:30:17 dholland Exp $
 
 WBM_NAME=	syslog
+PKGREVISION=	1
 
 COMMENT=	Webmin module to configure the syslog server view log files
 
diff --git a/sysutils/wbm-syslog/PLIST b/sysutils/wbm-syslog/PLIST
index 80ab3b9d395..d421336fc7c 100644
--- a/sysutils/wbm-syslog/PLIST
+++ b/sysutils/wbm-syslog/PLIST
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:16:20 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/12/22 01:30:17 dholland Exp $
 share/examples/webmin/syslog/config
 share/webmin/syslog/CHANGELOG
 share/webmin/syslog/acl_security.pl
 share/webmin/syslog/backup_config.pl
+share/webmin/syslog/cgi_args.pl
+share/webmin/syslog/config-CentOS-Linux-6.0-*
+share/webmin/syslog/config-Ubuntu-Linux-10.04-*
 share/webmin/syslog/config-aix
 share/webmin/syslog/config-cobalt-linux
 share/webmin/syslog/config-coherent-linux
@@ -23,37 +26,52 @@ share/webmin/syslog/config-netbsd
 share/webmin/syslog/config-open-linux
 share/webmin/syslog/config-openbsd
 share/webmin/syslog/config-openserver
+share/webmin/syslog/config-pardus-linux
 share/webmin/syslog/config-redhat-linux-*-15.0
-share/webmin/syslog/config-redhat-linux-16.0-*
+share/webmin/syslog/config-redhat-linux-16.0-23.0
+share/webmin/syslog/config-redhat-linux-24.0-*
 share/webmin/syslog/config-slackware-linux
 share/webmin/syslog/config-sol-linux
 share/webmin/syslog/config-solaris
 share/webmin/syslog/config-solaris-9-10
 share/webmin/syslog/config-suse-linux
+share/webmin/syslog/config-suse-linux-11-*
 share/webmin/syslog/config-suse-linux-7.2-8.0
-share/webmin/syslog/config-suse-linux-8.2-*
+share/webmin/syslog/config-suse-linux-8.2-10.9
 share/webmin/syslog/config-trustix-linux
 share/webmin/syslog/config-turbo-linux
 share/webmin/syslog/config-united-linux
 share/webmin/syslog/config-unixware
 share/webmin/syslog/config.info
 share/webmin/syslog/config.info.ca
+share/webmin/syslog/config.info.ca.UTF-8
 share/webmin/syslog/config.info.cz
+share/webmin/syslog/config.info.cz.UTF-8
 share/webmin/syslog/config.info.de
+share/webmin/syslog/config.info.de.UTF-8
 share/webmin/syslog/config.info.el
 share/webmin/syslog/config.info.es
+share/webmin/syslog/config.info.es.UTF-8
 share/webmin/syslog/config.info.fr
+share/webmin/syslog/config.info.fr.UTF-8
 share/webmin/syslog/config.info.hu
+share/webmin/syslog/config.info.hu.UTF-8
 share/webmin/syslog/config.info.it
+share/webmin/syslog/config.info.it.UTF-8
 share/webmin/syslog/config.info.ja_JP.UTF-8
 share/webmin/syslog/config.info.ja_JP.euc
 share/webmin/syslog/config.info.ko_KR.UTF-8
 share/webmin/syslog/config.info.ko_KR.euc
 share/webmin/syslog/config.info.nl
+share/webmin/syslog/config.info.nl.UTF-8
+share/webmin/syslog/config.info.no
 share/webmin/syslog/config.info.pl
+share/webmin/syslog/config.info.pl.UTF-8
+share/webmin/syslog/config.info.ru.UTF-8
 share/webmin/syslog/config.info.ru_RU
 share/webmin/syslog/config.info.ru_SU
 share/webmin/syslog/config.info.sv
+share/webmin/syslog/config.info.sv.UTF-8
 share/webmin/syslog/config.info.tr
 share/webmin/syslog/config.info.uk_UA
 share/webmin/syslog/config.info.zh_CN
@@ -67,23 +85,36 @@ share/webmin/syslog/images/smallicon.gif
 share/webmin/syslog/index.cgi
 share/webmin/syslog/install_check.pl
 share/webmin/syslog/lang/ca
+share/webmin/syslog/lang/ca.UTF-8
 share/webmin/syslog/lang/cz
+share/webmin/syslog/lang/cz.UTF-8
 share/webmin/syslog/lang/de
+share/webmin/syslog/lang/de.UTF-8
 share/webmin/syslog/lang/el
 share/webmin/syslog/lang/en
+share/webmin/syslog/lang/en.UTF-8
 share/webmin/syslog/lang/es
+share/webmin/syslog/lang/es.UTF-8
 share/webmin/syslog/lang/fr
+share/webmin/syslog/lang/fr.UTF-8
 share/webmin/syslog/lang/hu
+share/webmin/syslog/lang/hu.UTF-8
 share/webmin/syslog/lang/it
+share/webmin/syslog/lang/it.UTF-8
 share/webmin/syslog/lang/ja_JP.UTF-8
 share/webmin/syslog/lang/ja_JP.euc
 share/webmin/syslog/lang/ko_KR.UTF-8
 share/webmin/syslog/lang/ko_KR.euc
 share/webmin/syslog/lang/nl
+share/webmin/syslog/lang/nl.UTF-8
+share/webmin/syslog/lang/no
 share/webmin/syslog/lang/pl
+share/webmin/syslog/lang/pl.UTF-8
+share/webmin/syslog/lang/ru.UTF-8
 share/webmin/syslog/lang/ru_RU
 share/webmin/syslog/lang/ru_SU
 share/webmin/syslog/lang/sv
+share/webmin/syslog/lang/sv.UTF-8
 share/webmin/syslog/lang/tr
 share/webmin/syslog/lang/uk_UA
 share/webmin/syslog/lang/zh_CN