summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2007-04-21 05:22:57 +0000
committerobache <obache@pkgsrc.org>2007-04-21 05:22:57 +0000
commit6d32efac595fd1522cae39cda70f98e8f882a767 (patch)
treef71a72257a97ae51e45125cc3b48da8d47215e16
parenta316c2729987bcab946c7e4fec1ea2ad5a68844d (diff)
downloadpkgsrc-6d32efac595fd1522cae39cda70f98e8f882a767.tar.gz
Update Webmin to 1.340.
pkgsrc chages: use full distfile instead of non version indivisual module files. Version 1.340 (8 April 2007) * Change the default Blue Framed theme to match the style of www.webmin.com, and generally look nicer. * User interface cleanups in various modules (Apache, Backup Config, Webmin Configuration and others), adding tabs to reduce the size of pages and converting code to use ui-lib.pl. * The Perl Modules module can now fetch RPM or Deb packaged modules from YUM or APT, where available. * Added easy fields for sending SMS messages in the System and Server Status module (for US carriers that have email to SMS gateways). * Replace the old HTMLarea widget for HTML editing in the File Manager and Read User Mail modules with Xinha. * Linux quotas are now set with the setquota command, which shows up nicely in the actions log. * Optimizations to speed up getting the hostname and Postfix config settings. * Improved YUM and Redhat Network support in the Software Packages module. * View the detailed change log. Version 1.330 (27 February 2007) * If the underlying OS is upgraded after Webmin is installed, a message is displayed on the main page prompting you to fix it. * Added a feature in the BIND module for updating an IP address in multiple zones at once. * The File Manager now automatic detects HTML files and launches the correct editor. * Improved the LDAP module's support for large databases. * When there are too many tables or databases to display in the MySQL and PostgreSQL modules, a menu for selecting a specific table is shown instead. * Added functions to ui-lib.pl for tabs and hidden table sections. * Added support for comments to the Shorewall module, and improved logging * The Webmin Actions Log module can now rollback selected files changed by an action, rather than all of them. * View the detailed change log. Version 1.320 (21 January 2007) * Added the PHP Configuration module for managing php.ini. * Changed the default theme for new installs to the Blue Framed theme. * Improved handling of large file uploads so that they are no longer read into memory by Webmin webserver. Also added a progress bar window for tracking uploads. * Added checkboxes for deleting multiple objects at once in several modules. * Changed all rows of links (like Select all / Invert selection / Add something) to put | characters between them, to improve readability. * Big improvements in Windows support in various modules and the Webmin core. * Enhanced the System and Server Status module to allow monitoring of all hosts in a Webmin server group. * View the detailed change log. Version 1.310 (28 November 2006) * Big improvements in Ubuntu support, including the Bootup and Shutdown module, mounting filesystems specified with the UUID syntax, and various default module config changes. * Re-designed the Simple Blue theme to use frames. * Added support for IPv6 addresses in modules where the underlying servers allow them. * Supported HFS and FATX filesystems under Linux. * MySQL backups can now be compressed with gzip or bzip2. * Added file locking and logging to the Postfix module, and improved access control features. * Added checkboxes and buttons for mass deletion in the Cron and DHCP modules. * Added access control options for the Info window to the File Manager module, and a feature to allow extraction of ZIP files on the server. * View the detailed change log. Version 1.300 (15 September 2006) * Fixed security holes that allow the source of Webmin programs to be viewed, and allow cross-site-scripting attacks. * XML-RPC clients can now call Webmin API functions. * On systems with no root password, users with sudo access can login to Webmin as root. * Improved support for latest Debian and Fedora releases, including the new IPtables config system in Debian 3.1. * The file manager can now extract tar.bz2 files, store a history of entered paths, and show the total size of a directory. * The Filesystem Backup module can backup and restore TAR and dump files over FTP. * MySQL server variables and connections can be viewed and changes. * Table data can be sorted by clicking on headers in the MySQL and PostgreSQL modules. * Improved support for PostgreSQL 8, including editing tables with no OID field. * Sendmail and Postfix aliases and maps can have a comment associated with each entry. * Squid 2.6 is now supported. * View the detailed change log. Version 1.290 (29 June 2006) * Fixed a security hole that would allow a remote attacker to view any file on the system. * Added the LDAP Client module, for setting up a Linux system to get users and groups from an LDAP server. * Added support for sending email when a group is over quota to the Disk Quotas module. * Several other small fixes for bugs found since 1.280. * View the detailed change log. Version 1.280 (16 June 2006) * Added the Simple Blue theme, a less graphics-heavy design which may eventually become the default. This theme takes advantage of changes in many modules to use highlighting on table rows. * Updated the Apache module to support version 2.2.0. * Updated the various operating-specific NFS server modules to support mass deletion of exports, and to internationalize those that were using hard-coded text strings. * Updated various modules to allow deletion of multiple objects (such as table fields, Samba shares, PostgreSQL grants, Squid ACLs and so on) at once. * Added configuration options to the Read User Mail module for the date format, pager arrow locations, timezone and separate message window mode. * Updated the MySQL module to support views in MySQL version 5. * Enhanced the System and Server Status module to allow the selection of multiple hosts for each monitor, added a monitor type for testing an SQL server, and updated the Network Traffic monitor to support FreeBSD. * Fixed a security hole that allows remote viewing of any file on the system when Webmin is run on a Windows server. * View the detailed change log.
-rw-r--r--sysutils/wbm-apache/Makefile14
-rw-r--r--sysutils/wbm-apache/PLIST22
-rw-r--r--sysutils/wbm-apache/distinfo8
-rw-r--r--sysutils/wbm-at/Makefile12
-rw-r--r--sysutils/wbm-at/PLIST8
-rw-r--r--sysutils/wbm-at/distinfo8
-rw-r--r--sysutils/wbm-bandwidth/Makefile12
-rw-r--r--sysutils/wbm-bandwidth/PLIST5
-rw-r--r--sysutils/wbm-bandwidth/distinfo8
-rw-r--r--sysutils/wbm-bind8/Makefile12
-rw-r--r--sysutils/wbm-bind8/PLIST16
-rw-r--r--sysutils/wbm-bind8/distinfo8
-rw-r--r--sysutils/wbm-change-user/Makefile12
-rw-r--r--sysutils/wbm-change-user/PLIST5
-rw-r--r--sysutils/wbm-change-user/distinfo8
-rw-r--r--sysutils/wbm-cluster-copy/Makefile13
-rw-r--r--sysutils/wbm-cluster-copy/distinfo8
-rw-r--r--sysutils/wbm-cluster-cron/Makefile13
-rw-r--r--sysutils/wbm-cluster-cron/PLIST4
-rw-r--r--sysutils/wbm-cluster-cron/distinfo8
-rw-r--r--sysutils/wbm-cluster-passwd/Makefile12
-rw-r--r--sysutils/wbm-cluster-passwd/distinfo8
-rw-r--r--sysutils/wbm-cluster-shell/Makefile12
-rw-r--r--sysutils/wbm-cluster-shell/distinfo8
-rw-r--r--sysutils/wbm-cluster-useradmin/Makefile12
-rw-r--r--sysutils/wbm-cluster-useradmin/distinfo8
-rw-r--r--sysutils/wbm-cluster-webmin/Makefile12
-rw-r--r--sysutils/wbm-cluster-webmin/distinfo8
-rw-r--r--sysutils/wbm-custom/Makefile12
-rw-r--r--sysutils/wbm-custom/PLIST17
-rw-r--r--sysutils/wbm-custom/distinfo8
-rw-r--r--sysutils/wbm-dhcpd/Makefile12
-rw-r--r--sysutils/wbm-dhcpd/PLIST25
-rw-r--r--sysutils/wbm-dhcpd/distinfo8
-rw-r--r--sysutils/wbm-dovecot/Makefile12
-rw-r--r--sysutils/wbm-dovecot/distinfo8
-rw-r--r--sysutils/wbm-fetchmail/Makefile12
-rw-r--r--sysutils/wbm-fetchmail/PLIST8
-rw-r--r--sysutils/wbm-fetchmail/distinfo8
-rw-r--r--sysutils/wbm-file/Makefile12
-rw-r--r--sysutils/wbm-file/PLIST1078
-rw-r--r--sysutils/wbm-file/distinfo8
-rw-r--r--sysutils/wbm-htaccess-htpasswd/Makefile13
-rw-r--r--sysutils/wbm-htaccess-htpasswd/PLIST9
-rw-r--r--sysutils/wbm-htaccess-htpasswd/distinfo8
-rw-r--r--sysutils/wbm-inetd/Makefile12
-rw-r--r--sysutils/wbm-inetd/PLIST14
-rw-r--r--sysutils/wbm-inetd/distinfo8
-rw-r--r--sysutils/wbm-ipfilter/Makefile15
-rw-r--r--sysutils/wbm-ipfilter/distinfo11
-rw-r--r--sysutils/wbm-ipfilter/files/ipfilter_config-netbsd9
-rw-r--r--sysutils/wbm-ipfilter/patches/patch-aa14
-rw-r--r--sysutils/wbm-ipfilter/patches/patch-ab10
-rw-r--r--sysutils/wbm-ldap-useradmin/Makefile12
-rw-r--r--sysutils/wbm-ldap-useradmin/PLIST4
-rw-r--r--sysutils/wbm-ldap-useradmin/distinfo8
-rw-r--r--sysutils/wbm-lpadmin/Makefile12
-rw-r--r--sysutils/wbm-lpadmin/PLIST12
-rw-r--r--sysutils/wbm-lpadmin/distinfo8
-rw-r--r--sysutils/wbm-mailboxes/Makefile12
-rw-r--r--sysutils/wbm-mailboxes/PLIST1074
-rw-r--r--sysutils/wbm-mailboxes/distinfo8
-rw-r--r--sysutils/wbm-mount/Makefile12
-rw-r--r--sysutils/wbm-mount/PLIST31
-rw-r--r--sysutils/wbm-mount/distinfo8
-rw-r--r--sysutils/wbm-mysql/Makefile12
-rw-r--r--sysutils/wbm-mysql/PLIST51
-rw-r--r--sysutils/wbm-mysql/distinfo8
-rw-r--r--sysutils/wbm-net/Makefile12
-rw-r--r--sysutils/wbm-net/PLIST15
-rw-r--r--sysutils/wbm-net/distinfo8
-rw-r--r--sysutils/wbm-openslp/Makefile12
-rw-r--r--sysutils/wbm-openslp/distinfo8
-rw-r--r--sysutils/wbm-passwd/Makefile12
-rw-r--r--sysutils/wbm-passwd/PLIST5
-rw-r--r--sysutils/wbm-passwd/distinfo8
-rw-r--r--sysutils/wbm-postfix/Makefile13
-rw-r--r--sysutils/wbm-postfix/PLIST46
-rw-r--r--sysutils/wbm-postfix/distinfo8
-rw-r--r--sysutils/wbm-postgresql/Makefile12
-rw-r--r--sysutils/wbm-postgresql/PLIST36
-rw-r--r--sysutils/wbm-postgresql/distinfo8
-rw-r--r--sysutils/wbm-qmailadmin/Makefile12
-rw-r--r--sysutils/wbm-qmailadmin/PLIST3
-rw-r--r--sysutils/wbm-qmailadmin/distinfo8
-rw-r--r--sysutils/wbm-quota/Makefile13
-rw-r--r--sysutils/wbm-quota/PLIST26
-rw-r--r--sysutils/wbm-quota/distinfo8
-rw-r--r--sysutils/wbm-sendmail/Makefile12
-rw-r--r--sysutils/wbm-sendmail/PLIST38
-rw-r--r--sysutils/wbm-sendmail/distinfo8
-rw-r--r--sysutils/wbm-shell/Makefile12
-rw-r--r--sysutils/wbm-shell/PLIST6
-rw-r--r--sysutils/wbm-shell/distinfo8
-rw-r--r--sysutils/wbm-sshd/Makefile12
-rw-r--r--sysutils/wbm-sshd/PLIST17
-rw-r--r--sysutils/wbm-sshd/distinfo8
-rw-r--r--sysutils/wbm-status/Makefile13
-rw-r--r--sysutils/wbm-status/PLIST17
-rw-r--r--sysutils/wbm-status/distinfo8
-rw-r--r--sysutils/wbm-syslog/Makefile12
-rw-r--r--sysutils/wbm-syslog/PLIST10
-rw-r--r--sysutils/wbm-syslog/distinfo8
-rw-r--r--sysutils/wbm-telnet/Makefile12
-rw-r--r--sysutils/wbm-telnet/PLIST21
-rw-r--r--sysutils/wbm-telnet/distinfo8
-rw-r--r--sysutils/wbm-time/Makefile13
-rw-r--r--sysutils/wbm-time/PLIST18
-rw-r--r--sysutils/wbm-time/distinfo11
-rw-r--r--sysutils/wbm-time/patches/patch-aa6
-rw-r--r--sysutils/wbm-time/patches/patch-ab19
-rw-r--r--sysutils/wbm-tunnel/Makefile12
-rw-r--r--sysutils/wbm-tunnel/distinfo8
-rw-r--r--sysutils/wbm-useradmin/Makefile12
-rw-r--r--sysutils/wbm-useradmin/PLIST91
-rw-r--r--sysutils/wbm-useradmin/distinfo8
-rw-r--r--sysutils/webmin/Makefile53
-rw-r--r--sysutils/webmin/PLIST300
-rw-r--r--sysutils/webmin/distinfo25
-rw-r--r--sysutils/webmin/patches/patch-aa10
-rw-r--r--sysutils/webmin/patches/patch-ab4
-rw-r--r--sysutils/webmin/patches/patch-ac20
-rw-r--r--sysutils/webmin/patches/patch-ad20
-rw-r--r--sysutils/webmin/patches/patch-ae8
-rw-r--r--sysutils/webmin/patches/patch-af8
-rw-r--r--sysutils/webmin/patches/patch-ag8
-rw-r--r--sysutils/webmin/patches/patch-ah8
-rw-r--r--sysutils/webmin/patches/patch-ai8
-rw-r--r--sysutils/webmin/version.mk3
-rw-r--r--sysutils/webmin/wbm.mk65
130 files changed, 3025 insertions, 1123 deletions
diff --git a/sysutils/wbm-apache/Makefile b/sysutils/wbm-apache/Makefile
index 18838656561..276daf57317 100644
--- a/sysutils/wbm-apache/Makefile
+++ b/sysutils/wbm-apache/Makefile
@@ -1,17 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:41 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:22:58 obache Exp $
-DISTNAME= apache
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= apache
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module for configuring Apache servers
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
CONF_FILES_PERMS+= ${WBM_EGDIR}/${WBMNAME}/site \
@@ -22,6 +14,6 @@ post-build:
${TOUCH} ${TOUCH_ARGS} ${WRKDIR}/site
post-install:
- ${INSTALL_DATA} ${WRKDIR}/site ${WBM_EGDIR}/${WBMNAME}/site
+ ${INSTALL_DATA} ${WRKDIR}/site ${WBM_EGDIR}/${WBM_NAME}/site
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-apache/PLIST b/sysutils/wbm-apache/PLIST
index 1286458c9ab..90d014e4b87 100644
--- a/sysutils/wbm-apache/PLIST
+++ b/sysutils/wbm-apache/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 21:39:04 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:22:58 obache Exp $
share/examples/webmin/apache/config
share/examples/webmin/apache/site
share/webmin/apache/CHANGELOG
@@ -64,11 +64,13 @@ 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.da
share/webmin/apache/config.info.de
share/webmin/apache/config.info.es
share/webmin/apache/config.info.fa
share/webmin/apache/config.info.fr
share/webmin/apache/config.info.hu
+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.pl
@@ -79,7 +81,9 @@ share/webmin/apache/config.info.sv
share/webmin/apache/config.info.tr
share/webmin/apache/config.info.uk_UA
share/webmin/apache/config.info.zh_CN
+share/webmin/apache/config.info.zh_CN.UTF-8
share/webmin/apache/config.info.zh_TW.Big5
+share/webmin/apache/config.info.zh_TW.UTF-8
share/webmin/apache/config_solaris.txt.1.25
share/webmin/apache/core.pl
share/webmin/apache/create_dir.cgi
@@ -140,6 +144,7 @@ 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/da
share/webmin/apache/lang/de
share/webmin/apache/lang/en
share/webmin/apache/lang/es
@@ -147,7 +152,9 @@ share/webmin/apache/lang/fa
share/webmin/apache/lang/fr
share/webmin/apache/lang/hu
share/webmin/apache/lang/it
+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/pl
@@ -159,7 +166,9 @@ share/webmin/apache/lang/sv
share/webmin/apache/lang/tr
share/webmin/apache/lang/uk_UA
share/webmin/apache/lang/zh_CN
+share/webmin/apache/lang/zh_CN.UTF-8
share/webmin/apache/lang/zh_TW.Big5
+share/webmin/apache/lang/zh_TW.UTF-8
share/webmin/apache/list_authgroups.cgi
share/webmin/apache/list_authusers.cgi
share/webmin/apache/log_parser.pl
@@ -171,7 +180,15 @@ share/webmin/apache/mod_alias.pl
share/webmin/apache/mod_apachessl.pl
share/webmin/apache/mod_asis.pl
share/webmin/apache/mod_auth.pl
+share/webmin/apache/mod_auth_basic.pl
share/webmin/apache/mod_auth_dbm.pl
+share/webmin/apache/mod_auth_digest.pl
+share/webmin/apache/mod_authn_dbm.pl
+share/webmin/apache/mod_authn_file.pl
+share/webmin/apache/mod_authz_dbm.pl
+share/webmin/apache/mod_authz_groupfile.pl
+share/webmin/apache/mod_authz_host.pl
+share/webmin/apache/mod_authz_owner.pl
share/webmin/apache/mod_autoindex.pl
share/webmin/apache/mod_bandwidth.pl
share/webmin/apache/mod_browser.pl
@@ -184,6 +201,8 @@ share/webmin/apache/mod_disk_cache.pl
share/webmin/apache/mod_env.pl
share/webmin/apache/mod_expires.pl.broken
share/webmin/apache/mod_ext_filter.pl
+share/webmin/apache/mod_fastcgi.pl
+share/webmin/apache/mod_fcgid.pl
share/webmin/apache/mod_imap.pl
share/webmin/apache/mod_include.pl
share/webmin/apache/mod_info.pl
@@ -201,6 +220,7 @@ share/webmin/apache/mod_php3.pl
share/webmin/apache/mod_php4.pl
share/webmin/apache/mod_php5.pl
share/webmin/apache/mod_proxy.pl
+share/webmin/apache/mod_ruby.pl
share/webmin/apache/mod_setenvif.pl
share/webmin/apache/mod_speling.pl
share/webmin/apache/mod_ssl.pl
diff --git a/sysutils/wbm-apache/distinfo b/sysutils/wbm-apache/distinfo
index cb06949960d..733cc86fda2 100644
--- a/sysutils/wbm-apache/distinfo
+++ b/sysutils/wbm-apache/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 21:39:04 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:22:58 obache Exp $
-SHA1 (webmin-modules-1.270/apache.wbm.gz) = cc9e4c4e18e771f38f4ec9fde15026af0e8ecda9
-RMD160 (webmin-modules-1.270/apache.wbm.gz) = 92e2452017e801de8cd656abcd76f119b1da81a5
-Size (webmin-modules-1.270/apache.wbm.gz) = 342821 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-at/Makefile b/sysutils/wbm-at/Makefile
index c07c199e123..8ab35e2f47b 100644
--- a/sysutils/wbm-at/Makefile
+++ b/sysutils/wbm-at/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:41 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:22:58 obache Exp $
-DISTNAME= at
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= at
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to schedule execution of commands
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-at/PLIST b/sysutils/wbm-at/PLIST
index 1462eeeffc8..afaced00e50 100644
--- a/sysutils/wbm-at/PLIST
+++ b/sysutils/wbm-at/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 21:39:15 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:22:58 obache Exp $
share/examples/webmin/at/config
share/webmin/at/CHANGELOG
share/webmin/at/acl_security.pl
@@ -41,12 +41,15 @@ share/webmin/at/config.info.pt_BR
share/webmin/at/config.info.ru_RU
share/webmin/at/config.info.ru_SU
share/webmin/at/config.info.sk
+share/webmin/at/config.info.sv
share/webmin/at/config.info.tr
share/webmin/at/config.info.uk_UA
share/webmin/at/config.info.zh_TW.Big5
+share/webmin/at/config.info.zh_TW.UTF-8
share/webmin/at/create_job.cgi
share/webmin/at/defaultacl
share/webmin/at/delete_job.cgi
+share/webmin/at/delete_jobs.cgi
share/webmin/at/edit_job.cgi
share/webmin/at/freebsd-lib.pl
share/webmin/at/images/icon.gif
@@ -69,10 +72,13 @@ share/webmin/at/lang/pt_BR
share/webmin/at/lang/ru_RU
share/webmin/at/lang/ru_SU
share/webmin/at/lang/sk
+share/webmin/at/lang/sv
share/webmin/at/lang/tr
share/webmin/at/lang/uk_UA
share/webmin/at/lang/zh_CN
+share/webmin/at/lang/zh_CN.UTF-8
share/webmin/at/lang/zh_TW.Big5
+share/webmin/at/lang/zh_TW.UTF-8
share/webmin/at/linux-lib.pl
share/webmin/at/macos-lib.pl
share/webmin/at/module.info
diff --git a/sysutils/wbm-at/distinfo b/sysutils/wbm-at/distinfo
index ef8f4546518..733cc86fda2 100644
--- a/sysutils/wbm-at/distinfo
+++ b/sysutils/wbm-at/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 21:39:15 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:22:58 obache Exp $
-SHA1 (webmin-modules-1.270/at.wbm.gz) = 12c202c9f473743c934b79b424715cac92fc3272
-RMD160 (webmin-modules-1.270/at.wbm.gz) = 890113f871e2efcd563f23379a86293be35981b5
-Size (webmin-modules-1.270/at.wbm.gz) = 19758 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-bandwidth/Makefile b/sysutils/wbm-bandwidth/Makefile
index 3a6c1f4803d..4f5b706fc2a 100644
--- a/sysutils/wbm-bandwidth/Makefile
+++ b/sysutils/wbm-bandwidth/Makefile
@@ -1,15 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/05/16 15:39:59 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2007/04/21 05:22:58 obache Exp $
-DISTNAME= bandwidth
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= bandwidth
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
+WBM_DEPEND_MODULES= net
-DEPENDS+= wbm-net>=1.270:../../sysutils/wbm-net
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to view bandwidth usage
.include "../../sysutils/webmin/wbm.mk"
diff --git a/sysutils/wbm-bandwidth/PLIST b/sysutils/wbm-bandwidth/PLIST
index 51ff546ca88..5dd0eff08d0 100644
--- a/sysutils/wbm-bandwidth/PLIST
+++ b/sysutils/wbm-bandwidth/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 15:39:59 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:22:58 obache Exp $
share/examples/webmin/bandwidth/config
share/webmin/bandwidth/CHANGELOG
share/webmin/bandwidth/acl_security.pl
@@ -10,6 +10,7 @@ share/webmin/bandwidth/config.info.ca
share/webmin/bandwidth/config.info.de
share/webmin/bandwidth/config.info.es
share/webmin/bandwidth/config.info.hu
+share/webmin/bandwidth/config.info.sv
share/webmin/bandwidth/defaultacl
share/webmin/bandwidth/help/intro.ca.html
share/webmin/bandwidth/help/intro.html
@@ -24,12 +25,14 @@ share/webmin/bandwidth/lang/en
share/webmin/bandwidth/lang/es
share/webmin/bandwidth/lang/fr
share/webmin/bandwidth/lang/hu
+share/webmin/bandwidth/lang/sv
share/webmin/bandwidth/log_parser.pl
share/webmin/bandwidth/module.info
share/webmin/bandwidth/rotate.cgi
share/webmin/bandwidth/rotate.pl
share/webmin/bandwidth/setup.cgi
share/webmin/bandwidth/turnoff.cgi
+share/webmin/bandwidth/uninstall.pl
@dirrm share/webmin/bandwidth/lang
@dirrm share/webmin/bandwidth/images
@dirrm share/webmin/bandwidth/help
diff --git a/sysutils/wbm-bandwidth/distinfo b/sysutils/wbm-bandwidth/distinfo
index c162b6d5637..733cc86fda2 100644
--- a/sysutils/wbm-bandwidth/distinfo
+++ b/sysutils/wbm-bandwidth/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 15:39:59 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:22:58 obache Exp $
-SHA1 (webmin-modules-1.270/bandwidth.wbm.gz) = decc4efa4b25621ef82e377c396b8acd14eb4b2a
-RMD160 (webmin-modules-1.270/bandwidth.wbm.gz) = aca11b2249acd4a0dc981e50a283766f8fdd402b
-Size (webmin-modules-1.270/bandwidth.wbm.gz) = 24476 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-bind8/Makefile b/sysutils/wbm-bind8/Makefile
index 93189fa7348..b99827e2f5f 100644
--- a/sysutils/wbm-bind8/Makefile
+++ b/sysutils/wbm-bind8/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:41 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:22:59 obache Exp $
-DISTNAME= bind8
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= bind8
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module for managing ISC BIND 8.x DNS servers
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-bind8/PLIST b/sysutils/wbm-bind8/PLIST
index ecdfa85006c..4991c28dda6 100644
--- a/sysutils/wbm-bind8/PLIST
+++ b/sysutils/wbm-bind8/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 15:40:22 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:22:59 obache Exp $
share/examples/webmin/bind8/config
share/webmin/bind8/CHANGELOG
share/webmin/bind8/acl_security.pl
@@ -24,7 +24,7 @@ share/webmin/bind8/config-corel-linux
share/webmin/bind8/config-debian-linux
share/webmin/bind8/config-debian-linux-2.2
share/webmin/bind8/config-debian-linux-3.0
-share/webmin/bind8/config-debian-linux-3.1
+share/webmin/bind8/config-debian-linux-3.1-*
share/webmin/bind8/config-freebsd-2.1-2.2
share/webmin/bind8/config-freebsd-3.0
share/webmin/bind8/config-freebsd-3.1-3.5
@@ -55,7 +55,8 @@ share/webmin/bind8/config-solaris-10-*
share/webmin/bind8/config-solaris-7-9
share/webmin/bind8/config-suse-linux
share/webmin/bind8/config-suse-linux-8.2
-share/webmin/bind8/config-suse-linux-9.0-*
+share/webmin/bind8/config-suse-linux-9.0-9.2
+share/webmin/bind8/config-suse-linux-9.3-*
share/webmin/bind8/config-trustix-linux
share/webmin/bind8/config-trustix-linux-2.1
share/webmin/bind8/config-trustix-linux-2.2-*
@@ -70,6 +71,7 @@ share/webmin/bind8/config.info.de
share/webmin/bind8/config.info.es
share/webmin/bind8/config.info.fa
share/webmin/bind8/config.info.fr
+share/webmin/bind8/config.info.ja_JP.UTF-8
share/webmin/bind8/config.info.ja_JP.euc
share/webmin/bind8/config.info.pl
share/webmin/bind8/config.info.pt_BR
@@ -79,7 +81,9 @@ share/webmin/bind8/config.info.sv
share/webmin/bind8/config.info.tr
share/webmin/bind8/config.info.uk_UA
share/webmin/bind8/config.info.zh_CN
+share/webmin/bind8/config.info.zh_CN.UTF-8
share/webmin/bind8/config.info.zh_TW.Big5
+share/webmin/bind8/config.info.zh_TW.UTF-8
share/webmin/bind8/convert_master.cgi
share/webmin/bind8/convert_slave.cgi
share/webmin/bind8/create_delegation.cgi
@@ -173,8 +177,10 @@ share/webmin/bind8/lang/es
share/webmin/bind8/lang/fa
share/webmin/bind8/lang/fr
share/webmin/bind8/lang/it
+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/pl
share/webmin/bind8/lang/pt
@@ -185,13 +191,17 @@ share/webmin/bind8/lang/sv
share/webmin/bind8/lang/tr
share/webmin/bind8/lang/uk_UA
share/webmin/bind8/lang/zh_CN
+share/webmin/bind8/lang/zh_CN.UTF-8
share/webmin/bind8/lang/zh_TW.Big5
+share/webmin/bind8/lang/zh_TW.UTF-8
share/webmin/bind8/list_gen.cgi
share/webmin/bind8/list_slaves.cgi
share/webmin/bind8/log_parser.pl
share/webmin/bind8/mass_create.cgi
share/webmin/bind8/mass_delete.cgi
share/webmin/bind8/mass_form.cgi
+share/webmin/bind8/mass_update.cgi
+share/webmin/bind8/mass_update_form.cgi
share/webmin/bind8/master_form.cgi
share/webmin/bind8/module.info
share/webmin/bind8/move_zone.cgi
diff --git a/sysutils/wbm-bind8/distinfo b/sysutils/wbm-bind8/distinfo
index 9b26e085163..7c3cc97e93b 100644
--- a/sysutils/wbm-bind8/distinfo
+++ b/sysutils/wbm-bind8/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 15:40:22 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:22:59 obache Exp $
-SHA1 (webmin-modules-1.270/bind8.wbm.gz) = 3c8712364f6bdefa868b05b2f87dfcbaca06c678
-RMD160 (webmin-modules-1.270/bind8.wbm.gz) = aac9c2082385170ef5ddff85828230475ec96b65
-Size (webmin-modules-1.270/bind8.wbm.gz) = 287848 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-change-user/Makefile b/sysutils/wbm-change-user/Makefile
index 53ba5f7b164..3770bbd1a6b 100644
--- a/sysutils/wbm-change-user/Makefile
+++ b/sysutils/wbm-change-user/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:41 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:22:59 obache Exp $
-DISTNAME= change-user
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= change-user
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to personalize Webmin user sessions
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-change-user/PLIST b/sysutils/wbm-change-user/PLIST
index bfc9dcba97e..919f1624253 100644
--- a/sysutils/wbm-change-user/PLIST
+++ b/sysutils/wbm-change-user/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 17:36:16 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:22:59 obache Exp $
share/examples/webmin/change-user/config
share/webmin/change-user/CHANGELOG
share/webmin/change-user/acl_security.pl
@@ -15,6 +15,7 @@ share/webmin/change-user/lang/es
share/webmin/change-user/lang/fa
share/webmin/change-user/lang/fr
share/webmin/change-user/lang/hu
+share/webmin/change-user/lang/ja_JP.UTF-8
share/webmin/change-user/lang/ja_JP.euc
share/webmin/change-user/lang/ms
share/webmin/change-user/lang/nl
@@ -24,7 +25,9 @@ share/webmin/change-user/lang/sk
share/webmin/change-user/lang/tr
share/webmin/change-user/lang/uk_UA
share/webmin/change-user/lang/zh_CN
+share/webmin/change-user/lang/zh_CN.UTF-8
share/webmin/change-user/lang/zh_TW.Big5
+share/webmin/change-user/lang/zh_TW.UTF-8
share/webmin/change-user/module.info
@dirrm share/webmin/change-user/lang
@dirrm share/webmin/change-user/images
diff --git a/sysutils/wbm-change-user/distinfo b/sysutils/wbm-change-user/distinfo
index c41065cbd82..7c3cc97e93b 100644
--- a/sysutils/wbm-change-user/distinfo
+++ b/sysutils/wbm-change-user/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 17:36:16 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:22:59 obache Exp $
-SHA1 (webmin-modules-1.270/change-user.wbm.gz) = 3f76afcd04ac1fd9b91dfc923a49dc2b59f3bb2f
-RMD160 (webmin-modules-1.270/change-user.wbm.gz) = 2b787f5eaf451a64400767e26cafc3a8b453df80
-Size (webmin-modules-1.270/change-user.wbm.gz) = 12628 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-cluster-copy/Makefile b/sysutils/wbm-cluster-copy/Makefile
index 228d716c7db..b94d349b2a6 100644
--- a/sysutils/wbm-cluster-copy/Makefile
+++ b/sysutils/wbm-cluster-copy/Makefile
@@ -1,17 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/02/19 21:52:41 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/04/21 05:22:59 obache Exp $
-DISTNAME= cluster-copy
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-PKGREVISION= 1
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= cluster-copy
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to schedule file transfers within a Webmin cluster
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-cluster-copy/distinfo b/sysutils/wbm-cluster-copy/distinfo
index 49b53aee0b2..7c3cc97e93b 100644
--- a/sysutils/wbm-cluster-copy/distinfo
+++ b/sysutils/wbm-cluster-copy/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 21:39:30 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:22:59 obache Exp $
-SHA1 (webmin-modules-1.270/cluster-copy.wbm.gz) = b4b6b4cdb622d53f944123663b60d1cea207c0e6
-RMD160 (webmin-modules-1.270/cluster-copy.wbm.gz) = fb3229619d256e9c289faf77d5281582edc0202c
-Size (webmin-modules-1.270/cluster-copy.wbm.gz) = 14123 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-cluster-cron/Makefile b/sysutils/wbm-cluster-cron/Makefile
index 322ad741747..d344439d260 100644
--- a/sysutils/wbm-cluster-cron/Makefile
+++ b/sysutils/wbm-cluster-cron/Makefile
@@ -1,17 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/02/19 21:52:41 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/04/21 05:22:59 obache Exp $
-DISTNAME= cluster-cron
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-PKGREVISION= 1
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= cluster-cron
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to schedule cron jobs within a Webmin cluster
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-cluster-cron/PLIST b/sysutils/wbm-cluster-cron/PLIST
index d7470634443..7b0464ddd6a 100644
--- a/sysutils/wbm-cluster-cron/PLIST
+++ b/sysutils/wbm-cluster-cron/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 21:39:44 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:22:59 obache Exp $
share/examples/webmin/cluster-cron/config
+share/webmin/cluster-cron/CHANGELOG
share/webmin/cluster-cron/cluster-cron-lib.pl
share/webmin/cluster-cron/cron.pl
share/webmin/cluster-cron/delete.cgi
+share/webmin/cluster-cron/delete_jobs.cgi
share/webmin/cluster-cron/edit.cgi
share/webmin/cluster-cron/exec.cgi
share/webmin/cluster-cron/help/intro.de.html
diff --git a/sysutils/wbm-cluster-cron/distinfo b/sysutils/wbm-cluster-cron/distinfo
index afef0753def..7c3cc97e93b 100644
--- a/sysutils/wbm-cluster-cron/distinfo
+++ b/sysutils/wbm-cluster-cron/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 21:39:44 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:22:59 obache Exp $
-SHA1 (webmin-modules-1.270/cluster-cron.wbm.gz) = a87977bdc059ee3d48f44a5af667535336c45587
-RMD160 (webmin-modules-1.270/cluster-cron.wbm.gz) = c9c5c912995c648da93cd36a6556166300167e59
-Size (webmin-modules-1.270/cluster-cron.wbm.gz) = 12080 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-cluster-passwd/Makefile b/sysutils/wbm-cluster-passwd/Makefile
index 6e7ae47d250..502efe99a0e 100644
--- a/sysutils/wbm-cluster-passwd/Makefile
+++ b/sysutils/wbm-cluster-passwd/Makefile
@@ -1,15 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/05/16 21:40:03 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2007/04/21 05:22:59 obache Exp $
-DISTNAME= cluster-passwd
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= cluster-passwd
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
+WBM_DEPEND_MODULES= cluster-useradmin
-DEPENDS+= wbm-cluster-useradmin>=1.270:../../sysutils/wbm-cluster-useradmin
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to change users' passwords within a Webmin cluster
.include "../../sysutils/webmin/wbm.mk"
diff --git a/sysutils/wbm-cluster-passwd/distinfo b/sysutils/wbm-cluster-passwd/distinfo
index af09cdf08ca..7c3cc97e93b 100644
--- a/sysutils/wbm-cluster-passwd/distinfo
+++ b/sysutils/wbm-cluster-passwd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 21:40:03 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:22:59 obache Exp $
-SHA1 (webmin-modules-1.270/cluster-passwd.wbm.gz) = 798ae8b0ac2685f934dd9905c11482bd8f3c439f
-RMD160 (webmin-modules-1.270/cluster-passwd.wbm.gz) = 6a7d2d7a717936412e44a174939a0fc2b5f877ce
-Size (webmin-modules-1.270/cluster-passwd.wbm.gz) = 8190 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-cluster-shell/Makefile b/sysutils/wbm-cluster-shell/Makefile
index ce31c0fb33d..a1f1f4269c6 100644
--- a/sysutils/wbm-cluster-shell/Makefile
+++ b/sysutils/wbm-cluster-shell/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:41 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:22:59 obache Exp $
-DISTNAME= cluster-shell
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= cluster-shell
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to run commands across a Webmin cluster
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-cluster-shell/distinfo b/sysutils/wbm-cluster-shell/distinfo
index 3d30c385e59..7c3cc97e93b 100644
--- a/sysutils/wbm-cluster-shell/distinfo
+++ b/sysutils/wbm-cluster-shell/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 21:40:17 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:22:59 obache Exp $
-SHA1 (webmin-modules-1.270/cluster-shell.wbm.gz) = b4ddba8b814098eac95c558cf76c7c245b588356
-RMD160 (webmin-modules-1.270/cluster-shell.wbm.gz) = 9d7e5113881a248ea11dc5780a92925e47a4215b
-Size (webmin-modules-1.270/cluster-shell.wbm.gz) = 9058 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-cluster-useradmin/Makefile b/sysutils/wbm-cluster-useradmin/Makefile
index 0851f785188..7bb13986e3e 100644
--- a/sysutils/wbm-cluster-useradmin/Makefile
+++ b/sysutils/wbm-cluster-useradmin/Makefile
@@ -1,15 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/05/16 21:40:32 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2007/04/21 05:23:00 obache Exp $
-DISTNAME= cluster-useradmin
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= cluster-useradmin
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
+DEPENDS+= wbm-useradmin>=${WBM_VERSION}:../../sysutils/wbm-useradmin
-DEPENDS+= wbm-useradmin>=1.270:../../sysutils/wbm-useradmin
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to manage users & groups within a Webmin cluster
.include "../../sysutils/webmin/wbm.mk"
diff --git a/sysutils/wbm-cluster-useradmin/distinfo b/sysutils/wbm-cluster-useradmin/distinfo
index 8ff6af45274..a42f1f1c9ed 100644
--- a/sysutils/wbm-cluster-useradmin/distinfo
+++ b/sysutils/wbm-cluster-useradmin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 21:40:32 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:00 obache Exp $
-SHA1 (webmin-modules-1.270/cluster-useradmin.wbm.gz) = d12c124d42f523bb71f0f93d2b02dc0dad23a899
-RMD160 (webmin-modules-1.270/cluster-useradmin.wbm.gz) = ade1bec283edae9b07474820aacb1fb577118bb9
-Size (webmin-modules-1.270/cluster-useradmin.wbm.gz) = 31503 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-cluster-webmin/Makefile b/sysutils/wbm-cluster-webmin/Makefile
index ecc6b664a72..b2ccb862868 100644
--- a/sysutils/wbm-cluster-webmin/Makefile
+++ b/sysutils/wbm-cluster-webmin/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:41 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:00 obache Exp $
-DISTNAME= cluster-webmin
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= cluster-webmin
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to manage Webmin settings across a Webmin cluster
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-cluster-webmin/distinfo b/sysutils/wbm-cluster-webmin/distinfo
index 686a11471c1..a42f1f1c9ed 100644
--- a/sysutils/wbm-cluster-webmin/distinfo
+++ b/sysutils/wbm-cluster-webmin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 21:40:45 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:00 obache Exp $
-SHA1 (webmin-modules-1.270/cluster-webmin.wbm.gz) = 85a38d77f9df11eeb87c2960f0f4f9f432234c81
-RMD160 (webmin-modules-1.270/cluster-webmin.wbm.gz) = 79980561902ed5bfecbefee8026419bff7b3b4a4
-Size (webmin-modules-1.270/cluster-webmin.wbm.gz) = 52995 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-custom/Makefile b/sysutils/wbm-custom/Makefile
index 44cab38b722..94cfbce08db 100644
--- a/sysutils/wbm-custom/Makefile
+++ b/sysutils/wbm-custom/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:41 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:00 obache Exp $
-DISTNAME= custom
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= custom
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module for creating custom action buttons
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-custom/PLIST b/sysutils/wbm-custom/PLIST
index 5ca241ec857..475e933a9ff 100644
--- a/sysutils/wbm-custom/PLIST
+++ b/sysutils/wbm-custom/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 21:40:57 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:00 obache Exp $
share/examples/webmin/custom/config
share/webmin/custom/CHANGELOG
share/webmin/custom/acl_security.pl
@@ -14,6 +14,7 @@ share/webmin/custom/config.info.nl
share/webmin/custom/config.info.pl
share/webmin/custom/config.info.ru_RU
share/webmin/custom/config.info.ru_SU
+share/webmin/custom/config.info.sk
share/webmin/custom/config.info.tr
share/webmin/custom/config.info.uk_UA
share/webmin/custom/custom-lib.pl
@@ -46,6 +47,7 @@ share/webmin/custom/help/cmd.nl.html
share/webmin/custom/help/cmd.pl.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.html
share/webmin/custom/help/command.de.html
share/webmin/custom/help/command.es.html
@@ -55,6 +57,7 @@ share/webmin/custom/help/command.nl.html
share/webmin/custom/help/command.pl.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.html
share/webmin/custom/help/create.de.html
share/webmin/custom/help/create.es.html
@@ -64,6 +67,7 @@ share/webmin/custom/help/create.nl.html
share/webmin/custom/help/create.pl.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.html
share/webmin/custom/help/desc.de.html
share/webmin/custom/help/desc.es.html
@@ -73,6 +77,7 @@ share/webmin/custom/help/desc.nl.html
share/webmin/custom/help/desc.pl.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/dir.ca.html
share/webmin/custom/help/dir.de.html
share/webmin/custom/help/dir.html
@@ -85,6 +90,7 @@ share/webmin/custom/help/edit.nl.html
share/webmin/custom/help/edit.pl.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.html
share/webmin/custom/help/editor.de.html
share/webmin/custom/help/editor.es.html
@@ -132,6 +138,7 @@ share/webmin/custom/help/intro.nl.html
share/webmin/custom/help/intro.pl.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.html
share/webmin/custom/help/noshow.de.html
share/webmin/custom/help/noshow.es.html
@@ -162,6 +169,7 @@ share/webmin/custom/help/raw.nl.html
share/webmin/custom/help/raw.pl.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.html
share/webmin/custom/help/run.de.html
share/webmin/custom/help/run.es.html
@@ -171,6 +179,7 @@ share/webmin/custom/help/run.nl.html
share/webmin/custom/help/run.pl.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.html
share/webmin/custom/help/timeout.de.html
share/webmin/custom/help/timeout.html
@@ -183,6 +192,7 @@ share/webmin/custom/help/user.nl.html
share/webmin/custom/help/user.pl.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.html
share/webmin/custom/help/usermin.de.html
share/webmin/custom/help/usermin.html
@@ -196,18 +206,23 @@ share/webmin/custom/lang/es
share/webmin/custom/lang/fr
share/webmin/custom/lang/hu
share/webmin/custom/lang/it
+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/pl
share/webmin/custom/lang/pt
share/webmin/custom/lang/ru_RU
share/webmin/custom/lang/ru_SU
+share/webmin/custom/lang/sk
share/webmin/custom/lang/sv
share/webmin/custom/lang/tr
share/webmin/custom/lang/uk_UA
share/webmin/custom/lang/zh_CN
+share/webmin/custom/lang/zh_CN.UTF-8
share/webmin/custom/lang/zh_TW.Big5
+share/webmin/custom/lang/zh_TW.UTF-8
share/webmin/custom/log_parser.pl
share/webmin/custom/module.info
share/webmin/custom/run.cgi
diff --git a/sysutils/wbm-custom/distinfo b/sysutils/wbm-custom/distinfo
index d8935bda624..a42f1f1c9ed 100644
--- a/sysutils/wbm-custom/distinfo
+++ b/sysutils/wbm-custom/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 21:40:57 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:00 obache Exp $
-SHA1 (webmin-modules-1.270/custom.wbm.gz) = f6fd9d0070e5fd51a99caa36532ef04024673fc2
-RMD160 (webmin-modules-1.270/custom.wbm.gz) = 5ca10492c4bf4411cb635dd8f7047e5149682178
-Size (webmin-modules-1.270/custom.wbm.gz) = 60857 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-dhcpd/Makefile b/sysutils/wbm-dhcpd/Makefile
index 57b13ae57e0..3f42242d6d8 100644
--- a/sysutils/wbm-dhcpd/Makefile
+++ b/sysutils/wbm-dhcpd/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:42 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:00 obache Exp $
-DISTNAME= dhcpd
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= dhcpd
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module for managing ISC DHCPd
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-dhcpd/PLIST b/sysutils/wbm-dhcpd/PLIST
index 2b45aef1512..9c606d0f8ac 100644
--- a/sysutils/wbm-dhcpd/PLIST
+++ b/sysutils/wbm-dhcpd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 04:02:22 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:00 obache Exp $
share/examples/webmin/dhcpd/config
share/webmin/dhcpd/CHANGELOG
share/webmin/dhcpd/acl_security.pl
@@ -8,7 +8,7 @@ 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-*
share/webmin/dhcpd/config-freebsd
share/webmin/dhcpd/config-generic-linux
share/webmin/dhcpd/config-gentoo-linux
@@ -25,8 +25,9 @@ share/webmin/dhcpd/config-openbsd-3.6-*
share/webmin/dhcpd/config-openserver
share/webmin/dhcpd/config-osf1
share/webmin/dhcpd/config-redhat-linux
+share/webmin/dhcpd/config-redhat-linux-14.0-*
share/webmin/dhcpd/config-redhat-linux-6.0-6.2
-share/webmin/dhcpd/config-redhat-linux-7.0-*
+share/webmin/dhcpd/config-redhat-linux-7.0-13.0
share/webmin/dhcpd/config-slackware-linux
share/webmin/dhcpd/config-slackware-linux-4.0
share/webmin/dhcpd/config-slackware-linux-7.1-*
@@ -35,32 +36,40 @@ share/webmin/dhcpd/config-solaris
share/webmin/dhcpd/config-suse-linux
share/webmin/dhcpd/config-suse-linux-7.1-7.3
share/webmin/dhcpd/config-suse-linux-8.0
-share/webmin/dhcpd/config-suse-linux-8.2-*
+share/webmin/dhcpd/config-suse-linux-8.2-9.1
+share/webmin/dhcpd/config-suse-linux-9.2-*
share/webmin/dhcpd/config-trustix-linux
share/webmin/dhcpd/config-turbo-linux
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.da
share/webmin/dhcpd/config.info.de
share/webmin/dhcpd/config.info.es
share/webmin/dhcpd/config.info.fa
share/webmin/dhcpd/config.info.fr
+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.pl
share/webmin/dhcpd/config.info.pt_BR
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.sv
share/webmin/dhcpd/config.info.tr
share/webmin/dhcpd/config.info.uk_UA
share/webmin/dhcpd/config.info.zh_CN
+share/webmin/dhcpd/config.info.zh_CN.UTF-8
share/webmin/dhcpd/config.info.zh_TW.Big5
+share/webmin/dhcpd/config.info.zh_TW.UTF-8
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_subnets.cgi
share/webmin/dhcpd/dhcpd-lib.pl
share/webmin/dhcpd/edit_group.cgi
share/webmin/dhcpd/edit_host.cgi
@@ -75,6 +84,7 @@ share/webmin/dhcpd/edit_zones.cgi
share/webmin/dhcpd/help/acl.ca.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.pt_BR.html
share/webmin/dhcpd/help/acl_info.ca.html
@@ -97,13 +107,16 @@ 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/da
share/webmin/dhcpd/lang/de
share/webmin/dhcpd/lang/en
share/webmin/dhcpd/lang/es
share/webmin/dhcpd/lang/fa
share/webmin/dhcpd/lang/fr
+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/pl
@@ -111,11 +124,14 @@ share/webmin/dhcpd/lang/pt
share/webmin/dhcpd/lang/pt_BR
share/webmin/dhcpd/lang/ru_RU
share/webmin/dhcpd/lang/ru_SU
+share/webmin/dhcpd/lang/sk
share/webmin/dhcpd/lang/sv
share/webmin/dhcpd/lang/tr
share/webmin/dhcpd/lang/uk_UA
share/webmin/dhcpd/lang/zh_CN
+share/webmin/dhcpd/lang/zh_CN.UTF-8
share/webmin/dhcpd/lang/zh_TW.Big5
+share/webmin/dhcpd/lang/zh_TW.UTF-8
share/webmin/dhcpd/list_leases.cgi
share/webmin/dhcpd/log_parser.pl
share/webmin/dhcpd/lookup_group.cgi
@@ -143,3 +159,4 @@ share/webmin/dhcpd/stop.cgi
@dirrm share/webmin/dhcpd/help
@dirrm share/webmin/dhcpd
@dirrm share/examples/webmin/dhcpd
+@dirrm etc/webmin/dhcpd
diff --git a/sysutils/wbm-dhcpd/distinfo b/sysutils/wbm-dhcpd/distinfo
index 9dc0618c3aa..a42f1f1c9ed 100644
--- a/sysutils/wbm-dhcpd/distinfo
+++ b/sysutils/wbm-dhcpd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 04:02:22 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:00 obache Exp $
-SHA1 (webmin-modules-1.270/dhcpd.wbm.gz) = da5ea5c2078909a9805216a08ec7912e9064e908
-RMD160 (webmin-modules-1.270/dhcpd.wbm.gz) = 8be56f88e390c6a6319e2438aed7ff19c0b88b51
-Size (webmin-modules-1.270/dhcpd.wbm.gz) = 128545 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-dovecot/Makefile b/sysutils/wbm-dovecot/Makefile
index 8262a8149f7..1e669f99ab2 100644
--- a/sysutils/wbm-dovecot/Makefile
+++ b/sysutils/wbm-dovecot/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:42 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:00 obache Exp $
-DISTNAME= dovecot
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= dovecot
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module for configuring the Dovecot IMAP/POP3 server
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-dovecot/distinfo b/sysutils/wbm-dovecot/distinfo
index c628e305824..a42f1f1c9ed 100644
--- a/sysutils/wbm-dovecot/distinfo
+++ b/sysutils/wbm-dovecot/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 21:41:09 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:00 obache Exp $
-SHA1 (webmin-modules-1.270/dovecot.wbm.gz) = 9514c110ef9e561508e432fdef2dec4f314d196a
-RMD160 (webmin-modules-1.270/dovecot.wbm.gz) = 3b3e0948ebdc409e285546ce295a2441ea212c7e
-Size (webmin-modules-1.270/dovecot.wbm.gz) = 18934 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-fetchmail/Makefile b/sysutils/wbm-fetchmail/Makefile
index 0f7a1df4ccd..97bd668a6fb 100644
--- a/sysutils/wbm-fetchmail/Makefile
+++ b/sysutils/wbm-fetchmail/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:42 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:00 obache Exp $
-DISTNAME= fetchmail
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= fetchmail
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module for configuring fetchmail
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-fetchmail/PLIST b/sysutils/wbm-fetchmail/PLIST
index b8adec02fe7..b474a25190a 100644
--- a/sysutils/wbm-fetchmail/PLIST
+++ b/sysutils/wbm-fetchmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 21:41:23 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:00 obache Exp $
share/examples/webmin/fetchmail/config
share/webmin/fetchmail/CHANGELOG
share/webmin/fetchmail/acl_security.pl
@@ -31,6 +31,7 @@ share/webmin/fetchmail/config.info.ru_RU
share/webmin/fetchmail/config.info.ru_SU
share/webmin/fetchmail/config.info.uk_UA
share/webmin/fetchmail/config.info.zh_TW.Big5
+share/webmin/fetchmail/config.info.zh_TW.UTF-8
share/webmin/fetchmail/defaultacl
share/webmin/fetchmail/edit_cron.cgi
share/webmin/fetchmail/edit_global.cgi
@@ -50,14 +51,18 @@ share/webmin/fetchmail/lang/en
share/webmin/fetchmail/lang/es
share/webmin/fetchmail/lang/hu
share/webmin/fetchmail/lang/it
+share/webmin/fetchmail/lang/ja_JP.UTF-8
share/webmin/fetchmail/lang/ja_JP.euc
+share/webmin/fetchmail/lang/ko_KR.UTF-8
share/webmin/fetchmail/lang/ko_KR.euc
share/webmin/fetchmail/lang/pl
share/webmin/fetchmail/lang/ru_RU
share/webmin/fetchmail/lang/ru_SU
share/webmin/fetchmail/lang/uk_UA
share/webmin/fetchmail/lang/zh_CN
+share/webmin/fetchmail/lang/zh_CN.UTF-8
share/webmin/fetchmail/lang/zh_TW.Big5
+share/webmin/fetchmail/lang/zh_TW.UTF-8
share/webmin/fetchmail/log_parser.pl
share/webmin/fetchmail/module.info
share/webmin/fetchmail/save_cron.cgi
@@ -69,3 +74,4 @@ share/webmin/fetchmail/stop.cgi
@dirrm share/webmin/fetchmail/images
@dirrm share/webmin/fetchmail
@dirrm share/examples/webmin/fetchmail
+@dirrm etc/webmin/fetchmail
diff --git a/sysutils/wbm-fetchmail/distinfo b/sysutils/wbm-fetchmail/distinfo
index 3c790daac90..b816bfe4e4e 100644
--- a/sysutils/wbm-fetchmail/distinfo
+++ b/sysutils/wbm-fetchmail/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 21:41:23 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:01 obache Exp $
-SHA1 (webmin-modules-1.270/fetchmail.wbm.gz) = 5e323e420838286b8c46c556623e94daceb90d6e
-RMD160 (webmin-modules-1.270/fetchmail.wbm.gz) = 98778c24431bf71d60176b1b5399e26236fe5827
-Size (webmin-modules-1.270/fetchmail.wbm.gz) = 36075 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-file/Makefile b/sysutils/wbm-file/Makefile
index 5df569b7d39..8d9b19cc84e 100644
--- a/sysutils/wbm-file/Makefile
+++ b/sysutils/wbm-file/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:42 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:01 obache Exp $
-DISTNAME= file
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= file
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module for managing file and directory permissions
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-file/PLIST b/sysutils/wbm-file/PLIST
index abf72b59cab..e1b47e9fde9 100644
--- a/sysutils/wbm-file/PLIST
+++ b/sysutils/wbm-file/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 04:02:38 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:01 obache Exp $
share/examples/webmin/file/config
share/webmin/file/ACLEditor.class
share/webmin/file/ACLEntry.class
@@ -36,6 +36,7 @@ share/webmin/file/EXTWindow.class
share/webmin/file/EditorWindow.class
share/webmin/file/ErrorWindow.class
share/webmin/file/ErrorWindow.java
+share/webmin/file/ExtractWindow.class
share/webmin/file/FileAttribute.class
share/webmin/file/FileManager.class
share/webmin/file/FileManager.java
@@ -51,6 +52,7 @@ share/webmin/file/Hierarchy.class
share/webmin/file/Hierarchy.java
share/webmin/file/HierarchyCallback.class
share/webmin/file/HierarchyNode.class
+share/webmin/file/HistoryWindow.class
share/webmin/file/ImagePanel.class
share/webmin/file/LinedPanel.class
share/webmin/file/LinedPanel.java
@@ -107,99 +109,13 @@ share/webmin/file/copy.cgi
share/webmin/file/defaultacl
share/webmin/file/delete.cgi
share/webmin/file/edit_html.cgi
+share/webmin/file/extract.cgi
share/webmin/file/file-lib.pl
share/webmin/file/file.jar
share/webmin/file/filesystems.cgi
share/webmin/file/getattrs.cgi
share/webmin/file/getext.cgi
share/webmin/file/getfacl.cgi
-share/webmin/file/htmlarea/dialog.js
-share/webmin/file/htmlarea/htmlarea.css
-share/webmin/file/htmlarea/htmlarea.js
-share/webmin/file/htmlarea/images/ed_about.gif
-share/webmin/file/htmlarea/images/ed_align_center.gif
-share/webmin/file/htmlarea/images/ed_align_justify.gif
-share/webmin/file/htmlarea/images/ed_align_left.gif
-share/webmin/file/htmlarea/images/ed_align_right.gif
-share/webmin/file/htmlarea/images/ed_blank.gif
-share/webmin/file/htmlarea/images/ed_charmap.gif
-share/webmin/file/htmlarea/images/ed_color_bg.gif
-share/webmin/file/htmlarea/images/ed_color_fg.gif
-share/webmin/file/htmlarea/images/ed_copy.gif
-share/webmin/file/htmlarea/images/ed_custom.gif
-share/webmin/file/htmlarea/images/ed_cut.gif
-share/webmin/file/htmlarea/images/ed_delete.gif
-share/webmin/file/htmlarea/images/ed_format_bold.gif
-share/webmin/file/htmlarea/images/ed_format_italic.gif
-share/webmin/file/htmlarea/images/ed_format_strike.gif
-share/webmin/file/htmlarea/images/ed_format_sub.gif
-share/webmin/file/htmlarea/images/ed_format_sup.gif
-share/webmin/file/htmlarea/images/ed_format_underline.gif
-share/webmin/file/htmlarea/images/ed_help.gif
-share/webmin/file/htmlarea/images/ed_hr.gif
-share/webmin/file/htmlarea/images/ed_html.gif
-share/webmin/file/htmlarea/images/ed_image.gif
-share/webmin/file/htmlarea/images/ed_indent_less.gif
-share/webmin/file/htmlarea/images/ed_indent_more.gif
-share/webmin/file/htmlarea/images/ed_left_to_right.gif
-share/webmin/file/htmlarea/images/ed_link.gif
-share/webmin/file/htmlarea/images/ed_list_bullet.gif
-share/webmin/file/htmlarea/images/ed_list_num.gif
-share/webmin/file/htmlarea/images/ed_paste.gif
-share/webmin/file/htmlarea/images/ed_redo.gif
-share/webmin/file/htmlarea/images/ed_right_to_left.gif
-share/webmin/file/htmlarea/images/ed_save.gif
-share/webmin/file/htmlarea/images/ed_show_border.gif
-share/webmin/file/htmlarea/images/ed_splitcel.gif
-share/webmin/file/htmlarea/images/ed_undo.gif
-share/webmin/file/htmlarea/images/fullscreen_maximize.gif
-share/webmin/file/htmlarea/images/fullscreen_minimize.gif
-share/webmin/file/htmlarea/images/insert_table.gif
-share/webmin/file/htmlarea/lang/b5.js
-share/webmin/file/htmlarea/lang/cz.js
-share/webmin/file/htmlarea/lang/da.js
-share/webmin/file/htmlarea/lang/de.js
-share/webmin/file/htmlarea/lang/ee.js
-share/webmin/file/htmlarea/lang/el.js
-share/webmin/file/htmlarea/lang/en.js
-share/webmin/file/htmlarea/lang/es.js
-share/webmin/file/htmlarea/lang/fi.js
-share/webmin/file/htmlarea/lang/fr.js
-share/webmin/file/htmlarea/lang/gb.js
-share/webmin/file/htmlarea/lang/he.js
-share/webmin/file/htmlarea/lang/hu.js
-share/webmin/file/htmlarea/lang/it.js
-share/webmin/file/htmlarea/lang/ja-euc.js
-share/webmin/file/htmlarea/lang/ja-jis.js
-share/webmin/file/htmlarea/lang/ja-sjis.js
-share/webmin/file/htmlarea/lang/ja-utf8.js
-share/webmin/file/htmlarea/lang/lt.js
-share/webmin/file/htmlarea/lang/lv.js
-share/webmin/file/htmlarea/lang/nb.js
-share/webmin/file/htmlarea/lang/nl.js
-share/webmin/file/htmlarea/lang/no.js
-share/webmin/file/htmlarea/lang/pl.js
-share/webmin/file/htmlarea/lang/pt_br.js
-share/webmin/file/htmlarea/lang/ro.js
-share/webmin/file/htmlarea/lang/ru.js
-share/webmin/file/htmlarea/lang/se.js
-share/webmin/file/htmlarea/lang/si.js
-share/webmin/file/htmlarea/lang/vn.js
-share/webmin/file/htmlarea/license.txt
-share/webmin/file/htmlarea/popupdiv.js
-share/webmin/file/htmlarea/popups/about.html
-share/webmin/file/htmlarea/popups/blank.html
-share/webmin/file/htmlarea/popups/custom2.html
-share/webmin/file/htmlarea/popups/editor_help.html
-share/webmin/file/htmlarea/popups/fullscreen.html
-share/webmin/file/htmlarea/popups/insert_image.html
-share/webmin/file/htmlarea/popups/insert_table.html
-share/webmin/file/htmlarea/popups/link.html
-share/webmin/file/htmlarea/popups/old-fullscreen.html
-share/webmin/file/htmlarea/popups/old_insert_image.html
-share/webmin/file/htmlarea/popups/popup.js
-share/webmin/file/htmlarea/popups/select_color.html
-share/webmin/file/htmlarea/popupwin.js
share/webmin/file/images/Thumbs.db
share/webmin/file/images/acl.gif
share/webmin/file/images/add.gif
@@ -216,6 +132,7 @@ share/webmin/file/images/dir.gif
share/webmin/file/images/down.gif
share/webmin/file/images/edit.gif
share/webmin/file/images/ext.gif
+share/webmin/file/images/extract.gif
share/webmin/file/images/file.gif
share/webmin/file/images/find.gif
share/webmin/file/images/goto.gif
@@ -263,7 +180,9 @@ share/webmin/file/lang/es
share/webmin/file/lang/fa
share/webmin/file/lang/fr
share/webmin/file/lang/it
+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/pl
share/webmin/file/lang/pt
@@ -275,7 +194,9 @@ share/webmin/file/lang/sv
share/webmin/file/lang/tr
share/webmin/file/lang/uk_UA
share/webmin/file/lang/zh_CN
+share/webmin/file/lang/zh_CN.UTF-8
share/webmin/file/lang/zh_TW.Big5
+share/webmin/file/lang/zh_TW.UTF-8
share/webmin/file/list.cgi
share/webmin/file/list_exports.cgi
share/webmin/file/list_shares.cgi
@@ -297,17 +218,990 @@ share/webmin/file/setattrs.cgi
share/webmin/file/setext.cgi
share/webmin/file/setfacl.cgi
share/webmin/file/show.cgi
+share/webmin/file/size.cgi
share/webmin/file/unicode.pl
share/webmin/file/unicode/zh_TW.Big5
share/webmin/file/upform.cgi
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/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/images/de/bold.gif
+share/webmin/file/xinha/images/de/italic.gif
+share/webmin/file/xinha/images/de/underline.gif
+share/webmin/file/xinha/images/ed_about.gif
+share/webmin/file/xinha/images/ed_align.gif
+share/webmin/file/xinha/images/ed_align_center.gif
+share/webmin/file/xinha/images/ed_align_justify.gif
+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_charmap.gif
+share/webmin/file/xinha/images/ed_clearfonts.gif
+share/webmin/file/xinha/images/ed_color_bg.gif
+share/webmin/file/xinha/images/ed_color_fg.gif
+share/webmin/file/xinha/images/ed_copy.gif
+share/webmin/file/xinha/images/ed_custom.gif
+share/webmin/file/xinha/images/ed_cut.gif
+share/webmin/file/xinha/images/ed_delete.gif
+share/webmin/file/xinha/images/ed_format_bold.gif
+share/webmin/file/xinha/images/ed_format_italic.gif
+share/webmin/file/xinha/images/ed_format_strike.gif
+share/webmin/file/xinha/images/ed_format_sub.gif
+share/webmin/file/xinha/images/ed_format_sup.gif
+share/webmin/file/xinha/images/ed_format_underline.gif
+share/webmin/file/xinha/images/ed_help.gif
+share/webmin/file/xinha/images/ed_hr.gif
+share/webmin/file/xinha/images/ed_html.gif
+share/webmin/file/xinha/images/ed_image.gif
+share/webmin/file/xinha/images/ed_indent_less.gif
+share/webmin/file/xinha/images/ed_indent_more.gif
+share/webmin/file/xinha/images/ed_killword.gif
+share/webmin/file/xinha/images/ed_left_to_right.gif
+share/webmin/file/xinha/images/ed_link.gif
+share/webmin/file/xinha/images/ed_list_bullet.gif
+share/webmin/file/xinha/images/ed_list_num.gif
+share/webmin/file/xinha/images/ed_overwrite.gif
+share/webmin/file/xinha/images/ed_paste.gif
+share/webmin/file/xinha/images/ed_print.gif
+share/webmin/file/xinha/images/ed_redo.gif
+share/webmin/file/xinha/images/ed_right_to_left.gif
+share/webmin/file/xinha/images/ed_rmformat.gif
+share/webmin/file/xinha/images/ed_save.gif
+share/webmin/file/xinha/images/ed_save.png
+share/webmin/file/xinha/images/ed_saveas.gif
+share/webmin/file/xinha/images/ed_selectall.gif
+share/webmin/file/xinha/images/ed_show_border.gif
+share/webmin/file/xinha/images/ed_splitblock.gif
+share/webmin/file/xinha/images/ed_splitcel.gif
+share/webmin/file/xinha/images/ed_undo.gif
+share/webmin/file/xinha/images/ed_word_cleaner.gif
+share/webmin/file/xinha/images/fr/bold.gif
+share/webmin/file/xinha/images/fr/strikethrough.gif
+share/webmin/file/xinha/images/fr/underline.gif
+share/webmin/file/xinha/images/fullscreen_maximize.gif
+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/tidy.gif
+share/webmin/file/xinha/images/toggle_borders.gif
+share/webmin/file/xinha/images/xinha_logo.gif
+share/webmin/file/xinha/lang/b5.js
+share/webmin/file/xinha/lang/ch.js
+share/webmin/file/xinha/lang/cz.js
+share/webmin/file/xinha/lang/da.js
+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/fa.js
+share/webmin/file/xinha/lang/fi.js
+share/webmin/file/xinha/lang/fr.js
+share/webmin/file/xinha/lang/gb.js
+share/webmin/file/xinha/lang/he.js
+share/webmin/file/xinha/lang/hu.js
+share/webmin/file/xinha/lang/it.js
+share/webmin/file/xinha/lang/ja.js
+share/webmin/file/xinha/lang/lt.js
+share/webmin/file/xinha/lang/lv.js
+share/webmin/file/xinha/lang/nb.js
+share/webmin/file/xinha/lang/nl.js
+share/webmin/file/xinha/lang/pl.js
+share/webmin/file/xinha/lang/pt_br.js
+share/webmin/file/xinha/lang/ro.js
+share/webmin/file/xinha/lang/ru.js
+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/vn.js
+share/webmin/file/xinha/license.txt
+share/webmin/file/xinha/modules/ColorPicker/ColorPicker.js
+share/webmin/file/xinha/modules/CreateLink/link.html
+share/webmin/file/xinha/modules/CreateLink/link.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/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/pl.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/InsertImage/insert_image.html
+share/webmin/file/xinha/modules/InsertImage/insert_image.js
+share/webmin/file/xinha/modules/InsertTable/insert_table.html
+share/webmin/file/xinha/modules/InsertTable/insert_table.js
+share/webmin/file/xinha/modules/InternetExplorer/InternetExplorer.js
+share/webmin/file/xinha/plugins/Abbreviation/abbr/de.js
+share/webmin/file/xinha/plugins/Abbreviation/abbr/en.js
+share/webmin/file/xinha/plugins/Abbreviation/abbreviation.css
+share/webmin/file/xinha/plugins/Abbreviation/abbreviation.js
+share/webmin/file/xinha/plugins/Abbreviation/img/ed_abbreviation.gif
+share/webmin/file/xinha/plugins/Abbreviation/lang/de.js
+share/webmin/file/xinha/plugins/Abbreviation/lang/fr.js
+share/webmin/file/xinha/plugins/Abbreviation/lang/ja.js
+share/webmin/file/xinha/plugins/Abbreviation/lang/nb.js
+share/webmin/file/xinha/plugins/Abbreviation/popups/abbreviation.html
+share/webmin/file/xinha/plugins/BackgroundImage/background-image.js
+share/webmin/file/xinha/plugins/BackgroundImage/backgrounds/blufur.jpg
+share/webmin/file/xinha/plugins/BackgroundImage/backgrounds/palecnvs.jpg
+share/webmin/file/xinha/plugins/BackgroundImage/backgrounds/ppplcnvs.jpg
+share/webmin/file/xinha/plugins/BackgroundImage/backgrounds/thumbnails/blufur.jpg
+share/webmin/file/xinha/plugins/BackgroundImage/backgrounds/thumbnails/palecnvs.jpg
+share/webmin/file/xinha/plugins/BackgroundImage/backgrounds/thumbnails/ppplcnvs.jpg
+share/webmin/file/xinha/plugins/BackgroundImage/backgrounds/thumbnails/ylwsand.jpg
+share/webmin/file/xinha/plugins/BackgroundImage/backgrounds/ylwsand.jpg
+share/webmin/file/xinha/plugins/BackgroundImage/img/ed_bgimage.gif
+share/webmin/file/xinha/plugins/BackgroundImage/lang/de.js
+share/webmin/file/xinha/plugins/BackgroundImage/lang/fr.js
+share/webmin/file/xinha/plugins/BackgroundImage/lang/ja.js
+share/webmin/file/xinha/plugins/BackgroundImage/lang/nb.js
+share/webmin/file/xinha/plugins/BackgroundImage/popups/bgimage.html
+share/webmin/file/xinha/plugins/CSS/css.js
+share/webmin/file/xinha/plugins/CharCounter/char-counter.js
+share/webmin/file/xinha/plugins/CharCounter/lang/de.js
+share/webmin/file/xinha/plugins/CharCounter/lang/fr.js
+share/webmin/file/xinha/plugins/CharCounter/lang/ja.js
+share/webmin/file/xinha/plugins/CharCounter/lang/nb.js
+share/webmin/file/xinha/plugins/CharacterMap/CharacterMap.css
+share/webmin/file/xinha/plugins/CharacterMap/character-map.js
+share/webmin/file/xinha/plugins/CharacterMap/img/ed_charmap.gif
+share/webmin/file/xinha/plugins/CharacterMap/lang/de.js
+share/webmin/file/xinha/plugins/CharacterMap/lang/fr.js
+share/webmin/file/xinha/plugins/CharacterMap/lang/it.js
+share/webmin/file/xinha/plugins/CharacterMap/lang/ja.js
+share/webmin/file/xinha/plugins/CharacterMap/lang/nb.js
+share/webmin/file/xinha/plugins/CharacterMap/lang/nl.js
+share/webmin/file/xinha/plugins/CharacterMap/lang/ru.js
+share/webmin/file/xinha/plugins/CharacterMap/lang/sv.js
+share/webmin/file/xinha/plugins/CharacterMap/popups/select_character.html
+share/webmin/file/xinha/plugins/ClientsideSpellcheck/clientside-spellcheck.js
+share/webmin/file/xinha/plugins/ClientsideSpellcheck/img/clientside-spellcheck.gif
+share/webmin/file/xinha/plugins/ClientsideSpellcheck/img/he-spell-check.gif
+share/webmin/file/xinha/plugins/ClientsideSpellcheck/lang/de.js
+share/webmin/file/xinha/plugins/ClientsideSpellcheck/lang/ja.js
+share/webmin/file/xinha/plugins/ClientsideSpellcheck/lang/nb.js
+share/webmin/file/xinha/plugins/ContextMenu/1.pl
+share/webmin/file/xinha/plugins/ContextMenu/context-menu.js
+share/webmin/file/xinha/plugins/ContextMenu/lang/de.js
+share/webmin/file/xinha/plugins/ContextMenu/lang/el.js
+share/webmin/file/xinha/plugins/ContextMenu/lang/fr.js
+share/webmin/file/xinha/plugins/ContextMenu/lang/he.js
+share/webmin/file/xinha/plugins/ContextMenu/lang/ja.js
+share/webmin/file/xinha/plugins/ContextMenu/lang/nb.js
+share/webmin/file/xinha/plugins/ContextMenu/lang/nl.js
+share/webmin/file/xinha/plugins/ContextMenu/lang/pl.js
+share/webmin/file/xinha/plugins/ContextMenu/lang/sv.js
+share/webmin/file/xinha/plugins/ContextMenu/menu.css
+share/webmin/file/xinha/plugins/DefinitionList/definition-list.css
+share/webmin/file/xinha/plugins/DefinitionList/definition-list.js
+share/webmin/file/xinha/plugins/DefinitionList/img/ed_dd.gif
+share/webmin/file/xinha/plugins/DefinitionList/img/ed_dl.gif
+share/webmin/file/xinha/plugins/DefinitionList/img/ed_dt.gif
+share/webmin/file/xinha/plugins/DefinitionList/lang/ja.js
+share/webmin/file/xinha/plugins/DoubleClick/double-click.js
+share/webmin/file/xinha/plugins/DynamicCSS/dynamiccss.js
+share/webmin/file/xinha/plugins/DynamicCSS/lang/de.js
+share/webmin/file/xinha/plugins/DynamicCSS/lang/fr.js
+share/webmin/file/xinha/plugins/DynamicCSS/lang/ja.js
+share/webmin/file/xinha/plugins/DynamicCSS/lang/nb.js
+share/webmin/file/xinha/plugins/DynamicCSS/lang/nl.js
+share/webmin/file/xinha/plugins/EditTag/edit-tag.js
+share/webmin/file/xinha/plugins/EditTag/img/ed_edit_tag.gif
+share/webmin/file/xinha/plugins/EditTag/lang/de.js
+share/webmin/file/xinha/plugins/EditTag/lang/fr.js
+share/webmin/file/xinha/plugins/EditTag/lang/ja.js
+share/webmin/file/xinha/plugins/EditTag/lang/nb.js
+share/webmin/file/xinha/plugins/EditTag/popups/edit_tag.html
+share/webmin/file/xinha/plugins/Equation/ASCIIMathML.js
+share/webmin/file/xinha/plugins/Equation/equation.js
+share/webmin/file/xinha/plugins/Equation/example.html
+share/webmin/file/xinha/plugins/Equation/img/abs_value.gif
+share/webmin/file/xinha/plugins/Equation/img/diag_fraction.gif
+share/webmin/file/xinha/plugins/Equation/img/divide.gif
+share/webmin/file/xinha/plugins/Equation/img/dsp_greater_equal.gif
+share/webmin/file/xinha/plugins/Equation/img/dsp_less_equal.gif
+share/webmin/file/xinha/plugins/Equation/img/dsp_notequal.gif
+share/webmin/file/xinha/plugins/Equation/img/equation.gif
+share/webmin/file/xinha/plugins/Equation/img/equation.old.gif
+share/webmin/file/xinha/plugins/Equation/img/greater_equal_than.gif
+share/webmin/file/xinha/plugins/Equation/img/hor_fraction.gif
+share/webmin/file/xinha/plugins/Equation/img/less_equal_than.gif
+share/webmin/file/xinha/plugins/Equation/img/mul.gif
+share/webmin/file/xinha/plugins/Equation/img/notequal.gif
+share/webmin/file/xinha/plugins/Equation/img/parenthesis.gif
+share/webmin/file/xinha/plugins/Equation/img/root.gif
+share/webmin/file/xinha/plugins/Equation/img/square_root.gif
+share/webmin/file/xinha/plugins/Equation/lang/de.js
+share/webmin/file/xinha/plugins/Equation/lang/ja.js
+share/webmin/file/xinha/plugins/Equation/popups/dialog.html
+share/webmin/file/xinha/plugins/Equation/readme.txt
+share/webmin/file/xinha/plugins/ExtendedFileManager/Classes/ExtendedFileManager.php
+share/webmin/file/xinha/plugins/ExtendedFileManager/Readme.txt
+share/webmin/file/xinha/plugins/ExtendedFileManager/assets/EditorContent.js
+share/webmin/file/xinha/plugins/ExtendedFileManager/assets/ImageEditor.css
+share/webmin/file/xinha/plugins/ExtendedFileManager/assets/dialog.js
+share/webmin/file/xinha/plugins/ExtendedFileManager/assets/editor.css
+share/webmin/file/xinha/plugins/ExtendedFileManager/assets/editor.js
+share/webmin/file/xinha/plugins/ExtendedFileManager/assets/editorFrame.css
+share/webmin/file/xinha/plugins/ExtendedFileManager/assets/editorFrame.js
+share/webmin/file/xinha/plugins/ExtendedFileManager/assets/hover.htc
+share/webmin/file/xinha/plugins/ExtendedFileManager/assets/imagelist.css
+share/webmin/file/xinha/plugins/ExtendedFileManager/assets/images.js
+share/webmin/file/xinha/plugins/ExtendedFileManager/assets/manager.css
+share/webmin/file/xinha/plugins/ExtendedFileManager/assets/manager.js
+share/webmin/file/xinha/plugins/ExtendedFileManager/assets/popup.js
+share/webmin/file/xinha/plugins/ExtendedFileManager/assets/slider.js
+share/webmin/file/xinha/plugins/ExtendedFileManager/assets/wz_jsgraphics.js
+share/webmin/file/xinha/plugins/ExtendedFileManager/backend.php
+share/webmin/file/xinha/plugins/ExtendedFileManager/config.inc.php
+share/webmin/file/xinha/plugins/ExtendedFileManager/demo_images/.htaccess
+share/webmin/file/xinha/plugins/ExtendedFileManager/demo_images/bikerpeep.jpg
+share/webmin/file/xinha/plugins/ExtendedFileManager/demo_images/linux/linux.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/demo_images/wesnoth078.jpg
+share/webmin/file/xinha/plugins/ExtendedFileManager/editor.php
+share/webmin/file/xinha/plugins/ExtendedFileManager/editorFrame.php
+share/webmin/file/xinha/plugins/ExtendedFileManager/extended-file-manager.js
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/def.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/def_small.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/doc.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/doc_small.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/fla.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/fla_small.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/folder.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/folder_small.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/gif_small.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/gz.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/gz_small.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/html.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/html_small.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/jpg_small.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/js.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/js_small.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/mov.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/mov_small.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/pdf.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/pdf_small.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/php.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/php_small.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/png_small.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/ppt.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/ppt_small.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/rar.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/rar_small.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/txt.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/txt_small.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/xls.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/xls_small.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/zip.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/icons/zip_small.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/images.php
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/1x1_transparent.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/2x2.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/2x2_w.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/btnFolderNew.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/btnFolderNew1.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/btnFolderUp.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/btnFolderUp1.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/btn_cancel.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/btn_ok.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/crop.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/default.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/div.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/dots.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/ed_linkfile.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/ed_linkfile1.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/edit_active.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/edit_copy.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/edit_cut.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/edit_paste.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/edit_pencil.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/edit_rename.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/edit_trash.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/folder.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/hand.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/islocked2.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/locked.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/measure.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/noimages.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/rotate.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/save.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/scale.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/spacer.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/t_black.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/t_white.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/unlocked.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/unlocked2.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/img/unlocked_empty.gif
+share/webmin/file/xinha/plugins/ExtendedFileManager/lang/de.js
+share/webmin/file/xinha/plugins/ExtendedFileManager/lang/ja.js
+share/webmin/file/xinha/plugins/ExtendedFileManager/lang/nb.js
+share/webmin/file/xinha/plugins/ExtendedFileManager/lang/nl.js
+share/webmin/file/xinha/plugins/ExtendedFileManager/lang/pl.js
+share/webmin/file/xinha/plugins/ExtendedFileManager/manager.php
+share/webmin/file/xinha/plugins/ExtendedFileManager/resizer.php
+share/webmin/file/xinha/plugins/ExtendedFileManager/thumbs.php
+share/webmin/file/xinha/plugins/Filter/filter.js
+share/webmin/file/xinha/plugins/Filter/filters/paragraph.js
+share/webmin/file/xinha/plugins/Filter/filters/word.js
+share/webmin/file/xinha/plugins/Filter/img/ed_filter.gif
+share/webmin/file/xinha/plugins/Filter/lang/ja.js
+share/webmin/file/xinha/plugins/FindReplace/find-replace.js
+share/webmin/file/xinha/plugins/FindReplace/fr_engine.js
+share/webmin/file/xinha/plugins/FindReplace/img/ed_find.gif
+share/webmin/file/xinha/plugins/FindReplace/lang/de.js
+share/webmin/file/xinha/plugins/FindReplace/lang/fr.js
+share/webmin/file/xinha/plugins/FindReplace/lang/ja.js
+share/webmin/file/xinha/plugins/FindReplace/lang/nb.js
+share/webmin/file/xinha/plugins/FindReplace/lang/pl.js
+share/webmin/file/xinha/plugins/FindReplace/lang/pt_br.js
+share/webmin/file/xinha/plugins/FindReplace/lang/ru.js
+share/webmin/file/xinha/plugins/FindReplace/lang/sv.js
+share/webmin/file/xinha/plugins/FindReplace/popups/find_replace.html
+share/webmin/file/xinha/plugins/FormOperations/README
+share/webmin/file/xinha/plugins/FormOperations/default_form.html
+share/webmin/file/xinha/plugins/FormOperations/form-operations.js
+share/webmin/file/xinha/plugins/FormOperations/formmail.php
+share/webmin/file/xinha/plugins/FormOperations/iframe.css
+share/webmin/file/xinha/plugins/FormOperations/img/buttons.gif
+share/webmin/file/xinha/plugins/FormOperations/lang/de.js
+share/webmin/file/xinha/plugins/FormOperations/lang/fr.js
+share/webmin/file/xinha/plugins/FormOperations/lang/ja.js
+share/webmin/file/xinha/plugins/FormOperations/lang/nb.js
+share/webmin/file/xinha/plugins/FormOperations/panel.html
+share/webmin/file/xinha/plugins/Forms/forms.css
+share/webmin/file/xinha/plugins/Forms/forms.js
+share/webmin/file/xinha/plugins/Forms/img/ed_button.gif
+share/webmin/file/xinha/plugins/Forms/img/ed_checkbox.gif
+share/webmin/file/xinha/plugins/Forms/img/ed_fieldset.gif
+share/webmin/file/xinha/plugins/Forms/img/ed_file.gif
+share/webmin/file/xinha/plugins/Forms/img/ed_form.gif
+share/webmin/file/xinha/plugins/Forms/img/ed_hidden.gif
+share/webmin/file/xinha/plugins/Forms/img/ed_image.gif
+share/webmin/file/xinha/plugins/Forms/img/ed_label.gif
+share/webmin/file/xinha/plugins/Forms/img/ed_password.gif
+share/webmin/file/xinha/plugins/Forms/img/ed_radio.gif
+share/webmin/file/xinha/plugins/Forms/img/ed_reset.gif
+share/webmin/file/xinha/plugins/Forms/img/ed_select.gif
+share/webmin/file/xinha/plugins/Forms/img/ed_submit.gif
+share/webmin/file/xinha/plugins/Forms/img/ed_text.gif
+share/webmin/file/xinha/plugins/Forms/img/ed_textarea.gif
+share/webmin/file/xinha/plugins/Forms/lang/ja.js
+share/webmin/file/xinha/plugins/Forms/popups/fieldset.html
+share/webmin/file/xinha/plugins/Forms/popups/form.html
+share/webmin/file/xinha/plugins/Forms/popups/input.html
+share/webmin/file/xinha/plugins/Forms/popups/label.html
+share/webmin/file/xinha/plugins/Forms/popups/select.html
+share/webmin/file/xinha/plugins/Forms/popups/textarea.html
+share/webmin/file/xinha/plugins/FullPage/full-page.js
+share/webmin/file/xinha/plugins/FullPage/img/docprop.gif
+share/webmin/file/xinha/plugins/FullPage/lang/de.js
+share/webmin/file/xinha/plugins/FullPage/lang/fr.js
+share/webmin/file/xinha/plugins/FullPage/lang/he.js
+share/webmin/file/xinha/plugins/FullPage/lang/ja.js
+share/webmin/file/xinha/plugins/FullPage/lang/nb.js
+share/webmin/file/xinha/plugins/FullPage/lang/nl.js
+share/webmin/file/xinha/plugins/FullPage/lang/pl.js
+share/webmin/file/xinha/plugins/FullPage/lang/ro.js
+share/webmin/file/xinha/plugins/FullPage/popups/docprop.html
+share/webmin/file/xinha/plugins/GetHtml/get-html.js
+share/webmin/file/xinha/plugins/HorizontalRule/horizontal-rule.js
+share/webmin/file/xinha/plugins/HorizontalRule/lang/de.js
+share/webmin/file/xinha/plugins/HorizontalRule/lang/fr.js
+share/webmin/file/xinha/plugins/HorizontalRule/lang/ja.js
+share/webmin/file/xinha/plugins/HorizontalRule/lang/nb.js
+share/webmin/file/xinha/plugins/HorizontalRule/popups/edit_horizontal_rule.html
+share/webmin/file/xinha/plugins/HtmlEntities/Entities.js
+share/webmin/file/xinha/plugins/HtmlEntities/html-entities.js
+share/webmin/file/xinha/plugins/HtmlEntities/iso-8859-1.js
+share/webmin/file/xinha/plugins/HtmlTidy/README
+share/webmin/file/xinha/plugins/HtmlTidy/html-tidy-config.cfg
+share/webmin/file/xinha/plugins/HtmlTidy/html-tidy-logic.php
+share/webmin/file/xinha/plugins/HtmlTidy/html-tidy.js
+share/webmin/file/xinha/plugins/HtmlTidy/img/html-tidy.gif
+share/webmin/file/xinha/plugins/HtmlTidy/lang/de.js
+share/webmin/file/xinha/plugins/HtmlTidy/lang/fr.js
+share/webmin/file/xinha/plugins/HtmlTidy/lang/ja.js
+share/webmin/file/xinha/plugins/HtmlTidy/lang/nb.js
+share/webmin/file/xinha/plugins/HtmlTidy/lang/nl.js
+share/webmin/file/xinha/plugins/ImageManager/Classes/Files.php
+share/webmin/file/xinha/plugins/ImageManager/Classes/GD.php
+share/webmin/file/xinha/plugins/ImageManager/Classes/IM.php
+share/webmin/file/xinha/plugins/ImageManager/Classes/ImageEditor.php
+share/webmin/file/xinha/plugins/ImageManager/Classes/ImageManager.php
+share/webmin/file/xinha/plugins/ImageManager/Classes/NetPBM.php
+share/webmin/file/xinha/plugins/ImageManager/Classes/Thumbnail.php
+share/webmin/file/xinha/plugins/ImageManager/Classes/Transform.php
+share/webmin/file/xinha/plugins/ImageManager/README.txt
+share/webmin/file/xinha/plugins/ImageManager/assets/EditorContent.js
+share/webmin/file/xinha/plugins/ImageManager/assets/ImageEditor.css
+share/webmin/file/xinha/plugins/ImageManager/assets/dialog.js
+share/webmin/file/xinha/plugins/ImageManager/assets/editor.css
+share/webmin/file/xinha/plugins/ImageManager/assets/editor.js
+share/webmin/file/xinha/plugins/ImageManager/assets/editorFrame.css
+share/webmin/file/xinha/plugins/ImageManager/assets/editorFrame.js
+share/webmin/file/xinha/plugins/ImageManager/assets/hover.htc
+share/webmin/file/xinha/plugins/ImageManager/assets/imagelist.css
+share/webmin/file/xinha/plugins/ImageManager/assets/images.js
+share/webmin/file/xinha/plugins/ImageManager/assets/manager.css
+share/webmin/file/xinha/plugins/ImageManager/assets/manager.js
+share/webmin/file/xinha/plugins/ImageManager/assets/popup.js
+share/webmin/file/xinha/plugins/ImageManager/assets/slider.js
+share/webmin/file/xinha/plugins/ImageManager/assets/wz_jsgraphics.js
+share/webmin/file/xinha/plugins/ImageManager/backend.php
+share/webmin/file/xinha/plugins/ImageManager/config.inc.php
+share/webmin/file/xinha/plugins/ImageManager/ddt.php
+share/webmin/file/xinha/plugins/ImageManager/demo_images/bikerpeep.jpg
+share/webmin/file/xinha/plugins/ImageManager/demo_images/linux/linux.gif
+share/webmin/file/xinha/plugins/ImageManager/demo_images/wesnoth078.jpg
+share/webmin/file/xinha/plugins/ImageManager/editor.php
+share/webmin/file/xinha/plugins/ImageManager/editorFrame.php
+share/webmin/file/xinha/plugins/ImageManager/image-manager.js
+share/webmin/file/xinha/plugins/ImageManager/images.php
+share/webmin/file/xinha/plugins/ImageManager/img/2x2.gif
+share/webmin/file/xinha/plugins/ImageManager/img/2x2_w.gif
+share/webmin/file/xinha/plugins/ImageManager/img/btnFolderNew.gif
+share/webmin/file/xinha/plugins/ImageManager/img/btnFolderUp.gif
+share/webmin/file/xinha/plugins/ImageManager/img/btn_cancel.gif
+share/webmin/file/xinha/plugins/ImageManager/img/btn_ok.gif
+share/webmin/file/xinha/plugins/ImageManager/img/crop.gif
+share/webmin/file/xinha/plugins/ImageManager/img/default.gif
+share/webmin/file/xinha/plugins/ImageManager/img/div.gif
+share/webmin/file/xinha/plugins/ImageManager/img/dots.gif
+share/webmin/file/xinha/plugins/ImageManager/img/edit_active.gif
+share/webmin/file/xinha/plugins/ImageManager/img/edit_pencil.gif
+share/webmin/file/xinha/plugins/ImageManager/img/edit_trash.gif
+share/webmin/file/xinha/plugins/ImageManager/img/folder.gif
+share/webmin/file/xinha/plugins/ImageManager/img/hand.gif
+share/webmin/file/xinha/plugins/ImageManager/img/islocked2.gif
+share/webmin/file/xinha/plugins/ImageManager/img/locked.gif
+share/webmin/file/xinha/plugins/ImageManager/img/measure.gif
+share/webmin/file/xinha/plugins/ImageManager/img/noimages.gif
+share/webmin/file/xinha/plugins/ImageManager/img/rotate.gif
+share/webmin/file/xinha/plugins/ImageManager/img/save.gif
+share/webmin/file/xinha/plugins/ImageManager/img/scale.gif
+share/webmin/file/xinha/plugins/ImageManager/img/spacer.gif
+share/webmin/file/xinha/plugins/ImageManager/img/t_black.gif
+share/webmin/file/xinha/plugins/ImageManager/img/t_white.gif
+share/webmin/file/xinha/plugins/ImageManager/img/unlocked.gif
+share/webmin/file/xinha/plugins/ImageManager/img/unlocked2.gif
+share/webmin/file/xinha/plugins/ImageManager/lang/de.js
+share/webmin/file/xinha/plugins/ImageManager/lang/fr.js
+share/webmin/file/xinha/plugins/ImageManager/lang/ja.js
+share/webmin/file/xinha/plugins/ImageManager/lang/nb.js
+share/webmin/file/xinha/plugins/ImageManager/lang/pl.js
+share/webmin/file/xinha/plugins/ImageManager/lang/ru.js
+share/webmin/file/xinha/plugins/ImageManager/lang/sv.js
+share/webmin/file/xinha/plugins/ImageManager/manager.php
+share/webmin/file/xinha/plugins/ImageManager/resizer.php
+share/webmin/file/xinha/plugins/ImageManager/thumbs.php
+share/webmin/file/xinha/plugins/InsertAnchor/img/insert-anchor.gif
+share/webmin/file/xinha/plugins/InsertAnchor/img/placeholder.gif
+share/webmin/file/xinha/plugins/InsertAnchor/insert-anchor.css
+share/webmin/file/xinha/plugins/InsertAnchor/insert-anchor.js
+share/webmin/file/xinha/plugins/InsertAnchor/lang/de.js
+share/webmin/file/xinha/plugins/InsertAnchor/lang/fr.js
+share/webmin/file/xinha/plugins/InsertAnchor/lang/ja.js
+share/webmin/file/xinha/plugins/InsertAnchor/lang/nb.js
+share/webmin/file/xinha/plugins/InsertAnchor/lang/nl.js
+share/webmin/file/xinha/plugins/InsertAnchor/lang/pl.js
+share/webmin/file/xinha/plugins/InsertAnchor/popups/insert_anchor.html
+share/webmin/file/xinha/plugins/InsertMarquee/img/ed_marquee.gif
+share/webmin/file/xinha/plugins/InsertMarquee/insert-marquee.js
+share/webmin/file/xinha/plugins/InsertMarquee/lang/de.js
+share/webmin/file/xinha/plugins/InsertMarquee/lang/fr.js
+share/webmin/file/xinha/plugins/InsertMarquee/lang/it.js
+share/webmin/file/xinha/plugins/InsertMarquee/lang/ja.js
+share/webmin/file/xinha/plugins/InsertMarquee/lang/nb.js
+share/webmin/file/xinha/plugins/InsertMarquee/popups/insert_marquee.html
+share/webmin/file/xinha/plugins/InsertPagebreak/img/pagebreak.gif
+share/webmin/file/xinha/plugins/InsertPagebreak/insert-pagebreak.js
+share/webmin/file/xinha/plugins/InsertPagebreak/lang/de.js
+share/webmin/file/xinha/plugins/InsertPagebreak/lang/fr.js
+share/webmin/file/xinha/plugins/InsertPagebreak/lang/ja.js
+share/webmin/file/xinha/plugins/InsertPagebreak/lang/nb.js
+share/webmin/file/xinha/plugins/InsertPicture/InsertPicture.php
+share/webmin/file/xinha/plugins/InsertPicture/demo_pictures/bikerpeep.jpg
+share/webmin/file/xinha/plugins/InsertPicture/demo_pictures/wesnoth078.jpg
+share/webmin/file/xinha/plugins/InsertPicture/img/btn_open.gif
+share/webmin/file/xinha/plugins/InsertPicture/img/nopic.gif
+share/webmin/file/xinha/plugins/InsertPicture/insert-picture.js
+share/webmin/file/xinha/plugins/InsertPicture/lang/de.js
+share/webmin/file/xinha/plugins/InsertPicture/lang/fr.js
+share/webmin/file/xinha/plugins/InsertPicture/lang/ja.js
+share/webmin/file/xinha/plugins/InsertPicture/lang/nb.js
+share/webmin/file/xinha/plugins/InsertPicture/lang/sv.js
+share/webmin/file/xinha/plugins/InsertPicture/viewpicture.html
+share/webmin/file/xinha/plugins/InsertSnippet/InsertSnippet.css
+share/webmin/file/xinha/plugins/InsertSnippet/demosnippets.js
+share/webmin/file/xinha/plugins/InsertSnippet/img/ed_snippet.gif
+share/webmin/file/xinha/plugins/InsertSnippet/insert-snippet.js
+share/webmin/file/xinha/plugins/InsertSnippet/lang/de.js
+share/webmin/file/xinha/plugins/InsertSnippet/lang/ja.js
+share/webmin/file/xinha/plugins/InsertSnippet/lang/nb.js
+share/webmin/file/xinha/plugins/InsertSnippet/popups/insertsnippet.html
+share/webmin/file/xinha/plugins/InsertSnippet/readme.html
+share/webmin/file/xinha/plugins/InsertSnippet/snippets.html
+share/webmin/file/xinha/plugins/InsertSnippet/snippets.php
+share/webmin/file/xinha/plugins/InsertWords/insert-words.js
+share/webmin/file/xinha/plugins/LangMarks/img/el.gif
+share/webmin/file/xinha/plugins/LangMarks/img/en.gif
+share/webmin/file/xinha/plugins/LangMarks/img/fr.gif
+share/webmin/file/xinha/plugins/LangMarks/img/la.gif
+share/webmin/file/xinha/plugins/LangMarks/lang-marks.css
+share/webmin/file/xinha/plugins/LangMarks/lang-marks.js
+share/webmin/file/xinha/plugins/LangMarks/lang/de.js
+share/webmin/file/xinha/plugins/LangMarks/lang/fr.js
+share/webmin/file/xinha/plugins/LangMarks/lang/ja.js
+share/webmin/file/xinha/plugins/LangMarks/lang/nb.js
+share/webmin/file/xinha/plugins/LangMarks/lang/nl.js
+share/webmin/file/xinha/plugins/Linker/dTree/api.html
+share/webmin/file/xinha/plugins/Linker/dTree/dtree.css
+share/webmin/file/xinha/plugins/Linker/dTree/dtree.js
+share/webmin/file/xinha/plugins/Linker/dTree/example01.html
+share/webmin/file/xinha/plugins/Linker/dTree/img/base.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/cd.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/copy.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/empty.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/folder.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/folderopen.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/globe.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/imgfolder.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/join.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/joinbottom.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/line.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/minus.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/minusbottom.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/move.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/musicfolder.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/nolines_minus.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/nolines_plus.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/offline.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/offline.png
+share/webmin/file/xinha/plugins/Linker/dTree/img/page.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/plus.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/plusbottom.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/question.gif
+share/webmin/file/xinha/plugins/Linker/dTree/img/trash.gif
+share/webmin/file/xinha/plugins/Linker/dialog.html
+share/webmin/file/xinha/plugins/Linker/lang/de.js
+share/webmin/file/xinha/plugins/Linker/lang/fr.js
+share/webmin/file/xinha/plugins/Linker/lang/ja.js
+share/webmin/file/xinha/plugins/Linker/lang/nb.js
+share/webmin/file/xinha/plugins/Linker/lang/pl.js
+share/webmin/file/xinha/plugins/Linker/linker.js
+share/webmin/file/xinha/plugins/Linker/scan.php
+share/webmin/file/xinha/plugins/ListType/ListType.css
+share/webmin/file/xinha/plugins/ListType/img/circle.png
+share/webmin/file/xinha/plugins/ListType/img/decimal.png
+share/webmin/file/xinha/plugins/ListType/img/disc.png
+share/webmin/file/xinha/plugins/ListType/img/lower-alpha.png
+share/webmin/file/xinha/plugins/ListType/img/lower-roman.png
+share/webmin/file/xinha/plugins/ListType/img/none.png
+share/webmin/file/xinha/plugins/ListType/img/square.png
+share/webmin/file/xinha/plugins/ListType/img/upper-alpha.png
+share/webmin/file/xinha/plugins/ListType/img/upper-roman.png
+share/webmin/file/xinha/plugins/ListType/lang/de.js
+share/webmin/file/xinha/plugins/ListType/lang/fr.js
+share/webmin/file/xinha/plugins/ListType/lang/ja.js
+share/webmin/file/xinha/plugins/ListType/lang/nb.js
+share/webmin/file/xinha/plugins/ListType/lang/nl.js
+share/webmin/file/xinha/plugins/ListType/lang/pl.js
+share/webmin/file/xinha/plugins/ListType/lang/ru.js
+share/webmin/file/xinha/plugins/ListType/lang/sv.js
+share/webmin/file/xinha/plugins/ListType/list-type.js
+share/webmin/file/xinha/plugins/NoteServer/img/note.gif
+share/webmin/file/xinha/plugins/NoteServer/lang/de.js
+share/webmin/file/xinha/plugins/NoteServer/lang/fr.js
+share/webmin/file/xinha/plugins/NoteServer/lang/ja.js
+share/webmin/file/xinha/plugins/NoteServer/lang/nb.js
+share/webmin/file/xinha/plugins/NoteServer/note-server.js
+share/webmin/file/xinha/plugins/NoteServer/popups/codenote.html
+share/webmin/file/xinha/plugins/PasteText/img/ed_paste_text.gif
+share/webmin/file/xinha/plugins/PasteText/lang/de.js
+share/webmin/file/xinha/plugins/PasteText/lang/fr.js
+share/webmin/file/xinha/plugins/PasteText/lang/ja.js
+share/webmin/file/xinha/plugins/PasteText/lang/nb.js
+share/webmin/file/xinha/plugins/PasteText/lang/pl.js
+share/webmin/file/xinha/plugins/PasteText/paste-text.js
+share/webmin/file/xinha/plugins/PasteText/popups/paste_text.html
+share/webmin/file/xinha/plugins/QuickTag/img/ed_quicktag.gif
+share/webmin/file/xinha/plugins/QuickTag/lang/de.js
+share/webmin/file/xinha/plugins/QuickTag/lang/fr.js
+share/webmin/file/xinha/plugins/QuickTag/lang/ja.js
+share/webmin/file/xinha/plugins/QuickTag/lang/nb.js
+share/webmin/file/xinha/plugins/QuickTag/lang/pl.js
+share/webmin/file/xinha/plugins/QuickTag/lang/pt_br.js
+share/webmin/file/xinha/plugins/QuickTag/popups/quicktag.html
+share/webmin/file/xinha/plugins/QuickTag/quick-tag.js
+share/webmin/file/xinha/plugins/QuickTag/tag-lib.js
+share/webmin/file/xinha/plugins/SaveSubmit/README.txt
+share/webmin/file/xinha/plugins/SaveSubmit/img/ed_save_green.gif
+share/webmin/file/xinha/plugins/SaveSubmit/img/ed_save_red.gif
+share/webmin/file/xinha/plugins/SaveSubmit/lang/de.js
+share/webmin/file/xinha/plugins/SaveSubmit/lang/ja.js
+share/webmin/file/xinha/plugins/SaveSubmit/lang/ru.js
+share/webmin/file/xinha/plugins/SaveSubmit/save-submit.js
+share/webmin/file/xinha/plugins/SetId/img/placeholder.gif
+share/webmin/file/xinha/plugins/SetId/img/set-id.gif
+share/webmin/file/xinha/plugins/SetId/lang/de.js
+share/webmin/file/xinha/plugins/SetId/lang/ja.js
+share/webmin/file/xinha/plugins/SetId/lang/nb.js
+share/webmin/file/xinha/plugins/SetId/popups/set_id.html
+share/webmin/file/xinha/plugins/SetId/set-id.css
+share/webmin/file/xinha/plugins/SetId/set-id.js
+share/webmin/file/xinha/plugins/SmartReplace/img/smartquotes.gif
+share/webmin/file/xinha/plugins/SmartReplace/lang/de.js
+share/webmin/file/xinha/plugins/SmartReplace/lang/ja.js
+share/webmin/file/xinha/plugins/SmartReplace/popups/dialog.html
+share/webmin/file/xinha/plugins/SmartReplace/readme.txt
+share/webmin/file/xinha/plugins/SmartReplace/smart-replace.js
+share/webmin/file/xinha/plugins/SpellChecker/README
+share/webmin/file/xinha/plugins/SpellChecker/aspell_setup.php
+share/webmin/file/xinha/plugins/SpellChecker/img/he-spell-check.gif
+share/webmin/file/xinha/plugins/SpellChecker/img/spell-check.gif
+share/webmin/file/xinha/plugins/SpellChecker/lang/cz.js
+share/webmin/file/xinha/plugins/SpellChecker/lang/da.js
+share/webmin/file/xinha/plugins/SpellChecker/lang/de.js
+share/webmin/file/xinha/plugins/SpellChecker/lang/fr.js
+share/webmin/file/xinha/plugins/SpellChecker/lang/he.js
+share/webmin/file/xinha/plugins/SpellChecker/lang/hu.js
+share/webmin/file/xinha/plugins/SpellChecker/lang/ja.js
+share/webmin/file/xinha/plugins/SpellChecker/lang/nb.js
+share/webmin/file/xinha/plugins/SpellChecker/lang/nl.js
+share/webmin/file/xinha/plugins/SpellChecker/lang/ro.js
+share/webmin/file/xinha/plugins/SpellChecker/readme-tech.html
+share/webmin/file/xinha/plugins/SpellChecker/spell-check-logic.php
+share/webmin/file/xinha/plugins/SpellChecker/spell-check-savedicts.php
+share/webmin/file/xinha/plugins/SpellChecker/spell-check-style.css
+share/webmin/file/xinha/plugins/SpellChecker/spell-check-ui.html
+share/webmin/file/xinha/plugins/SpellChecker/spell-check-ui.js
+share/webmin/file/xinha/plugins/SpellChecker/spell-checker.js
+share/webmin/file/xinha/plugins/Stylist/lang/de.js
+share/webmin/file/xinha/plugins/Stylist/lang/fr.js
+share/webmin/file/xinha/plugins/Stylist/lang/ja.js
+share/webmin/file/xinha/plugins/Stylist/lang/nb.js
+share/webmin/file/xinha/plugins/Stylist/lang/pl.js
+share/webmin/file/xinha/plugins/Stylist/stylist.js
+share/webmin/file/xinha/plugins/SuperClean/dialog.html
+share/webmin/file/xinha/plugins/SuperClean/filters/paragraph.js
+share/webmin/file/xinha/plugins/SuperClean/filters/word.js
+share/webmin/file/xinha/plugins/SuperClean/img/ed_superclean.gif
+share/webmin/file/xinha/plugins/SuperClean/lang/de.js
+share/webmin/file/xinha/plugins/SuperClean/lang/fr.js
+share/webmin/file/xinha/plugins/SuperClean/lang/ja.js
+share/webmin/file/xinha/plugins/SuperClean/lang/nb.js
+share/webmin/file/xinha/plugins/SuperClean/super-clean.js
+share/webmin/file/xinha/plugins/SuperClean/tidy.php
+share/webmin/file/xinha/plugins/TableOperations/img/cell-delete.gif
+share/webmin/file/xinha/plugins/TableOperations/img/cell-insert-after.gif
+share/webmin/file/xinha/plugins/TableOperations/img/cell-insert-before.gif
+share/webmin/file/xinha/plugins/TableOperations/img/cell-merge.gif
+share/webmin/file/xinha/plugins/TableOperations/img/cell-prop.gif
+share/webmin/file/xinha/plugins/TableOperations/img/cell-split.gif
+share/webmin/file/xinha/plugins/TableOperations/img/col-delete.gif
+share/webmin/file/xinha/plugins/TableOperations/img/col-insert-after.gif
+share/webmin/file/xinha/plugins/TableOperations/img/col-insert-before.gif
+share/webmin/file/xinha/plugins/TableOperations/img/col-split.gif
+share/webmin/file/xinha/plugins/TableOperations/img/row-delete.gif
+share/webmin/file/xinha/plugins/TableOperations/img/row-insert-above.gif
+share/webmin/file/xinha/plugins/TableOperations/img/row-insert-under.gif
+share/webmin/file/xinha/plugins/TableOperations/img/row-prop.gif
+share/webmin/file/xinha/plugins/TableOperations/img/row-split.gif
+share/webmin/file/xinha/plugins/TableOperations/img/table-prop.gif
+share/webmin/file/xinha/plugins/TableOperations/lang/cz.js
+share/webmin/file/xinha/plugins/TableOperations/lang/da.js
+share/webmin/file/xinha/plugins/TableOperations/lang/de.js
+share/webmin/file/xinha/plugins/TableOperations/lang/el.js
+share/webmin/file/xinha/plugins/TableOperations/lang/fi.js
+share/webmin/file/xinha/plugins/TableOperations/lang/fr.js
+share/webmin/file/xinha/plugins/TableOperations/lang/he.js
+share/webmin/file/xinha/plugins/TableOperations/lang/it.js
+share/webmin/file/xinha/plugins/TableOperations/lang/ja.js
+share/webmin/file/xinha/plugins/TableOperations/lang/nb.js
+share/webmin/file/xinha/plugins/TableOperations/lang/nl.js
+share/webmin/file/xinha/plugins/TableOperations/lang/pl.js
+share/webmin/file/xinha/plugins/TableOperations/lang/ro.js
+share/webmin/file/xinha/plugins/TableOperations/lang/ru.js
+share/webmin/file/xinha/plugins/TableOperations/lang/sv.js
+share/webmin/file/xinha/plugins/TableOperations/table-operations.js
+share/webmin/file/xinha/plugins/Template/img/ed_template.gif
+share/webmin/file/xinha/plugins/Template/img/layout_01.gif
+share/webmin/file/xinha/plugins/Template/img/layout_02.gif
+share/webmin/file/xinha/plugins/Template/img/layout_03.gif
+share/webmin/file/xinha/plugins/Template/lang/de.js
+share/webmin/file/xinha/plugins/Template/lang/fr.js
+share/webmin/file/xinha/plugins/Template/lang/it.js
+share/webmin/file/xinha/plugins/Template/lang/ja.js
+share/webmin/file/xinha/plugins/Template/lang/nb.js
+share/webmin/file/xinha/plugins/Template/popups/template.html
+share/webmin/file/xinha/plugins/Template/template.css
+share/webmin/file/xinha/plugins/Template/template.js
+share/webmin/file/xinha/plugins/UnFormat/img/unformat.gif
+share/webmin/file/xinha/plugins/UnFormat/lang/de.js
+share/webmin/file/xinha/plugins/UnFormat/lang/fr.js
+share/webmin/file/xinha/plugins/UnFormat/lang/ja.js
+share/webmin/file/xinha/plugins/UnFormat/lang/nb.js
+share/webmin/file/xinha/plugins/UnFormat/lang/nl.js
+share/webmin/file/xinha/plugins/UnFormat/popups/unformat.html
+share/webmin/file/xinha/plugins/UnFormat/un-format.js
+share/webmin/file/xinha/popups/about.html
+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/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
+@dirrm share/webmin/file/xinha/skins/xp-green
+@dirrm share/webmin/file/xinha/skins/xp-blue
+@dirrm share/webmin/file/xinha/skins/titan
+@dirrm share/webmin/file/xinha/skins/silva
+@dirrm share/webmin/file/xinha/skins/inditreuse
+@dirrm share/webmin/file/xinha/skins/green-look
+@dirrm share/webmin/file/xinha/skins/blue-metallic
+@dirrm share/webmin/file/xinha/skins/blue-look
+@dirrm share/webmin/file/xinha/skins
+@dirrm share/webmin/file/xinha/popups
+@dirrm share/webmin/file/xinha/plugins/UnFormat/popups
+@dirrm share/webmin/file/xinha/plugins/UnFormat/lang
+@dirrm share/webmin/file/xinha/plugins/UnFormat/img
+@dirrm share/webmin/file/xinha/plugins/UnFormat
+@dirrm share/webmin/file/xinha/plugins/Template/popups
+@dirrm share/webmin/file/xinha/plugins/Template/lang
+@dirrm share/webmin/file/xinha/plugins/Template/img
+@dirrm share/webmin/file/xinha/plugins/Template
+@dirrm share/webmin/file/xinha/plugins/TableOperations/lang
+@dirrm share/webmin/file/xinha/plugins/TableOperations/img
+@dirrm share/webmin/file/xinha/plugins/TableOperations
+@dirrm share/webmin/file/xinha/plugins/SuperClean/lang
+@dirrm share/webmin/file/xinha/plugins/SuperClean/img
+@dirrm share/webmin/file/xinha/plugins/SuperClean/filters
+@dirrm share/webmin/file/xinha/plugins/SuperClean
+@dirrm share/webmin/file/xinha/plugins/Stylist/lang
+@dirrm share/webmin/file/xinha/plugins/Stylist
+@dirrm share/webmin/file/xinha/plugins/SpellChecker/lang
+@dirrm share/webmin/file/xinha/plugins/SpellChecker/img
+@dirrm share/webmin/file/xinha/plugins/SpellChecker
+@dirrm share/webmin/file/xinha/plugins/SmartReplace/popups
+@dirrm share/webmin/file/xinha/plugins/SmartReplace/lang
+@dirrm share/webmin/file/xinha/plugins/SmartReplace/img
+@dirrm share/webmin/file/xinha/plugins/SmartReplace
+@dirrm share/webmin/file/xinha/plugins/SetId/popups
+@dirrm share/webmin/file/xinha/plugins/SetId/lang
+@dirrm share/webmin/file/xinha/plugins/SetId/img
+@dirrm share/webmin/file/xinha/plugins/SetId
+@dirrm share/webmin/file/xinha/plugins/SaveSubmit/lang
+@dirrm share/webmin/file/xinha/plugins/SaveSubmit/img
+@dirrm share/webmin/file/xinha/plugins/SaveSubmit
+@dirrm share/webmin/file/xinha/plugins/QuickTag/popups
+@dirrm share/webmin/file/xinha/plugins/QuickTag/lang
+@dirrm share/webmin/file/xinha/plugins/QuickTag/img
+@dirrm share/webmin/file/xinha/plugins/QuickTag
+@dirrm share/webmin/file/xinha/plugins/PasteText/popups
+@dirrm share/webmin/file/xinha/plugins/PasteText/lang
+@dirrm share/webmin/file/xinha/plugins/PasteText/img
+@dirrm share/webmin/file/xinha/plugins/PasteText
+@dirrm share/webmin/file/xinha/plugins/NoteServer/popups
+@dirrm share/webmin/file/xinha/plugins/NoteServer/lang
+@dirrm share/webmin/file/xinha/plugins/NoteServer/img
+@dirrm share/webmin/file/xinha/plugins/NoteServer
+@dirrm share/webmin/file/xinha/plugins/ListType/lang
+@dirrm share/webmin/file/xinha/plugins/ListType/img
+@dirrm share/webmin/file/xinha/plugins/ListType
+@dirrm share/webmin/file/xinha/plugins/Linker/lang
+@dirrm share/webmin/file/xinha/plugins/Linker/dTree/img
+@dirrm share/webmin/file/xinha/plugins/Linker/dTree
+@dirrm share/webmin/file/xinha/plugins/Linker
+@dirrm share/webmin/file/xinha/plugins/LangMarks/lang
+@dirrm share/webmin/file/xinha/plugins/LangMarks/img
+@dirrm share/webmin/file/xinha/plugins/LangMarks
+@dirrm share/webmin/file/xinha/plugins/InsertWords
+@dirrm share/webmin/file/xinha/plugins/InsertSnippet/popups
+@dirrm share/webmin/file/xinha/plugins/InsertSnippet/lang
+@dirrm share/webmin/file/xinha/plugins/InsertSnippet/img
+@dirrm share/webmin/file/xinha/plugins/InsertSnippet
+@dirrm share/webmin/file/xinha/plugins/InsertPicture/lang
+@dirrm share/webmin/file/xinha/plugins/InsertPicture/img
+@dirrm share/webmin/file/xinha/plugins/InsertPicture/demo_pictures
+@dirrm share/webmin/file/xinha/plugins/InsertPicture
+@dirrm share/webmin/file/xinha/plugins/InsertPagebreak/lang
+@dirrm share/webmin/file/xinha/plugins/InsertPagebreak/img
+@dirrm share/webmin/file/xinha/plugins/InsertPagebreak
+@dirrm share/webmin/file/xinha/plugins/InsertMarquee/popups
+@dirrm share/webmin/file/xinha/plugins/InsertMarquee/lang
+@dirrm share/webmin/file/xinha/plugins/InsertMarquee/img
+@dirrm share/webmin/file/xinha/plugins/InsertMarquee
+@dirrm share/webmin/file/xinha/plugins/InsertAnchor/popups
+@dirrm share/webmin/file/xinha/plugins/InsertAnchor/lang
+@dirrm share/webmin/file/xinha/plugins/InsertAnchor/img
+@dirrm share/webmin/file/xinha/plugins/InsertAnchor
+@dirrm share/webmin/file/xinha/plugins/ImageManager/lang
+@dirrm share/webmin/file/xinha/plugins/ImageManager/img
+@dirrm share/webmin/file/xinha/plugins/ImageManager/demo_images/linux
+@dirrm share/webmin/file/xinha/plugins/ImageManager/demo_images
+@dirrm share/webmin/file/xinha/plugins/ImageManager/assets
+@dirrm share/webmin/file/xinha/plugins/ImageManager/Classes
+@dirrm share/webmin/file/xinha/plugins/ImageManager
+@dirrm share/webmin/file/xinha/plugins/HtmlTidy/lang
+@dirrm share/webmin/file/xinha/plugins/HtmlTidy/img
+@dirrm share/webmin/file/xinha/plugins/HtmlTidy
+@dirrm share/webmin/file/xinha/plugins/HtmlEntities
+@dirrm share/webmin/file/xinha/plugins/HorizontalRule/popups
+@dirrm share/webmin/file/xinha/plugins/HorizontalRule/lang
+@dirrm share/webmin/file/xinha/plugins/HorizontalRule
+@dirrm share/webmin/file/xinha/plugins/GetHtml
+@dirrm share/webmin/file/xinha/plugins/FullPage/popups
+@dirrm share/webmin/file/xinha/plugins/FullPage/lang
+@dirrm share/webmin/file/xinha/plugins/FullPage/img
+@dirrm share/webmin/file/xinha/plugins/FullPage
+@dirrm share/webmin/file/xinha/plugins/Forms/popups
+@dirrm share/webmin/file/xinha/plugins/Forms/lang
+@dirrm share/webmin/file/xinha/plugins/Forms/img
+@dirrm share/webmin/file/xinha/plugins/Forms
+@dirrm share/webmin/file/xinha/plugins/FormOperations/lang
+@dirrm share/webmin/file/xinha/plugins/FormOperations/img
+@dirrm share/webmin/file/xinha/plugins/FormOperations
+@dirrm share/webmin/file/xinha/plugins/FindReplace/popups
+@dirrm share/webmin/file/xinha/plugins/FindReplace/lang
+@dirrm share/webmin/file/xinha/plugins/FindReplace/img
+@dirrm share/webmin/file/xinha/plugins/FindReplace
+@dirrm share/webmin/file/xinha/plugins/Filter/lang
+@dirrm share/webmin/file/xinha/plugins/Filter/img
+@dirrm share/webmin/file/xinha/plugins/Filter/filters
+@dirrm share/webmin/file/xinha/plugins/Filter
+@dirrm share/webmin/file/xinha/plugins/ExtendedFileManager/lang
+@dirrm share/webmin/file/xinha/plugins/ExtendedFileManager/img
+@dirrm share/webmin/file/xinha/plugins/ExtendedFileManager/icons
+@dirrm share/webmin/file/xinha/plugins/ExtendedFileManager/demo_images/linux
+@dirrm share/webmin/file/xinha/plugins/ExtendedFileManager/demo_images
+@dirrm share/webmin/file/xinha/plugins/ExtendedFileManager/assets
+@dirrm share/webmin/file/xinha/plugins/ExtendedFileManager/Classes
+@dirrm share/webmin/file/xinha/plugins/ExtendedFileManager
+@dirrm share/webmin/file/xinha/plugins/Equation/popups
+@dirrm share/webmin/file/xinha/plugins/Equation/lang
+@dirrm share/webmin/file/xinha/plugins/Equation/img
+@dirrm share/webmin/file/xinha/plugins/Equation
+@dirrm share/webmin/file/xinha/plugins/EditTag/popups
+@dirrm share/webmin/file/xinha/plugins/EditTag/lang
+@dirrm share/webmin/file/xinha/plugins/EditTag/img
+@dirrm share/webmin/file/xinha/plugins/EditTag
+@dirrm share/webmin/file/xinha/plugins/DynamicCSS/lang
+@dirrm share/webmin/file/xinha/plugins/DynamicCSS
+@dirrm share/webmin/file/xinha/plugins/DoubleClick
+@dirrm share/webmin/file/xinha/plugins/DefinitionList/lang
+@dirrm share/webmin/file/xinha/plugins/DefinitionList/img
+@dirrm share/webmin/file/xinha/plugins/DefinitionList
+@dirrm share/webmin/file/xinha/plugins/ContextMenu/lang
+@dirrm share/webmin/file/xinha/plugins/ContextMenu
+@dirrm share/webmin/file/xinha/plugins/ClientsideSpellcheck/lang
+@dirrm share/webmin/file/xinha/plugins/ClientsideSpellcheck/img
+@dirrm share/webmin/file/xinha/plugins/ClientsideSpellcheck
+@dirrm share/webmin/file/xinha/plugins/CharacterMap/popups
+@dirrm share/webmin/file/xinha/plugins/CharacterMap/lang
+@dirrm share/webmin/file/xinha/plugins/CharacterMap/img
+@dirrm share/webmin/file/xinha/plugins/CharacterMap
+@dirrm share/webmin/file/xinha/plugins/CharCounter/lang
+@dirrm share/webmin/file/xinha/plugins/CharCounter
+@dirrm share/webmin/file/xinha/plugins/CSS
+@dirrm share/webmin/file/xinha/plugins/BackgroundImage/popups
+@dirrm share/webmin/file/xinha/plugins/BackgroundImage/lang
+@dirrm share/webmin/file/xinha/plugins/BackgroundImage/img
+@dirrm share/webmin/file/xinha/plugins/BackgroundImage/backgrounds/thumbnails
+@dirrm share/webmin/file/xinha/plugins/BackgroundImage/backgrounds
+@dirrm share/webmin/file/xinha/plugins/BackgroundImage
+@dirrm share/webmin/file/xinha/plugins/Abbreviation/popups
+@dirrm share/webmin/file/xinha/plugins/Abbreviation/lang
+@dirrm share/webmin/file/xinha/plugins/Abbreviation/img
+@dirrm share/webmin/file/xinha/plugins/Abbreviation/abbr
+@dirrm share/webmin/file/xinha/plugins/Abbreviation
+@dirrm share/webmin/file/xinha/plugins
+@dirrm share/webmin/file/xinha/modules/InternetExplorer
+@dirrm share/webmin/file/xinha/modules/InsertTable
+@dirrm share/webmin/file/xinha/modules/InsertImage
+@dirrm share/webmin/file/xinha/modules/GetHtml
+@dirrm share/webmin/file/xinha/modules/Gecko
+@dirrm share/webmin/file/xinha/modules/FullScreen/lang
+@dirrm share/webmin/file/xinha/modules/FullScreen
+@dirrm share/webmin/file/xinha/modules/Dialogs
+@dirrm share/webmin/file/xinha/modules/CreateLink
+@dirrm share/webmin/file/xinha/modules/ColorPicker
+@dirrm share/webmin/file/xinha/modules
+@dirrm share/webmin/file/xinha/lang
+@dirrm share/webmin/file/xinha/images/fr
+@dirrm share/webmin/file/xinha/images/de
+@dirrm share/webmin/file/xinha/images
+@dirrm share/webmin/file/xinha/examples
+@dirrm share/webmin/file/xinha/contrib
+@dirrm share/webmin/file/xinha
@dirrm share/webmin/file/unicode
@dirrm share/webmin/file/lang
@dirrm share/webmin/file/images
-@dirrm share/webmin/file/htmlarea/popups
-@dirrm share/webmin/file/htmlarea/lang
-@dirrm share/webmin/file/htmlarea/images
-@dirrm share/webmin/file/htmlarea
@dirrm share/webmin/file
@dirrm share/examples/webmin/file
+@dirrm etc/webmin/file
diff --git a/sysutils/wbm-file/distinfo b/sysutils/wbm-file/distinfo
index 07141791c44..b816bfe4e4e 100644
--- a/sysutils/wbm-file/distinfo
+++ b/sysutils/wbm-file/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 04:02:38 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:01 obache Exp $
-SHA1 (webmin-modules-1.270/file.wbm.gz) = cdf1e0fbc0c868cfe50334b07f5415b39d2394f4
-RMD160 (webmin-modules-1.270/file.wbm.gz) = d83ede1a16371b03505ce4e1984033e390e85566
-Size (webmin-modules-1.270/file.wbm.gz) = 451104 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-htaccess-htpasswd/Makefile b/sysutils/wbm-htaccess-htpasswd/Makefile
index d81644338d6..895bffd190c 100644
--- a/sysutils/wbm-htaccess-htpasswd/Makefile
+++ b/sysutils/wbm-htaccess-htpasswd/Makefile
@@ -1,16 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/05/16 21:41:36 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2007/04/21 05:23:01 obache Exp $
-DISTNAME= htaccess-htpasswd
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= htaccess-htpasswd
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
+WBM_DEPEND_MODULES= apache useradmin
-DEPENDS+= wbm-apache>=1.270:../../sysutils/wbm-apache
-DEPENDS+= wbm-useradmin>=1.270:../../sysutils/wbm-useradmin
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to protect Apache web-accessible directories
.include "../../sysutils/webmin/wbm.mk"
diff --git a/sysutils/wbm-htaccess-htpasswd/PLIST b/sysutils/wbm-htaccess-htpasswd/PLIST
index e8407391174..9e219444d69 100644
--- a/sysutils/wbm-htaccess-htpasswd/PLIST
+++ b/sysutils/wbm-htaccess-htpasswd/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 21:41:36 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:01 obache Exp $
share/examples/webmin/htaccess-htpasswd/config
share/webmin/htaccess-htpasswd/CHANGELOG
share/webmin/htaccess-htpasswd/acl_security.pl
share/webmin/htaccess-htpasswd/config
+share/webmin/htaccess-htpasswd/config-windows
share/webmin/htaccess-htpasswd/config.info
share/webmin/htaccess-htpasswd/config.info.ca
share/webmin/htaccess-htpasswd/config.info.de
@@ -10,8 +11,11 @@ share/webmin/htaccess-htpasswd/config.info.es
share/webmin/htaccess-htpasswd/config.info.fr
share/webmin/htaccess-htpasswd/config.info.hu
share/webmin/htaccess-htpasswd/config.info.ms
+share/webmin/htaccess-htpasswd/config.info.tr
share/webmin/htaccess-htpasswd/config.info.zh_TW.Big5
+share/webmin/htaccess-htpasswd/config.info.zh_TW.UTF-8
share/webmin/htaccess-htpasswd/defaultacl
+share/webmin/htaccess-htpasswd/delete.cgi
share/webmin/htaccess-htpasswd/edit_dir.cgi
share/webmin/htaccess-htpasswd/edit_group.cgi
share/webmin/htaccess-htpasswd/edit_user.cgi
@@ -27,7 +31,9 @@ share/webmin/htaccess-htpasswd/lang/es
share/webmin/htaccess-htpasswd/lang/fr
share/webmin/htaccess-htpasswd/lang/hu
share/webmin/htaccess-htpasswd/lang/ms
+share/webmin/htaccess-htpasswd/lang/tr
share/webmin/htaccess-htpasswd/lang/zh_TW.Big5
+share/webmin/htaccess-htpasswd/lang/zh_TW.UTF-8
share/webmin/htaccess-htpasswd/log_parser.pl
share/webmin/htaccess-htpasswd/md5-lib.pl
share/webmin/htaccess-htpasswd/module.info
@@ -40,3 +46,4 @@ share/webmin/htaccess-htpasswd/useradmin_update.pl
@dirrm share/webmin/htaccess-htpasswd/images
@dirrm share/webmin/htaccess-htpasswd
@dirrm share/examples/webmin/htaccess-htpasswd
+@dirrm etc/webmin/htaccess-htpasswd
diff --git a/sysutils/wbm-htaccess-htpasswd/distinfo b/sysutils/wbm-htaccess-htpasswd/distinfo
index 62d87cf19d1..b816bfe4e4e 100644
--- a/sysutils/wbm-htaccess-htpasswd/distinfo
+++ b/sysutils/wbm-htaccess-htpasswd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 21:41:36 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:01 obache Exp $
-SHA1 (webmin-modules-1.270/htaccess-htpasswd.wbm.gz) = 6e666a96857c61a52bbc8166242495a24be3b593
-RMD160 (webmin-modules-1.270/htaccess-htpasswd.wbm.gz) = 03bded6747191da2d1b74ada83400e04c28fba6d
-Size (webmin-modules-1.270/htaccess-htpasswd.wbm.gz) = 23204 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-inetd/Makefile b/sysutils/wbm-inetd/Makefile
index 400031af54c..5e260cb77d1 100644
--- a/sysutils/wbm-inetd/Makefile
+++ b/sysutils/wbm-inetd/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:42 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:01 obache Exp $
-DISTNAME= inetd
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= inetd
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to configure inetd
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-inetd/PLIST b/sysutils/wbm-inetd/PLIST
index 8adb4031884..3481b79a396 100644
--- a/sysutils/wbm-inetd/PLIST
+++ b/sysutils/wbm-inetd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 15:40:45 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:01 obache Exp $
share/examples/webmin/inetd/config
share/webmin/inetd/backup_config.pl
share/webmin/inetd/config-aix
@@ -16,9 +16,9 @@ share/webmin/inetd/config-macos
share/webmin/inetd/config-macos-1.5-*
share/webmin/inetd/config-mandrake-linux
share/webmin/inetd/config-msc-linux
-share/webmin/inetd/config-netbsd
+share/webmin/inetd/config-${LOWER_OPSYS}
share/webmin/inetd/config-open-linux
-share/webmin/inetd/config-open-linux-3.1e
+share/webmin/inetd/config-open-linux-${OS_VERSION}e
share/webmin/inetd/config-openbsd
share/webmin/inetd/config-openserver
share/webmin/inetd/config-osf1
@@ -47,7 +47,9 @@ share/webmin/inetd/config.info.sv
share/webmin/inetd/config.info.tr
share/webmin/inetd/config.info.uk_UA
share/webmin/inetd/config.info.zh_CN
+share/webmin/inetd/config.info.zh_CN.UTF-8
share/webmin/inetd/config.info.zh_TW.Big5
+share/webmin/inetd/config.info.zh_TW.UTF-8
share/webmin/inetd/delete_rpc.cgi
share/webmin/inetd/delete_serv.cgi
share/webmin/inetd/edit_rpc.cgi
@@ -57,6 +59,7 @@ share/webmin/inetd/help/help.es.html
share/webmin/inetd/help/help.html
share/webmin/inetd/help/help.sv.html
share/webmin/inetd/help/help.zh_TW.Big5.html
+share/webmin/inetd/help/help.zh_TW.UTF-8.html
share/webmin/inetd/images/icon.gif
share/webmin/inetd/images/smallicon.gif
share/webmin/inetd/index.cgi
@@ -71,13 +74,17 @@ share/webmin/inetd/lang/es
share/webmin/inetd/lang/fr
share/webmin/inetd/lang/hu
share/webmin/inetd/lang/it
+share/webmin/inetd/lang/ja_JP.UTF-8
share/webmin/inetd/lang/ja_JP.euc
+share/webmin/inetd/lang/ko_KR.UTF-8
share/webmin/inetd/lang/ko_KR.euc
share/webmin/inetd/lang/pl
share/webmin/inetd/lang/sv
share/webmin/inetd/lang/tr
share/webmin/inetd/lang/zh_CN
+share/webmin/inetd/lang/zh_CN.UTF-8
share/webmin/inetd/lang/zh_TW.Big5
+share/webmin/inetd/lang/zh_TW.UTF-8
share/webmin/inetd/log_parser.pl
share/webmin/inetd/module.info
share/webmin/inetd/restart_inetd.cgi
@@ -88,3 +95,4 @@ share/webmin/inetd/save_serv.cgi
@dirrm share/webmin/inetd/help
@dirrm share/webmin/inetd
@dirrm share/examples/webmin/inetd
+@dirrm etc/webmin/inetd
diff --git a/sysutils/wbm-inetd/distinfo b/sysutils/wbm-inetd/distinfo
index 79a10ec90c3..b816bfe4e4e 100644
--- a/sysutils/wbm-inetd/distinfo
+++ b/sysutils/wbm-inetd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 15:40:45 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:01 obache Exp $
-SHA1 (webmin-modules-1.270/inetd.wbm.gz) = 2b088973cfd28d74b33adb24d2eade38aaedab28
-RMD160 (webmin-modules-1.270/inetd.wbm.gz) = 440020c47bb340c9f056986f3a01d23e4d1667de
-Size (webmin-modules-1.270/inetd.wbm.gz) = 46151 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-ipfilter/Makefile b/sysutils/wbm-ipfilter/Makefile
index 0ec923c9b25..471366e33b8 100644
--- a/sysutils/wbm-ipfilter/Makefile
+++ b/sysutils/wbm-ipfilter/Makefile
@@ -1,16 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/05/16 04:02:54 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2007/04/21 05:23:01 obache Exp $
-DISTNAME= ipfilter
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= ipfilter
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
+WBM_DEPEND_MODULES+= net
-DEPENDS+= wbm-net>=1.270:../../sysutils/wbm-net
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module for IPFilter configuration
+post-extract:
+ cp ${FILESDIR}/ipfilter_config-netbsd ${WRKSRC}/${WBM_NAME}/config-netbsd
+
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-ipfilter/distinfo b/sysutils/wbm-ipfilter/distinfo
index ad7db38ec7d..7824e4f146d 100644
--- a/sysutils/wbm-ipfilter/distinfo
+++ b/sysutils/wbm-ipfilter/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 04:02:54 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:01 obache Exp $
-SHA1 (webmin-modules-1.270/ipfilter.wbm.gz) = e27404097e32d33ba6288f19e60aea829c62f175
-RMD160 (webmin-modules-1.270/ipfilter.wbm.gz) = d6d0ecc74eaea5e4580b98125d25b9d3af5680ec
-Size (webmin-modules-1.270/ipfilter.wbm.gz) = 34633 bytes
-SHA1 (patch-aa) = 7fd8f42669f1937025a51e7c2698d16f11af5963
-SHA1 (patch-ab) = b8a6e1d5f1b4efbebc483dafb528711f19fddc1c
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
+SHA1 (patch-ab) = ed1c9912349fd071bb560c2b695e3197c404ac0e
diff --git a/sysutils/wbm-ipfilter/files/ipfilter_config-netbsd b/sysutils/wbm-ipfilter/files/ipfilter_config-netbsd
new file mode 100644
index 00000000000..37938b5bf2a
--- /dev/null
+++ b/sysutils/wbm-ipfilter/files/ipfilter_config-netbsd
@@ -0,0 +1,9 @@
+ipf_conf=/etc/ipf.conf
+ipnat_conf=/etc/ipnat.conf
+view_condition=1
+view_comment=0
+ipf=/sbin/ipf
+ipfstat=/usr/sbin/ipfstat
+cluster_mode=0
+ipnat=/usr/sbin/ipnat
+cluster_nat=1
diff --git a/sysutils/wbm-ipfilter/patches/patch-aa b/sysutils/wbm-ipfilter/patches/patch-aa
deleted file mode 100644
index 5e29fc6bc9a..00000000000
--- a/sysutils/wbm-ipfilter/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/05/16 04:02:54 jlam Exp $
-
---- /dev/null Tue May 16 02:15:03 2006
-+++ config-netbsd
-@@ -0,0 +1,9 @@
-+ipf_conf=/etc/ipf.conf
-+ipnat_conf=/etc/ipnat.conf
-+view_condition=1
-+view_comment=0
-+ipf=/sbin/ipf
-+ipfstat=/usr/sbin/ipfstat
-+cluster_mode=0
-+ipnat=/usr/sbin/ipnat
-+cluster_nat=1
diff --git a/sysutils/wbm-ipfilter/patches/patch-ab b/sysutils/wbm-ipfilter/patches/patch-ab
index e8b0ce5ffab..ba9b61132bf 100644
--- a/sysutils/wbm-ipfilter/patches/patch-ab
+++ b/sysutils/wbm-ipfilter/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/05/16 04:02:54 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2007/04/21 05:23:02 obache Exp $
---- module.info.orig Tue Apr 4 23:16:16 2006
-+++ module.info
+--- ipfilter/module.info.orig 2007-04-09 05:00:48.000000000 +0000
++++ ipfilter/module.info
@@ -1,7 +1,7 @@
category=net
longdesc=Configure a firewall using the IPFilter package, by creating and editing rules.
- depends=net 1.270
+ depends=net 1.340
-os_support=solaris {&has_command("ipf")}
+os_support=netbsd solaris {&has_command("ipf")}
desc=IPFilter Firewall
- version=1.270
+ version=1.340
desc_ca=Tallafocs IPFIlter
diff --git a/sysutils/wbm-ldap-useradmin/Makefile b/sysutils/wbm-ldap-useradmin/Makefile
index f409f77a688..45b6cb217c3 100644
--- a/sysutils/wbm-ldap-useradmin/Makefile
+++ b/sysutils/wbm-ldap-useradmin/Makefile
@@ -1,15 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/05/16 15:41:06 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2007/04/21 05:23:02 obache Exp $
-DISTNAME= ldap-useradmin
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= ldap-useradmin
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
+WBM_DEPEND_MODULES+= useradmin
-DEPENDS+= wbm-useradmin>=1.270:../../sysutils/wbm-useradmin
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to manage users and groups stored in LDAP
.include "../../sysutils/webmin/wbm.mk"
diff --git a/sysutils/wbm-ldap-useradmin/PLIST b/sysutils/wbm-ldap-useradmin/PLIST
index ca36531ce2f..102ccae26dd 100644
--- a/sysutils/wbm-ldap-useradmin/PLIST
+++ b/sysutils/wbm-ldap-useradmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 15:41:06 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:02 obache Exp $
share/examples/webmin/ldap-useradmin/config
share/webmin/ldap-useradmin/CHANGELOG
share/webmin/ldap-useradmin/acl_security.pl
@@ -21,6 +21,7 @@ share/webmin/ldap-useradmin/config.info
share/webmin/ldap-useradmin/config.info.ca
share/webmin/ldap-useradmin/config.info.de
share/webmin/ldap-useradmin/config.info.es
+share/webmin/ldap-useradmin/cpan_modules.pl
share/webmin/ldap-useradmin/defaultacl
share/webmin/ldap-useradmin/edit_group.cgi
share/webmin/ldap-useradmin/edit_user.cgi
@@ -46,6 +47,7 @@ share/webmin/ldap-useradmin/log_parser.pl
share/webmin/ldap-useradmin/mass_delete_group.cgi
share/webmin/ldap-useradmin/mass_delete_user.cgi
share/webmin/ldap-useradmin/module.info
+share/webmin/ldap-useradmin/postinstall.pl
share/webmin/ldap-useradmin/raw.cgi
share/webmin/ldap-useradmin/save_group.cgi
share/webmin/ldap-useradmin/save_user.cgi
diff --git a/sysutils/wbm-ldap-useradmin/distinfo b/sysutils/wbm-ldap-useradmin/distinfo
index 88f7e29c397..d993c794322 100644
--- a/sysutils/wbm-ldap-useradmin/distinfo
+++ b/sysutils/wbm-ldap-useradmin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 15:41:06 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:02 obache Exp $
-SHA1 (webmin-modules-1.270/ldap-useradmin.wbm.gz) = 918589fafb260eeb651b494cdeb479910cbd4132
-RMD160 (webmin-modules-1.270/ldap-useradmin.wbm.gz) = bfb54aa7496ebc3e1802896a2f121f053cb7f3b6
-Size (webmin-modules-1.270/ldap-useradmin.wbm.gz) = 48694 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-lpadmin/Makefile b/sysutils/wbm-lpadmin/Makefile
index e9fee5d130a..0c45283a423 100644
--- a/sysutils/wbm-lpadmin/Makefile
+++ b/sysutils/wbm-lpadmin/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:42 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:02 obache Exp $
-DISTNAME= lpadmin
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= lpadmin
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to manage local and remote printers
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-lpadmin/PLIST b/sysutils/wbm-lpadmin/PLIST
index 47850d40fab..2011086be0f 100644
--- a/sysutils/wbm-lpadmin/PLIST
+++ b/sysutils/wbm-lpadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 15:41:24 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:02 obache Exp $
share/examples/webmin/lpadmin/config
share/webmin/lpadmin/CHANGELOG
share/webmin/lpadmin/acl_security.pl
@@ -20,6 +20,7 @@ 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-freebsd
share/webmin/lpadmin/config-generic-linux
share/webmin/lpadmin/config-gentoo-linux
@@ -55,6 +56,7 @@ share/webmin/lpadmin/config.info.de
share/webmin/lpadmin/config.info.es
share/webmin/lpadmin/config.info.fr
share/webmin/lpadmin/config.info.hu
+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.pl
@@ -64,11 +66,14 @@ share/webmin/lpadmin/config.info.sv
share/webmin/lpadmin/config.info.tr
share/webmin/lpadmin/config.info.uk_UA
share/webmin/lpadmin/config.info.zh_CN
+share/webmin/lpadmin/config.info.zh_CN.UTF-8
share/webmin/lpadmin/config.info.zh_TW.Big5
+share/webmin/lpadmin/config.info.zh_TW.UTF-8
share/webmin/lpadmin/cups-driver.pl
share/webmin/lpadmin/cups-lib.pl
share/webmin/lpadmin/defaultacl
share/webmin/lpadmin/delete_printer.cgi
+share/webmin/lpadmin/delete_printers.cgi
share/webmin/lpadmin/drivers
share/webmin/lpadmin/edit_printer.cgi
share/webmin/lpadmin/freebsd-lib.pl
@@ -86,7 +91,9 @@ share/webmin/lpadmin/lang/es
share/webmin/lpadmin/lang/fr
share/webmin/lpadmin/lang/hu
share/webmin/lpadmin/lang/it
+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/pl
@@ -98,7 +105,9 @@ share/webmin/lpadmin/lang/sv
share/webmin/lpadmin/lang/tr
share/webmin/lpadmin/lang/uk_UA
share/webmin/lpadmin/lang/zh_CN
+share/webmin/lpadmin/lang/zh_CN.UTF-8
share/webmin/lpadmin/lang/zh_TW.Big5
+share/webmin/lpadmin/lang/zh_TW.UTF-8
share/webmin/lpadmin/linux-lib.pl
share/webmin/lpadmin/list_jobs.cgi
share/webmin/lpadmin/log_parser.pl
@@ -129,3 +138,4 @@ share/webmin/lpadmin/webmin-driver.pl
@dirrm share/webmin/lpadmin/images
@dirrm share/webmin/lpadmin
@dirrm share/examples/webmin/lpadmin
+@dirrm etc/webmin/lpadmin
diff --git a/sysutils/wbm-lpadmin/distinfo b/sysutils/wbm-lpadmin/distinfo
index fdb106302b9..d993c794322 100644
--- a/sysutils/wbm-lpadmin/distinfo
+++ b/sysutils/wbm-lpadmin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 15:41:24 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:02 obache Exp $
-SHA1 (webmin-modules-1.270/lpadmin.wbm.gz) = 0e6de3ea0251c37f842cb995e3aaf7111ad9955c
-RMD160 (webmin-modules-1.270/lpadmin.wbm.gz) = c7f73e353b939327dd16060e1bc6856bf952f229
-Size (webmin-modules-1.270/lpadmin.wbm.gz) = 127502 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-mailboxes/Makefile b/sysutils/wbm-mailboxes/Makefile
index dc80f2bba82..3198572c913 100644
--- a/sysutils/wbm-mailboxes/Makefile
+++ b/sysutils/wbm-mailboxes/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:42 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:02 obache Exp $
-DISTNAME= mailboxes
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= mailboxes
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to read email in users' mailboxes
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-mailboxes/PLIST b/sysutils/wbm-mailboxes/PLIST
index d7bcbf3f1d2..2f3ef39dfc3 100644
--- a/sysutils/wbm-mailboxes/PLIST
+++ b/sysutils/wbm-mailboxes/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 15:41:41 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:02 obache Exp $
share/examples/webmin/mailboxes/config
share/webmin/mailboxes/CHANGELOG
share/webmin/mailboxes/Makefile
@@ -10,97 +10,11 @@ share/webmin/mailboxes/config.info.ca
share/webmin/mailboxes/config.info.de
share/webmin/mailboxes/config_info.pl
share/webmin/mailboxes/defaultacl
+share/webmin/mailboxes/delete_all.cgi
share/webmin/mailboxes/delete_mail.cgi
share/webmin/mailboxes/detach.cgi
share/webmin/mailboxes/find.cgi
share/webmin/mailboxes/folders-lib.pl
-share/webmin/mailboxes/htmlarea/dialog.js
-share/webmin/mailboxes/htmlarea/htmlarea.css
-share/webmin/mailboxes/htmlarea/htmlarea.js
-share/webmin/mailboxes/htmlarea/images/ed_about.gif
-share/webmin/mailboxes/htmlarea/images/ed_align_center.gif
-share/webmin/mailboxes/htmlarea/images/ed_align_justify.gif
-share/webmin/mailboxes/htmlarea/images/ed_align_left.gif
-share/webmin/mailboxes/htmlarea/images/ed_align_right.gif
-share/webmin/mailboxes/htmlarea/images/ed_blank.gif
-share/webmin/mailboxes/htmlarea/images/ed_charmap.gif
-share/webmin/mailboxes/htmlarea/images/ed_color_bg.gif
-share/webmin/mailboxes/htmlarea/images/ed_color_fg.gif
-share/webmin/mailboxes/htmlarea/images/ed_copy.gif
-share/webmin/mailboxes/htmlarea/images/ed_custom.gif
-share/webmin/mailboxes/htmlarea/images/ed_cut.gif
-share/webmin/mailboxes/htmlarea/images/ed_delete.gif
-share/webmin/mailboxes/htmlarea/images/ed_format_bold.gif
-share/webmin/mailboxes/htmlarea/images/ed_format_italic.gif
-share/webmin/mailboxes/htmlarea/images/ed_format_strike.gif
-share/webmin/mailboxes/htmlarea/images/ed_format_sub.gif
-share/webmin/mailboxes/htmlarea/images/ed_format_sup.gif
-share/webmin/mailboxes/htmlarea/images/ed_format_underline.gif
-share/webmin/mailboxes/htmlarea/images/ed_help.gif
-share/webmin/mailboxes/htmlarea/images/ed_hr.gif
-share/webmin/mailboxes/htmlarea/images/ed_html.gif
-share/webmin/mailboxes/htmlarea/images/ed_image.gif
-share/webmin/mailboxes/htmlarea/images/ed_indent_less.gif
-share/webmin/mailboxes/htmlarea/images/ed_indent_more.gif
-share/webmin/mailboxes/htmlarea/images/ed_left_to_right.gif
-share/webmin/mailboxes/htmlarea/images/ed_link.gif
-share/webmin/mailboxes/htmlarea/images/ed_list_bullet.gif
-share/webmin/mailboxes/htmlarea/images/ed_list_num.gif
-share/webmin/mailboxes/htmlarea/images/ed_paste.gif
-share/webmin/mailboxes/htmlarea/images/ed_redo.gif
-share/webmin/mailboxes/htmlarea/images/ed_right_to_left.gif
-share/webmin/mailboxes/htmlarea/images/ed_save.gif
-share/webmin/mailboxes/htmlarea/images/ed_show_border.gif
-share/webmin/mailboxes/htmlarea/images/ed_splitcel.gif
-share/webmin/mailboxes/htmlarea/images/ed_undo.gif
-share/webmin/mailboxes/htmlarea/images/fullscreen_maximize.gif
-share/webmin/mailboxes/htmlarea/images/fullscreen_minimize.gif
-share/webmin/mailboxes/htmlarea/images/insert_table.gif
-share/webmin/mailboxes/htmlarea/lang/b5.js
-share/webmin/mailboxes/htmlarea/lang/cz.js
-share/webmin/mailboxes/htmlarea/lang/da.js
-share/webmin/mailboxes/htmlarea/lang/de.js
-share/webmin/mailboxes/htmlarea/lang/ee.js
-share/webmin/mailboxes/htmlarea/lang/el.js
-share/webmin/mailboxes/htmlarea/lang/en.js
-share/webmin/mailboxes/htmlarea/lang/es.js
-share/webmin/mailboxes/htmlarea/lang/fi.js
-share/webmin/mailboxes/htmlarea/lang/fr.js
-share/webmin/mailboxes/htmlarea/lang/gb.js
-share/webmin/mailboxes/htmlarea/lang/he.js
-share/webmin/mailboxes/htmlarea/lang/hu.js
-share/webmin/mailboxes/htmlarea/lang/it.js
-share/webmin/mailboxes/htmlarea/lang/ja-euc.js
-share/webmin/mailboxes/htmlarea/lang/ja-jis.js
-share/webmin/mailboxes/htmlarea/lang/ja-sjis.js
-share/webmin/mailboxes/htmlarea/lang/ja-utf8.js
-share/webmin/mailboxes/htmlarea/lang/lt.js
-share/webmin/mailboxes/htmlarea/lang/lv.js
-share/webmin/mailboxes/htmlarea/lang/nb.js
-share/webmin/mailboxes/htmlarea/lang/nl.js
-share/webmin/mailboxes/htmlarea/lang/no.js
-share/webmin/mailboxes/htmlarea/lang/pl.js
-share/webmin/mailboxes/htmlarea/lang/pt_br.js
-share/webmin/mailboxes/htmlarea/lang/ro.js
-share/webmin/mailboxes/htmlarea/lang/ru.js
-share/webmin/mailboxes/htmlarea/lang/se.js
-share/webmin/mailboxes/htmlarea/lang/si.js
-share/webmin/mailboxes/htmlarea/lang/vn.js
-share/webmin/mailboxes/htmlarea/license.txt
-share/webmin/mailboxes/htmlarea/popupdiv.js
-share/webmin/mailboxes/htmlarea/popups/about.html
-share/webmin/mailboxes/htmlarea/popups/blank.html
-share/webmin/mailboxes/htmlarea/popups/custom2.html
-share/webmin/mailboxes/htmlarea/popups/editor_help.html
-share/webmin/mailboxes/htmlarea/popups/fullscreen.html
-share/webmin/mailboxes/htmlarea/popups/insert_image.html
-share/webmin/mailboxes/htmlarea/popups/insert_table.html
-share/webmin/mailboxes/htmlarea/popups/link.html
-share/webmin/mailboxes/htmlarea/popups/old-fullscreen.html
-share/webmin/mailboxes/htmlarea/popups/old_insert_image.html
-share/webmin/mailboxes/htmlarea/popups/popup.js
-share/webmin/mailboxes/htmlarea/popups/select_color.html
-share/webmin/mailboxes/htmlarea/popupwin.js
share/webmin/mailboxes/images/attach.gif
share/webmin/mailboxes/images/boxes.gif
share/webmin/mailboxes/images/error.gif
@@ -117,15 +31,19 @@ share/webmin/mailboxes/lang/en
share/webmin/mailboxes/lang/es
share/webmin/mailboxes/lang/fr
share/webmin/mailboxes/lang/it
+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/pl
share/webmin/mailboxes/lang/pt
share/webmin/mailboxes/lang/sv
share/webmin/mailboxes/lang/tr
share/webmin/mailboxes/lang/zh_CN
+share/webmin/mailboxes/lang/zh_CN.UTF-8
share/webmin/mailboxes/lang/zh_TW.Big5
+share/webmin/mailboxes/lang/zh_TW.UTF-8
share/webmin/mailboxes/list_mail.cgi
share/webmin/mailboxes/log_parser.pl
share/webmin/mailboxes/mail_search.cgi
@@ -137,11 +55,983 @@ share/webmin/mailboxes/search_form.cgi
share/webmin/mailboxes/send_mail.cgi
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/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/images/de/bold.gif
+share/webmin/mailboxes/xinha/images/de/italic.gif
+share/webmin/mailboxes/xinha/images/de/underline.gif
+share/webmin/mailboxes/xinha/images/ed_about.gif
+share/webmin/mailboxes/xinha/images/ed_align.gif
+share/webmin/mailboxes/xinha/images/ed_align_center.gif
+share/webmin/mailboxes/xinha/images/ed_align_justify.gif
+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_charmap.gif
+share/webmin/mailboxes/xinha/images/ed_clearfonts.gif
+share/webmin/mailboxes/xinha/images/ed_color_bg.gif
+share/webmin/mailboxes/xinha/images/ed_color_fg.gif
+share/webmin/mailboxes/xinha/images/ed_copy.gif
+share/webmin/mailboxes/xinha/images/ed_custom.gif
+share/webmin/mailboxes/xinha/images/ed_cut.gif
+share/webmin/mailboxes/xinha/images/ed_delete.gif
+share/webmin/mailboxes/xinha/images/ed_format_bold.gif
+share/webmin/mailboxes/xinha/images/ed_format_italic.gif
+share/webmin/mailboxes/xinha/images/ed_format_strike.gif
+share/webmin/mailboxes/xinha/images/ed_format_sub.gif
+share/webmin/mailboxes/xinha/images/ed_format_sup.gif
+share/webmin/mailboxes/xinha/images/ed_format_underline.gif
+share/webmin/mailboxes/xinha/images/ed_help.gif
+share/webmin/mailboxes/xinha/images/ed_hr.gif
+share/webmin/mailboxes/xinha/images/ed_html.gif
+share/webmin/mailboxes/xinha/images/ed_image.gif
+share/webmin/mailboxes/xinha/images/ed_indent_less.gif
+share/webmin/mailboxes/xinha/images/ed_indent_more.gif
+share/webmin/mailboxes/xinha/images/ed_killword.gif
+share/webmin/mailboxes/xinha/images/ed_left_to_right.gif
+share/webmin/mailboxes/xinha/images/ed_link.gif
+share/webmin/mailboxes/xinha/images/ed_list_bullet.gif
+share/webmin/mailboxes/xinha/images/ed_list_num.gif
+share/webmin/mailboxes/xinha/images/ed_overwrite.gif
+share/webmin/mailboxes/xinha/images/ed_paste.gif
+share/webmin/mailboxes/xinha/images/ed_print.gif
+share/webmin/mailboxes/xinha/images/ed_redo.gif
+share/webmin/mailboxes/xinha/images/ed_right_to_left.gif
+share/webmin/mailboxes/xinha/images/ed_rmformat.gif
+share/webmin/mailboxes/xinha/images/ed_save.gif
+share/webmin/mailboxes/xinha/images/ed_save.png
+share/webmin/mailboxes/xinha/images/ed_saveas.gif
+share/webmin/mailboxes/xinha/images/ed_selectall.gif
+share/webmin/mailboxes/xinha/images/ed_show_border.gif
+share/webmin/mailboxes/xinha/images/ed_splitblock.gif
+share/webmin/mailboxes/xinha/images/ed_splitcel.gif
+share/webmin/mailboxes/xinha/images/ed_undo.gif
+share/webmin/mailboxes/xinha/images/ed_word_cleaner.gif
+share/webmin/mailboxes/xinha/images/fr/bold.gif
+share/webmin/mailboxes/xinha/images/fr/strikethrough.gif
+share/webmin/mailboxes/xinha/images/fr/underline.gif
+share/webmin/mailboxes/xinha/images/fullscreen_maximize.gif
+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/tidy.gif
+share/webmin/mailboxes/xinha/images/toggle_borders.gif
+share/webmin/mailboxes/xinha/images/xinha_logo.gif
+share/webmin/mailboxes/xinha/lang/b5.js
+share/webmin/mailboxes/xinha/lang/ch.js
+share/webmin/mailboxes/xinha/lang/cz.js
+share/webmin/mailboxes/xinha/lang/da.js
+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/fa.js
+share/webmin/mailboxes/xinha/lang/fi.js
+share/webmin/mailboxes/xinha/lang/fr.js
+share/webmin/mailboxes/xinha/lang/gb.js
+share/webmin/mailboxes/xinha/lang/he.js
+share/webmin/mailboxes/xinha/lang/hu.js
+share/webmin/mailboxes/xinha/lang/it.js
+share/webmin/mailboxes/xinha/lang/ja.js
+share/webmin/mailboxes/xinha/lang/lt.js
+share/webmin/mailboxes/xinha/lang/lv.js
+share/webmin/mailboxes/xinha/lang/nb.js
+share/webmin/mailboxes/xinha/lang/nl.js
+share/webmin/mailboxes/xinha/lang/pl.js
+share/webmin/mailboxes/xinha/lang/pt_br.js
+share/webmin/mailboxes/xinha/lang/ro.js
+share/webmin/mailboxes/xinha/lang/ru.js
+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/vn.js
+share/webmin/mailboxes/xinha/license.txt
+share/webmin/mailboxes/xinha/modules/ColorPicker/ColorPicker.js
+share/webmin/mailboxes/xinha/modules/CreateLink/link.html
+share/webmin/mailboxes/xinha/modules/CreateLink/link.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/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/pl.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/InsertImage/insert_image.html
+share/webmin/mailboxes/xinha/modules/InsertImage/insert_image.js
+share/webmin/mailboxes/xinha/modules/InsertTable/insert_table.html
+share/webmin/mailboxes/xinha/modules/InsertTable/insert_table.js
+share/webmin/mailboxes/xinha/modules/InternetExplorer/InternetExplorer.js
+share/webmin/mailboxes/xinha/plugins/Abbreviation/abbr/de.js
+share/webmin/mailboxes/xinha/plugins/Abbreviation/abbr/en.js
+share/webmin/mailboxes/xinha/plugins/Abbreviation/abbreviation.css
+share/webmin/mailboxes/xinha/plugins/Abbreviation/abbreviation.js
+share/webmin/mailboxes/xinha/plugins/Abbreviation/img/ed_abbreviation.gif
+share/webmin/mailboxes/xinha/plugins/Abbreviation/lang/de.js
+share/webmin/mailboxes/xinha/plugins/Abbreviation/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/Abbreviation/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/Abbreviation/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/Abbreviation/popups/abbreviation.html
+share/webmin/mailboxes/xinha/plugins/BackgroundImage/background-image.js
+share/webmin/mailboxes/xinha/plugins/BackgroundImage/backgrounds/blufur.jpg
+share/webmin/mailboxes/xinha/plugins/BackgroundImage/backgrounds/palecnvs.jpg
+share/webmin/mailboxes/xinha/plugins/BackgroundImage/backgrounds/ppplcnvs.jpg
+share/webmin/mailboxes/xinha/plugins/BackgroundImage/backgrounds/thumbnails/blufur.jpg
+share/webmin/mailboxes/xinha/plugins/BackgroundImage/backgrounds/thumbnails/palecnvs.jpg
+share/webmin/mailboxes/xinha/plugins/BackgroundImage/backgrounds/thumbnails/ppplcnvs.jpg
+share/webmin/mailboxes/xinha/plugins/BackgroundImage/backgrounds/thumbnails/ylwsand.jpg
+share/webmin/mailboxes/xinha/plugins/BackgroundImage/backgrounds/ylwsand.jpg
+share/webmin/mailboxes/xinha/plugins/BackgroundImage/img/ed_bgimage.gif
+share/webmin/mailboxes/xinha/plugins/BackgroundImage/lang/de.js
+share/webmin/mailboxes/xinha/plugins/BackgroundImage/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/BackgroundImage/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/BackgroundImage/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/BackgroundImage/popups/bgimage.html
+share/webmin/mailboxes/xinha/plugins/CSS/css.js
+share/webmin/mailboxes/xinha/plugins/CharCounter/char-counter.js
+share/webmin/mailboxes/xinha/plugins/CharCounter/lang/de.js
+share/webmin/mailboxes/xinha/plugins/CharCounter/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/CharCounter/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/CharCounter/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/CharacterMap/CharacterMap.css
+share/webmin/mailboxes/xinha/plugins/CharacterMap/character-map.js
+share/webmin/mailboxes/xinha/plugins/CharacterMap/img/ed_charmap.gif
+share/webmin/mailboxes/xinha/plugins/CharacterMap/lang/de.js
+share/webmin/mailboxes/xinha/plugins/CharacterMap/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/CharacterMap/lang/it.js
+share/webmin/mailboxes/xinha/plugins/CharacterMap/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/CharacterMap/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/CharacterMap/lang/nl.js
+share/webmin/mailboxes/xinha/plugins/CharacterMap/lang/ru.js
+share/webmin/mailboxes/xinha/plugins/CharacterMap/lang/sv.js
+share/webmin/mailboxes/xinha/plugins/CharacterMap/popups/select_character.html
+share/webmin/mailboxes/xinha/plugins/ClientsideSpellcheck/clientside-spellcheck.js
+share/webmin/mailboxes/xinha/plugins/ClientsideSpellcheck/img/clientside-spellcheck.gif
+share/webmin/mailboxes/xinha/plugins/ClientsideSpellcheck/img/he-spell-check.gif
+share/webmin/mailboxes/xinha/plugins/ClientsideSpellcheck/lang/de.js
+share/webmin/mailboxes/xinha/plugins/ClientsideSpellcheck/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/ClientsideSpellcheck/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/ContextMenu/1.pl
+share/webmin/mailboxes/xinha/plugins/ContextMenu/context-menu.js
+share/webmin/mailboxes/xinha/plugins/ContextMenu/lang/de.js
+share/webmin/mailboxes/xinha/plugins/ContextMenu/lang/el.js
+share/webmin/mailboxes/xinha/plugins/ContextMenu/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/ContextMenu/lang/he.js
+share/webmin/mailboxes/xinha/plugins/ContextMenu/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/ContextMenu/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/ContextMenu/lang/nl.js
+share/webmin/mailboxes/xinha/plugins/ContextMenu/lang/pl.js
+share/webmin/mailboxes/xinha/plugins/ContextMenu/lang/sv.js
+share/webmin/mailboxes/xinha/plugins/ContextMenu/menu.css
+share/webmin/mailboxes/xinha/plugins/DefinitionList/definition-list.css
+share/webmin/mailboxes/xinha/plugins/DefinitionList/definition-list.js
+share/webmin/mailboxes/xinha/plugins/DefinitionList/img/ed_dd.gif
+share/webmin/mailboxes/xinha/plugins/DefinitionList/img/ed_dl.gif
+share/webmin/mailboxes/xinha/plugins/DefinitionList/img/ed_dt.gif
+share/webmin/mailboxes/xinha/plugins/DefinitionList/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/DoubleClick/double-click.js
+share/webmin/mailboxes/xinha/plugins/DynamicCSS/dynamiccss.js
+share/webmin/mailboxes/xinha/plugins/DynamicCSS/lang/de.js
+share/webmin/mailboxes/xinha/plugins/DynamicCSS/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/DynamicCSS/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/DynamicCSS/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/DynamicCSS/lang/nl.js
+share/webmin/mailboxes/xinha/plugins/EditTag/edit-tag.js
+share/webmin/mailboxes/xinha/plugins/EditTag/img/ed_edit_tag.gif
+share/webmin/mailboxes/xinha/plugins/EditTag/lang/de.js
+share/webmin/mailboxes/xinha/plugins/EditTag/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/EditTag/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/EditTag/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/EditTag/popups/edit_tag.html
+share/webmin/mailboxes/xinha/plugins/Equation/ASCIIMathML.js
+share/webmin/mailboxes/xinha/plugins/Equation/equation.js
+share/webmin/mailboxes/xinha/plugins/Equation/example.html
+share/webmin/mailboxes/xinha/plugins/Equation/img/abs_value.gif
+share/webmin/mailboxes/xinha/plugins/Equation/img/diag_fraction.gif
+share/webmin/mailboxes/xinha/plugins/Equation/img/divide.gif
+share/webmin/mailboxes/xinha/plugins/Equation/img/dsp_greater_equal.gif
+share/webmin/mailboxes/xinha/plugins/Equation/img/dsp_less_equal.gif
+share/webmin/mailboxes/xinha/plugins/Equation/img/dsp_notequal.gif
+share/webmin/mailboxes/xinha/plugins/Equation/img/equation.gif
+share/webmin/mailboxes/xinha/plugins/Equation/img/equation.old.gif
+share/webmin/mailboxes/xinha/plugins/Equation/img/greater_equal_than.gif
+share/webmin/mailboxes/xinha/plugins/Equation/img/hor_fraction.gif
+share/webmin/mailboxes/xinha/plugins/Equation/img/less_equal_than.gif
+share/webmin/mailboxes/xinha/plugins/Equation/img/mul.gif
+share/webmin/mailboxes/xinha/plugins/Equation/img/notequal.gif
+share/webmin/mailboxes/xinha/plugins/Equation/img/parenthesis.gif
+share/webmin/mailboxes/xinha/plugins/Equation/img/root.gif
+share/webmin/mailboxes/xinha/plugins/Equation/img/square_root.gif
+share/webmin/mailboxes/xinha/plugins/Equation/lang/de.js
+share/webmin/mailboxes/xinha/plugins/Equation/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/Equation/popups/dialog.html
+share/webmin/mailboxes/xinha/plugins/Equation/readme.txt
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/Classes/ExtendedFileManager.php
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/Readme.txt
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/assets/EditorContent.js
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/assets/ImageEditor.css
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/assets/dialog.js
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/assets/editor.css
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/assets/editor.js
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/assets/editorFrame.css
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/assets/editorFrame.js
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/assets/hover.htc
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/assets/imagelist.css
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/assets/images.js
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/assets/manager.css
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/assets/manager.js
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/assets/popup.js
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/assets/slider.js
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/assets/wz_jsgraphics.js
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/backend.php
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/config.inc.php
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/demo_images/.htaccess
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/demo_images/bikerpeep.jpg
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/demo_images/linux/linux.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/demo_images/wesnoth078.jpg
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/editor.php
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/editorFrame.php
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/extended-file-manager.js
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/def.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/def_small.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/doc.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/doc_small.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/fla.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/fla_small.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/folder.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/folder_small.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/gif_small.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/gz.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/gz_small.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/html.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/html_small.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/jpg_small.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/js.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/js_small.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/mov.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/mov_small.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/pdf.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/pdf_small.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/php.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/php_small.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/png_small.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/ppt.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/ppt_small.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/rar.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/rar_small.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/txt.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/txt_small.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/xls.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/xls_small.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/zip.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons/zip_small.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/images.php
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/1x1_transparent.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/2x2.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/2x2_w.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/btnFolderNew.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/btnFolderNew1.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/btnFolderUp.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/btnFolderUp1.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/btn_cancel.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/btn_ok.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/crop.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/default.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/div.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/dots.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/ed_linkfile.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/ed_linkfile1.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/edit_active.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/edit_copy.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/edit_cut.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/edit_paste.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/edit_pencil.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/edit_rename.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/edit_trash.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/folder.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/hand.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/islocked2.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/locked.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/measure.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/noimages.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/rotate.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/save.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/scale.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/spacer.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/t_black.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/t_white.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/unlocked.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/unlocked2.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img/unlocked_empty.gif
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/lang/de.js
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/lang/nl.js
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/lang/pl.js
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/manager.php
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/resizer.php
+share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/thumbs.php
+share/webmin/mailboxes/xinha/plugins/Filter/filter.js
+share/webmin/mailboxes/xinha/plugins/Filter/filters/paragraph.js
+share/webmin/mailboxes/xinha/plugins/Filter/filters/word.js
+share/webmin/mailboxes/xinha/plugins/Filter/img/ed_filter.gif
+share/webmin/mailboxes/xinha/plugins/Filter/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/FindReplace/find-replace.js
+share/webmin/mailboxes/xinha/plugins/FindReplace/fr_engine.js
+share/webmin/mailboxes/xinha/plugins/FindReplace/img/ed_find.gif
+share/webmin/mailboxes/xinha/plugins/FindReplace/lang/de.js
+share/webmin/mailboxes/xinha/plugins/FindReplace/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/FindReplace/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/FindReplace/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/FindReplace/lang/pl.js
+share/webmin/mailboxes/xinha/plugins/FindReplace/lang/pt_br.js
+share/webmin/mailboxes/xinha/plugins/FindReplace/lang/ru.js
+share/webmin/mailboxes/xinha/plugins/FindReplace/lang/sv.js
+share/webmin/mailboxes/xinha/plugins/FindReplace/popups/find_replace.html
+share/webmin/mailboxes/xinha/plugins/FormOperations/README
+share/webmin/mailboxes/xinha/plugins/FormOperations/default_form.html
+share/webmin/mailboxes/xinha/plugins/FormOperations/form-operations.js
+share/webmin/mailboxes/xinha/plugins/FormOperations/formmail.php
+share/webmin/mailboxes/xinha/plugins/FormOperations/iframe.css
+share/webmin/mailboxes/xinha/plugins/FormOperations/img/buttons.gif
+share/webmin/mailboxes/xinha/plugins/FormOperations/lang/de.js
+share/webmin/mailboxes/xinha/plugins/FormOperations/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/FormOperations/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/FormOperations/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/FormOperations/panel.html
+share/webmin/mailboxes/xinha/plugins/Forms/forms.css
+share/webmin/mailboxes/xinha/plugins/Forms/forms.js
+share/webmin/mailboxes/xinha/plugins/Forms/img/ed_button.gif
+share/webmin/mailboxes/xinha/plugins/Forms/img/ed_checkbox.gif
+share/webmin/mailboxes/xinha/plugins/Forms/img/ed_fieldset.gif
+share/webmin/mailboxes/xinha/plugins/Forms/img/ed_file.gif
+share/webmin/mailboxes/xinha/plugins/Forms/img/ed_form.gif
+share/webmin/mailboxes/xinha/plugins/Forms/img/ed_hidden.gif
+share/webmin/mailboxes/xinha/plugins/Forms/img/ed_image.gif
+share/webmin/mailboxes/xinha/plugins/Forms/img/ed_label.gif
+share/webmin/mailboxes/xinha/plugins/Forms/img/ed_password.gif
+share/webmin/mailboxes/xinha/plugins/Forms/img/ed_radio.gif
+share/webmin/mailboxes/xinha/plugins/Forms/img/ed_reset.gif
+share/webmin/mailboxes/xinha/plugins/Forms/img/ed_select.gif
+share/webmin/mailboxes/xinha/plugins/Forms/img/ed_submit.gif
+share/webmin/mailboxes/xinha/plugins/Forms/img/ed_text.gif
+share/webmin/mailboxes/xinha/plugins/Forms/img/ed_textarea.gif
+share/webmin/mailboxes/xinha/plugins/Forms/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/Forms/popups/fieldset.html
+share/webmin/mailboxes/xinha/plugins/Forms/popups/form.html
+share/webmin/mailboxes/xinha/plugins/Forms/popups/input.html
+share/webmin/mailboxes/xinha/plugins/Forms/popups/label.html
+share/webmin/mailboxes/xinha/plugins/Forms/popups/select.html
+share/webmin/mailboxes/xinha/plugins/Forms/popups/textarea.html
+share/webmin/mailboxes/xinha/plugins/FullPage/full-page.js
+share/webmin/mailboxes/xinha/plugins/FullPage/img/docprop.gif
+share/webmin/mailboxes/xinha/plugins/FullPage/lang/de.js
+share/webmin/mailboxes/xinha/plugins/FullPage/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/FullPage/lang/he.js
+share/webmin/mailboxes/xinha/plugins/FullPage/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/FullPage/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/FullPage/lang/nl.js
+share/webmin/mailboxes/xinha/plugins/FullPage/lang/pl.js
+share/webmin/mailboxes/xinha/plugins/FullPage/lang/ro.js
+share/webmin/mailboxes/xinha/plugins/FullPage/popups/docprop.html
+share/webmin/mailboxes/xinha/plugins/GetHtml/get-html.js
+share/webmin/mailboxes/xinha/plugins/HorizontalRule/horizontal-rule.js
+share/webmin/mailboxes/xinha/plugins/HorizontalRule/lang/de.js
+share/webmin/mailboxes/xinha/plugins/HorizontalRule/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/HorizontalRule/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/HorizontalRule/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/HorizontalRule/popups/edit_horizontal_rule.html
+share/webmin/mailboxes/xinha/plugins/HtmlEntities/Entities.js
+share/webmin/mailboxes/xinha/plugins/HtmlEntities/html-entities.js
+share/webmin/mailboxes/xinha/plugins/HtmlEntities/iso-8859-1.js
+share/webmin/mailboxes/xinha/plugins/HtmlTidy/README
+share/webmin/mailboxes/xinha/plugins/HtmlTidy/html-tidy-config.cfg
+share/webmin/mailboxes/xinha/plugins/HtmlTidy/html-tidy-logic.php
+share/webmin/mailboxes/xinha/plugins/HtmlTidy/html-tidy.js
+share/webmin/mailboxes/xinha/plugins/HtmlTidy/img/html-tidy.gif
+share/webmin/mailboxes/xinha/plugins/HtmlTidy/lang/de.js
+share/webmin/mailboxes/xinha/plugins/HtmlTidy/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/HtmlTidy/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/HtmlTidy/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/HtmlTidy/lang/nl.js
+share/webmin/mailboxes/xinha/plugins/ImageManager/Classes/Files.php
+share/webmin/mailboxes/xinha/plugins/ImageManager/Classes/GD.php
+share/webmin/mailboxes/xinha/plugins/ImageManager/Classes/IM.php
+share/webmin/mailboxes/xinha/plugins/ImageManager/Classes/ImageEditor.php
+share/webmin/mailboxes/xinha/plugins/ImageManager/Classes/ImageManager.php
+share/webmin/mailboxes/xinha/plugins/ImageManager/Classes/NetPBM.php
+share/webmin/mailboxes/xinha/plugins/ImageManager/Classes/Thumbnail.php
+share/webmin/mailboxes/xinha/plugins/ImageManager/Classes/Transform.php
+share/webmin/mailboxes/xinha/plugins/ImageManager/README.txt
+share/webmin/mailboxes/xinha/plugins/ImageManager/assets/EditorContent.js
+share/webmin/mailboxes/xinha/plugins/ImageManager/assets/ImageEditor.css
+share/webmin/mailboxes/xinha/plugins/ImageManager/assets/dialog.js
+share/webmin/mailboxes/xinha/plugins/ImageManager/assets/editor.css
+share/webmin/mailboxes/xinha/plugins/ImageManager/assets/editor.js
+share/webmin/mailboxes/xinha/plugins/ImageManager/assets/editorFrame.css
+share/webmin/mailboxes/xinha/plugins/ImageManager/assets/editorFrame.js
+share/webmin/mailboxes/xinha/plugins/ImageManager/assets/hover.htc
+share/webmin/mailboxes/xinha/plugins/ImageManager/assets/imagelist.css
+share/webmin/mailboxes/xinha/plugins/ImageManager/assets/images.js
+share/webmin/mailboxes/xinha/plugins/ImageManager/assets/manager.css
+share/webmin/mailboxes/xinha/plugins/ImageManager/assets/manager.js
+share/webmin/mailboxes/xinha/plugins/ImageManager/assets/popup.js
+share/webmin/mailboxes/xinha/plugins/ImageManager/assets/slider.js
+share/webmin/mailboxes/xinha/plugins/ImageManager/assets/wz_jsgraphics.js
+share/webmin/mailboxes/xinha/plugins/ImageManager/backend.php
+share/webmin/mailboxes/xinha/plugins/ImageManager/config.inc.php
+share/webmin/mailboxes/xinha/plugins/ImageManager/ddt.php
+share/webmin/mailboxes/xinha/plugins/ImageManager/demo_images/bikerpeep.jpg
+share/webmin/mailboxes/xinha/plugins/ImageManager/demo_images/linux/linux.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/demo_images/wesnoth078.jpg
+share/webmin/mailboxes/xinha/plugins/ImageManager/editor.php
+share/webmin/mailboxes/xinha/plugins/ImageManager/editorFrame.php
+share/webmin/mailboxes/xinha/plugins/ImageManager/image-manager.js
+share/webmin/mailboxes/xinha/plugins/ImageManager/images.php
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/2x2.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/2x2_w.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/btnFolderNew.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/btnFolderUp.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/btn_cancel.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/btn_ok.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/crop.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/default.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/div.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/dots.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/edit_active.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/edit_pencil.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/edit_trash.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/folder.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/hand.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/islocked2.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/locked.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/measure.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/noimages.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/rotate.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/save.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/scale.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/spacer.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/t_black.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/t_white.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/unlocked.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/img/unlocked2.gif
+share/webmin/mailboxes/xinha/plugins/ImageManager/lang/de.js
+share/webmin/mailboxes/xinha/plugins/ImageManager/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/ImageManager/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/ImageManager/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/ImageManager/lang/pl.js
+share/webmin/mailboxes/xinha/plugins/ImageManager/lang/ru.js
+share/webmin/mailboxes/xinha/plugins/ImageManager/lang/sv.js
+share/webmin/mailboxes/xinha/plugins/ImageManager/manager.php
+share/webmin/mailboxes/xinha/plugins/ImageManager/resizer.php
+share/webmin/mailboxes/xinha/plugins/ImageManager/thumbs.php
+share/webmin/mailboxes/xinha/plugins/InsertAnchor/img/insert-anchor.gif
+share/webmin/mailboxes/xinha/plugins/InsertAnchor/img/placeholder.gif
+share/webmin/mailboxes/xinha/plugins/InsertAnchor/insert-anchor.css
+share/webmin/mailboxes/xinha/plugins/InsertAnchor/insert-anchor.js
+share/webmin/mailboxes/xinha/plugins/InsertAnchor/lang/de.js
+share/webmin/mailboxes/xinha/plugins/InsertAnchor/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/InsertAnchor/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/InsertAnchor/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/InsertAnchor/lang/nl.js
+share/webmin/mailboxes/xinha/plugins/InsertAnchor/lang/pl.js
+share/webmin/mailboxes/xinha/plugins/InsertAnchor/popups/insert_anchor.html
+share/webmin/mailboxes/xinha/plugins/InsertMarquee/img/ed_marquee.gif
+share/webmin/mailboxes/xinha/plugins/InsertMarquee/insert-marquee.js
+share/webmin/mailboxes/xinha/plugins/InsertMarquee/lang/de.js
+share/webmin/mailboxes/xinha/plugins/InsertMarquee/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/InsertMarquee/lang/it.js
+share/webmin/mailboxes/xinha/plugins/InsertMarquee/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/InsertMarquee/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/InsertMarquee/popups/insert_marquee.html
+share/webmin/mailboxes/xinha/plugins/InsertPagebreak/img/pagebreak.gif
+share/webmin/mailboxes/xinha/plugins/InsertPagebreak/insert-pagebreak.js
+share/webmin/mailboxes/xinha/plugins/InsertPagebreak/lang/de.js
+share/webmin/mailboxes/xinha/plugins/InsertPagebreak/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/InsertPagebreak/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/InsertPagebreak/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/InsertPicture/InsertPicture.php
+share/webmin/mailboxes/xinha/plugins/InsertPicture/demo_pictures/bikerpeep.jpg
+share/webmin/mailboxes/xinha/plugins/InsertPicture/demo_pictures/wesnoth078.jpg
+share/webmin/mailboxes/xinha/plugins/InsertPicture/img/btn_open.gif
+share/webmin/mailboxes/xinha/plugins/InsertPicture/img/nopic.gif
+share/webmin/mailboxes/xinha/plugins/InsertPicture/insert-picture.js
+share/webmin/mailboxes/xinha/plugins/InsertPicture/lang/de.js
+share/webmin/mailboxes/xinha/plugins/InsertPicture/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/InsertPicture/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/InsertPicture/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/InsertPicture/lang/sv.js
+share/webmin/mailboxes/xinha/plugins/InsertPicture/viewpicture.html
+share/webmin/mailboxes/xinha/plugins/InsertSnippet/InsertSnippet.css
+share/webmin/mailboxes/xinha/plugins/InsertSnippet/demosnippets.js
+share/webmin/mailboxes/xinha/plugins/InsertSnippet/img/ed_snippet.gif
+share/webmin/mailboxes/xinha/plugins/InsertSnippet/insert-snippet.js
+share/webmin/mailboxes/xinha/plugins/InsertSnippet/lang/de.js
+share/webmin/mailboxes/xinha/plugins/InsertSnippet/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/InsertSnippet/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/InsertSnippet/popups/insertsnippet.html
+share/webmin/mailboxes/xinha/plugins/InsertSnippet/readme.html
+share/webmin/mailboxes/xinha/plugins/InsertSnippet/snippets.html
+share/webmin/mailboxes/xinha/plugins/InsertSnippet/snippets.php
+share/webmin/mailboxes/xinha/plugins/InsertWords/insert-words.js
+share/webmin/mailboxes/xinha/plugins/LangMarks/img/el.gif
+share/webmin/mailboxes/xinha/plugins/LangMarks/img/en.gif
+share/webmin/mailboxes/xinha/plugins/LangMarks/img/fr.gif
+share/webmin/mailboxes/xinha/plugins/LangMarks/img/la.gif
+share/webmin/mailboxes/xinha/plugins/LangMarks/lang-marks.css
+share/webmin/mailboxes/xinha/plugins/LangMarks/lang-marks.js
+share/webmin/mailboxes/xinha/plugins/LangMarks/lang/de.js
+share/webmin/mailboxes/xinha/plugins/LangMarks/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/LangMarks/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/LangMarks/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/LangMarks/lang/nl.js
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/api.html
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/dtree.css
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/dtree.js
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/example01.html
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/base.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/cd.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/copy.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/empty.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/folder.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/folderopen.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/globe.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/imgfolder.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/join.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/joinbottom.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/line.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/minus.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/minusbottom.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/move.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/musicfolder.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/nolines_minus.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/nolines_plus.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/offline.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/offline.png
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/page.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/plus.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/plusbottom.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/question.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dTree/img/trash.gif
+share/webmin/mailboxes/xinha/plugins/Linker/dialog.html
+share/webmin/mailboxes/xinha/plugins/Linker/lang/de.js
+share/webmin/mailboxes/xinha/plugins/Linker/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/Linker/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/Linker/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/Linker/lang/pl.js
+share/webmin/mailboxes/xinha/plugins/Linker/linker.js
+share/webmin/mailboxes/xinha/plugins/Linker/scan.php
+share/webmin/mailboxes/xinha/plugins/ListType/ListType.css
+share/webmin/mailboxes/xinha/plugins/ListType/img/circle.png
+share/webmin/mailboxes/xinha/plugins/ListType/img/decimal.png
+share/webmin/mailboxes/xinha/plugins/ListType/img/disc.png
+share/webmin/mailboxes/xinha/plugins/ListType/img/lower-alpha.png
+share/webmin/mailboxes/xinha/plugins/ListType/img/lower-roman.png
+share/webmin/mailboxes/xinha/plugins/ListType/img/none.png
+share/webmin/mailboxes/xinha/plugins/ListType/img/square.png
+share/webmin/mailboxes/xinha/plugins/ListType/img/upper-alpha.png
+share/webmin/mailboxes/xinha/plugins/ListType/img/upper-roman.png
+share/webmin/mailboxes/xinha/plugins/ListType/lang/de.js
+share/webmin/mailboxes/xinha/plugins/ListType/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/ListType/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/ListType/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/ListType/lang/nl.js
+share/webmin/mailboxes/xinha/plugins/ListType/lang/pl.js
+share/webmin/mailboxes/xinha/plugins/ListType/lang/ru.js
+share/webmin/mailboxes/xinha/plugins/ListType/lang/sv.js
+share/webmin/mailboxes/xinha/plugins/ListType/list-type.js
+share/webmin/mailboxes/xinha/plugins/NoteServer/img/note.gif
+share/webmin/mailboxes/xinha/plugins/NoteServer/lang/de.js
+share/webmin/mailboxes/xinha/plugins/NoteServer/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/NoteServer/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/NoteServer/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/NoteServer/note-server.js
+share/webmin/mailboxes/xinha/plugins/NoteServer/popups/codenote.html
+share/webmin/mailboxes/xinha/plugins/PasteText/img/ed_paste_text.gif
+share/webmin/mailboxes/xinha/plugins/PasteText/lang/de.js
+share/webmin/mailboxes/xinha/plugins/PasteText/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/PasteText/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/PasteText/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/PasteText/lang/pl.js
+share/webmin/mailboxes/xinha/plugins/PasteText/paste-text.js
+share/webmin/mailboxes/xinha/plugins/PasteText/popups/paste_text.html
+share/webmin/mailboxes/xinha/plugins/QuickTag/img/ed_quicktag.gif
+share/webmin/mailboxes/xinha/plugins/QuickTag/lang/de.js
+share/webmin/mailboxes/xinha/plugins/QuickTag/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/QuickTag/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/QuickTag/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/QuickTag/lang/pl.js
+share/webmin/mailboxes/xinha/plugins/QuickTag/lang/pt_br.js
+share/webmin/mailboxes/xinha/plugins/QuickTag/popups/quicktag.html
+share/webmin/mailboxes/xinha/plugins/QuickTag/quick-tag.js
+share/webmin/mailboxes/xinha/plugins/QuickTag/tag-lib.js
+share/webmin/mailboxes/xinha/plugins/SaveSubmit/README.txt
+share/webmin/mailboxes/xinha/plugins/SaveSubmit/img/ed_save_green.gif
+share/webmin/mailboxes/xinha/plugins/SaveSubmit/img/ed_save_red.gif
+share/webmin/mailboxes/xinha/plugins/SaveSubmit/lang/de.js
+share/webmin/mailboxes/xinha/plugins/SaveSubmit/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/SaveSubmit/lang/ru.js
+share/webmin/mailboxes/xinha/plugins/SaveSubmit/save-submit.js
+share/webmin/mailboxes/xinha/plugins/SetId/img/placeholder.gif
+share/webmin/mailboxes/xinha/plugins/SetId/img/set-id.gif
+share/webmin/mailboxes/xinha/plugins/SetId/lang/de.js
+share/webmin/mailboxes/xinha/plugins/SetId/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/SetId/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/SetId/popups/set_id.html
+share/webmin/mailboxes/xinha/plugins/SetId/set-id.css
+share/webmin/mailboxes/xinha/plugins/SetId/set-id.js
+share/webmin/mailboxes/xinha/plugins/SmartReplace/img/smartquotes.gif
+share/webmin/mailboxes/xinha/plugins/SmartReplace/lang/de.js
+share/webmin/mailboxes/xinha/plugins/SmartReplace/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/SmartReplace/popups/dialog.html
+share/webmin/mailboxes/xinha/plugins/SmartReplace/readme.txt
+share/webmin/mailboxes/xinha/plugins/SmartReplace/smart-replace.js
+share/webmin/mailboxes/xinha/plugins/SpellChecker/README
+share/webmin/mailboxes/xinha/plugins/SpellChecker/aspell_setup.php
+share/webmin/mailboxes/xinha/plugins/SpellChecker/img/he-spell-check.gif
+share/webmin/mailboxes/xinha/plugins/SpellChecker/img/spell-check.gif
+share/webmin/mailboxes/xinha/plugins/SpellChecker/lang/cz.js
+share/webmin/mailboxes/xinha/plugins/SpellChecker/lang/da.js
+share/webmin/mailboxes/xinha/plugins/SpellChecker/lang/de.js
+share/webmin/mailboxes/xinha/plugins/SpellChecker/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/SpellChecker/lang/he.js
+share/webmin/mailboxes/xinha/plugins/SpellChecker/lang/hu.js
+share/webmin/mailboxes/xinha/plugins/SpellChecker/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/SpellChecker/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/SpellChecker/lang/nl.js
+share/webmin/mailboxes/xinha/plugins/SpellChecker/lang/ro.js
+share/webmin/mailboxes/xinha/plugins/SpellChecker/readme-tech.html
+share/webmin/mailboxes/xinha/plugins/SpellChecker/spell-check-logic.php
+share/webmin/mailboxes/xinha/plugins/SpellChecker/spell-check-savedicts.php
+share/webmin/mailboxes/xinha/plugins/SpellChecker/spell-check-style.css
+share/webmin/mailboxes/xinha/plugins/SpellChecker/spell-check-ui.html
+share/webmin/mailboxes/xinha/plugins/SpellChecker/spell-check-ui.js
+share/webmin/mailboxes/xinha/plugins/SpellChecker/spell-checker.js
+share/webmin/mailboxes/xinha/plugins/Stylist/lang/de.js
+share/webmin/mailboxes/xinha/plugins/Stylist/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/Stylist/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/Stylist/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/Stylist/lang/pl.js
+share/webmin/mailboxes/xinha/plugins/Stylist/stylist.js
+share/webmin/mailboxes/xinha/plugins/SuperClean/dialog.html
+share/webmin/mailboxes/xinha/plugins/SuperClean/filters/paragraph.js
+share/webmin/mailboxes/xinha/plugins/SuperClean/filters/word.js
+share/webmin/mailboxes/xinha/plugins/SuperClean/img/ed_superclean.gif
+share/webmin/mailboxes/xinha/plugins/SuperClean/lang/de.js
+share/webmin/mailboxes/xinha/plugins/SuperClean/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/SuperClean/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/SuperClean/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/SuperClean/super-clean.js
+share/webmin/mailboxes/xinha/plugins/SuperClean/tidy.php
+share/webmin/mailboxes/xinha/plugins/TableOperations/img/cell-delete.gif
+share/webmin/mailboxes/xinha/plugins/TableOperations/img/cell-insert-after.gif
+share/webmin/mailboxes/xinha/plugins/TableOperations/img/cell-insert-before.gif
+share/webmin/mailboxes/xinha/plugins/TableOperations/img/cell-merge.gif
+share/webmin/mailboxes/xinha/plugins/TableOperations/img/cell-prop.gif
+share/webmin/mailboxes/xinha/plugins/TableOperations/img/cell-split.gif
+share/webmin/mailboxes/xinha/plugins/TableOperations/img/col-delete.gif
+share/webmin/mailboxes/xinha/plugins/TableOperations/img/col-insert-after.gif
+share/webmin/mailboxes/xinha/plugins/TableOperations/img/col-insert-before.gif
+share/webmin/mailboxes/xinha/plugins/TableOperations/img/col-split.gif
+share/webmin/mailboxes/xinha/plugins/TableOperations/img/row-delete.gif
+share/webmin/mailboxes/xinha/plugins/TableOperations/img/row-insert-above.gif
+share/webmin/mailboxes/xinha/plugins/TableOperations/img/row-insert-under.gif
+share/webmin/mailboxes/xinha/plugins/TableOperations/img/row-prop.gif
+share/webmin/mailboxes/xinha/plugins/TableOperations/img/row-split.gif
+share/webmin/mailboxes/xinha/plugins/TableOperations/img/table-prop.gif
+share/webmin/mailboxes/xinha/plugins/TableOperations/lang/cz.js
+share/webmin/mailboxes/xinha/plugins/TableOperations/lang/da.js
+share/webmin/mailboxes/xinha/plugins/TableOperations/lang/de.js
+share/webmin/mailboxes/xinha/plugins/TableOperations/lang/el.js
+share/webmin/mailboxes/xinha/plugins/TableOperations/lang/fi.js
+share/webmin/mailboxes/xinha/plugins/TableOperations/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/TableOperations/lang/he.js
+share/webmin/mailboxes/xinha/plugins/TableOperations/lang/it.js
+share/webmin/mailboxes/xinha/plugins/TableOperations/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/TableOperations/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/TableOperations/lang/nl.js
+share/webmin/mailboxes/xinha/plugins/TableOperations/lang/pl.js
+share/webmin/mailboxes/xinha/plugins/TableOperations/lang/ro.js
+share/webmin/mailboxes/xinha/plugins/TableOperations/lang/ru.js
+share/webmin/mailboxes/xinha/plugins/TableOperations/lang/sv.js
+share/webmin/mailboxes/xinha/plugins/TableOperations/table-operations.js
+share/webmin/mailboxes/xinha/plugins/Template/img/ed_template.gif
+share/webmin/mailboxes/xinha/plugins/Template/img/layout_01.gif
+share/webmin/mailboxes/xinha/plugins/Template/img/layout_02.gif
+share/webmin/mailboxes/xinha/plugins/Template/img/layout_03.gif
+share/webmin/mailboxes/xinha/plugins/Template/lang/de.js
+share/webmin/mailboxes/xinha/plugins/Template/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/Template/lang/it.js
+share/webmin/mailboxes/xinha/plugins/Template/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/Template/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/Template/popups/template.html
+share/webmin/mailboxes/xinha/plugins/Template/template.css
+share/webmin/mailboxes/xinha/plugins/Template/template.js
+share/webmin/mailboxes/xinha/plugins/UnFormat/img/unformat.gif
+share/webmin/mailboxes/xinha/plugins/UnFormat/lang/de.js
+share/webmin/mailboxes/xinha/plugins/UnFormat/lang/fr.js
+share/webmin/mailboxes/xinha/plugins/UnFormat/lang/ja.js
+share/webmin/mailboxes/xinha/plugins/UnFormat/lang/nb.js
+share/webmin/mailboxes/xinha/plugins/UnFormat/lang/nl.js
+share/webmin/mailboxes/xinha/plugins/UnFormat/popups/unformat.html
+share/webmin/mailboxes/xinha/plugins/UnFormat/un-format.js
+share/webmin/mailboxes/xinha/popups/about.html
+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/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
+@dirrm share/webmin/mailboxes/xinha/skins/xp-green
+@dirrm share/webmin/mailboxes/xinha/skins/xp-blue
+@dirrm share/webmin/mailboxes/xinha/skins/titan
+@dirrm share/webmin/mailboxes/xinha/skins/silva
+@dirrm share/webmin/mailboxes/xinha/skins/inditreuse
+@dirrm share/webmin/mailboxes/xinha/skins/green-look
+@dirrm share/webmin/mailboxes/xinha/skins/blue-metallic
+@dirrm share/webmin/mailboxes/xinha/skins/blue-look
+@dirrm share/webmin/mailboxes/xinha/skins
+@dirrm share/webmin/mailboxes/xinha/popups
+@dirrm share/webmin/mailboxes/xinha/plugins/UnFormat/popups
+@dirrm share/webmin/mailboxes/xinha/plugins/UnFormat/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/UnFormat/img
+@dirrm share/webmin/mailboxes/xinha/plugins/UnFormat
+@dirrm share/webmin/mailboxes/xinha/plugins/Template/popups
+@dirrm share/webmin/mailboxes/xinha/plugins/Template/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/Template/img
+@dirrm share/webmin/mailboxes/xinha/plugins/Template
+@dirrm share/webmin/mailboxes/xinha/plugins/TableOperations/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/TableOperations/img
+@dirrm share/webmin/mailboxes/xinha/plugins/TableOperations
+@dirrm share/webmin/mailboxes/xinha/plugins/SuperClean/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/SuperClean/img
+@dirrm share/webmin/mailboxes/xinha/plugins/SuperClean/filters
+@dirrm share/webmin/mailboxes/xinha/plugins/SuperClean
+@dirrm share/webmin/mailboxes/xinha/plugins/Stylist/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/Stylist
+@dirrm share/webmin/mailboxes/xinha/plugins/SpellChecker/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/SpellChecker/img
+@dirrm share/webmin/mailboxes/xinha/plugins/SpellChecker
+@dirrm share/webmin/mailboxes/xinha/plugins/SmartReplace/popups
+@dirrm share/webmin/mailboxes/xinha/plugins/SmartReplace/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/SmartReplace/img
+@dirrm share/webmin/mailboxes/xinha/plugins/SmartReplace
+@dirrm share/webmin/mailboxes/xinha/plugins/SetId/popups
+@dirrm share/webmin/mailboxes/xinha/plugins/SetId/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/SetId/img
+@dirrm share/webmin/mailboxes/xinha/plugins/SetId
+@dirrm share/webmin/mailboxes/xinha/plugins/SaveSubmit/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/SaveSubmit/img
+@dirrm share/webmin/mailboxes/xinha/plugins/SaveSubmit
+@dirrm share/webmin/mailboxes/xinha/plugins/QuickTag/popups
+@dirrm share/webmin/mailboxes/xinha/plugins/QuickTag/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/QuickTag/img
+@dirrm share/webmin/mailboxes/xinha/plugins/QuickTag
+@dirrm share/webmin/mailboxes/xinha/plugins/PasteText/popups
+@dirrm share/webmin/mailboxes/xinha/plugins/PasteText/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/PasteText/img
+@dirrm share/webmin/mailboxes/xinha/plugins/PasteText
+@dirrm share/webmin/mailboxes/xinha/plugins/NoteServer/popups
+@dirrm share/webmin/mailboxes/xinha/plugins/NoteServer/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/NoteServer/img
+@dirrm share/webmin/mailboxes/xinha/plugins/NoteServer
+@dirrm share/webmin/mailboxes/xinha/plugins/ListType/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/ListType/img
+@dirrm share/webmin/mailboxes/xinha/plugins/ListType
+@dirrm share/webmin/mailboxes/xinha/plugins/Linker/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/Linker/dTree/img
+@dirrm share/webmin/mailboxes/xinha/plugins/Linker/dTree
+@dirrm share/webmin/mailboxes/xinha/plugins/Linker
+@dirrm share/webmin/mailboxes/xinha/plugins/LangMarks/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/LangMarks/img
+@dirrm share/webmin/mailboxes/xinha/plugins/LangMarks
+@dirrm share/webmin/mailboxes/xinha/plugins/InsertWords
+@dirrm share/webmin/mailboxes/xinha/plugins/InsertSnippet/popups
+@dirrm share/webmin/mailboxes/xinha/plugins/InsertSnippet/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/InsertSnippet/img
+@dirrm share/webmin/mailboxes/xinha/plugins/InsertSnippet
+@dirrm share/webmin/mailboxes/xinha/plugins/InsertPicture/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/InsertPicture/img
+@dirrm share/webmin/mailboxes/xinha/plugins/InsertPicture/demo_pictures
+@dirrm share/webmin/mailboxes/xinha/plugins/InsertPicture
+@dirrm share/webmin/mailboxes/xinha/plugins/InsertPagebreak/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/InsertPagebreak/img
+@dirrm share/webmin/mailboxes/xinha/plugins/InsertPagebreak
+@dirrm share/webmin/mailboxes/xinha/plugins/InsertMarquee/popups
+@dirrm share/webmin/mailboxes/xinha/plugins/InsertMarquee/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/InsertMarquee/img
+@dirrm share/webmin/mailboxes/xinha/plugins/InsertMarquee
+@dirrm share/webmin/mailboxes/xinha/plugins/InsertAnchor/popups
+@dirrm share/webmin/mailboxes/xinha/plugins/InsertAnchor/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/InsertAnchor/img
+@dirrm share/webmin/mailboxes/xinha/plugins/InsertAnchor
+@dirrm share/webmin/mailboxes/xinha/plugins/ImageManager/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/ImageManager/img
+@dirrm share/webmin/mailboxes/xinha/plugins/ImageManager/demo_images/linux
+@dirrm share/webmin/mailboxes/xinha/plugins/ImageManager/demo_images
+@dirrm share/webmin/mailboxes/xinha/plugins/ImageManager/assets
+@dirrm share/webmin/mailboxes/xinha/plugins/ImageManager/Classes
+@dirrm share/webmin/mailboxes/xinha/plugins/ImageManager
+@dirrm share/webmin/mailboxes/xinha/plugins/HtmlTidy/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/HtmlTidy/img
+@dirrm share/webmin/mailboxes/xinha/plugins/HtmlTidy
+@dirrm share/webmin/mailboxes/xinha/plugins/HtmlEntities
+@dirrm share/webmin/mailboxes/xinha/plugins/HorizontalRule/popups
+@dirrm share/webmin/mailboxes/xinha/plugins/HorizontalRule/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/HorizontalRule
+@dirrm share/webmin/mailboxes/xinha/plugins/GetHtml
+@dirrm share/webmin/mailboxes/xinha/plugins/FullPage/popups
+@dirrm share/webmin/mailboxes/xinha/plugins/FullPage/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/FullPage/img
+@dirrm share/webmin/mailboxes/xinha/plugins/FullPage
+@dirrm share/webmin/mailboxes/xinha/plugins/Forms/popups
+@dirrm share/webmin/mailboxes/xinha/plugins/Forms/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/Forms/img
+@dirrm share/webmin/mailboxes/xinha/plugins/Forms
+@dirrm share/webmin/mailboxes/xinha/plugins/FormOperations/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/FormOperations/img
+@dirrm share/webmin/mailboxes/xinha/plugins/FormOperations
+@dirrm share/webmin/mailboxes/xinha/plugins/FindReplace/popups
+@dirrm share/webmin/mailboxes/xinha/plugins/FindReplace/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/FindReplace/img
+@dirrm share/webmin/mailboxes/xinha/plugins/FindReplace
+@dirrm share/webmin/mailboxes/xinha/plugins/Filter/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/Filter/img
+@dirrm share/webmin/mailboxes/xinha/plugins/Filter/filters
+@dirrm share/webmin/mailboxes/xinha/plugins/Filter
+@dirrm share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/img
+@dirrm share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/icons
+@dirrm share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/demo_images/linux
+@dirrm share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/demo_images
+@dirrm share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/assets
+@dirrm share/webmin/mailboxes/xinha/plugins/ExtendedFileManager/Classes
+@dirrm share/webmin/mailboxes/xinha/plugins/ExtendedFileManager
+@dirrm share/webmin/mailboxes/xinha/plugins/Equation/popups
+@dirrm share/webmin/mailboxes/xinha/plugins/Equation/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/Equation/img
+@dirrm share/webmin/mailboxes/xinha/plugins/Equation
+@dirrm share/webmin/mailboxes/xinha/plugins/EditTag/popups
+@dirrm share/webmin/mailboxes/xinha/plugins/EditTag/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/EditTag/img
+@dirrm share/webmin/mailboxes/xinha/plugins/EditTag
+@dirrm share/webmin/mailboxes/xinha/plugins/DynamicCSS/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/DynamicCSS
+@dirrm share/webmin/mailboxes/xinha/plugins/DoubleClick
+@dirrm share/webmin/mailboxes/xinha/plugins/DefinitionList/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/DefinitionList/img
+@dirrm share/webmin/mailboxes/xinha/plugins/DefinitionList
+@dirrm share/webmin/mailboxes/xinha/plugins/ContextMenu/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/ContextMenu
+@dirrm share/webmin/mailboxes/xinha/plugins/ClientsideSpellcheck/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/ClientsideSpellcheck/img
+@dirrm share/webmin/mailboxes/xinha/plugins/ClientsideSpellcheck
+@dirrm share/webmin/mailboxes/xinha/plugins/CharacterMap/popups
+@dirrm share/webmin/mailboxes/xinha/plugins/CharacterMap/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/CharacterMap/img
+@dirrm share/webmin/mailboxes/xinha/plugins/CharacterMap
+@dirrm share/webmin/mailboxes/xinha/plugins/CharCounter/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/CharCounter
+@dirrm share/webmin/mailboxes/xinha/plugins/CSS
+@dirrm share/webmin/mailboxes/xinha/plugins/BackgroundImage/popups
+@dirrm share/webmin/mailboxes/xinha/plugins/BackgroundImage/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/BackgroundImage/img
+@dirrm share/webmin/mailboxes/xinha/plugins/BackgroundImage/backgrounds/thumbnails
+@dirrm share/webmin/mailboxes/xinha/plugins/BackgroundImage/backgrounds
+@dirrm share/webmin/mailboxes/xinha/plugins/BackgroundImage
+@dirrm share/webmin/mailboxes/xinha/plugins/Abbreviation/popups
+@dirrm share/webmin/mailboxes/xinha/plugins/Abbreviation/lang
+@dirrm share/webmin/mailboxes/xinha/plugins/Abbreviation/img
+@dirrm share/webmin/mailboxes/xinha/plugins/Abbreviation/abbr
+@dirrm share/webmin/mailboxes/xinha/plugins/Abbreviation
+@dirrm share/webmin/mailboxes/xinha/plugins
+@dirrm share/webmin/mailboxes/xinha/modules/InternetExplorer
+@dirrm share/webmin/mailboxes/xinha/modules/InsertTable
+@dirrm share/webmin/mailboxes/xinha/modules/InsertImage
+@dirrm share/webmin/mailboxes/xinha/modules/GetHtml
+@dirrm share/webmin/mailboxes/xinha/modules/Gecko
+@dirrm share/webmin/mailboxes/xinha/modules/FullScreen/lang
+@dirrm share/webmin/mailboxes/xinha/modules/FullScreen
+@dirrm share/webmin/mailboxes/xinha/modules/Dialogs
+@dirrm share/webmin/mailboxes/xinha/modules/CreateLink
+@dirrm share/webmin/mailboxes/xinha/modules/ColorPicker
+@dirrm share/webmin/mailboxes/xinha/modules
+@dirrm share/webmin/mailboxes/xinha/lang
+@dirrm share/webmin/mailboxes/xinha/images/fr
+@dirrm share/webmin/mailboxes/xinha/images/de
+@dirrm share/webmin/mailboxes/xinha/images
+@dirrm share/webmin/mailboxes/xinha/examples
+@dirrm share/webmin/mailboxes/xinha/contrib
+@dirrm share/webmin/mailboxes/xinha
@dirrm share/webmin/mailboxes/lang
@dirrm share/webmin/mailboxes/images
-@dirrm share/webmin/mailboxes/htmlarea/popups
-@dirrm share/webmin/mailboxes/htmlarea/lang
-@dirrm share/webmin/mailboxes/htmlarea/images
-@dirrm share/webmin/mailboxes/htmlarea
@dirrm share/webmin/mailboxes
@dirrm share/examples/webmin/mailboxes
+@dirrm etc/webmin/mailboxes
diff --git a/sysutils/wbm-mailboxes/distinfo b/sysutils/wbm-mailboxes/distinfo
index 225533dce39..9658a5b2861 100644
--- a/sysutils/wbm-mailboxes/distinfo
+++ b/sysutils/wbm-mailboxes/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 15:41:41 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:03 obache Exp $
-SHA1 (webmin-modules-1.270/mailboxes.wbm.gz) = bde67ad88f8f360ca2947b52935752fb5129ac52
-RMD160 (webmin-modules-1.270/mailboxes.wbm.gz) = a2c6872c984909ed4f58f1ab01fa7f7dffc5d755
-Size (webmin-modules-1.270/mailboxes.wbm.gz) = 155874 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-mount/Makefile b/sysutils/wbm-mount/Makefile
index dba789b227d..51a504405ce 100644
--- a/sysutils/wbm-mount/Makefile
+++ b/sysutils/wbm-mount/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:42 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:03 obache Exp $
-DISTNAME= mount
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= mount
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to mount filesystems
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-mount/PLIST b/sysutils/wbm-mount/PLIST
index 70d6dd4f756..8362949203e 100644
--- a/sysutils/wbm-mount/PLIST
+++ b/sysutils/wbm-mount/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 15:41:56 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:03 obache Exp $
share/examples/webmin/mount/config
share/webmin/mount/CHANGELOG
share/webmin/mount/acl_security.pl
@@ -46,7 +46,9 @@ share/webmin/mount/config.info.sv
share/webmin/mount/config.info.tr
share/webmin/mount/config.info.uk_UA
share/webmin/mount/config.info.zh_CN
+share/webmin/mount/config.info.zh_CN.UTF-8
share/webmin/mount/config.info.zh_TW.Big5
+share/webmin/mount/config.info.zh_TW.UTF-8
share/webmin/mount/create_swap.cgi
share/webmin/mount/defaultacl
share/webmin/mount/edit_mount.cgi
@@ -60,6 +62,7 @@ share/webmin/mount/freebsd-mounts-4.c
share/webmin/mount/freebsd-mounts-5
share/webmin/mount/freebsd-mounts-5.c
share/webmin/mount/help/edit_dir.ca.html
+share/webmin/mount/help/edit_dir.fa.html
share/webmin/mount/help/edit_dir.fr.html
share/webmin/mount/help/edit_dir.html
share/webmin/mount/help/help.ca.html
@@ -67,64 +70,82 @@ share/webmin/mount/help/help.es.html
share/webmin/mount/help/help.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/linux_auth.ca.html
share/webmin/mount/help/linux_auth.fr.html
share/webmin/mount/help/linux_auth.html
share/webmin/mount/help/linux_bg.ca.html
+share/webmin/mount/help/linux_bg.fa.html
share/webmin/mount/help/linux_bg.fr.html
share/webmin/mount/help/linux_bg.html
share/webmin/mount/help/linux_intr.ca.html
share/webmin/mount/help/linux_intr.fr.html
share/webmin/mount/help/linux_intr.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.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.html
share/webmin/mount/help/linux_nosuid.ca.html
+share/webmin/mount/help/linux_nosuid.fa.html
share/webmin/mount/help/linux_nosuid.fr.html
share/webmin/mount/help/linux_nosuid.html
share/webmin/mount/help/linux_port.ca.html
+share/webmin/mount/help/linux_port.fa.html
share/webmin/mount/help/linux_port.fr.html
share/webmin/mount/help/linux_port.html
share/webmin/mount/help/linux_retrans.ca.html
+share/webmin/mount/help/linux_retrans.fa.html
share/webmin/mount/help/linux_retrans.fr.html
share/webmin/mount/help/linux_retrans.html
share/webmin/mount/help/linux_ro.ca.html
+share/webmin/mount/help/linux_ro.fa.html
share/webmin/mount/help/linux_ro.fr.html
share/webmin/mount/help/linux_ro.html
share/webmin/mount/help/linux_rsize.ca.html
share/webmin/mount/help/linux_rsize.fr.html
share/webmin/mount/help/linux_rsize.html
share/webmin/mount/help/linux_sec.ca.html
+share/webmin/mount/help/linux_sec.fa.html
share/webmin/mount/help/linux_sec.fr.html
share/webmin/mount/help/linux_sec.html
share/webmin/mount/help/linux_soft.ca.html
+share/webmin/mount/help/linux_soft.fa.html
share/webmin/mount/help/linux_soft.fr.html
share/webmin/mount/help/linux_soft.html
share/webmin/mount/help/linux_sync.ca.html
+share/webmin/mount/help/linux_sync.fa.html
share/webmin/mount/help/linux_sync.fr.html
share/webmin/mount/help/linux_sync.html
share/webmin/mount/help/linux_timeo.ca.html
+share/webmin/mount/help/linux_timeo.fa.html
share/webmin/mount/help/linux_timeo.fr.html
share/webmin/mount/help/linux_timeo.html
share/webmin/mount/help/linux_transfert.ca.html
+share/webmin/mount/help/linux_transfert.fa.html
share/webmin/mount/help/linux_transfert.fr.html
share/webmin/mount/help/linux_transfert.html
share/webmin/mount/help/linux_user.ca.html
+share/webmin/mount/help/linux_user.fa.html
share/webmin/mount/help/linux_user.fr.html
share/webmin/mount/help/linux_user.html
share/webmin/mount/help/linux_vers.ca.html
+share/webmin/mount/help/linux_vers.fa.html
share/webmin/mount/help/linux_vers.fr.html
share/webmin/mount/help/linux_vers.html
share/webmin/mount/help/linux_wsize.ca.html
+share/webmin/mount/help/linux_wsize.fa.html
share/webmin/mount/help/linux_wsize.fr.html
share/webmin/mount/help/linux_wsize.html
share/webmin/mount/help/nfsdir.ca.html
+share/webmin/mount/help/nfsdir.fa.html
share/webmin/mount/help/nfsdir.fr.html
share/webmin/mount/help/nfsdir.html
share/webmin/mount/help/nfshost.ca.html
+share/webmin/mount/help/nfshost.fa.html
share/webmin/mount/help/nfshost.fr.html
share/webmin/mount/help/nfshost.html
share/webmin/mount/hpux-lib.pl
@@ -166,7 +187,9 @@ share/webmin/mount/lang/fa
share/webmin/mount/lang/fr
share/webmin/mount/lang/hu
share/webmin/mount/lang/it
+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/pl
share/webmin/mount/lang/ru_RU
@@ -175,12 +198,16 @@ share/webmin/mount/lang/sv
share/webmin/mount/lang/tr
share/webmin/mount/lang/uk_UA
share/webmin/mount/lang/zh_CN
+share/webmin/mount/lang/zh_CN.UTF-8
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
@@ -197,6 +224,7 @@ share/webmin/mount/openbsd-mounts-2
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/osf1-lib.pl
share/webmin/mount/rbac-mapping
share/webmin/mount/save_mount.cgi
@@ -210,3 +238,4 @@ share/webmin/mount/unmount.cgi
@dirrm share/webmin/mount/help
@dirrm share/webmin/mount
@dirrm share/examples/webmin/mount
+@dirrm etc/webmin/mount
diff --git a/sysutils/wbm-mount/distinfo b/sysutils/wbm-mount/distinfo
index 1420d033308..9658a5b2861 100644
--- a/sysutils/wbm-mount/distinfo
+++ b/sysutils/wbm-mount/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 15:41:56 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:03 obache Exp $
-SHA1 (webmin-modules-1.270/mount.wbm.gz) = 46b025609832fd4324a05e45cbd4a5233c9db79c
-RMD160 (webmin-modules-1.270/mount.wbm.gz) = 5e3c9d25281939bed2f29dd93e538df8c55e23d6
-Size (webmin-modules-1.270/mount.wbm.gz) = 273576 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-mysql/Makefile b/sysutils/wbm-mysql/Makefile
index d14a6ec7058..dbc485dc3f3 100644
--- a/sysutils/wbm-mysql/Makefile
+++ b/sysutils/wbm-mysql/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:42 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:03 obache Exp $
-DISTNAME= mysql
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= mysql
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module for managing MySQL databases
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-mysql/PLIST b/sysutils/wbm-mysql/PLIST
index 789802c5b27..c6213dab956 100644
--- a/sysutils/wbm-mysql/PLIST
+++ b/sysutils/wbm-mysql/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 15:42:12 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:03 obache Exp $
share/examples/webmin/mysql/config
share/webmin/mysql/CHANGELOG
share/webmin/mysql/acl_security.pl
@@ -36,6 +36,7 @@ share/webmin/mysql/config.info.cz
share/webmin/mysql/config.info.de
share/webmin/mysql/config.info.es
share/webmin/mysql/config.info.hu
+share/webmin/mysql/config.info.ja_JP.UTF-8
share/webmin/mysql/config.info.ja_JP.euc
share/webmin/mysql/config.info.pl
share/webmin/mysql/config.info.ru_RU
@@ -44,13 +45,17 @@ share/webmin/mysql/config.info.sv
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/cpan_modules.pl
share/webmin/mysql/create_table.cgi
share/webmin/mysql/csv.cgi
share/webmin/mysql/csv_form.cgi
share/webmin/mysql/defaultacl
share/webmin/mysql/delete_cprivs.cgi
share/webmin/mysql/delete_dbs.cgi
+share/webmin/mysql/delete_fields.cgi
share/webmin/mysql/delete_hosts.cgi
share/webmin/mysql/delete_tprivs.cgi
share/webmin/mysql/delete_users.cgi
@@ -69,6 +74,7 @@ share/webmin/mysql/edit_index.cgi
share/webmin/mysql/edit_table.cgi
share/webmin/mysql/edit_tpriv.cgi
share/webmin/mysql/edit_user.cgi
+share/webmin/mysql/edit_view.cgi
share/webmin/mysql/exec.cgi
share/webmin/mysql/exec_file.cgi
share/webmin/mysql/exec_form.cgi
@@ -84,42 +90,49 @@ share/webmin/mysql/help/cpriv.html
share/webmin/mysql/help/cpriv.hu.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.html
share/webmin/mysql/help/cprivs.es.html
share/webmin/mysql/help/cprivs.html
share/webmin/mysql/help/cprivs.hu.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.html
share/webmin/mysql/help/create_cpriv.es.html
share/webmin/mysql/help/create_cpriv.html
share/webmin/mysql/help/create_cpriv.hu.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.html
share/webmin/mysql/help/create_db.es.html
share/webmin/mysql/help/create_db.html
share/webmin/mysql/help/create_db.hu.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.html
share/webmin/mysql/help/create_field.es.html
share/webmin/mysql/help/create_field.html
share/webmin/mysql/help/create_field.hu.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.html
share/webmin/mysql/help/create_tpriv.es.html
share/webmin/mysql/help/create_tpriv.html
share/webmin/mysql/help/create_tpriv.hu.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.html
share/webmin/mysql/help/create_user.es.html
share/webmin/mysql/help/create_user.html
share/webmin/mysql/help/create_user.hu.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.html
share/webmin/mysql/help/csv.html
share/webmin/mysql/help/db.ca.html
@@ -128,108 +141,130 @@ share/webmin/mysql/help/db.html
share/webmin/mysql/help/db.hu.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.html
share/webmin/mysql/help/dbs.es.html
share/webmin/mysql/help/dbs.html
share/webmin/mysql/help/dbs.hu.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.html
share/webmin/mysql/help/edit_cpriv.es.html
share/webmin/mysql/help/edit_cpriv.html
share/webmin/mysql/help/edit_cpriv.hu.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.html
share/webmin/mysql/help/edit_db.es.html
share/webmin/mysql/help/edit_db.html
share/webmin/mysql/help/edit_db.hu.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.html
share/webmin/mysql/help/edit_dbase.es.html
share/webmin/mysql/help/edit_dbase.html
share/webmin/mysql/help/edit_dbase.hu.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.html
share/webmin/mysql/help/edit_field.es.html
share/webmin/mysql/help/edit_field.html
share/webmin/mysql/help/edit_field.hu.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.html
share/webmin/mysql/help/edit_table.es.html
share/webmin/mysql/help/edit_table.html
share/webmin/mysql/help/edit_table.hu.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.html
share/webmin/mysql/help/edit_tpriv.es.html
share/webmin/mysql/help/edit_tpriv.html
share/webmin/mysql/help/edit_tpriv.hu.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.html
share/webmin/mysql/help/edit_user.es.html
share/webmin/mysql/help/edit_user.html
share/webmin/mysql/help/edit_user.hu.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.html
share/webmin/mysql/help/exec_form.es.html
share/webmin/mysql/help/exec_form.html
share/webmin/mysql/help/exec_form.hu.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.html
share/webmin/mysql/help/field.es.html
share/webmin/mysql/help/field.html
share/webmin/mysql/help/field.hu.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.html
share/webmin/mysql/help/intro.es.html
share/webmin/mysql/help/intro.html
share/webmin/mysql/help/intro.hu.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.html
share/webmin/mysql/help/newdb_form.es.html
share/webmin/mysql/help/newdb_form.html
share/webmin/mysql/help/newdb_form.hu.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.html
+share/webmin/mysql/help/procs.html
share/webmin/mysql/help/table_form.ca.html
share/webmin/mysql/help/table_form.es.html
share/webmin/mysql/help/table_form.html
share/webmin/mysql/help/table_form.hu.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.html
share/webmin/mysql/help/tpriv.es.html
share/webmin/mysql/help/tpriv.html
share/webmin/mysql/help/tpriv.hu.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.html
share/webmin/mysql/help/tprivs.es.html
share/webmin/mysql/help/tprivs.html
share/webmin/mysql/help/tprivs.hu.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.html
share/webmin/mysql/help/user.es.html
share/webmin/mysql/help/user.html
share/webmin/mysql/help/user.hu.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.html
share/webmin/mysql/help/users.es.html
share/webmin/mysql/help/users.html
share/webmin/mysql/help/users.hu.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.html
+share/webmin/mysql/help/vars.html
share/webmin/mysql/images/cnf.gif
share/webmin/mysql/images/cprivs.gif
share/webmin/mysql/images/db.gif
@@ -240,13 +275,17 @@ share/webmin/mysql/images/hosts.gif
share/webmin/mysql/images/icon.gif
share/webmin/mysql/images/index.gif
share/webmin/mysql/images/mysql.gif
+share/webmin/mysql/images/procs.gif
share/webmin/mysql/images/smallicon.gif
share/webmin/mysql/images/table.gif
share/webmin/mysql/images/tprivs.gif
share/webmin/mysql/images/users.gif
+share/webmin/mysql/images/vars.gif
+share/webmin/mysql/images/view.gif
share/webmin/mysql/import.cgi
share/webmin/mysql/index.cgi
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/cz
@@ -256,7 +295,9 @@ share/webmin/mysql/lang/es
share/webmin/mysql/lang/he
share/webmin/mysql/lang/hu
share/webmin/mysql/lang/it
+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/pl
share/webmin/mysql/lang/ru_RU
@@ -265,12 +306,16 @@ share/webmin/mysql/lang/sv
share/webmin/mysql/lang/tr
share/webmin/mysql/lang/uk_UA
share/webmin/mysql/lang/zh_CN
+share/webmin/mysql/lang/zh_CN.UTF-8
share/webmin/mysql/lang/zh_TW.Big5
+share/webmin/mysql/lang/zh_TW.UTF-8
share/webmin/mysql/list_cprivs.cgi
share/webmin/mysql/list_dbs.cgi
share/webmin/mysql/list_hosts.cgi
+share/webmin/mysql/list_procs.cgi
share/webmin/mysql/list_tprivs.cgi
share/webmin/mysql/list_users.cgi
+share/webmin/mysql/list_vars.cgi
share/webmin/mysql/log_parser.pl
share/webmin/mysql/login.cgi
share/webmin/mysql/module.info
@@ -286,15 +331,19 @@ share/webmin/mysql/save_index.cgi
share/webmin/mysql/save_sync.cgi
share/webmin/mysql/save_tpriv.cgi
share/webmin/mysql/save_user.cgi
+share/webmin/mysql/save_vars.cgi
+share/webmin/mysql/save_view.cgi
share/webmin/mysql/search_form.cgi
share/webmin/mysql/start.cgi
share/webmin/mysql/stop.cgi
share/webmin/mysql/syslog_logs.pl
share/webmin/mysql/table_form.cgi
share/webmin/mysql/useradmin_update.pl
+share/webmin/mysql/view-lib.pl
share/webmin/mysql/view_table.cgi
@dirrm share/webmin/mysql/lang
@dirrm share/webmin/mysql/images
@dirrm share/webmin/mysql/help
@dirrm share/webmin/mysql
@dirrm share/examples/webmin/mysql
+@dirrm etc/webmin/mysql
diff --git a/sysutils/wbm-mysql/distinfo b/sysutils/wbm-mysql/distinfo
index 666b8952c91..9658a5b2861 100644
--- a/sysutils/wbm-mysql/distinfo
+++ b/sysutils/wbm-mysql/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 15:42:12 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:03 obache Exp $
-SHA1 (webmin-modules-1.270/mysql.wbm.gz) = 5bc4264e0c255856f0a8be619a6eb99dcb78b789
-RMD160 (webmin-modules-1.270/mysql.wbm.gz) = 6e9c4462a8f2d5fac693982613e130aa6674c368
-Size (webmin-modules-1.270/mysql.wbm.gz) = 181812 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-net/Makefile b/sysutils/wbm-net/Makefile
index 6d6bc106293..067e035fa24 100644
--- a/sysutils/wbm-net/Makefile
+++ b/sysutils/wbm-net/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:42 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:03 obache Exp $
-DISTNAME= net
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= net
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module for network configuration
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-net/PLIST b/sysutils/wbm-net/PLIST
index 9de9fdadc86..8285566d5f5 100644
--- a/sysutils/wbm-net/PLIST
+++ b/sysutils/wbm-net/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 04:03:06 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:03 obache Exp $
share/examples/webmin/net/config
share/webmin/net/CHANGELOG
share/webmin/net/acl_security.pl
@@ -22,6 +22,7 @@ share/webmin/net/config.info.de
share/webmin/net/config.info.es
share/webmin/net/config.info.fa
share/webmin/net/config.info.fr
+share/webmin/net/config.info.ja_JP.UTF-8
share/webmin/net/config.info.ja_JP.euc
share/webmin/net/config.info.pl
share/webmin/net/config.info.ru_RU
@@ -30,10 +31,17 @@ share/webmin/net/config.info.sv
share/webmin/net/config.info.tr
share/webmin/net/config.info.uk_UA
share/webmin/net/config.info.zh_CN
+share/webmin/net/config.info.zh_CN.UTF-8
share/webmin/net/config.info.zh_TW.Big5
+share/webmin/net/config.info.zh_TW.UTF-8
+share/webmin/net/create_route.cgi
share/webmin/net/cygwin-lib.pl
share/webmin/net/debian-linux-lib.pl
share/webmin/net/defaultacl
+share/webmin/net/delete_aifcs.cgi
+share/webmin/net/delete_bifcs.cgi
+share/webmin/net/delete_hosts.cgi
+share/webmin/net/delete_routes.cgi
share/webmin/net/edit_aifc.cgi
share/webmin/net/edit_bifc.cgi
share/webmin/net/edit_host.cgi
@@ -59,7 +67,9 @@ share/webmin/net/lang/es
share/webmin/net/lang/fa
share/webmin/net/lang/fr
share/webmin/net/lang/it
+share/webmin/net/lang/ja_JP.UTF-8
share/webmin/net/lang/ja_JP.euc
+share/webmin/net/lang/ko_KR.UTF-8
share/webmin/net/lang/ko_KR.euc
share/webmin/net/lang/nl
share/webmin/net/lang/pl
@@ -70,7 +80,9 @@ share/webmin/net/lang/sv
share/webmin/net/lang/tr
share/webmin/net/lang/uk_UA
share/webmin/net/lang/zh_CN
+share/webmin/net/lang/zh_CN.UTF-8
share/webmin/net/lang/zh_TW.Big5
+share/webmin/net/lang/zh_TW.UTF-8
share/webmin/net/linux-lib.pl
share/webmin/net/list_dns.cgi
share/webmin/net/list_hosts.cgi
@@ -109,6 +121,7 @@ share/webmin/net/suse-linux-9.0-lib.pl
share/webmin/net/suse-linux-9.1-lib.pl
share/webmin/net/suse-linux-9.2-lib.pl
share/webmin/net/suse-linux-9.3-lib.pl
+share/webmin/net/suse-linux-10.1-lib.pl
share/webmin/net/suse-linux-lib.pl
share/webmin/net/trustix-linux-lib.pl
share/webmin/net/turbo-linux-lib.pl
diff --git a/sysutils/wbm-net/distinfo b/sysutils/wbm-net/distinfo
index cf912907ba7..9658a5b2861 100644
--- a/sysutils/wbm-net/distinfo
+++ b/sysutils/wbm-net/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 04:03:06 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:03 obache Exp $
-SHA1 (webmin-modules-1.270/net.wbm.gz) = 97ab2abc3a710fcf1e9c55fdd66f896354ba3988
-RMD160 (webmin-modules-1.270/net.wbm.gz) = 0809898265ff5931b630a2a92bab2779d59553fa
-Size (webmin-modules-1.270/net.wbm.gz) = 135184 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-openslp/Makefile b/sysutils/wbm-openslp/Makefile
index e0907228969..e8ef0a64cd6 100644
--- a/sysutils/wbm-openslp/Makefile
+++ b/sysutils/wbm-openslp/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:42 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:03 obache Exp $
-DISTNAME= openslp
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= openslp
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to configure an OpenSLP server
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-openslp/distinfo b/sysutils/wbm-openslp/distinfo
index 0eaacb20bc5..9658a5b2861 100644
--- a/sysutils/wbm-openslp/distinfo
+++ b/sysutils/wbm-openslp/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 21:41:50 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:03 obache Exp $
-SHA1 (webmin-modules-1.270/openslp.wbm.gz) = 32a9cd67139dfae0a0d8c3812ce3ff4ec6697755
-RMD160 (webmin-modules-1.270/openslp.wbm.gz) = 812186822b09791e2373ed35b92de59811c60374
-Size (webmin-modules-1.270/openslp.wbm.gz) = 19988 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-passwd/Makefile b/sysutils/wbm-passwd/Makefile
index 4652c32843c..54ac9fd5ad7 100644
--- a/sysutils/wbm-passwd/Makefile
+++ b/sysutils/wbm-passwd/Makefile
@@ -1,15 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/05/16 21:42:00 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2007/04/21 05:23:03 obache Exp $
-DISTNAME= passwd
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= passwd
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
+WBM_DEPEND_MODULES+= useradmin
-DEPENDS+= wbm-useradmin>=1.270:../../sysutils/wbm-useradmin
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to change users' system passwords
.include "../../sysutils/webmin/wbm.mk"
diff --git a/sysutils/wbm-passwd/PLIST b/sysutils/wbm-passwd/PLIST
index fb16fa765b0..e049625e4b4 100644
--- a/sysutils/wbm-passwd/PLIST
+++ b/sysutils/wbm-passwd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 21:42:00 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:03 obache Exp $
share/examples/webmin/passwd/config
share/webmin/passwd/CHANGELOG
share/webmin/passwd/acl_security.pl
@@ -22,6 +22,7 @@ share/webmin/passwd/config.info.ru_SU
share/webmin/passwd/config.info.tr
share/webmin/passwd/config.info.uk_UA
share/webmin/passwd/config.info.zh_TW.Big5
+share/webmin/passwd/config.info.zh_TW.UTF-8
share/webmin/passwd/defaultacl
share/webmin/passwd/edit_passwd.cgi
share/webmin/passwd/images/icon.gif
@@ -48,7 +49,9 @@ share/webmin/passwd/lang/sk
share/webmin/passwd/lang/tr
share/webmin/passwd/lang/uk_UA
share/webmin/passwd/lang/zh_CN
+share/webmin/passwd/lang/zh_CN.UTF-8
share/webmin/passwd/lang/zh_TW.Big5
+share/webmin/passwd/lang/zh_TW.UTF-8
share/webmin/passwd/log_parser.pl
share/webmin/passwd/module.info
share/webmin/passwd/passwd-lib.pl
diff --git a/sysutils/wbm-passwd/distinfo b/sysutils/wbm-passwd/distinfo
index 11f11cab591..9658a5b2861 100644
--- a/sysutils/wbm-passwd/distinfo
+++ b/sysutils/wbm-passwd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 21:42:00 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:03 obache Exp $
-SHA1 (webmin-modules-1.270/passwd.wbm.gz) = 143371104fc5b9180893bd0b5edb6c1124d25263
-RMD160 (webmin-modules-1.270/passwd.wbm.gz) = 8d418783f23a6f4a4aed81e88bcac90e6cbf686e
-Size (webmin-modules-1.270/passwd.wbm.gz) = 23693 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-postfix/Makefile b/sysutils/wbm-postfix/Makefile
index 3c08585c5ed..bd383d7654e 100644
--- a/sysutils/wbm-postfix/Makefile
+++ b/sysutils/wbm-postfix/Makefile
@@ -1,17 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/02/19 21:52:42 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/04/21 05:23:04 obache Exp $
-DISTNAME= postfix
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-PKGREVSION= 1
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= postfix
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module for Postfix mail server configuration
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-postfix/PLIST b/sysutils/wbm-postfix/PLIST
index bdbc235aa3b..1eb9bc2f56b 100644
--- a/sysutils/wbm-postfix/PLIST
+++ b/sysutils/wbm-postfix/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 04:03:27 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:04 obache Exp $
share/examples/webmin/postfix/config
share/webmin/postfix/CHANGELOG
share/webmin/postfix/acl_security.pl
@@ -21,6 +21,7 @@ share/webmin/postfix/config.info.ca
share/webmin/postfix/config.info.de
share/webmin/postfix/config.info.es
share/webmin/postfix/config.info.fr
+share/webmin/postfix/config.info.ja_JP.UTF-8
share/webmin/postfix/config.info.ja_JP.euc
share/webmin/postfix/config.info.pl
share/webmin/postfix/config.info.ru_RU
@@ -29,7 +30,9 @@ share/webmin/postfix/config.info.sv
share/webmin/postfix/config.info.tr
share/webmin/postfix/config.info.uk_UA
share/webmin/postfix/config.info.zh_CN
+share/webmin/postfix/config.info.zh_CN.UTF-8
share/webmin/postfix/config.info.zh_TW.Big5
+share/webmin/postfix/config.info.zh_TW.UTF-8
share/webmin/postfix/debug.cgi
share/webmin/postfix/defaultacl
share/webmin/postfix/delete_aliases.cgi
@@ -49,7 +52,40 @@ share/webmin/postfix/filter.pl
share/webmin/postfix/flushq.cgi
share/webmin/postfix/general.cgi
share/webmin/postfix/header.cgi
+share/webmin/postfix/help/access.ca.html
share/webmin/postfix/help/access.html
+share/webmin/postfix/help/alias_cmt.ca.html
+share/webmin/postfix/help/alias_cmt.html
+share/webmin/postfix/help/alias_enabled.ca.html
+share/webmin/postfix/help/alias_enabled.es.html
+share/webmin/postfix/help/alias_enabled.fr.html
+share/webmin/postfix/help/alias_enabled.html
+share/webmin/postfix/help/alias_enabled.pl.html
+share/webmin/postfix/help/alias_enabled.ru_RU.html
+share/webmin/postfix/help/alias_enabled.ru_SU.html
+share/webmin/postfix/help/alias_enabled.sv.html
+share/webmin/postfix/help/alias_enabled.zh_TW.Big5.html
+share/webmin/postfix/help/alias_enabled.zh_TW.UTF-8.html
+share/webmin/postfix/help/alias_name.ca.html
+share/webmin/postfix/help/alias_name.es.html
+share/webmin/postfix/help/alias_name.fr.html
+share/webmin/postfix/help/alias_name.html
+share/webmin/postfix/help/alias_name.pl.html
+share/webmin/postfix/help/alias_name.ru_RU.html
+share/webmin/postfix/help/alias_name.ru_SU.html
+share/webmin/postfix/help/alias_name.sv.html
+share/webmin/postfix/help/alias_name.zh_TW.Big5.html
+share/webmin/postfix/help/alias_name.zh_TW.UTF-8.html
+share/webmin/postfix/help/alias_to.ca.html
+share/webmin/postfix/help/alias_to.es.html
+share/webmin/postfix/help/alias_to.fr.html
+share/webmin/postfix/help/alias_to.html
+share/webmin/postfix/help/alias_to.pl.html
+share/webmin/postfix/help/alias_to.ru_RU.html
+share/webmin/postfix/help/alias_to.ru_SU.html
+share/webmin/postfix/help/alias_to.sv.html
+share/webmin/postfix/help/alias_to.zh_TW.Big5.html
+share/webmin/postfix/help/alias_to.zh_TW.UTF-8.html
share/webmin/postfix/help/aliases.ca.html
share/webmin/postfix/help/aliases.es.html
share/webmin/postfix/help/aliases.html
@@ -138,6 +174,7 @@ share/webmin/postfix/help/opt_canonical_maps.es.html
share/webmin/postfix/help/opt_canonical_maps.html
share/webmin/postfix/help/opt_canonical_maps.pl.html
share/webmin/postfix/help/opt_canonical_maps.sv.html
+share/webmin/postfix/help/opt_check_sender_access.ca.html
share/webmin/postfix/help/opt_check_sender_access.html
share/webmin/postfix/help/opt_command_time_limit.ca.html
share/webmin/postfix/help/opt_command_time_limit.es.html
@@ -535,6 +572,7 @@ share/webmin/postfix/help/opt_reject_code.es.html
share/webmin/postfix/help/opt_reject_code.html
share/webmin/postfix/help/opt_reject_code.pl.html
share/webmin/postfix/help/opt_reject_code.sv.html
+share/webmin/postfix/help/opt_reject_rbl_client.ca.html
share/webmin/postfix/help/opt_reject_rbl_client.html
share/webmin/postfix/help/opt_relay_domains.ca.html
share/webmin/postfix/help/opt_relay_domains.de.html
@@ -801,8 +839,10 @@ share/webmin/postfix/lang/de
share/webmin/postfix/lang/en
share/webmin/postfix/lang/es
share/webmin/postfix/lang/fr
+share/webmin/postfix/lang/ja_JP.UTF-8
share/webmin/postfix/lang/ja_JP.euc
share/webmin/postfix/lang/ja_JP.jis
+share/webmin/postfix/lang/ko_KR.UTF-8
share/webmin/postfix/lang/ko_KR.euc
share/webmin/postfix/lang/pl
share/webmin/postfix/lang/pt_BR
@@ -811,9 +851,12 @@ share/webmin/postfix/lang/ru_SU
share/webmin/postfix/lang/sv
share/webmin/postfix/lang/uk_UA
share/webmin/postfix/lang/zh_CN
+share/webmin/postfix/lang/zh_CN.UTF-8
share/webmin/postfix/lang/zh_TW.Big5
+share/webmin/postfix/lang/zh_TW.UTF-8
share/webmin/postfix/ldap.cgi
share/webmin/postfix/local_delivery.cgi
+share/webmin/postfix/log_parser.pl
share/webmin/postfix/mailq.cgi
share/webmin/postfix/mailq_search.cgi
share/webmin/postfix/manual.cgi
@@ -854,3 +897,4 @@ share/webmin/postfix/virtual.cgi
@dirrm share/webmin/postfix/help
@dirrm share/webmin/postfix
@dirrm share/examples/webmin/postfix
+@dirrm etc/webmin/postfix
diff --git a/sysutils/wbm-postfix/distinfo b/sysutils/wbm-postfix/distinfo
index 893ebe6443b..703792e030c 100644
--- a/sysutils/wbm-postfix/distinfo
+++ b/sysutils/wbm-postfix/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 04:03:26 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:04 obache Exp $
-SHA1 (webmin-modules-1.270/postfix.wbm.gz) = 1718786cb5f0a649ed85cf0aa2aa51213ba485ea
-RMD160 (webmin-modules-1.270/postfix.wbm.gz) = 8e954f6416b69e5dabab752ad46960114f879d4f
-Size (webmin-modules-1.270/postfix.wbm.gz) = 314719 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-postgresql/Makefile b/sysutils/wbm-postgresql/Makefile
index 9010e910e34..3c57d9ee58d 100644
--- a/sysutils/wbm-postgresql/Makefile
+++ b/sysutils/wbm-postgresql/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:43 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:04 obache Exp $
-DISTNAME= postgresql
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= postgresql
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module for managing PostgreSQL databases
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-postgresql/PLIST b/sysutils/wbm-postgresql/PLIST
index f83c988ac18..4621a8eb3e2 100644
--- a/sysutils/wbm-postgresql/PLIST
+++ b/sysutils/wbm-postgresql/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 04:16:32 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:04 obache Exp $
share/examples/webmin/postgresql/config
share/webmin/postgresql/CHANGELOG
share/webmin/postgresql/acl_security.pl
@@ -14,7 +14,7 @@ share/webmin/postgresql/config-freebsd
share/webmin/postgresql/config-gentoo-linux
share/webmin/postgresql/config-mandrake-linux
share/webmin/postgresql/config-msc-linux
-share/webmin/postgresql/config-netbsd
+share/webmin/postgresql/config-${LOWER_OPSYS}
share/webmin/postgresql/config-redhat-linux
share/webmin/postgresql/config-redhat-linux-10.0-*
share/webmin/postgresql/config-redhat-linux-7.0-7.2
@@ -27,23 +27,30 @@ share/webmin/postgresql/config-suse-linux-7.1-9.0
share/webmin/postgresql/config-suse-linux-9.1-*
share/webmin/postgresql/config-trustix-linux
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.de
share/webmin/postgresql/config.info.es
share/webmin/postgresql/config.info.fr
+share/webmin/postgresql/config.info.ja_JP.UTF-8
share/webmin/postgresql/config.info.ja_JP.euc
share/webmin/postgresql/config.info.pl
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.tr
share/webmin/postgresql/config.info.uk_UA
share/webmin/postgresql/config.info.zh_CN
+share/webmin/postgresql/config.info.zh_CN.UTF-8
share/webmin/postgresql/config.info.zh_TW.Big5
+share/webmin/postgresql/config.info.zh_TW.UTF-8
+share/webmin/postgresql/cpan_modules.pl
share/webmin/postgresql/create_table.cgi
share/webmin/postgresql/csv.cgi
share/webmin/postgresql/csv_form.cgi
share/webmin/postgresql/defaultacl
+share/webmin/postgresql/delete_grants.cgi
share/webmin/postgresql/delete_groups.cgi
share/webmin/postgresql/delete_hosts.cgi
share/webmin/postgresql/delete_users.cgi
@@ -67,12 +74,14 @@ 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.html
share/webmin/postgresql/help/backup_form.html
share/webmin/postgresql/help/create_field.ca.html
share/webmin/postgresql/help/create_field.es.html
share/webmin/postgresql/help/create_field.html
share/webmin/postgresql/help/create_field.hu.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.pl.html
share/webmin/postgresql/help/csv.ca.html
@@ -85,6 +94,7 @@ share/webmin/postgresql/help/edit_dbase.es.html
share/webmin/postgresql/help/edit_dbase.html
share/webmin/postgresql/help/edit_dbase.hu.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.pl.html
share/webmin/postgresql/help/edit_field.ca.html
@@ -92,6 +102,7 @@ share/webmin/postgresql/help/edit_field.es.html
share/webmin/postgresql/help/edit_field.html
share/webmin/postgresql/help/edit_field.hu.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.pl.html
share/webmin/postgresql/help/edit_table.ca.html
@@ -99,6 +110,7 @@ share/webmin/postgresql/help/edit_table.es.html
share/webmin/postgresql/help/edit_table.html
share/webmin/postgresql/help/edit_table.hu.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.pl.html
share/webmin/postgresql/help/exec_form.ca.html
@@ -106,6 +118,7 @@ share/webmin/postgresql/help/exec_form.es.html
share/webmin/postgresql/help/exec_form.html
share/webmin/postgresql/help/exec_form.hu.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.pl.html
share/webmin/postgresql/help/intro.ca.html
@@ -113,6 +126,7 @@ share/webmin/postgresql/help/intro.es.html
share/webmin/postgresql/help/intro.html
share/webmin/postgresql/help/intro.hu.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.pl.html
share/webmin/postgresql/help/list_grants.ca.html
@@ -120,6 +134,7 @@ share/webmin/postgresql/help/list_grants.es.html
share/webmin/postgresql/help/list_grants.html
share/webmin/postgresql/help/list_grants.hu.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.pl.html
share/webmin/postgresql/help/list_groups.ca.html
@@ -127,6 +142,7 @@ share/webmin/postgresql/help/list_groups.es.html
share/webmin/postgresql/help/list_groups.html
share/webmin/postgresql/help/list_groups.hu.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.pl.html
share/webmin/postgresql/help/list_hosts.ca.html
@@ -134,6 +150,7 @@ share/webmin/postgresql/help/list_hosts.es.html
share/webmin/postgresql/help/list_hosts.html
share/webmin/postgresql/help/list_hosts.hu.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.pl.html
share/webmin/postgresql/help/list_users.ca.html
@@ -141,6 +158,7 @@ share/webmin/postgresql/help/list_users.es.html
share/webmin/postgresql/help/list_users.html
share/webmin/postgresql/help/list_users.hu.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.pl.html
share/webmin/postgresql/help/newdb_form.ca.html
@@ -148,6 +166,7 @@ share/webmin/postgresql/help/newdb_form.es.html
share/webmin/postgresql/help/newdb_form.html
share/webmin/postgresql/help/newdb_form.hu.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.pl.html
share/webmin/postgresql/help/table_form.ca.html
@@ -155,6 +174,7 @@ share/webmin/postgresql/help/table_form.es.html
share/webmin/postgresql/help/table_form.html
share/webmin/postgresql/help/table_form.hu.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.pl.html
share/webmin/postgresql/help/view_table.ca.html
@@ -162,6 +182,7 @@ share/webmin/postgresql/help/view_table.es.html
share/webmin/postgresql/help/view_table.html
share/webmin/postgresql/help/view_table.hu.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.pl.html
share/webmin/postgresql/images/Thumbs.db
@@ -190,15 +211,20 @@ share/webmin/postgresql/lang/es
share/webmin/postgresql/lang/fr
share/webmin/postgresql/lang/hu
share/webmin/postgresql/lang/it
+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/pl
+share/webmin/postgresql/lang/pt
share/webmin/postgresql/lang/ru_RU
share/webmin/postgresql/lang/ru_SU
share/webmin/postgresql/lang/sv
share/webmin/postgresql/lang/uk_UA
share/webmin/postgresql/lang/zh_CN
+share/webmin/postgresql/lang/zh_CN.UTF-8
share/webmin/postgresql/lang/zh_TW.Big5
+share/webmin/postgresql/lang/zh_TW.UTF-8
share/webmin/postgresql/list_grants.cgi
share/webmin/postgresql/list_groups.cgi
share/webmin/postgresql/list_hosts.cgi
@@ -209,6 +235,9 @@ share/webmin/postgresql/login.cgi
share/webmin/postgresql/module.info
share/webmin/postgresql/newdb.cgi
share/webmin/postgresql/newdb_form.cgi
+share/webmin/postgresql/old/download.cgi
+share/webmin/postgresql/old/search_form.cgi
+share/webmin/postgresql/old/view_table.cgi
share/webmin/postgresql/postgresql-lib.pl
share/webmin/postgresql/restore.cgi
share/webmin/postgresql/restore_form.cgi
@@ -228,9 +257,12 @@ share/webmin/postgresql/stop.cgi
share/webmin/postgresql/table_form.cgi
share/webmin/postgresql/up.cgi
share/webmin/postgresql/useradmin_update.pl
+share/webmin/postgresql/view-lib.pl
share/webmin/postgresql/view_table.cgi
+@dirrm share/webmin/postgresql/old
@dirrm share/webmin/postgresql/lang
@dirrm share/webmin/postgresql/images
@dirrm share/webmin/postgresql/help
@dirrm share/webmin/postgresql
@dirrm share/examples/webmin/postgresql
+@dirrm etc/webmin/postgresql
diff --git a/sysutils/wbm-postgresql/distinfo b/sysutils/wbm-postgresql/distinfo
index cd2315359aa..703792e030c 100644
--- a/sysutils/wbm-postgresql/distinfo
+++ b/sysutils/wbm-postgresql/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 04:16:32 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:04 obache Exp $
-SHA1 (webmin-modules-1.270/postgresql.wbm.gz) = 371e22497ade84594d2b7db7493729879f9ee809
-RMD160 (webmin-modules-1.270/postgresql.wbm.gz) = e47e366dc467c841086c21819056f214d6027b7a
-Size (webmin-modules-1.270/postgresql.wbm.gz) = 154041 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-qmailadmin/Makefile b/sysutils/wbm-qmailadmin/Makefile
index 23782bd823d..39da4139cbc 100644
--- a/sysutils/wbm-qmailadmin/Makefile
+++ b/sysutils/wbm-qmailadmin/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:43 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:04 obache Exp $
-DISTNAME= qmailadmin
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= qmailadmin
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to configure the qmail mail server
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-qmailadmin/PLIST b/sysutils/wbm-qmailadmin/PLIST
index ae218c74aa8..ca1040a2435 100644
--- a/sysutils/wbm-qmailadmin/PLIST
+++ b/sysutils/wbm-qmailadmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 21:42:22 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:04 obache Exp $
share/examples/webmin/qmailadmin/config
share/webmin/qmailadmin/CHANGELOG
share/webmin/qmailadmin/autoreply.pl
@@ -56,6 +56,7 @@ share/webmin/qmailadmin/lang/ru_RU
share/webmin/qmailadmin/lang/ru_SU
share/webmin/qmailadmin/lang/uk_UA
share/webmin/qmailadmin/lang/zh_CN
+share/webmin/qmailadmin/lang/zh_CN.UTF-8
share/webmin/qmailadmin/list_aliases.cgi
share/webmin/qmailadmin/list_assigns.cgi
share/webmin/qmailadmin/list_bads.cgi
diff --git a/sysutils/wbm-qmailadmin/distinfo b/sysutils/wbm-qmailadmin/distinfo
index 42fa1dd4ea5..703792e030c 100644
--- a/sysutils/wbm-qmailadmin/distinfo
+++ b/sysutils/wbm-qmailadmin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 21:42:22 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:04 obache Exp $
-SHA1 (webmin-modules-1.270/qmailadmin.wbm.gz) = 8fd8684f2fd753ffe25c94fa5336ef704d36e3e1
-RMD160 (webmin-modules-1.270/qmailadmin.wbm.gz) = 33f54d9ba86be9251f2d26c66b34a840fe2ecc69
-Size (webmin-modules-1.270/qmailadmin.wbm.gz) = 80943 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-quota/Makefile b/sysutils/wbm-quota/Makefile
index 4cff407b959..6e815e84110 100644
--- a/sysutils/wbm-quota/Makefile
+++ b/sysutils/wbm-quota/Makefile
@@ -1,16 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2006/05/19 17:14:53 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:04 obache Exp $
-DISTNAME= quota
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-PKGREVISION= 1
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= quota
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
+WBM_DEPEND_MODULES+= mount
-DEPENDS+= wbm-mount>=1.270:../../sysutils/wbm-mount
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to setup disk quotas
.include "../../sysutils/webmin/wbm.mk"
diff --git a/sysutils/wbm-quota/PLIST b/sysutils/wbm-quota/PLIST
index 08cd4d9264e..081e55d4244 100644
--- a/sysutils/wbm-quota/PLIST
+++ b/sysutils/wbm-quota/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 15:42:30 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:04 obache Exp $
share/examples/webmin/quota/config
share/webmin/quota/CHANGELOG
share/webmin/quota/acl_security.pl
@@ -15,6 +15,7 @@ share/webmin/quota/config-solaris
share/webmin/quota/config-unixware
share/webmin/quota/config.info
share/webmin/quota/config.info.ca
+share/webmin/quota/config.info.da
share/webmin/quota/config.info.de
share/webmin/quota/config.info.es
share/webmin/quota/config.info.fr
@@ -27,7 +28,9 @@ share/webmin/quota/config.info.sv
share/webmin/quota/config.info.tr
share/webmin/quota/config.info.uk_UA
share/webmin/quota/config.info.zh_CN
+share/webmin/quota/config.info.zh_CN.UTF-8
share/webmin/quota/config.info.zh_TW.Big5
+share/webmin/quota/config.info.zh_TW.UTF-8
share/webmin/quota/copy_group.cgi
share/webmin/quota/copy_group_form.cgi
share/webmin/quota/copy_user.cgi
@@ -45,6 +48,7 @@ share/webmin/quota/group_filesys.cgi
share/webmin/quota/group_grace_form.cgi
share/webmin/quota/group_grace_save.cgi
share/webmin/quota/help/copy_group.ca.html
+share/webmin/quota/help/copy_group.da.html
share/webmin/quota/help/copy_group.es.html
share/webmin/quota/help/copy_group.fr.html
share/webmin/quota/help/copy_group.html
@@ -52,7 +56,9 @@ share/webmin/quota/help/copy_group.nl.html
share/webmin/quota/help/copy_group.pl.html
share/webmin/quota/help/copy_group.sv.html
share/webmin/quota/help/copy_group.zh_TW.Big5.html
+share/webmin/quota/help/copy_group.zh_TW.UTF-8.html
share/webmin/quota/help/copy_user.ca.html
+share/webmin/quota/help/copy_user.da.html
share/webmin/quota/help/copy_user.es.html
share/webmin/quota/help/copy_user.fr.html
share/webmin/quota/help/copy_user.html
@@ -60,6 +66,8 @@ share/webmin/quota/help/copy_user.nl.html
share/webmin/quota/help/copy_user.pl.html
share/webmin/quota/help/copy_user.sv.html
share/webmin/quota/help/copy_user.zh_TW.Big5.html
+share/webmin/quota/help/copy_user.zh_TW.UTF-8.html
+share/webmin/quota/help/edit_group_mass.ca.html
share/webmin/quota/help/edit_group_mass.html
share/webmin/quota/help/edit_group_quota.ca.html
share/webmin/quota/help/edit_group_quota.es.html
@@ -69,6 +77,8 @@ share/webmin/quota/help/edit_group_quota.nl.html
share/webmin/quota/help/edit_group_quota.pl.html
share/webmin/quota/help/edit_group_quota.sv.html
share/webmin/quota/help/edit_group_quota.zh_TW.Big5.html
+share/webmin/quota/help/edit_group_quota.zh_TW.UTF-8.html
+share/webmin/quota/help/edit_user_mass.ca.html
share/webmin/quota/help/edit_user_mass.html
share/webmin/quota/help/edit_user_quota.ca.html
share/webmin/quota/help/edit_user_quota.es.html
@@ -78,6 +88,7 @@ share/webmin/quota/help/edit_user_quota.nl.html
share/webmin/quota/help/edit_user_quota.pl.html
share/webmin/quota/help/edit_user_quota.sv.html
share/webmin/quota/help/edit_user_quota.zh_TW.Big5.html
+share/webmin/quota/help/edit_user_quota.zh_TW.UTF-8.html
share/webmin/quota/help/group_filesys.ca.html
share/webmin/quota/help/group_filesys.es.html
share/webmin/quota/help/group_filesys.fr.html
@@ -86,6 +97,7 @@ share/webmin/quota/help/group_filesys.nl.html
share/webmin/quota/help/group_filesys.pl.html
share/webmin/quota/help/group_filesys.sv.html
share/webmin/quota/help/group_filesys.zh_TW.Big5.html
+share/webmin/quota/help/group_filesys.zh_TW.UTF-8.html
share/webmin/quota/help/group_grace.ca.html
share/webmin/quota/help/group_grace.es.html
share/webmin/quota/help/group_grace.fr.html
@@ -94,6 +106,7 @@ share/webmin/quota/help/group_grace.nl.html
share/webmin/quota/help/group_grace.pl.html
share/webmin/quota/help/group_grace.sv.html
share/webmin/quota/help/group_grace.zh_TW.Big5.html
+share/webmin/quota/help/group_grace.zh_TW.UTF-8.html
share/webmin/quota/help/intro.ca.html
share/webmin/quota/help/intro.es.html
share/webmin/quota/help/intro.fr.html
@@ -102,6 +115,7 @@ share/webmin/quota/help/intro.nl.html
share/webmin/quota/help/intro.pl.html
share/webmin/quota/help/intro.sv.html
share/webmin/quota/help/intro.zh_TW.Big5.html
+share/webmin/quota/help/intro.zh_TW.UTF-8.html
share/webmin/quota/help/list_groups.ca.html
share/webmin/quota/help/list_groups.es.html
share/webmin/quota/help/list_groups.fr.html
@@ -117,6 +131,7 @@ share/webmin/quota/help/list_users.nl.html
share/webmin/quota/help/list_users.pl.html
share/webmin/quota/help/list_users.sv.html
share/webmin/quota/help/list_users.zh_TW.Big5.html
+share/webmin/quota/help/list_users.zh_TW.UTF-8.html
share/webmin/quota/help/user_filesys.ca.html
share/webmin/quota/help/user_filesys.es.html
share/webmin/quota/help/user_filesys.fr.html
@@ -125,6 +140,7 @@ share/webmin/quota/help/user_filesys.nl.html
share/webmin/quota/help/user_filesys.pl.html
share/webmin/quota/help/user_filesys.sv.html
share/webmin/quota/help/user_filesys.zh_TW.Big5.html
+share/webmin/quota/help/user_filesys.zh_TW.UTF-8.html
share/webmin/quota/help/user_grace.ca.html
share/webmin/quota/help/user_grace.es.html
share/webmin/quota/help/user_grace.fr.html
@@ -133,6 +149,7 @@ share/webmin/quota/help/user_grace.nl.html
share/webmin/quota/help/user_grace.pl.html
share/webmin/quota/help/user_grace.sv.html
share/webmin/quota/help/user_grace.zh_TW.Big5.html
+share/webmin/quota/help/user_grace.zh_TW.UTF-8.html
share/webmin/quota/hpux-lib.pl
share/webmin/quota/images/icon.gif
share/webmin/quota/images/smallicon.gif
@@ -141,11 +158,14 @@ share/webmin/quota/install_check.pl
share/webmin/quota/irix-lib.pl
share/webmin/quota/lang/ca
share/webmin/quota/lang/cz
+share/webmin/quota/lang/da
share/webmin/quota/lang/en
share/webmin/quota/lang/es
share/webmin/quota/lang/fr
share/webmin/quota/lang/it
+share/webmin/quota/lang/ja_JP.UTF-8
share/webmin/quota/lang/ja_JP.euc
+share/webmin/quota/lang/ko_KR.UTF-8
share/webmin/quota/lang/ko_KR.euc
share/webmin/quota/lang/nl
share/webmin/quota/lang/pl
@@ -157,7 +177,9 @@ share/webmin/quota/lang/sv
share/webmin/quota/lang/tr
share/webmin/quota/lang/uk_UA
share/webmin/quota/lang/zh_CN
+share/webmin/quota/lang/zh_CN.UTF-8
share/webmin/quota/lang/zh_TW.Big5
+share/webmin/quota/lang/zh_TW.UTF-8
share/webmin/quota/linux-lib.pl
share/webmin/quota/list_groups.cgi
share/webmin/quota/list_users.cgi
@@ -169,6 +191,7 @@ share/webmin/quota/notes
share/webmin/quota/openbsd-lib.pl
share/webmin/quota/quota-lib.pl
share/webmin/quota/save_email.cgi
+share/webmin/quota/save_gemail.cgi
share/webmin/quota/save_group_mass.cgi
share/webmin/quota/save_group_quota.cgi
share/webmin/quota/save_gsync.cgi
@@ -187,3 +210,4 @@ share/webmin/quota/useradmin_update.pl
@dirrm share/webmin/quota/help
@dirrm share/webmin/quota
@dirrm share/examples/webmin/quota
+@dirrm etc/webmin/quota
diff --git a/sysutils/wbm-quota/distinfo b/sysutils/wbm-quota/distinfo
index 391ee82fca7..703792e030c 100644
--- a/sysutils/wbm-quota/distinfo
+++ b/sysutils/wbm-quota/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 15:42:30 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:04 obache Exp $
-SHA1 (webmin-modules-1.270/quota.wbm.gz) = 3891416daeea2d267cdc83df8efdfec6dd0f628c
-RMD160 (webmin-modules-1.270/quota.wbm.gz) = e881ef312c7d5972058742be9d6c18d75f69ca96
-Size (webmin-modules-1.270/quota.wbm.gz) = 110059 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-sendmail/Makefile b/sysutils/wbm-sendmail/Makefile
index c967837d150..c44b9ce3564 100644
--- a/sysutils/wbm-sendmail/Makefile
+++ b/sysutils/wbm-sendmail/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:43 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:05 obache Exp $
-DISTNAME= sendmail
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= sendmail
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to manage Sendmail
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-sendmail/PLIST b/sysutils/wbm-sendmail/PLIST
index c8035bfc1ab..a2033e98a10 100644
--- a/sysutils/wbm-sendmail/PLIST
+++ b/sysutils/wbm-sendmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 15:42:42 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:05 obache Exp $
share/examples/webmin/sendmail/config
share/webmin/sendmail/CHANGELOG
share/webmin/sendmail/access-lib.pl
@@ -64,7 +64,9 @@ share/webmin/sendmail/config.info.sv
share/webmin/sendmail/config.info.tr
share/webmin/sendmail/config.info.uk_UA
share/webmin/sendmail/config.info.zh_CN
+share/webmin/sendmail/config.info.zh_CN.UTF-8
share/webmin/sendmail/config.info.zh_TW.Big5
+share/webmin/sendmail/config.info.zh_TW.UTF-8
share/webmin/sendmail/create_file.cgi
share/webmin/sendmail/defaultacl
share/webmin/sendmail/defines
@@ -94,6 +96,8 @@ 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.html
+share/webmin/sendmail/help/alias_cmt.html
share/webmin/sendmail/help/alias_enabled.ca.html
share/webmin/sendmail/help/alias_enabled.es.html
share/webmin/sendmail/help/alias_enabled.fr.html
@@ -103,6 +107,7 @@ 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.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_name.ca.html
share/webmin/sendmail/help/alias_name.es.html
share/webmin/sendmail/help/alias_name.fr.html
@@ -112,6 +117,7 @@ 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.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.html
share/webmin/sendmail/help/alias_to.es.html
share/webmin/sendmail/help/alias_to.fr.html
@@ -121,6 +127,7 @@ 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.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.html
share/webmin/sendmail/help/aliases.es.html
share/webmin/sendmail/help/aliases.fr.html
@@ -130,6 +137,7 @@ share/webmin/sendmail/help/aliases.ru_RU.html
share/webmin/sendmail/help/aliases.ru_SU.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.html
share/webmin/sendmail/help/edit_alias.es.html
share/webmin/sendmail/help/edit_alias.fr.html
@@ -139,6 +147,7 @@ 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.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.html
share/webmin/sendmail/help/intro.es.html
share/webmin/sendmail/help/intro.fr.html
@@ -148,6 +157,9 @@ share/webmin/sendmail/help/intro.ru_RU.html
share/webmin/sendmail/help/intro.ru_SU.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.html
+share/webmin/sendmail/help/opt_BadRcptThrottle.html
share/webmin/sendmail/help/opt_ConnectionRateThrottle.ca.html
share/webmin/sendmail/help/opt_ConnectionRateThrottle.es.html
share/webmin/sendmail/help/opt_ConnectionRateThrottle.fr.html
@@ -157,6 +169,7 @@ 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.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.html
share/webmin/sendmail/help/opt_DH.es.html
share/webmin/sendmail/help/opt_DH.fr.html
@@ -166,6 +179,7 @@ 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.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.html
share/webmin/sendmail/help/opt_DR.es.html
share/webmin/sendmail/help/opt_DR.fr.html
@@ -175,6 +189,7 @@ 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.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.html
share/webmin/sendmail/help/opt_DS.es.html
share/webmin/sendmail/help/opt_DS.fr.html
@@ -184,6 +199,7 @@ 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.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.html
share/webmin/sendmail/help/opt_DaemonPortOptions.es.html
share/webmin/sendmail/help/opt_DaemonPortOptions.html
@@ -198,6 +214,7 @@ 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.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.html
share/webmin/sendmail/help/opt_LogLevel.es.html
share/webmin/sendmail/help/opt_LogLevel.fr.html
@@ -207,6 +224,7 @@ 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.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.html
share/webmin/sendmail/help/opt_MatchGECOS.es.html
share/webmin/sendmail/help/opt_MatchGECOS.html
@@ -220,6 +238,7 @@ 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.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.html
share/webmin/sendmail/help/opt_MaxHopCount.es.html
share/webmin/sendmail/help/opt_MaxHopCount.html
@@ -233,6 +252,7 @@ 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.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.html
share/webmin/sendmail/help/opt_MaxQueueRunSize.es.html
share/webmin/sendmail/help/opt_MaxQueueRunSize.fr.html
@@ -242,6 +262,7 @@ 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.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.html
share/webmin/sendmail/help/opt_MinFreeBlocks.es.html
share/webmin/sendmail/help/opt_MinFreeBlocks.fr.html
@@ -251,6 +272,7 @@ 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.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.html
share/webmin/sendmail/help/opt_MinQueueAge.es.html
share/webmin/sendmail/help/opt_MinQueueAge.fr.html
@@ -260,6 +282,7 @@ 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.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.html
share/webmin/sendmail/help/opt_PostMasterCopy.es.html
share/webmin/sendmail/help/opt_PostMasterCopy.fr.html
@@ -269,6 +292,7 @@ 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.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.html
share/webmin/sendmail/help/opt_QueueDirectory.es.html
share/webmin/sendmail/help/opt_QueueDirectory.fr.html
@@ -278,6 +302,7 @@ 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.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.html
share/webmin/sendmail/help/opt_QueueLA.es.html
share/webmin/sendmail/help/opt_QueueLA.fr.html
@@ -287,6 +312,7 @@ 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.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.html
share/webmin/sendmail/help/opt_RefuseLA.es.html
share/webmin/sendmail/help/opt_RefuseLA.fr.html
@@ -296,6 +322,7 @@ 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.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.html
share/webmin/sendmail/help/opt_SendMimeErrors.es.html
share/webmin/sendmail/help/opt_SendMimeErrors.fr.html
@@ -305,6 +332,7 @@ 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.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.queuereturn.ca.html
share/webmin/sendmail/help/opt_Timeout.queuereturn.es.html
share/webmin/sendmail/help/opt_Timeout.queuereturn.fr.html
@@ -314,6 +342,7 @@ 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.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.html
share/webmin/sendmail/help/opt_Timeout.queuewarn.es.html
share/webmin/sendmail/help/opt_Timeout.queuewarn.fr.html
@@ -323,6 +352,7 @@ 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.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.html
share/webmin/sendmail/help/opt_dmode.es.html
share/webmin/sendmail/help/opt_dmode.html
@@ -338,6 +368,7 @@ share/webmin/sendmail/help/units.ru_RU.html
share/webmin/sendmail/help/units.ru_SU.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
share/webmin/sendmail/images/access.gif
share/webmin/sendmail/images/aliases.gif
share/webmin/sendmail/images/attach.gif
@@ -370,8 +401,10 @@ share/webmin/sendmail/lang/de
share/webmin/sendmail/lang/en
share/webmin/sendmail/lang/es
share/webmin/sendmail/lang/fr
+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/pl
@@ -382,7 +415,9 @@ share/webmin/sendmail/lang/sv
share/webmin/sendmail/lang/tr
share/webmin/sendmail/lang/uk_UA
share/webmin/sendmail/lang/zh_CN
+share/webmin/sendmail/lang/zh_CN.UTF-8
share/webmin/sendmail/lang/zh_TW.Big5
+share/webmin/sendmail/lang/zh_TW.UTF-8
share/webmin/sendmail/list_access.cgi
share/webmin/sendmail/list_aliases.cgi
share/webmin/sendmail/list_cgs.cgi
@@ -434,3 +469,4 @@ share/webmin/sendmail/virtusers-lib.pl
@dirrm share/webmin/sendmail/help
@dirrm share/webmin/sendmail
@dirrm share/examples/webmin/sendmail
+@dirrm etc/webmin/sendmail
diff --git a/sysutils/wbm-sendmail/distinfo b/sysutils/wbm-sendmail/distinfo
index 253521174ba..06ca64dba16 100644
--- a/sysutils/wbm-sendmail/distinfo
+++ b/sysutils/wbm-sendmail/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 15:42:42 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:05 obache Exp $
-SHA1 (webmin-modules-1.270/sendmail.wbm.gz) = dd67c541915a7a8155903dcccf600b88a44d3d07
-RMD160 (webmin-modules-1.270/sendmail.wbm.gz) = ae771e506417f4c75d72602c4fbe3b69d596855a
-Size (webmin-modules-1.270/sendmail.wbm.gz) = 283084 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-shell/Makefile b/sysutils/wbm-shell/Makefile
index 8ae231092e2..2332d338425 100644
--- a/sysutils/wbm-shell/Makefile
+++ b/sysutils/wbm-shell/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:43 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:05 obache Exp $
-DISTNAME= shell
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= shell
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module for executing shell commands
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-shell/PLIST b/sysutils/wbm-shell/PLIST
index 24cdbebbd80..b90bfe45c3a 100644
--- a/sysutils/wbm-shell/PLIST
+++ b/sysutils/wbm-shell/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 04:03:45 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:05 obache Exp $
share/examples/webmin/shell/config
share/webmin/shell/acl_security.pl
share/webmin/shell/config
share/webmin/shell/config.info
share/webmin/shell/config.info.ca
share/webmin/shell/config.info.es
+share/webmin/shell/config.info.fr
share/webmin/shell/config.info.sk
share/webmin/shell/defaultacl
share/webmin/shell/images/icon.gif
@@ -17,7 +18,9 @@ share/webmin/shell/lang/en
share/webmin/shell/lang/es
share/webmin/shell/lang/fr
share/webmin/shell/lang/hu
+share/webmin/shell/lang/ja_JP.UTF-8
share/webmin/shell/lang/ja_JP.euc
+share/webmin/shell/lang/ko_KR.UTF-8
share/webmin/shell/lang/ko_KR.euc
share/webmin/shell/lang/ms
share/webmin/shell/lang/pl
@@ -26,6 +29,7 @@ share/webmin/shell/lang/ru_SU
share/webmin/shell/lang/sk
share/webmin/shell/lang/uk_UA
share/webmin/shell/lang/zh_TW.Big5
+share/webmin/shell/lang/zh_TW.UTF-8
share/webmin/shell/log_parser.pl
share/webmin/shell/module.info
share/webmin/shell/shell-lib.pl
diff --git a/sysutils/wbm-shell/distinfo b/sysutils/wbm-shell/distinfo
index 84063ab792d..06ca64dba16 100644
--- a/sysutils/wbm-shell/distinfo
+++ b/sysutils/wbm-shell/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 04:03:45 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:05 obache Exp $
-SHA1 (webmin-modules-1.270/shell.wbm.gz) = 6da6357b38eb4349fb38d40bff37597f5210097b
-RMD160 (webmin-modules-1.270/shell.wbm.gz) = a5f554cd76636583c181c70399188e85733e987c
-Size (webmin-modules-1.270/shell.wbm.gz) = 56414 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-sshd/Makefile b/sysutils/wbm-sshd/Makefile
index e0bf7ad8f42..bfe288a6506 100644
--- a/sysutils/wbm-sshd/Makefile
+++ b/sysutils/wbm-sshd/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:43 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:05 obache Exp $
-DISTNAME= sshd
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= sshd
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to setup the Secure Shell server
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-sshd/PLIST b/sysutils/wbm-sshd/PLIST
index 565dd043860..eacfcbcb4ad 100644
--- a/sysutils/wbm-sshd/PLIST
+++ b/sysutils/wbm-sshd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 15:43:00 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:05 obache Exp $
share/examples/webmin/sshd/config
share/webmin/sshd/CHANGELOG
share/webmin/sshd/apply.cgi
@@ -20,16 +20,19 @@ share/webmin/sshd/config-suse-linux-8.2-*
share/webmin/sshd/config-trustix-linux
share/webmin/sshd/config-turbo-linux-7.0
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.de
share/webmin/sshd/config.info.es
share/webmin/sshd/config.info.fa
share/webmin/sshd/config.info.fr
+share/webmin/sshd/config.info.ja_JP.UTF-8
share/webmin/sshd/config.info.ja_JP.euc
share/webmin/sshd/config.info.pl
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.uk_UA
share/webmin/sshd/edit_access.cgi
share/webmin/sshd/edit_host.cgi
@@ -40,26 +43,31 @@ share/webmin/sshd/edit_sync.cgi
share/webmin/sshd/edit_users.cgi
share/webmin/sshd/help/access.ca.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.html
share/webmin/sshd/help/access.pl.html
share/webmin/sshd/help/chost.ca.html
share/webmin/sshd/help/chost.es.html
+share/webmin/sshd/help/chost.fa.html
share/webmin/sshd/help/chost.html
share/webmin/sshd/help/chost.hu.html
share/webmin/sshd/help/chost.pl.html
share/webmin/sshd/help/ehost.ca.html
share/webmin/sshd/help/ehost.es.html
+share/webmin/sshd/help/ehost.fa.html
share/webmin/sshd/help/ehost.html
share/webmin/sshd/help/ehost.hu.html
share/webmin/sshd/help/ehost.pl.html
share/webmin/sshd/help/host.ca.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.html
share/webmin/sshd/help/host.pl.html
share/webmin/sshd/help/hosts.ca.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.html
share/webmin/sshd/help/hosts.pl.html
@@ -70,16 +78,19 @@ share/webmin/sshd/help/intro.hu.html
share/webmin/sshd/help/intro.pl.html
share/webmin/sshd/help/misc.ca.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.html
share/webmin/sshd/help/misc.pl.html
share/webmin/sshd/help/net.ca.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.html
share/webmin/sshd/help/net.pl.html
share/webmin/sshd/help/users.ca.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.html
share/webmin/sshd/help/users.pl.html
@@ -102,12 +113,15 @@ share/webmin/sshd/lang/es
share/webmin/sshd/lang/fa
share/webmin/sshd/lang/fr
share/webmin/sshd/lang/it
+share/webmin/sshd/lang/ja_JP.UTF-8
share/webmin/sshd/lang/ja_JP.euc
share/webmin/sshd/lang/pl
share/webmin/sshd/lang/ru_RU
share/webmin/sshd/lang/ru_SU
+share/webmin/sshd/lang/sk
share/webmin/sshd/lang/uk_UA
share/webmin/sshd/lang/zh_CN
+share/webmin/sshd/lang/zh_CN.UTF-8
share/webmin/sshd/list_hosts.cgi
share/webmin/sshd/log_parser.pl
share/webmin/sshd/module.info
@@ -127,3 +141,4 @@ share/webmin/sshd/useradmin_update.pl
@dirrm share/webmin/sshd/help
@dirrm share/webmin/sshd
@dirrm share/examples/webmin/sshd
+@dirrm etc/webmin/sshd
diff --git a/sysutils/wbm-sshd/distinfo b/sysutils/wbm-sshd/distinfo
index b041e69657c..06ca64dba16 100644
--- a/sysutils/wbm-sshd/distinfo
+++ b/sysutils/wbm-sshd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 15:43:00 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:05 obache Exp $
-SHA1 (webmin-modules-1.270/sshd.wbm.gz) = bb513e91aaf724dd49be21873f29db7b9a91fe2b
-RMD160 (webmin-modules-1.270/sshd.wbm.gz) = 6655c6f220f3261817b3752da402cb5ed2260fe7
-Size (webmin-modules-1.270/sshd.wbm.gz) = 68967 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-status/Makefile b/sysutils/wbm-status/Makefile
index 9992b16ca1e..5423002ee07 100644
--- a/sysutils/wbm-status/Makefile
+++ b/sysutils/wbm-status/Makefile
@@ -1,16 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2006/05/19 17:14:53 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:05 obache Exp $
-DISTNAME= status
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-PKGREVISION= 1
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= status
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
+WBM_DEPEND_MODULES+= mailboxes
-DEPENDS+= wbm-mailboxes>=1.270:../../sysutils/wbm-mailboxes
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to view the status of services
.include "../../sysutils/webmin/wbm.mk"
diff --git a/sysutils/wbm-status/PLIST b/sysutils/wbm-status/PLIST
index 3cfa8c36cc1..4ace6015441 100644
--- a/sysutils/wbm-status/PLIST
+++ b/sysutils/wbm-status/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 15:43:17 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:05 obache Exp $
share/examples/webmin/status/config
share/webmin/status/CHANGELOG
share/webmin/status/WEBMIN-STATUS-MIB.txt
share/webmin/status/acl_security.pl
+share/webmin/status/alive-monitor.pl
share/webmin/status/apache-monitor.pl
share/webmin/status/backup_config.pl
share/webmin/status/bind8-monitor.pl
@@ -12,7 +13,7 @@ share/webmin/status/config
share/webmin/status/config-*-linux
share/webmin/status/config-debian-linux
share/webmin/status/config-debian-linux-3.0
-share/webmin/status/config-debian-linux-3.1
+share/webmin/status/config-debian-linux-3.1-*
share/webmin/status/config-freebsd
share/webmin/status/config-hpux
share/webmin/status/config-netbsd
@@ -23,6 +24,7 @@ share/webmin/status/config.info.de
share/webmin/status/config.info.es
share/webmin/status/config.info.fa
share/webmin/status/config.info.fr
+share/webmin/status/config.info.ja_JP.UTF-8
share/webmin/status/config.info.ja_JP.euc
share/webmin/status/config.info.nl
share/webmin/status/config.info.pl
@@ -32,7 +34,10 @@ share/webmin/status/config.info.sv
share/webmin/status/config.info.tr
share/webmin/status/config.info.uk_UA
share/webmin/status/config.info.zh_CN
+share/webmin/status/config.info.zh_CN.UTF-8
share/webmin/status/config.info.zh_TW.Big5
+share/webmin/status/config.info.zh_TW.UTF-8
+share/webmin/status/consume-monitor.pl
share/webmin/status/defaultacl
share/webmin/status/delete_mons.cgi
share/webmin/status/dhcpd-monitor.pl
@@ -43,6 +48,7 @@ share/webmin/status/edit_sched.cgi
share/webmin/status/exec-monitor.pl
share/webmin/status/feedback_files.pl
share/webmin/status/file-monitor.pl
+share/webmin/status/ftp-monitor.pl
share/webmin/status/hostsentry-monitor.pl
share/webmin/status/http-monitor.pl
share/webmin/status/iface-monitor.pl
@@ -64,7 +70,9 @@ share/webmin/status/lang/en
share/webmin/status/lang/es
share/webmin/status/lang/fa
share/webmin/status/lang/fr
+share/webmin/status/lang/ja_JP.UTF-8
share/webmin/status/lang/ja_JP.euc
+share/webmin/status/lang/ko_KR.UTF-8
share/webmin/status/lang/ko_KR.euc
share/webmin/status/lang/nl
share/webmin/status/lang/pl
@@ -75,7 +83,9 @@ share/webmin/status/lang/sv
share/webmin/status/lang/tr
share/webmin/status/lang/uk_UA
share/webmin/status/lang/zh_CN
+share/webmin/status/lang/zh_CN.UTF-8
share/webmin/status/lang/zh_TW.Big5
+share/webmin/status/lang/zh_TW.UTF-8
share/webmin/status/load-monitor.pl
share/webmin/status/log_parser.pl
share/webmin/status/mailq-monitor.pl
@@ -94,8 +104,10 @@ share/webmin/status/postgresql-monitor.pl
share/webmin/status/proc-monitor.pl
share/webmin/status/proftpd-monitor.pl
share/webmin/status/qmailadmin-monitor.pl
+share/webmin/status/query-monitor.pl
share/webmin/status/raid-monitor.pl
share/webmin/status/refresh.cgi
+share/webmin/status/rssh-monitor.pl
share/webmin/status/samba-monitor.pl
share/webmin/status/save_mon.cgi
share/webmin/status/save_sched.cgi
@@ -131,3 +143,4 @@ share/webmin/status/xinetd-monitor.pl
@dirrm share/webmin/status/images
@dirrm share/webmin/status
@dirrm share/examples/webmin/status
+@dirrm etc/webmin/status
diff --git a/sysutils/wbm-status/distinfo b/sysutils/wbm-status/distinfo
index 0edf2cbdd61..06ca64dba16 100644
--- a/sysutils/wbm-status/distinfo
+++ b/sysutils/wbm-status/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 15:43:17 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:05 obache Exp $
-SHA1 (webmin-modules-1.270/status.wbm.gz) = 6e0033716c7588f483a895c92747e15e42c5bcc6
-RMD160 (webmin-modules-1.270/status.wbm.gz) = 390f7173ceb5d81bf311385a745c9ef6577fb58f
-Size (webmin-modules-1.270/status.wbm.gz) = 81785 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-syslog/Makefile b/sysutils/wbm-syslog/Makefile
index 1cf04c6dce0..f9f09013f59 100644
--- a/sysutils/wbm-syslog/Makefile
+++ b/sysutils/wbm-syslog/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:43 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:05 obache Exp $
-DISTNAME= syslog
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= syslog
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to configure the syslog server view log files
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-syslog/PLIST b/sysutils/wbm-syslog/PLIST
index 993e66b38fd..e9d233349d8 100644
--- a/sysutils/wbm-syslog/PLIST
+++ b/sysutils/wbm-syslog/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 15:43:38 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:05 obache Exp $
share/examples/webmin/syslog/config
share/webmin/syslog/CHANGELOG
share/webmin/syslog/acl_security.pl
@@ -38,6 +38,7 @@ share/webmin/syslog/config.info.de
share/webmin/syslog/config.info.es
share/webmin/syslog/config.info.fr
share/webmin/syslog/config.info.hu
+share/webmin/syslog/config.info.ja_JP.UTF-8
share/webmin/syslog/config.info.ja_JP.euc
share/webmin/syslog/config.info.pl
share/webmin/syslog/config.info.ru_RU
@@ -46,7 +47,9 @@ share/webmin/syslog/config.info.sv
share/webmin/syslog/config.info.tr
share/webmin/syslog/config.info.uk_UA
share/webmin/syslog/config.info.zh_CN
+share/webmin/syslog/config.info.zh_CN.UTF-8
share/webmin/syslog/config.info.zh_TW.Big5
+share/webmin/syslog/config.info.zh_TW.UTF-8
share/webmin/syslog/defaultacl
share/webmin/syslog/edit_log.cgi
share/webmin/syslog/images/icon.gif
@@ -59,7 +62,9 @@ share/webmin/syslog/lang/en
share/webmin/syslog/lang/es
share/webmin/syslog/lang/fr
share/webmin/syslog/lang/hu
+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/pl
share/webmin/syslog/lang/ru_RU
@@ -68,7 +73,9 @@ share/webmin/syslog/lang/sv
share/webmin/syslog/lang/tr
share/webmin/syslog/lang/uk_UA
share/webmin/syslog/lang/zh_CN
+share/webmin/syslog/lang/zh_CN.UTF-8
share/webmin/syslog/lang/zh_TW.Big5
+share/webmin/syslog/lang/zh_TW.UTF-8
share/webmin/syslog/log_parser.pl
share/webmin/syslog/low.risk
share/webmin/syslog/low.skill
@@ -84,3 +91,4 @@ share/webmin/syslog/syslog-lib.pl
@dirrm share/webmin/syslog/images
@dirrm share/webmin/syslog
@dirrm share/examples/webmin/syslog
+@dirrm etc/webmin/syslog
diff --git a/sysutils/wbm-syslog/distinfo b/sysutils/wbm-syslog/distinfo
index 948779f66b4..06ca64dba16 100644
--- a/sysutils/wbm-syslog/distinfo
+++ b/sysutils/wbm-syslog/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 15:43:38 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:05 obache Exp $
-SHA1 (webmin-modules-1.270/syslog.wbm.gz) = a1d4bb92c259b24e4efacad1e5607baf06d9f907
-RMD160 (webmin-modules-1.270/syslog.wbm.gz) = 8aa1be1bcfb772fe085e6159d1fb1b5528634e80
-Size (webmin-modules-1.270/syslog.wbm.gz) = 38536 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-telnet/Makefile b/sysutils/wbm-telnet/Makefile
index 6d67afece28..8b6039872ef 100644
--- a/sysutils/wbm-telnet/Makefile
+++ b/sysutils/wbm-telnet/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:43 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:06 obache Exp $
-DISTNAME= telnet
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= telnet
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to login via telnet or SSH
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-telnet/PLIST b/sysutils/wbm-telnet/PLIST
index 7cff026956d..1540301c7e4 100644
--- a/sysutils/wbm-telnet/PLIST
+++ b/sysutils/wbm-telnet/PLIST
@@ -1,17 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 15:43:52 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:06 obache Exp $
share/examples/webmin/telnet/config
+share/webmin/telnet/CHANGELOG
share/webmin/telnet/config
-share/webmin/telnet/config-coherent-linux
-share/webmin/telnet/config-debian-linux-3.0-*
-share/webmin/telnet/config-freebsd-5.0-*
-share/webmin/telnet/config-macos-1.3-*
-share/webmin/telnet/config-mandrake-linux-9.0-*
-share/webmin/telnet/config-open-linux-3.1e
-share/webmin/telnet/config-redhat-linux-8.0-*
-share/webmin/telnet/config-solaris-10-*
-share/webmin/telnet/config-suse-linux-8.0-*
-share/webmin/telnet/config-turbo-linux-7.0-*
-share/webmin/telnet/config-united-linux
share/webmin/telnet/config.info
share/webmin/telnet/config.info.ca
share/webmin/telnet/config.info.de
@@ -27,7 +17,9 @@ share/webmin/telnet/config.info.sv
share/webmin/telnet/config.info.tr
share/webmin/telnet/config.info.uk_UA
share/webmin/telnet/config.info.zh_CN
+share/webmin/telnet/config.info.zh_CN.UTF-8
share/webmin/telnet/config.info.zh_TW.Big5
+share/webmin/telnet/config.info.zh_TW.UTF-8
share/webmin/telnet/images/icon.gif
share/webmin/telnet/images/smallicon.gif
share/webmin/telnet/index.cgi
@@ -40,7 +32,9 @@ share/webmin/telnet/lang/en
share/webmin/telnet/lang/es
share/webmin/telnet/lang/fr
share/webmin/telnet/lang/it
+share/webmin/telnet/lang/ja_JP.UTF-8
share/webmin/telnet/lang/ja_JP.euc
+share/webmin/telnet/lang/ko_KR.UTF-8
share/webmin/telnet/lang/ko_KR.euc
share/webmin/telnet/lang/ms
share/webmin/telnet/lang/pl
@@ -53,7 +47,9 @@ share/webmin/telnet/lang/sv
share/webmin/telnet/lang/tr
share/webmin/telnet/lang/uk_UA
share/webmin/telnet/lang/zh_CN
+share/webmin/telnet/lang/zh_CN.UTF-8
share/webmin/telnet/lang/zh_TW.Big5
+share/webmin/telnet/lang/zh_TW.UTF-8
share/webmin/telnet/module.info
share/webmin/telnet/ssh.conf
share/webmin/telnet/telnet.conf
@@ -61,3 +57,4 @@ share/webmin/telnet/telnet.conf
@dirrm share/webmin/telnet/images
@dirrm share/webmin/telnet
@dirrm share/examples/webmin/telnet
+@dirrm etc/webmin/telnet
diff --git a/sysutils/wbm-telnet/distinfo b/sysutils/wbm-telnet/distinfo
index bcb4159402d..ac6a7e9bc9f 100644
--- a/sysutils/wbm-telnet/distinfo
+++ b/sysutils/wbm-telnet/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 15:43:52 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:06 obache Exp $
-SHA1 (webmin-modules-1.270/telnet.wbm.gz) = 32ff279ee67b1f4cbc291335eaa853e913e4c4a1
-RMD160 (webmin-modules-1.270/telnet.wbm.gz) = 9a5ecd8d7adac1e6be63bfdc768c20440e48a817
-Size (webmin-modules-1.270/telnet.wbm.gz) = 446646 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-time/Makefile b/sysutils/wbm-time/Makefile
index bf3df39c556..333d3786ff2 100644
--- a/sysutils/wbm-time/Makefile
+++ b/sysutils/wbm-time/Makefile
@@ -1,17 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/02/19 21:52:43 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/04/21 05:23:07 obache Exp $
-DISTNAME= time
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-PKGREVISION= 1
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= time
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to set the system time
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-time/PLIST b/sysutils/wbm-time/PLIST
index d8f098b2aca..86759e751d0 100644
--- a/sysutils/wbm-time/PLIST
+++ b/sysutils/wbm-time/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 15:44:04 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:07 obache Exp $
share/examples/webmin/time/config
share/webmin/time/CHANGELOG
share/webmin/time/acl_security.pl
@@ -21,6 +21,7 @@ share/webmin/time/config.info.es
share/webmin/time/config.info.fa
share/webmin/time/config.info.fr
share/webmin/time/config.info.hu
+share/webmin/time/config.info.ja_JP.UTF-8
share/webmin/time/config.info.ja_JP.euc
share/webmin/time/config.info.ms
share/webmin/time/config.info.pl
@@ -31,12 +32,15 @@ share/webmin/time/config.info.sv
share/webmin/time/config.info.tr
share/webmin/time/config.info.uk_UA
share/webmin/time/config.info.zh_CN
+share/webmin/time/config.info.zh_CN.UTF-8
share/webmin/time/config.info.zh_TW.Big5
+share/webmin/time/config.info.zh_TW.UTF-8
share/webmin/time/defaultacl
share/webmin/time/freebsd-lib.pl
share/webmin/time/help/hardware_time.ca.html
share/webmin/time/help/hardware_time.de.html
share/webmin/time/help/hardware_time.es.html
+share/webmin/time/help/hardware_time.fa.html
share/webmin/time/help/hardware_time.fr.html
share/webmin/time/help/hardware_time.html
share/webmin/time/help/hardware_time.hu.html
@@ -46,9 +50,11 @@ share/webmin/time/help/hardware_time.ru_SU.html
share/webmin/time/help/hardware_time.sk.html
share/webmin/time/help/hardware_time.sv.html
share/webmin/time/help/hardware_time.zh_TW.Big5.html
+share/webmin/time/help/hardware_time.zh_TW.UTF-8.html
share/webmin/time/help/index.ca.html
share/webmin/time/help/index.de.html
share/webmin/time/help/index.es.html
+share/webmin/time/help/index.fa.html
share/webmin/time/help/index.fr.html
share/webmin/time/help/index.html
share/webmin/time/help/index.hu.html
@@ -58,9 +64,11 @@ share/webmin/time/help/index.ru_SU.html
share/webmin/time/help/index.sk.html
share/webmin/time/help/index.sv.html
share/webmin/time/help/index.zh_TW.Big5.html
+share/webmin/time/help/index.zh_TW.UTF-8.html
share/webmin/time/help/system_time.ca.html
share/webmin/time/help/system_time.de.html
share/webmin/time/help/system_time.es.html
+share/webmin/time/help/system_time.fa.html
share/webmin/time/help/system_time.fr.html
share/webmin/time/help/system_time.html
share/webmin/time/help/system_time.hu.html
@@ -70,9 +78,11 @@ share/webmin/time/help/system_time.ru_SU.html
share/webmin/time/help/system_time.sk.html
share/webmin/time/help/system_time.sv.html
share/webmin/time/help/system_time.zh_TW.Big5.html
+share/webmin/time/help/system_time.zh_TW.UTF-8.html
share/webmin/time/help/timeserver.ca.html
share/webmin/time/help/timeserver.de.html
share/webmin/time/help/timeserver.es.html
+share/webmin/time/help/timeserver.fa.html
share/webmin/time/help/timeserver.fr.html
share/webmin/time/help/timeserver.html
share/webmin/time/help/timeserver.hu.html
@@ -82,6 +92,7 @@ share/webmin/time/help/timeserver.ru_SU.html
share/webmin/time/help/timeserver.sk.html
share/webmin/time/help/timeserver.sv.html
share/webmin/time/help/timeserver.zh_TW.Big5.html
+share/webmin/time/help/timeserver.zh_TW.UTF-8.html
share/webmin/time/images/icon.gif
share/webmin/time/images/smallicon.gif
share/webmin/time/index.cgi
@@ -93,8 +104,10 @@ share/webmin/time/lang/es
share/webmin/time/lang/fa
share/webmin/time/lang/fr
share/webmin/time/lang/hu
+share/webmin/time/lang/ja_JP.UTF-8
share/webmin/time/lang/ja_JP.euc
share/webmin/time/lang/ja_JP.jis
+share/webmin/time/lang/ko_KR.UTF-8
share/webmin/time/lang/ko_KR.euc
share/webmin/time/lang/ms
share/webmin/time/lang/pl
@@ -105,7 +118,9 @@ share/webmin/time/lang/sv
share/webmin/time/lang/tr
share/webmin/time/lang/uk_UA
share/webmin/time/lang/zh_CN
+share/webmin/time/lang/zh_CN.UTF-8
share/webmin/time/lang/zh_TW.Big5
+share/webmin/time/lang/zh_TW.UTF-8
share/webmin/time/linux-lib.pl
share/webmin/time/log_parser.pl
share/webmin/time/module.info
@@ -121,3 +136,4 @@ share/webmin/time/uninstall.pl
@dirrm share/webmin/time/help
@dirrm share/webmin/time
@dirrm share/examples/webmin/time
+@dirrm etc/webmin/time
diff --git a/sysutils/wbm-time/distinfo b/sysutils/wbm-time/distinfo
index e84438ce5b7..4b78a38cfce 100644
--- a/sysutils/wbm-time/distinfo
+++ b/sysutils/wbm-time/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2006/05/19 17:14:53 jlam Exp $
+$NetBSD: distinfo,v 1.3 2007/04/21 05:23:07 obache Exp $
-SHA1 (webmin-modules-1.270/time.wbm.gz) = d4b785569fd27a78b5ff9ade348ef8fe1fbca9aa
-RMD160 (webmin-modules-1.270/time.wbm.gz) = 73b049052db9b13c865b0d5af8ef7684074f19c6
-Size (webmin-modules-1.270/time.wbm.gz) = 32355 bytes
-SHA1 (patch-aa) = 12531637b08992dd84c8f49863b0892b63606eac
-SHA1 (patch-ab) = a4d2bdb99969c6a16fc15f8f011be5b2a8199ef1
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
+SHA1 (patch-aa) = f8d96032a71758d6360758c400c6c404db750820
diff --git a/sysutils/wbm-time/patches/patch-aa b/sysutils/wbm-time/patches/patch-aa
index e055a2b15fe..a8e79958742 100644
--- a/sysutils/wbm-time/patches/patch-aa
+++ b/sysutils/wbm-time/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/05/16 15:44:04 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2007/04/21 05:23:07 obache Exp $
---- module.info.orig Tue Apr 4 23:16:16 2006
-+++ module.info
+--- time/module.info.orig 2007-04-09 05:00:48.000000000 +0000
++++ time/module.info
@@ -1,7 +1,7 @@
desc_ru_SU=
risk=low medium high
diff --git a/sysutils/wbm-time/patches/patch-ab b/sysutils/wbm-time/patches/patch-ab
deleted file mode 100644
index c8580ff9dba..00000000000
--- a/sysutils/wbm-time/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/05/19 17:14:53 jlam Exp $
-
---- uninstall.pl.orig Tue Apr 4 23:16:15 2006
-+++ uninstall.pl
-@@ -5,14 +5,12 @@ require 'time-lib.pl';
-
- sub module_uninstall
- {
--if ($config{'sched_mode'}) {
- # Scheduled checking is enabled .. remove the cron job
- &foreign_require("cron", "cron-lib.pl");
- $job = &find_cron_job();
- if ($job) {
- &cron::delete_cron_job($job);
- }
-- }
- }
-
- 1;
diff --git a/sysutils/wbm-tunnel/Makefile b/sysutils/wbm-tunnel/Makefile
index 220dba45a68..2a6c1b522c9 100644
--- a/sysutils/wbm-tunnel/Makefile
+++ b/sysutils/wbm-tunnel/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:43 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:08 obache Exp $
-DISTNAME= tunnel
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= tunnel
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to tunnel to another HTTP server
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-tunnel/distinfo b/sysutils/wbm-tunnel/distinfo
index 1096770e3e9..9e93e10da00 100644
--- a/sysutils/wbm-tunnel/distinfo
+++ b/sysutils/wbm-tunnel/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 15:44:15 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:08 obache Exp $
-SHA1 (webmin-modules-1.270/tunnel.wbm.gz) = a37f0b85ea768a322c96fa6bec71e24d0c79a289
-RMD160 (webmin-modules-1.270/tunnel.wbm.gz) = a63b6af777bec1ad67d86a4476958d5dae970e05
-Size (webmin-modules-1.270/tunnel.wbm.gz) = 7594 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/wbm-useradmin/Makefile b/sysutils/wbm-useradmin/Makefile
index 8639e1d487f..0ccb27a51e4 100644
--- a/sysutils/wbm-useradmin/Makefile
+++ b/sysutils/wbm-useradmin/Makefile
@@ -1,16 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2007/02/19 21:52:43 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/04/21 05:23:08 obache Exp $
-DISTNAME= useradmin
-PKGNAME= wbm-${DISTNAME}-${WBM_VERSION}
-DIST_SUBDIR= webmin-modules-${WBM_VERSION}
+WBM_NAME= useradmin
-# The version is from the module.info file from the extracted distfile.
-WBM_VERSION= 1.270
-
-HOMEPAGE= http://www.webmin.com/standard.html
COMMENT= Webmin module to manage users and groups
-BROKEN= "Distfile broken"
-
.include "../../sysutils/webmin/wbm.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wbm-useradmin/PLIST b/sysutils/wbm-useradmin/PLIST
index 1c31ed2b59d..0a6d10c310f 100644
--- a/sysutils/wbm-useradmin/PLIST
+++ b/sysutils/wbm-useradmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/05/16 15:44:30 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/04/21 05:23:08 obache Exp $
share/examples/webmin/useradmin/config
share/webmin/useradmin/CHANGELOG
share/webmin/useradmin/acl_security.pl
@@ -36,10 +36,12 @@ share/webmin/useradmin/config-united-linux
share/webmin/useradmin/config-unixware
share/webmin/useradmin/config.info
share/webmin/useradmin/config.info.ca
+share/webmin/useradmin/config.info.da
share/webmin/useradmin/config.info.de
share/webmin/useradmin/config.info.es
share/webmin/useradmin/config.info.fa
share/webmin/useradmin/config.info.fr
+share/webmin/useradmin/config.info.ja_JP.UTF-8
share/webmin/useradmin/config.info.ja_JP.euc
share/webmin/useradmin/config.info.nl
share/webmin/useradmin/config.info.pl
@@ -50,7 +52,10 @@ share/webmin/useradmin/config.info.sv
share/webmin/useradmin/config.info.tr
share/webmin/useradmin/config.info.uk_UA
share/webmin/useradmin/config.info.zh_CN
+share/webmin/useradmin/config.info.zh_CN.UTF-8
share/webmin/useradmin/config.info.zh_TW.Big5
+share/webmin/useradmin/config.info.zh_TW.UTF-8
+share/webmin/useradmin/cpan_modules.pl
share/webmin/useradmin/defaultacl
share/webmin/useradmin/delete_group.cgi
share/webmin/useradmin/delete_user.cgi
@@ -62,6 +67,7 @@ share/webmin/useradmin/freebsd-lib.pl
share/webmin/useradmin/help.html
share/webmin/useradmin/help/2nd.ca.html
share/webmin/useradmin/help/2nd.es.html
+share/webmin/useradmin/help/2nd.fa.html
share/webmin/useradmin/help/2nd.fr.html
share/webmin/useradmin/help/2nd.html
share/webmin/useradmin/help/2nd.nl.html
@@ -70,11 +76,14 @@ share/webmin/useradmin/help/2nd.ru_RU.html
share/webmin/useradmin/help/2nd.ru_SU.html
share/webmin/useradmin/help/2nd.sv.html
share/webmin/useradmin/help/2nd.zh_TW.Big5.html
+share/webmin/useradmin/help/2nd.zh_TW.UTF-8.html
share/webmin/useradmin/help/ask.ca.html
share/webmin/useradmin/help/ask.es.html
+share/webmin/useradmin/help/ask.fa.html
share/webmin/useradmin/help/ask.html
share/webmin/useradmin/help/change.ca.html
share/webmin/useradmin/help/change.es.html
+share/webmin/useradmin/help/change.fa.html
share/webmin/useradmin/help/change.fr.html
share/webmin/useradmin/help/change.html
share/webmin/useradmin/help/change.nl.html
@@ -83,8 +92,10 @@ share/webmin/useradmin/help/change.ru_RU.html
share/webmin/useradmin/help/change.ru_SU.html
share/webmin/useradmin/help/change.sv.html
share/webmin/useradmin/help/change.zh_TW.Big5.html
+share/webmin/useradmin/help/change.zh_TW.UTF-8.html
share/webmin/useradmin/help/change2.ca.html
share/webmin/useradmin/help/change2.es.html
+share/webmin/useradmin/help/change2.fa.html
share/webmin/useradmin/help/change2.fr.html
share/webmin/useradmin/help/change2.html
share/webmin/useradmin/help/change2.nl.html
@@ -93,8 +104,10 @@ share/webmin/useradmin/help/change2.ru_RU.html
share/webmin/useradmin/help/change2.ru_SU.html
share/webmin/useradmin/help/change2.sv.html
share/webmin/useradmin/help/change2.zh_TW.Big5.html
+share/webmin/useradmin/help/change2.zh_TW.UTF-8.html
share/webmin/useradmin/help/chgid.ca.html
share/webmin/useradmin/help/chgid.es.html
+share/webmin/useradmin/help/chgid.fa.html
share/webmin/useradmin/help/chgid.fr.html
share/webmin/useradmin/help/chgid.html
share/webmin/useradmin/help/chgid.nl.html
@@ -103,8 +116,10 @@ share/webmin/useradmin/help/chgid.ru_RU.html
share/webmin/useradmin/help/chgid.ru_SU.html
share/webmin/useradmin/help/chgid.sv.html
share/webmin/useradmin/help/chgid.zh_TW.Big5.html
+share/webmin/useradmin/help/chgid.zh_TW.UTF-8.html
share/webmin/useradmin/help/chuid.ca.html
share/webmin/useradmin/help/chuid.es.html
+share/webmin/useradmin/help/chuid.fa.html
share/webmin/useradmin/help/chuid.fr.html
share/webmin/useradmin/help/chuid.html
share/webmin/useradmin/help/chuid.nl.html
@@ -113,8 +128,10 @@ share/webmin/useradmin/help/chuid.ru_RU.html
share/webmin/useradmin/help/chuid.ru_SU.html
share/webmin/useradmin/help/chuid.sv.html
share/webmin/useradmin/help/chuid.zh_TW.Big5.html
+share/webmin/useradmin/help/chuid.zh_TW.UTF-8.html
share/webmin/useradmin/help/class.ca.html
share/webmin/useradmin/help/class.es.html
+share/webmin/useradmin/help/class.fa.html
share/webmin/useradmin/help/class.fr.html
share/webmin/useradmin/help/class.html
share/webmin/useradmin/help/class.nl.html
@@ -123,8 +140,10 @@ share/webmin/useradmin/help/class.ru_RU.html
share/webmin/useradmin/help/class.ru_SU.html
share/webmin/useradmin/help/class.sv.html
share/webmin/useradmin/help/class.zh_TW.Big5.html
+share/webmin/useradmin/help/class.zh_TW.UTF-8.html
share/webmin/useradmin/help/copy_files.ca.html
share/webmin/useradmin/help/copy_files.es.html
+share/webmin/useradmin/help/copy_files.fa.html
share/webmin/useradmin/help/copy_files.fr.html
share/webmin/useradmin/help/copy_files.html
share/webmin/useradmin/help/copy_files.nl.html
@@ -133,8 +152,10 @@ share/webmin/useradmin/help/copy_files.ru_RU.html
share/webmin/useradmin/help/copy_files.ru_SU.html
share/webmin/useradmin/help/copy_files.sv.html
share/webmin/useradmin/help/copy_files.zh_TW.Big5.html
+share/webmin/useradmin/help/copy_files.zh_TW.UTF-8.html
share/webmin/useradmin/help/create_group.ca.html
share/webmin/useradmin/help/create_group.es.html
+share/webmin/useradmin/help/create_group.fa.html
share/webmin/useradmin/help/create_group.fr.html
share/webmin/useradmin/help/create_group.html
share/webmin/useradmin/help/create_group.nl.html
@@ -143,8 +164,10 @@ share/webmin/useradmin/help/create_group.ru_RU.html
share/webmin/useradmin/help/create_group.ru_SU.html
share/webmin/useradmin/help/create_group.sv.html
share/webmin/useradmin/help/create_group.zh_TW.Big5.html
+share/webmin/useradmin/help/create_group.zh_TW.UTF-8.html
share/webmin/useradmin/help/create_user.ca.html
share/webmin/useradmin/help/create_user.es.html
+share/webmin/useradmin/help/create_user.fa.html
share/webmin/useradmin/help/create_user.fr.html
share/webmin/useradmin/help/create_user.html
share/webmin/useradmin/help/create_user.nl.html
@@ -153,8 +176,10 @@ share/webmin/useradmin/help/create_user.ru_RU.html
share/webmin/useradmin/help/create_user.ru_SU.html
share/webmin/useradmin/help/create_user.sv.html
share/webmin/useradmin/help/create_user.zh_TW.Big5.html
+share/webmin/useradmin/help/create_user.zh_TW.UTF-8.html
share/webmin/useradmin/help/edit_group.ca.html
share/webmin/useradmin/help/edit_group.es.html
+share/webmin/useradmin/help/edit_group.fa.html
share/webmin/useradmin/help/edit_group.fr.html
share/webmin/useradmin/help/edit_group.html
share/webmin/useradmin/help/edit_group.nl.html
@@ -163,8 +188,10 @@ share/webmin/useradmin/help/edit_group.ru_RU.html
share/webmin/useradmin/help/edit_group.ru_SU.html
share/webmin/useradmin/help/edit_group.sv.html
share/webmin/useradmin/help/edit_group.zh_TW.Big5.html
+share/webmin/useradmin/help/edit_group.zh_TW.UTF-8.html
share/webmin/useradmin/help/edit_user.ca.html
share/webmin/useradmin/help/edit_user.es.html
+share/webmin/useradmin/help/edit_user.fa.html
share/webmin/useradmin/help/edit_user.fr.html
share/webmin/useradmin/help/edit_user.html
share/webmin/useradmin/help/edit_user.nl.html
@@ -173,8 +200,10 @@ share/webmin/useradmin/help/edit_user.ru_RU.html
share/webmin/useradmin/help/edit_user.ru_SU.html
share/webmin/useradmin/help/edit_user.sv.html
share/webmin/useradmin/help/edit_user.zh_TW.Big5.html
+share/webmin/useradmin/help/edit_user.zh_TW.UTF-8.html
share/webmin/useradmin/help/expire.ca.html
share/webmin/useradmin/help/expire.es.html
+share/webmin/useradmin/help/expire.fa.html
share/webmin/useradmin/help/expire.fr.html
share/webmin/useradmin/help/expire.html
share/webmin/useradmin/help/expire.nl.html
@@ -183,8 +212,10 @@ share/webmin/useradmin/help/expire.ru_RU.html
share/webmin/useradmin/help/expire.ru_SU.html
share/webmin/useradmin/help/expire.sv.html
share/webmin/useradmin/help/expire.zh_TW.Big5.html
+share/webmin/useradmin/help/expire.zh_TW.UTF-8.html
share/webmin/useradmin/help/expire2.ca.html
share/webmin/useradmin/help/expire2.es.html
+share/webmin/useradmin/help/expire2.fa.html
share/webmin/useradmin/help/expire2.fr.html
share/webmin/useradmin/help/expire2.html
share/webmin/useradmin/help/expire2.nl.html
@@ -193,14 +224,18 @@ share/webmin/useradmin/help/expire2.ru_RU.html
share/webmin/useradmin/help/expire2.ru_SU.html
share/webmin/useradmin/help/expire2.sv.html
share/webmin/useradmin/help/expire2.zh_TW.Big5.html
+share/webmin/useradmin/help/expire2.zh_TW.UTF-8.html
share/webmin/useradmin/help/export.ca.html
+share/webmin/useradmin/help/export.fa.html
share/webmin/useradmin/help/export.html
share/webmin/useradmin/help/extra.ca.html
share/webmin/useradmin/help/extra.es.html
+share/webmin/useradmin/help/extra.fa.html
share/webmin/useradmin/help/extra.html
share/webmin/useradmin/help/extra.nl.html
share/webmin/useradmin/help/findform.ca.html
share/webmin/useradmin/help/findform.es.html
+share/webmin/useradmin/help/findform.fa.html
share/webmin/useradmin/help/findform.fr.html
share/webmin/useradmin/help/findform.html
share/webmin/useradmin/help/findform.nl.html
@@ -209,13 +244,16 @@ share/webmin/useradmin/help/findform.ru_RU.html
share/webmin/useradmin/help/findform.ru_SU.html
share/webmin/useradmin/help/findform.sv.html
share/webmin/useradmin/help/findform.zh_TW.Big5.html
+share/webmin/useradmin/help/findform.zh_TW.UTF-8.html
share/webmin/useradmin/help/flags.ca.html
share/webmin/useradmin/help/flags.es.html
+share/webmin/useradmin/help/flags.fa.html
share/webmin/useradmin/help/flags.html
share/webmin/useradmin/help/flags.nl.html
share/webmin/useradmin/help/flags.pl.html
share/webmin/useradmin/help/gchgid.ca.html
share/webmin/useradmin/help/gchgid.es.html
+share/webmin/useradmin/help/gchgid.fa.html
share/webmin/useradmin/help/gchgid.fr.html
share/webmin/useradmin/help/gchgid.html
share/webmin/useradmin/help/gchgid.pl.html
@@ -223,8 +261,10 @@ share/webmin/useradmin/help/gchgid.ru_RU.html
share/webmin/useradmin/help/gchgid.ru_SU.html
share/webmin/useradmin/help/gchgid.sv.html
share/webmin/useradmin/help/gchgid.zh_TW.Big5.html
+share/webmin/useradmin/help/gchgid.zh_TW.UTF-8.html
share/webmin/useradmin/help/ggid.ca.html
share/webmin/useradmin/help/ggid.es.html
+share/webmin/useradmin/help/ggid.fa.html
share/webmin/useradmin/help/ggid.fr.html
share/webmin/useradmin/help/ggid.html
share/webmin/useradmin/help/ggid.nl.html
@@ -233,8 +273,10 @@ share/webmin/useradmin/help/ggid.ru_RU.html
share/webmin/useradmin/help/ggid.ru_SU.html
share/webmin/useradmin/help/ggid.sv.html
share/webmin/useradmin/help/ggid.zh_TW.Big5.html
+share/webmin/useradmin/help/ggid.zh_TW.UTF-8.html
share/webmin/useradmin/help/ggroup.ca.html
share/webmin/useradmin/help/ggroup.es.html
+share/webmin/useradmin/help/ggroup.fa.html
share/webmin/useradmin/help/ggroup.fr.html
share/webmin/useradmin/help/ggroup.html
share/webmin/useradmin/help/ggroup.nl.html
@@ -243,8 +285,10 @@ share/webmin/useradmin/help/ggroup.ru_RU.html
share/webmin/useradmin/help/ggroup.ru_SU.html
share/webmin/useradmin/help/ggroup.sv.html
share/webmin/useradmin/help/ggroup.zh_TW.Big5.html
+share/webmin/useradmin/help/ggroup.zh_TW.UTF-8.html
share/webmin/useradmin/help/gmembers.ca.html
share/webmin/useradmin/help/gmembers.es.html
+share/webmin/useradmin/help/gmembers.fa.html
share/webmin/useradmin/help/gmembers.fr.html
share/webmin/useradmin/help/gmembers.html
share/webmin/useradmin/help/gmembers.nl.html
@@ -253,8 +297,10 @@ share/webmin/useradmin/help/gmembers.ru_RU.html
share/webmin/useradmin/help/gmembers.ru_SU.html
share/webmin/useradmin/help/gmembers.sv.html
share/webmin/useradmin/help/gmembers.zh_TW.Big5.html
+share/webmin/useradmin/help/gmembers.zh_TW.UTF-8.html
share/webmin/useradmin/help/gpasswd.ca.html
share/webmin/useradmin/help/gpasswd.es.html
+share/webmin/useradmin/help/gpasswd.fa.html
share/webmin/useradmin/help/gpasswd.fr.html
share/webmin/useradmin/help/gpasswd.html
share/webmin/useradmin/help/gpasswd.nl.html
@@ -263,8 +309,10 @@ share/webmin/useradmin/help/gpasswd.ru_RU.html
share/webmin/useradmin/help/gpasswd.ru_SU.html
share/webmin/useradmin/help/gpasswd.sv.html
share/webmin/useradmin/help/gpasswd.zh_TW.Big5.html
+share/webmin/useradmin/help/gpasswd.zh_TW.UTF-8.html
share/webmin/useradmin/help/group.ca.html
share/webmin/useradmin/help/group.es.html
+share/webmin/useradmin/help/group.fa.html
share/webmin/useradmin/help/group.fr.html
share/webmin/useradmin/help/group.html
share/webmin/useradmin/help/group.nl.html
@@ -273,8 +321,10 @@ share/webmin/useradmin/help/group.ru_RU.html
share/webmin/useradmin/help/group.ru_SU.html
share/webmin/useradmin/help/group.sv.html
share/webmin/useradmin/help/group.zh_TW.Big5.html
+share/webmin/useradmin/help/group.zh_TW.UTF-8.html
share/webmin/useradmin/help/home.ca.html
share/webmin/useradmin/help/home.es.html
+share/webmin/useradmin/help/home.fa.html
share/webmin/useradmin/help/home.fr.html
share/webmin/useradmin/help/home.html
share/webmin/useradmin/help/home.nl.html
@@ -283,13 +333,16 @@ share/webmin/useradmin/help/home.ru_RU.html
share/webmin/useradmin/help/home.ru_SU.html
share/webmin/useradmin/help/home.sv.html
share/webmin/useradmin/help/home.zh_TW.Big5.html
+share/webmin/useradmin/help/home.zh_TW.UTF-8.html
share/webmin/useradmin/help/homeph.ca.html
share/webmin/useradmin/help/homeph.es.html
+share/webmin/useradmin/help/homeph.fa.html
share/webmin/useradmin/help/homeph.html
share/webmin/useradmin/help/homeph.nl.html
share/webmin/useradmin/help/icon.gif
share/webmin/useradmin/help/inactive.ca.html
share/webmin/useradmin/help/inactive.es.html
+share/webmin/useradmin/help/inactive.fa.html
share/webmin/useradmin/help/inactive.fr.html
share/webmin/useradmin/help/inactive.html
share/webmin/useradmin/help/inactive.nl.html
@@ -298,8 +351,10 @@ share/webmin/useradmin/help/inactive.ru_RU.html
share/webmin/useradmin/help/inactive.ru_SU.html
share/webmin/useradmin/help/inactive.sv.html
share/webmin/useradmin/help/inactive.zh_TW.Big5.html
+share/webmin/useradmin/help/inactive.zh_TW.UTF-8.html
share/webmin/useradmin/help/intro.ca.html
share/webmin/useradmin/help/intro.es.html
+share/webmin/useradmin/help/intro.fa.html
share/webmin/useradmin/help/intro.fr.html
share/webmin/useradmin/help/intro.html
share/webmin/useradmin/help/intro.nl.html
@@ -308,8 +363,10 @@ share/webmin/useradmin/help/intro.ru_RU.html
share/webmin/useradmin/help/intro.ru_SU.html
share/webmin/useradmin/help/intro.sv.html
share/webmin/useradmin/help/intro.zh_TW.Big5.html
+share/webmin/useradmin/help/intro.zh_TW.UTF-8.html
share/webmin/useradmin/help/list_logins.ca.html
share/webmin/useradmin/help/list_logins.es.html
+share/webmin/useradmin/help/list_logins.fa.html
share/webmin/useradmin/help/list_logins.fr.html
share/webmin/useradmin/help/list_logins.html
share/webmin/useradmin/help/list_logins.nl.html
@@ -318,8 +375,10 @@ share/webmin/useradmin/help/list_logins.ru_RU.html
share/webmin/useradmin/help/list_logins.ru_SU.html
share/webmin/useradmin/help/list_logins.sv.html
share/webmin/useradmin/help/list_logins.zh_TW.Big5.html
+share/webmin/useradmin/help/list_logins.zh_TW.UTF-8.html
share/webmin/useradmin/help/makehome.ca.html
share/webmin/useradmin/help/makehome.es.html
+share/webmin/useradmin/help/makehome.fa.html
share/webmin/useradmin/help/makehome.fr.html
share/webmin/useradmin/help/makehome.html
share/webmin/useradmin/help/makehome.pl.html
@@ -327,8 +386,10 @@ share/webmin/useradmin/help/makehome.ru_RU.html
share/webmin/useradmin/help/makehome.ru_SU.html
share/webmin/useradmin/help/makehome.sv.html
share/webmin/useradmin/help/makehome.zh_TW.Big5.html
+share/webmin/useradmin/help/makehome.zh_TW.UTF-8.html
share/webmin/useradmin/help/max.ca.html
share/webmin/useradmin/help/max.es.html
+share/webmin/useradmin/help/max.fa.html
share/webmin/useradmin/help/max.fr.html
share/webmin/useradmin/help/max.html
share/webmin/useradmin/help/max.nl.html
@@ -337,12 +398,15 @@ share/webmin/useradmin/help/max.ru_RU.html
share/webmin/useradmin/help/max.ru_SU.html
share/webmin/useradmin/help/max.sv.html
share/webmin/useradmin/help/max.zh_TW.Big5.html
+share/webmin/useradmin/help/max.zh_TW.UTF-8.html
share/webmin/useradmin/help/max_weeks.ca.html
share/webmin/useradmin/help/max_weeks.es.html
+share/webmin/useradmin/help/max_weeks.fa.html
share/webmin/useradmin/help/max_weeks.html
share/webmin/useradmin/help/max_weeks.pl.html
share/webmin/useradmin/help/min.ca.html
share/webmin/useradmin/help/min.es.html
+share/webmin/useradmin/help/min.fa.html
share/webmin/useradmin/help/min.fr.html
share/webmin/useradmin/help/min.html
share/webmin/useradmin/help/min.nl.html
@@ -351,13 +415,16 @@ share/webmin/useradmin/help/min.ru_RU.html
share/webmin/useradmin/help/min.ru_SU.html
share/webmin/useradmin/help/min.sv.html
share/webmin/useradmin/help/min.zh_TW.Big5.html
+share/webmin/useradmin/help/min.zh_TW.UTF-8.html
share/webmin/useradmin/help/min_weeks.ca.html
share/webmin/useradmin/help/min_weeks.es.html
+share/webmin/useradmin/help/min_weeks.fa.html
share/webmin/useradmin/help/min_weeks.html
share/webmin/useradmin/help/min_weeks.nl.html
share/webmin/useradmin/help/min_weeks.pl.html
share/webmin/useradmin/help/movehome.ca.html
share/webmin/useradmin/help/movehome.es.html
+share/webmin/useradmin/help/movehome.fa.html
share/webmin/useradmin/help/movehome.fr.html
share/webmin/useradmin/help/movehome.html
share/webmin/useradmin/help/movehome.nl.html
@@ -366,14 +433,18 @@ share/webmin/useradmin/help/movehome.ru_RU.html
share/webmin/useradmin/help/movehome.ru_SU.html
share/webmin/useradmin/help/movehome.sv.html
share/webmin/useradmin/help/movehome.zh_TW.Big5.html
+share/webmin/useradmin/help/movehome.zh_TW.UTF-8.html
share/webmin/useradmin/help/office.ca.html
share/webmin/useradmin/help/office.es.html
+share/webmin/useradmin/help/office.fa.html
share/webmin/useradmin/help/office.html
share/webmin/useradmin/help/office.nl.html
share/webmin/useradmin/help/others.ca.html
+share/webmin/useradmin/help/others.fa.html
share/webmin/useradmin/help/others.html
share/webmin/useradmin/help/pass.ca.html
share/webmin/useradmin/help/pass.es.html
+share/webmin/useradmin/help/pass.fa.html
share/webmin/useradmin/help/pass.fr.html
share/webmin/useradmin/help/pass.html
share/webmin/useradmin/help/pass.nl.html
@@ -382,8 +453,10 @@ share/webmin/useradmin/help/pass.ru_RU.html
share/webmin/useradmin/help/pass.ru_SU.html
share/webmin/useradmin/help/pass.sv.html
share/webmin/useradmin/help/pass.zh_TW.Big5.html
+share/webmin/useradmin/help/pass.zh_TW.UTF-8.html
share/webmin/useradmin/help/real.ca.html
share/webmin/useradmin/help/real.es.html
+share/webmin/useradmin/help/real.fa.html
share/webmin/useradmin/help/real.fr.html
share/webmin/useradmin/help/real.html
share/webmin/useradmin/help/real.nl.html
@@ -392,8 +465,10 @@ share/webmin/useradmin/help/real.ru_RU.html
share/webmin/useradmin/help/real.ru_SU.html
share/webmin/useradmin/help/real.sv.html
share/webmin/useradmin/help/real.zh_TW.Big5.html
+share/webmin/useradmin/help/real.zh_TW.UTF-8.html
share/webmin/useradmin/help/shell.ca.html
share/webmin/useradmin/help/shell.es.html
+share/webmin/useradmin/help/shell.fa.html
share/webmin/useradmin/help/shell.fr.html
share/webmin/useradmin/help/shell.html
share/webmin/useradmin/help/shell.nl.html
@@ -402,8 +477,10 @@ share/webmin/useradmin/help/shell.ru_RU.html
share/webmin/useradmin/help/shell.ru_SU.html
share/webmin/useradmin/help/shell.sv.html
share/webmin/useradmin/help/shell.zh_TW.Big5.html
+share/webmin/useradmin/help/shell.zh_TW.UTF-8.html
share/webmin/useradmin/help/uid.ca.html
share/webmin/useradmin/help/uid.es.html
+share/webmin/useradmin/help/uid.fa.html
share/webmin/useradmin/help/uid.fr.html
share/webmin/useradmin/help/uid.html
share/webmin/useradmin/help/uid.nl.html
@@ -412,8 +489,10 @@ share/webmin/useradmin/help/uid.ru_RU.html
share/webmin/useradmin/help/uid.ru_SU.html
share/webmin/useradmin/help/uid.sv.html
share/webmin/useradmin/help/uid.zh_TW.Big5.html
+share/webmin/useradmin/help/uid.zh_TW.UTF-8.html
share/webmin/useradmin/help/user.ca.html
share/webmin/useradmin/help/user.es.html
+share/webmin/useradmin/help/user.fa.html
share/webmin/useradmin/help/user.fr.html
share/webmin/useradmin/help/user.html
share/webmin/useradmin/help/user.nl.html
@@ -422,8 +501,10 @@ share/webmin/useradmin/help/user.ru_RU.html
share/webmin/useradmin/help/user.ru_SU.html
share/webmin/useradmin/help/user.sv.html
share/webmin/useradmin/help/user.zh_TW.Big5.html
+share/webmin/useradmin/help/user.zh_TW.UTF-8.html
share/webmin/useradmin/help/warn.ca.html
share/webmin/useradmin/help/warn.es.html
+share/webmin/useradmin/help/warn.fa.html
share/webmin/useradmin/help/warn.fr.html
share/webmin/useradmin/help/warn.html
share/webmin/useradmin/help/warn.nl.html
@@ -432,8 +513,10 @@ share/webmin/useradmin/help/warn.ru_RU.html
share/webmin/useradmin/help/warn.ru_SU.html
share/webmin/useradmin/help/warn.sv.html
share/webmin/useradmin/help/warn.zh_TW.Big5.html
+share/webmin/useradmin/help/warn.zh_TW.UTF-8.html
share/webmin/useradmin/help/workph.ca.html
share/webmin/useradmin/help/workph.es.html
+share/webmin/useradmin/help/workph.fa.html
share/webmin/useradmin/help/workph.html
share/webmin/useradmin/help/workph.nl.html
share/webmin/useradmin/hpux-lib.pl
@@ -445,13 +528,16 @@ share/webmin/useradmin/index.cgi
share/webmin/useradmin/irix-lib.pl
share/webmin/useradmin/lang/ca
share/webmin/useradmin/lang/cz
+share/webmin/useradmin/lang/da
share/webmin/useradmin/lang/de
share/webmin/useradmin/lang/en
share/webmin/useradmin/lang/es
share/webmin/useradmin/lang/fa
share/webmin/useradmin/lang/fr
share/webmin/useradmin/lang/he
+share/webmin/useradmin/lang/ja_JP.UTF-8
share/webmin/useradmin/lang/ja_JP.euc
+share/webmin/useradmin/lang/ko_KR.UTF-8
share/webmin/useradmin/lang/ko_KR.euc
share/webmin/useradmin/lang/nl
share/webmin/useradmin/lang/pl
@@ -463,7 +549,9 @@ share/webmin/useradmin/lang/sv
share/webmin/useradmin/lang/tr
share/webmin/useradmin/lang/uk_UA
share/webmin/useradmin/lang/zh_CN
+share/webmin/useradmin/lang/zh_CN.UTF-8
share/webmin/useradmin/lang/zh_TW.Big5
+share/webmin/useradmin/lang/zh_TW.UTF-8
share/webmin/useradmin/linux-lib.pl
share/webmin/useradmin/list_logins.cgi
share/webmin/useradmin/list_who.cgi
@@ -494,3 +582,4 @@ share/webmin/useradmin/user-lib.pl
@dirrm share/webmin/useradmin/help
@dirrm share/webmin/useradmin
@dirrm share/examples/webmin/useradmin
+@dirrm etc/webmin/useradmin
diff --git a/sysutils/wbm-useradmin/distinfo b/sysutils/wbm-useradmin/distinfo
index d740ff6aa61..9e93e10da00 100644
--- a/sysutils/wbm-useradmin/distinfo
+++ b/sysutils/wbm-useradmin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/05/16 15:44:30 jlam Exp $
+$NetBSD: distinfo,v 1.2 2007/04/21 05:23:08 obache Exp $
-SHA1 (webmin-modules-1.270/useradmin.wbm.gz) = b6cd1e700b49e63d4caeb3d858e008c949b50687
-RMD160 (webmin-modules-1.270/useradmin.wbm.gz) = 445a6fb9c95db236def4b75829da5e4617037ee4
-Size (webmin-modules-1.270/useradmin.wbm.gz) = 237111 bytes
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index 7e082f45462..94ba7a8c60c 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2007/01/31 00:04:12 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2007/04/21 05:22:57 obache Exp $
-DISTNAME= webmin-1.270-minimal
-PKGNAME= ${DISTNAME:S/-minimal$//}
-PKGREVISION= 3
+.include "version.mk"
+
+DISTNAME= webmin-${WBM_VERSION}
CATEGORIES= sysutils www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=webadmin/}
@@ -10,8 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.webmin.com/
COMMENT= Perl web server and CGI for Unix system administration
-BROKEN_IN= pkgsrc-2006Q4
-
DEPENDS+= p5-Net-SSLeay-[0-9]*:../../security/p5-Net-SSLeay
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
@@ -29,30 +27,32 @@ FILES_SUBST+= WEBMIN_EGDIR=${WEBMIN_EGDIR:Q}
FILES_SUBST+= WEBMIN_ETCDIR=${WEBMIN_ETCDIR:Q}
FILES_SUBST+= WEBMIN_VARDIR=${WEBMIN_VARDIR:Q}
MESSAGE_SUBST+= WEBMIN_DIR=${WEBMIN_DIR:Q}
+BUILD_DEFS+= VARBASE
+
+WEBMIN_MINIMAL_MODULES= acl cron init inittab man proc servers webmin webminlog
PKG_SYSCONFSUBDIR= webmin
OWN_DIRS_PERMS+= ${WEBMIN_VARDIR} ${ROOT_USER} ${ROOT_GROUP} 0700
-.for _file_ in config install-dir perl-path var-path version
-CONF_FILES+= ${WEBMIN_EGDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_}
+.for f in config install-dir perl-path var-path version
+CONF_FILES+= ${WEBMIN_EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
-.for _module_ in acl cron init inittab man proc servers webmin \
- webminlog
-OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/${_module_} \
+.for m in ${WEBMIN_MINIMAL_MODULES}
+OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/${m} \
${ROOT_USER} ${ROOT_GROUP} 0700
-CONF_FILES_PERMS+= ${WEBMIN_EGDIR}/${_module_}/config \
- ${PKG_SYSCONFDIR}/${_module_}/config \
+CONF_FILES_PERMS+= ${WEBMIN_EGDIR}/${m}/config \
+ ${PKG_SYSCONFDIR}/${m}/config \
${ROOT_USER} ${ROOT_GROUP} 0600
.endfor
-.for _file_ in miniserv.pem
-CONF_FILES_PERMS+= ${WEBMIN_DIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_} \
+.for f in miniserv.pem
+CONF_FILES_PERMS+= ${WEBMIN_DIR}/${f} ${PKG_SYSCONFDIR}/${f} \
${ROOT_USER} ${ROOT_GROUP} 0600
.endfor
-.for _file_ in miniserv.conf miniserv.users webmin.acl
-CONF_FILES_PERMS+= ${WEBMIN_EGDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_} \
+.for f in miniserv.conf miniserv.users webmin.acl
+CONF_FILES_PERMS+= ${WEBMIN_EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
${ROOT_USER} ${ROOT_GROUP} 0600
.endfor
-.for _file_ in reload restart start stop
-CONF_FILES_PERMS+= ${WEBMIN_EGDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_} \
+.for f in reload restart start stop
+CONF_FILES_PERMS+= ${WEBMIN_EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
${ROOT_USER} ${ROOT_GROUP} 0755
.endfor
RCD_SCRIPTS= webmin
@@ -65,8 +65,21 @@ post-extract:
${CP} ${FILESDIR}/acl_config-dragonfly ${WRKSRC}/acl/config-dragonfly
${CP} ${FILESDIR}/init_config-dragonfly ${WRKSRC}/init/config-dragonfly
${CP} ${FILESDIR}/man_config-dragonfly ${WRKSRC}/man/config-dragonfly
- ${CP} ${FILESDIR}/proc_config-dragonfly ${WRKSRC}/proc//config-dragonfly
+ ${CP} ${FILESDIR}/proc_config-dragonfly ${WRKSRC}/proc/config-dragonfly
+pre-configure:
+ cd ${WRKSRC} && \
+ ptn="@"`${ECHO} ${WEBMIN_MINIMAL_MODULES}|sed -e 's/ /@/g'`"@" && \
+ for m in `${ECHO} */module.info | sed -e 's/\/module.info//g'`; do \
+ case $${ptn} in \
+ *@$${m}@*) ;; \
+ *) rm -rf $${m} ;; \
+ esac; \
+ done && \
+ for t in `${ECHO} */theme.info | sed -e 's/\/theme.info//g'`; do\
+ rm -rf $${t}; \
+ done && \
+ touch ${WRKSRC}/minimal-install
do-configure:
${SED} -e "s,@WEBMIN_EGDIR@,${WEBMIN_EGDIR},g" \
diff --git a/sysutils/webmin/PLIST b/sysutils/webmin/PLIST
index 5492d89bced..8e809bef429 100644
--- a/sysutils/webmin/PLIST
+++ b/sysutils/webmin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/06/04 14:44:13 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/04/21 05:22:57 obache Exp $
share/examples/rc.d/webmin
share/examples/webmin/acl/config
share/examples/webmin/config
@@ -23,6 +23,7 @@ share/examples/webmin/webmin/config
share/examples/webmin/webminlog/config
share/webmin/LICENCE
share/webmin/LICENCE.ja
+share/webmin/PATENTS
share/webmin/README
share/webmin/Webmin/All.pm
share/webmin/Webmin/Button.pm
@@ -107,11 +108,13 @@ share/webmin/acl/config.info
share/webmin/acl/config.info.bg
share/webmin/acl/config.info.ca
share/webmin/acl/config.info.cz
+share/webmin/acl/config.info.da
share/webmin/acl/config.info.de
share/webmin/acl/config.info.es
share/webmin/acl/config.info.fa
share/webmin/acl/config.info.fr
share/webmin/acl/config.info.hu
+share/webmin/acl/config.info.ja_JP.UTF-8
share/webmin/acl/config.info.ja_JP.euc
share/webmin/acl/config.info.nl
share/webmin/acl/config.info.no
@@ -124,7 +127,9 @@ share/webmin/acl/config.info.sv
share/webmin/acl/config.info.tr
share/webmin/acl/config.info.uk_UA
share/webmin/acl/config.info.zh_CN
+share/webmin/acl/config.info.zh_CN.UTF-8
share/webmin/acl/config.info.zh_TW.Big5
+share/webmin/acl/config.info.zh_TW.UTF-8
share/webmin/acl/convert.cgi
share/webmin/acl/convert_form.cgi
share/webmin/acl/defaultacl
@@ -141,7 +146,11 @@ share/webmin/acl/edit_unix.cgi
share/webmin/acl/edit_user.cgi
share/webmin/acl/feedback_files.pl
share/webmin/acl/help/ips.ca.html
+share/webmin/acl/help/ips.da.html
+share/webmin/acl/help/ips.fa.html
+share/webmin/acl/help/ips.fr.html
share/webmin/acl/help/ips.html
+share/webmin/acl/help/ips.sk.html
share/webmin/acl/hide.cgi
share/webmin/acl/hide_form.cgi
share/webmin/acl/images/cert.gif
@@ -158,6 +167,7 @@ share/webmin/acl/index.cgi
share/webmin/acl/lang/bg
share/webmin/acl/lang/ca
share/webmin/acl/lang/cz
+share/webmin/acl/lang/da
share/webmin/acl/lang/de
share/webmin/acl/lang/en
share/webmin/acl/lang/es
@@ -165,7 +175,9 @@ share/webmin/acl/lang/fa
share/webmin/acl/lang/fr
share/webmin/acl/lang/hu
share/webmin/acl/lang/it
+share/webmin/acl/lang/ja_JP.UTF-8
share/webmin/acl/lang/ja_JP.euc
+share/webmin/acl/lang/ko_KR.UTF-8
share/webmin/acl/lang/ko_KR.euc
share/webmin/acl/lang/nl
share/webmin/acl/lang/no
@@ -179,7 +191,9 @@ share/webmin/acl/lang/sv
share/webmin/acl/lang/tr
share/webmin/acl/lang/uk_UA
share/webmin/acl/lang/zh_CN
+share/webmin/acl/lang/zh_CN.UTF-8
share/webmin/acl/lang/zh_TW.Big5
+share/webmin/acl/lang/zh_TW.UTF-8
share/webmin/acl/list_sessions.cgi
share/webmin/acl/log_parser.pl
share/webmin/acl/module.info
@@ -228,6 +242,7 @@ share/webmin/config-windows
share/webmin/config.cgi
share/webmin/config_save.cgi
share/webmin/copyconfig.pl
+share/webmin/create-module.pl
share/webmin/cron/CHANGELOG
share/webmin/cron/acl_security.pl
share/webmin/cron/backup_config.pl
@@ -270,17 +285,21 @@ share/webmin/cron/config.info.es
share/webmin/cron/config.info.fa
share/webmin/cron/config.info.fr
share/webmin/cron/config.info.hu
+share/webmin/cron/config.info.ja_JP.UTF-8
share/webmin/cron/config.info.ja_JP.euc
share/webmin/cron/config.info.ms
share/webmin/cron/config.info.nl
share/webmin/cron/config.info.pl
share/webmin/cron/config.info.ru_RU
share/webmin/cron/config.info.ru_SU
+share/webmin/cron/config.info.sk
share/webmin/cron/config.info.sv
share/webmin/cron/config.info.tr
share/webmin/cron/config.info.uk_UA
share/webmin/cron/config.info.zh_CN
+share/webmin/cron/config.info.zh_CN.UTF-8
share/webmin/cron/config.info.zh_TW.Big5
+share/webmin/cron/config.info.zh_TW.UTF-8
share/webmin/cron/cron-lib.pl
share/webmin/cron/cron_editor.pl
share/webmin/cron/defaultacl
@@ -301,9 +320,11 @@ share/webmin/cron/help/help.it.html
share/webmin/cron/help/help.nl.html
share/webmin/cron/help/help.sv.html
share/webmin/cron/help/help.zh_TW.Big5.html
+share/webmin/cron/help/help.zh_TW.UTF-8.html
share/webmin/cron/help/intro.ca.html
share/webmin/cron/help/intro.de.html
share/webmin/cron/help/intro.es.html
+share/webmin/cron/help/intro.fa.html
share/webmin/cron/help/intro.fr.html
share/webmin/cron/help/intro.html
share/webmin/cron/help/intro.hu.html
@@ -311,6 +332,7 @@ share/webmin/cron/help/intro.it.html
share/webmin/cron/help/intro.nl.html
share/webmin/cron/help/intro.sv.html
share/webmin/cron/help/intro.zh_TW.Big5.html
+share/webmin/cron/help/intro.zh_TW.UTF-8.html
share/webmin/cron/images/down.gif
share/webmin/cron/images/gap.gif
share/webmin/cron/images/icon.gif
@@ -329,7 +351,9 @@ share/webmin/cron/lang/fa
share/webmin/cron/lang/fr
share/webmin/cron/lang/hu
share/webmin/cron/lang/it
+share/webmin/cron/lang/ja_JP.UTF-8
share/webmin/cron/lang/ja_JP.euc
+share/webmin/cron/lang/ko_KR.UTF-8
share/webmin/cron/lang/ko_KR.euc
share/webmin/cron/lang/ms
share/webmin/cron/lang/nl
@@ -337,11 +361,14 @@ share/webmin/cron/lang/pl
share/webmin/cron/lang/pt
share/webmin/cron/lang/ru_RU
share/webmin/cron/lang/ru_SU
+share/webmin/cron/lang/sk
share/webmin/cron/lang/sv
share/webmin/cron/lang/tr
share/webmin/cron/lang/uk_UA
share/webmin/cron/lang/zh_CN
+share/webmin/cron/lang/zh_CN.UTF-8
share/webmin/cron/lang/zh_TW.Big5
+share/webmin/cron/lang/zh_TW.UTF-8
share/webmin/cron/log_parser.pl
share/webmin/cron/module.info
share/webmin/cron/move.cgi
@@ -361,10 +388,12 @@ share/webmin/feedback.cgi
share/webmin/feedback_form.cgi
share/webmin/group_chooser.cgi
share/webmin/help.cgi
+share/webmin/images/1x1.gif
share/webmin/images/audio.gif
share/webmin/images/back.gif
share/webmin/images/binary.gif
share/webmin/images/critical.gif
+share/webmin/images/closed.gif
share/webmin/images/dir.gif
share/webmin/images/first-grey.gif
share/webmin/images/first.gif
@@ -375,189 +404,12 @@ share/webmin/images/lc1.gif
share/webmin/images/lc2.gif
share/webmin/images/left-grey.gif
share/webmin/images/left.gif
-share/webmin/images/letters/100.gif
-share/webmin/images/letters/101.gif
-share/webmin/images/letters/102.gif
-share/webmin/images/letters/103.gif
-share/webmin/images/letters/104.gif
-share/webmin/images/letters/105.gif
-share/webmin/images/letters/106.gif
-share/webmin/images/letters/107.gif
-share/webmin/images/letters/108.gif
-share/webmin/images/letters/109.gif
-share/webmin/images/letters/110.gif
-share/webmin/images/letters/111.gif
-share/webmin/images/letters/112.gif
-share/webmin/images/letters/113.gif
-share/webmin/images/letters/114.gif
-share/webmin/images/letters/115.gif
-share/webmin/images/letters/116.gif
-share/webmin/images/letters/117.gif
-share/webmin/images/letters/118.gif
-share/webmin/images/letters/119.gif
-share/webmin/images/letters/120.gif
-share/webmin/images/letters/121.gif
-share/webmin/images/letters/122.gif
-share/webmin/images/letters/123.gif
-share/webmin/images/letters/124.gif
-share/webmin/images/letters/125.gif
-share/webmin/images/letters/126.gif
-share/webmin/images/letters/177.iso-8859-2.gif
-share/webmin/images/letters/179.iso-8859-2.gif
-share/webmin/images/letters/182.iso-8859-2.gif
-share/webmin/images/letters/188.iso-8859-2.gif
-share/webmin/images/letters/191.iso-8859-2.gif
-share/webmin/images/letters/192.gif
-share/webmin/images/letters/193.gif
-share/webmin/images/letters/194.gif
-share/webmin/images/letters/195.gif
-share/webmin/images/letters/196.gif
-share/webmin/images/letters/197.gif
-share/webmin/images/letters/198.gif
-share/webmin/images/letters/199.gif
-share/webmin/images/letters/200.gif
-share/webmin/images/letters/201.gif
-share/webmin/images/letters/202.gif
-share/webmin/images/letters/203.gif
-share/webmin/images/letters/204.gif
-share/webmin/images/letters/205.gif
-share/webmin/images/letters/206.gif
-share/webmin/images/letters/207.gif
-share/webmin/images/letters/208.gif
-share/webmin/images/letters/208.iso-8859-9.gif
-share/webmin/images/letters/209.gif
-share/webmin/images/letters/210.gif
-share/webmin/images/letters/211.gif
-share/webmin/images/letters/211.iso-8859-2.gif
-share/webmin/images/letters/212.gif
-share/webmin/images/letters/213.gif
-share/webmin/images/letters/214.gif
-share/webmin/images/letters/214.iso-8859-9.gif
-share/webmin/images/letters/215.gif
-share/webmin/images/letters/216.gif
-share/webmin/images/letters/217.gif
-share/webmin/images/letters/218.gif
-share/webmin/images/letters/219.gif
-share/webmin/images/letters/220.gif
-share/webmin/images/letters/220.iso-8859-9.gif
-share/webmin/images/letters/221.gif
-share/webmin/images/letters/221.iso-8859-9.gif
-share/webmin/images/letters/222.gif
-share/webmin/images/letters/222.iso-8859-9.gif
-share/webmin/images/letters/223.gif
-share/webmin/images/letters/224.gif
-share/webmin/images/letters/225.gif
-share/webmin/images/letters/226.gif
-share/webmin/images/letters/227.gif
-share/webmin/images/letters/228.gif
-share/webmin/images/letters/229.gif
-share/webmin/images/letters/230.gif
-share/webmin/images/letters/230.iso-8859-2.gif
-share/webmin/images/letters/231.gif
-share/webmin/images/letters/231.iso-8859-9.gif
-share/webmin/images/letters/232.gif
-share/webmin/images/letters/233.gif
-share/webmin/images/letters/234.gif
-share/webmin/images/letters/234.iso-8859-2.gif
-share/webmin/images/letters/235.gif
-share/webmin/images/letters/236.gif
-share/webmin/images/letters/237.gif
-share/webmin/images/letters/238.gif
-share/webmin/images/letters/239.gif
-share/webmin/images/letters/240.gif
-share/webmin/images/letters/240.iso-8859-9.gif
-share/webmin/images/letters/241.gif
-share/webmin/images/letters/241.iso-8859-2.gif
-share/webmin/images/letters/242.gif
-share/webmin/images/letters/243.gif
-share/webmin/images/letters/243.iso-8859-2.gif
-share/webmin/images/letters/244.gif
-share/webmin/images/letters/245.gif
-share/webmin/images/letters/246.gif
-share/webmin/images/letters/246.iso-8859-9.gif
-share/webmin/images/letters/247.gif
-share/webmin/images/letters/248.gif
-share/webmin/images/letters/249.gif
-share/webmin/images/letters/250.gif
-share/webmin/images/letters/251.gif
-share/webmin/images/letters/252.gif
-share/webmin/images/letters/252.iso-8859-9.gif
-share/webmin/images/letters/253.gif
-share/webmin/images/letters/253.iso-8859-9.gif
-share/webmin/images/letters/254.gif
-share/webmin/images/letters/255.gif
-share/webmin/images/letters/32.gif
-share/webmin/images/letters/33.gif
-share/webmin/images/letters/34.gif
-share/webmin/images/letters/35.gif
-share/webmin/images/letters/36.gif
-share/webmin/images/letters/37.gif
-share/webmin/images/letters/38.gif
-share/webmin/images/letters/39.gif
-share/webmin/images/letters/40.gif
-share/webmin/images/letters/41.gif
-share/webmin/images/letters/42.gif
-share/webmin/images/letters/43.gif
-share/webmin/images/letters/44.gif
-share/webmin/images/letters/45.gif
-share/webmin/images/letters/46.gif
-share/webmin/images/letters/47.gif
-share/webmin/images/letters/48.gif
-share/webmin/images/letters/49.gif
-share/webmin/images/letters/50.gif
-share/webmin/images/letters/51.gif
-share/webmin/images/letters/52.gif
-share/webmin/images/letters/53.gif
-share/webmin/images/letters/54.gif
-share/webmin/images/letters/55.gif
-share/webmin/images/letters/56.gif
-share/webmin/images/letters/57.gif
-share/webmin/images/letters/58.gif
-share/webmin/images/letters/59.gif
-share/webmin/images/letters/60.gif
-share/webmin/images/letters/61.gif
-share/webmin/images/letters/62.gif
-share/webmin/images/letters/63.gif
-share/webmin/images/letters/64.gif
-share/webmin/images/letters/65.gif
-share/webmin/images/letters/66.gif
-share/webmin/images/letters/67.gif
-share/webmin/images/letters/68.gif
-share/webmin/images/letters/69.gif
-share/webmin/images/letters/70.gif
-share/webmin/images/letters/71.gif
-share/webmin/images/letters/72.gif
-share/webmin/images/letters/73.gif
-share/webmin/images/letters/74.gif
-share/webmin/images/letters/75.gif
-share/webmin/images/letters/76.gif
-share/webmin/images/letters/77.gif
-share/webmin/images/letters/78.gif
-share/webmin/images/letters/79.gif
-share/webmin/images/letters/80.gif
-share/webmin/images/letters/81.gif
-share/webmin/images/letters/82.gif
-share/webmin/images/letters/83.gif
-share/webmin/images/letters/84.gif
-share/webmin/images/letters/85.gif
-share/webmin/images/letters/86.gif
-share/webmin/images/letters/87.gif
-share/webmin/images/letters/88.gif
-share/webmin/images/letters/89.gif
-share/webmin/images/letters/90.gif
-share/webmin/images/letters/91.gif
-share/webmin/images/letters/93.gif
-share/webmin/images/letters/94.gif
-share/webmin/images/letters/95.gif
-share/webmin/images/letters/96.gif
-share/webmin/images/letters/97.gif
-share/webmin/images/letters/98.gif
-share/webmin/images/letters/99.gif
share/webmin/images/major.gif
share/webmin/images/minor.gif
share/webmin/images/newlogo.gif
share/webmin/images/nosort.gif
share/webmin/images/ok.gif
+share/webmin/images/open.gif
share/webmin/images/rc1.gif
share/webmin/images/rc2.gif
share/webmin/images/right-grey.gif
@@ -617,6 +469,7 @@ share/webmin/init/config.info.de
share/webmin/init/config.info.es
share/webmin/init/config.info.fa
share/webmin/init/config.info.fr
+share/webmin/init/config.info.ja_JP.UTF-8
share/webmin/init/config.info.ja_JP.euc
share/webmin/init/config.info.pl
share/webmin/init/config.info.ru_RU
@@ -626,7 +479,9 @@ share/webmin/init/config.info.sv
share/webmin/init/config.info.tr
share/webmin/init/config.info.uk_UA
share/webmin/init/config.info.zh_CN
+share/webmin/init/config.info.zh_CN.UTF-8
share/webmin/init/config.info.zh_TW.Big5
+share/webmin/init/config.info.zh_TW.UTF-8
share/webmin/init/defaultacl
share/webmin/init/delboot.pl
share/webmin/init/delete_action.cgi
@@ -637,11 +492,13 @@ share/webmin/init/fix_action.cgi
share/webmin/init/help/help.ca.html
share/webmin/init/help/help.de.html
share/webmin/init/help/help.es.html
+share/webmin/init/help/help.fa.html
share/webmin/init/help/help.html
share/webmin/init/help/help.sv.html
share/webmin/init/help/proc.ca.html
share/webmin/init/help/proc.de.html
share/webmin/init/help/proc.es.html
+share/webmin/init/help/proc.fa.html
share/webmin/init/help/proc.html
share/webmin/init/help/proc.sv.html
share/webmin/init/hostconfig-lib.pl
@@ -656,7 +513,9 @@ share/webmin/init/lang/es
share/webmin/init/lang/fa
share/webmin/init/lang/fr
share/webmin/init/lang/it
+share/webmin/init/lang/ja_JP.UTF-8
share/webmin/init/lang/ja_JP.euc
+share/webmin/init/lang/ko_KR.UTF-8
share/webmin/init/lang/ko_KR.euc
share/webmin/init/lang/pl
share/webmin/init/lang/pt
@@ -667,7 +526,9 @@ share/webmin/init/lang/sv
share/webmin/init/lang/tr
share/webmin/init/lang/uk_UA
share/webmin/init/lang/zh_CN
+share/webmin/init/lang/zh_CN.UTF-8
share/webmin/init/lang/zh_TW.Big5
+share/webmin/init/lang/zh_TW.UTF-8
share/webmin/init/log_parser.pl
share/webmin/init/low.risk
share/webmin/init/mass_rcs.cgi
@@ -687,6 +548,7 @@ share/webmin/init/shutdown.cgi
share/webmin/init/start_stop.cgi
share/webmin/init/uninstall.pl
share/webmin/init/win32.pl
+share/webmin/inittab/CHANGELOG
share/webmin/inittab/apply.cgi
share/webmin/inittab/backup_config.pl
share/webmin/inittab/config
@@ -704,7 +566,10 @@ share/webmin/inittab/config.info.sv
share/webmin/inittab/config.info.tr
share/webmin/inittab/config.info.uk_UA
share/webmin/inittab/config.info.zh_CN
+share/webmin/inittab/config.info.zh_CN.UTF-8
share/webmin/inittab/config.info.zh_TW.Big5
+share/webmin/inittab/config.info.zh_TW.UTF-8
+share/webmin/inittab/delete.cgi
share/webmin/inittab/edit_inittab.cgi
share/webmin/inittab/help/action.ca.html
share/webmin/inittab/help/action.es.html
@@ -758,7 +623,9 @@ share/webmin/inittab/lang/de
share/webmin/inittab/lang/en
share/webmin/inittab/lang/es
share/webmin/inittab/lang/fr
+share/webmin/inittab/lang/ja_JP.UTF-8
share/webmin/inittab/lang/ja_JP.euc
+share/webmin/inittab/lang/ko_KR.UTF-8
share/webmin/inittab/lang/ko_KR.euc
share/webmin/inittab/lang/ms
share/webmin/inittab/lang/pl
@@ -768,7 +635,9 @@ share/webmin/inittab/lang/sv
share/webmin/inittab/lang/tr
share/webmin/inittab/lang/uk_UA
share/webmin/inittab/lang/zh_CN
+share/webmin/inittab/lang/zh_CN.UTF-8
share/webmin/inittab/lang/zh_TW.Big5
+share/webmin/inittab/lang/zh_TW.UTF-8
share/webmin/inittab/log_parser.pl
share/webmin/inittab/module.info
share/webmin/inittab/new_inittab.cgi
@@ -777,6 +646,7 @@ share/webmin/install-module.pl
share/webmin/install-type
share/webmin/javascript-lib.pl
share/webmin/lang/af
+share/webmin/lang/ar
share/webmin/lang/bg
share/webmin/lang/ca
share/webmin/lang/cz
@@ -789,7 +659,9 @@ share/webmin/lang/fr
share/webmin/lang/he
share/webmin/lang/hu
share/webmin/lang/it
+share/webmin/lang/ja_JP.UTF-8
share/webmin/lang/ja_JP.euc
+share/webmin/lang/ko_KR.UTF-8
share/webmin/lang/ko_KR.euc
share/webmin/lang/lt
share/webmin/lang/ms
@@ -798,6 +670,7 @@ share/webmin/lang/no
share/webmin/lang/pl
share/webmin/lang/pt
share/webmin/lang/pt_BR
+share/webmin/lang/ro
share/webmin/lang/ru_RU
share/webmin/lang/ru_SU
share/webmin/lang/si
@@ -805,9 +678,12 @@ share/webmin/lang/sk
share/webmin/lang/sv
share/webmin/lang/th
share/webmin/lang/tr
+share/webmin/lang/ua
share/webmin/lang/uk_UA
share/webmin/lang/zh_CN
+share/webmin/lang/zh_CN.UTF-8
share/webmin/lang/zh_TW.Big5
+share/webmin/lang/zh_TW.UTF-8
share/webmin/lang_list.txt
share/webmin/maketemp.pl
share/webmin/man/CHANGELOG
@@ -860,7 +736,9 @@ share/webmin/man/config.info.sv
share/webmin/man/config.info.tr
share/webmin/man/config.info.uk_UA
share/webmin/man/config.info.zh_CN
+share/webmin/man/config.info.zh_CN.UTF-8
share/webmin/man/config.info.zh_TW.Big5
+share/webmin/man/config.info.zh_TW.UTF-8
share/webmin/man/help/intro.ca.html
share/webmin/man/help/intro.de.html
share/webmin/man/help/intro.es.html
@@ -884,7 +762,9 @@ share/webmin/man/lang/es
share/webmin/man/lang/fr
share/webmin/man/lang/hu
share/webmin/man/lang/it
+share/webmin/man/lang/ja_JP.UTF-8
share/webmin/man/lang/ja_JP.euc
+share/webmin/man/lang/ko_KR.UTF-8
share/webmin/man/lang/ko_KR.euc
share/webmin/man/lang/ms
share/webmin/man/lang/pl
@@ -895,7 +775,9 @@ share/webmin/man/lang/sv
share/webmin/man/lang/tr
share/webmin/man/lang/uk_UA
share/webmin/man/lang/zh_CN
+share/webmin/man/lang/zh_CN.UTF-8
share/webmin/man/lang/zh_TW.Big5
+share/webmin/man/lang/zh_TW.UTF-8
share/webmin/man/man-lib.pl
share/webmin/man/module.info
share/webmin/man/save_check.cgi
@@ -972,7 +854,10 @@ share/webmin/proc/config.info.sv
share/webmin/proc/config.info.tr
share/webmin/proc/config.info.uk_UA
share/webmin/proc/config.info.zh_CN
+share/webmin/proc/config.info.zh_CN.UTF-8
share/webmin/proc/config.info.zh_TW.Big5
+share/webmin/proc/config.info.zh_TW.UTF-8
+share/webmin/proc/cpan_modules.pl
share/webmin/proc/defaultacl
share/webmin/proc/edit_proc.cgi
share/webmin/proc/freebsd-lib.pl
@@ -984,6 +869,7 @@ share/webmin/proc/help/cmd.hu.html
share/webmin/proc/help/cmd.pl.html
share/webmin/proc/help/cmd.sv.html
share/webmin/proc/help/cmd.zh_TW.Big5.html
+share/webmin/proc/help/cmd.zh_TW.UTF-8.html
share/webmin/proc/help/cpu.ca.html
share/webmin/proc/help/cpu.es.html
share/webmin/proc/help/cpu.fr.html
@@ -992,6 +878,7 @@ share/webmin/proc/help/cpu.hu.html
share/webmin/proc/help/cpu.pl.html
share/webmin/proc/help/cpu.sv.html
share/webmin/proc/help/cpu.zh_TW.Big5.html
+share/webmin/proc/help/cpu.zh_TW.UTF-8.html
share/webmin/proc/help/edit_proc.ca.html
share/webmin/proc/help/edit_proc.es.html
share/webmin/proc/help/edit_proc.fr.html
@@ -1000,6 +887,7 @@ share/webmin/proc/help/edit_proc.hu.html
share/webmin/proc/help/edit_proc.pl.html
share/webmin/proc/help/edit_proc.sv.html
share/webmin/proc/help/edit_proc.zh_TW.Big5.html
+share/webmin/proc/help/edit_proc.zh_TW.UTF-8.html
share/webmin/proc/help/input.ca.html
share/webmin/proc/help/input.es.html
share/webmin/proc/help/input.fr.html
@@ -1008,6 +896,7 @@ share/webmin/proc/help/input.hu.html
share/webmin/proc/help/input.pl.html
share/webmin/proc/help/input.sv.html
share/webmin/proc/help/input.zh_TW.Big5.html
+share/webmin/proc/help/input.zh_TW.UTF-8.html
share/webmin/proc/help/intro.ca.html
share/webmin/proc/help/intro.es.html
share/webmin/proc/help/intro.fr.html
@@ -1016,6 +905,7 @@ share/webmin/proc/help/intro.hu.html
share/webmin/proc/help/intro.pl.html
share/webmin/proc/help/intro.sv.html
share/webmin/proc/help/intro.zh_TW.Big5.html
+share/webmin/proc/help/intro.zh_TW.UTF-8.html
share/webmin/proc/help/mode.ca.html
share/webmin/proc/help/mode.es.html
share/webmin/proc/help/mode.fr.html
@@ -1024,6 +914,7 @@ share/webmin/proc/help/mode.hu.html
share/webmin/proc/help/mode.pl.html
share/webmin/proc/help/mode.sv.html
share/webmin/proc/help/mode.zh_TW.Big5.html
+share/webmin/proc/help/mode.zh_TW.UTF-8.html
share/webmin/proc/help/nice.ca.html
share/webmin/proc/help/nice.es.html
share/webmin/proc/help/nice.fr.html
@@ -1032,6 +923,7 @@ share/webmin/proc/help/nice.hu.html
share/webmin/proc/help/nice.pl.html
share/webmin/proc/help/nice.sv.html
share/webmin/proc/help/nice.zh_TW.Big5.html
+share/webmin/proc/help/nice.zh_TW.UTF-8.html
share/webmin/proc/help/open_proc.ca.html
share/webmin/proc/help/open_proc.html
share/webmin/proc/help/overview.ca.html
@@ -1042,6 +934,7 @@ share/webmin/proc/help/overview.hu.html
share/webmin/proc/help/overview.pl.html
share/webmin/proc/help/overview.sv.html
share/webmin/proc/help/overview.zh_TW.Big5.html
+share/webmin/proc/help/overview.zh_TW.UTF-8.html
share/webmin/proc/help/run.ca.html
share/webmin/proc/help/run.es.html
share/webmin/proc/help/run.fr.html
@@ -1050,6 +943,7 @@ share/webmin/proc/help/run.hu.html
share/webmin/proc/help/run.pl.html
share/webmin/proc/help/run.sv.html
share/webmin/proc/help/run.zh_TW.Big5.html
+share/webmin/proc/help/run.zh_TW.UTF-8.html
share/webmin/proc/help/scpu.ca.html
share/webmin/proc/help/scpu.es.html
share/webmin/proc/help/scpu.fr.html
@@ -1058,6 +952,7 @@ share/webmin/proc/help/scpu.hu.html
share/webmin/proc/help/scpu.pl.html
share/webmin/proc/help/scpu.sv.html
share/webmin/proc/help/scpu.zh_TW.Big5.html
+share/webmin/proc/help/scpu.zh_TW.UTF-8.html
share/webmin/proc/help/search.ca.html
share/webmin/proc/help/search.es.html
share/webmin/proc/help/search.fr.html
@@ -1066,6 +961,7 @@ share/webmin/proc/help/search.hu.html
share/webmin/proc/help/search.pl.html
share/webmin/proc/help/search.sv.html
share/webmin/proc/help/search.zh_TW.Big5.html
+share/webmin/proc/help/search.zh_TW.UTF-8.html
share/webmin/proc/help/sfiles.ca.html
share/webmin/proc/help/sfiles.es.html
share/webmin/proc/help/sfiles.fr.html
@@ -1074,6 +970,7 @@ share/webmin/proc/help/sfiles.hu.html
share/webmin/proc/help/sfiles.pl.html
share/webmin/proc/help/sfiles.sv.html
share/webmin/proc/help/sfiles.zh_TW.Big5.html
+share/webmin/proc/help/sfiles.zh_TW.UTF-8.html
share/webmin/proc/help/sfs.ca.html
share/webmin/proc/help/sfs.es.html
share/webmin/proc/help/sfs.fr.html
@@ -1082,6 +979,7 @@ share/webmin/proc/help/sfs.hu.html
share/webmin/proc/help/sfs.pl.html
share/webmin/proc/help/sfs.sv.html
share/webmin/proc/help/sfs.zh_TW.Big5.html
+share/webmin/proc/help/sfs.zh_TW.UTF-8.html
share/webmin/proc/help/signore.ca.html
share/webmin/proc/help/signore.es.html
share/webmin/proc/help/signore.html
@@ -1096,6 +994,7 @@ share/webmin/proc/help/size.hu.html
share/webmin/proc/help/size.pl.html
share/webmin/proc/help/size.sv.html
share/webmin/proc/help/size.zh_TW.Big5.html
+share/webmin/proc/help/size.zh_TW.UTF-8.html
share/webmin/proc/help/smatch.ca.html
share/webmin/proc/help/smatch.es.html
share/webmin/proc/help/smatch.fr.html
@@ -1104,6 +1003,7 @@ share/webmin/proc/help/smatch.hu.html
share/webmin/proc/help/smatch.pl.html
share/webmin/proc/help/smatch.sv.html
share/webmin/proc/help/smatch.zh_TW.Big5.html
+share/webmin/proc/help/smatch.zh_TW.UTF-8.html
share/webmin/proc/help/ssocket.ca.html
share/webmin/proc/help/ssocket.es.html
share/webmin/proc/help/ssocket.html
@@ -1115,6 +1015,7 @@ share/webmin/proc/help/suser.hu.html
share/webmin/proc/help/suser.pl.html
share/webmin/proc/help/suser.sv.html
share/webmin/proc/help/suser.zh_TW.Big5.html
+share/webmin/proc/help/suser.zh_TW.UTF-8.html
share/webmin/proc/help/trace.ca.html
share/webmin/proc/help/trace.html
share/webmin/proc/help/tree.ca.html
@@ -1125,6 +1026,7 @@ share/webmin/proc/help/tree.hu.html
share/webmin/proc/help/tree.pl.html
share/webmin/proc/help/tree.sv.html
share/webmin/proc/help/tree.zh_TW.Big5.html
+share/webmin/proc/help/tree.zh_TW.UTF-8.html
share/webmin/proc/help/user.ca.html
share/webmin/proc/help/user.es.html
share/webmin/proc/help/user.fr.html
@@ -1133,6 +1035,7 @@ share/webmin/proc/help/user.hu.html
share/webmin/proc/help/user.pl.html
share/webmin/proc/help/user.sv.html
share/webmin/proc/help/user.zh_TW.Big5.html
+share/webmin/proc/help/user.zh_TW.UTF-8.html
share/webmin/proc/help/zone.ca.html
share/webmin/proc/help/zone.html
share/webmin/proc/hpux-lib.pl
@@ -1157,7 +1060,9 @@ share/webmin/proc/lang/fa
share/webmin/proc/lang/fr
share/webmin/proc/lang/hu
share/webmin/proc/lang/it
+share/webmin/proc/lang/ja_JP.UTF-8
share/webmin/proc/lang/ja_JP.euc
+share/webmin/proc/lang/ko_KR.UTF-8
share/webmin/proc/lang/ko_KR.euc
share/webmin/proc/lang/pl
share/webmin/proc/lang/pt
@@ -1167,7 +1072,9 @@ share/webmin/proc/lang/sv
share/webmin/proc/lang/tr
share/webmin/proc/lang/uk_UA
share/webmin/proc/lang/zh_CN
+share/webmin/proc/lang/zh_CN.UTF-8
share/webmin/proc/lang/zh_TW.Big5
+share/webmin/proc/lang/zh_TW.UTF-8
share/webmin/proc/linux-lib.pl
share/webmin/proc/log_parser.pl
share/webmin/proc/low.skill
@@ -1182,6 +1089,7 @@ share/webmin/proc/proc-lib.pl
share/webmin/proc/rbac-mapping
share/webmin/proc/renice_proc.cgi
share/webmin/proc/run.cgi
+share/webmin/proc/syslog_logs.pl
share/webmin/proc/sysv-lib.pl
share/webmin/proc/tail.cgi
share/webmin/proc/trace.cgi
@@ -1209,7 +1117,9 @@ share/webmin/servers/config.info.sk
share/webmin/servers/config.info.sv
share/webmin/servers/config.info.tr
share/webmin/servers/config.info.zh_CN
+share/webmin/servers/config.info.zh_CN.UTF-8
share/webmin/servers/config.info.zh_TW.Big5
+share/webmin/servers/config.info.zh_TW.UTF-8
share/webmin/servers/config_info.pl
share/webmin/servers/defaultacl
share/webmin/servers/delete_servs.cgi
@@ -1217,7 +1127,9 @@ share/webmin/servers/edit_auto.cgi
share/webmin/servers/edit_serv.cgi
share/webmin/servers/feedback_files.pl
share/webmin/servers/find.cgi
+share/webmin/servers/images/asianux.gif
share/webmin/servers/images/caldera.gif
+share/webmin/servers/images/centos.gif
share/webmin/servers/images/cobalt.gif
share/webmin/servers/images/debian.gif
share/webmin/servers/images/fedora.gif
@@ -1230,13 +1142,17 @@ share/webmin/servers/images/mac.gif
share/webmin/servers/images/mandrake.gif
share/webmin/servers/images/msc.gif
share/webmin/servers/images/openbsd.gif
+share/webmin/servers/images/redflag.gif
share/webmin/servers/images/redhat.gif
share/webmin/servers/images/sco.gif
share/webmin/servers/images/slackware.gif
share/webmin/servers/images/smallicon.gif
share/webmin/servers/images/solaris.gif
share/webmin/servers/images/suse.gif
+share/webmin/servers/images/turbo.gif
+share/webmin/servers/images/ubuntu.gif
share/webmin/servers/images/unknown.gif
+share/webmin/servers/images/windows.gif
share/webmin/servers/index.cgi
share/webmin/servers/lang/ca
share/webmin/servers/lang/cz
@@ -1245,7 +1161,9 @@ share/webmin/servers/lang/en
share/webmin/servers/lang/es
share/webmin/servers/lang/fr
share/webmin/servers/lang/hu
+share/webmin/servers/lang/ja_JP.UTF-8
share/webmin/servers/lang/ja_JP.euc
+share/webmin/servers/lang/ko_KR.UTF-8
share/webmin/servers/lang/ko_KR.euc
share/webmin/servers/lang/ms
share/webmin/servers/lang/no
@@ -1258,7 +1176,9 @@ share/webmin/servers/lang/sv
share/webmin/servers/lang/tr
share/webmin/servers/lang/uk_UA
share/webmin/servers/lang/zh_CN
+share/webmin/servers/lang/zh_CN.UTF-8
share/webmin/servers/lang/zh_TW.Big5
+share/webmin/servers/lang/zh_TW.UTF-8
share/webmin/servers/link.cgi
share/webmin/servers/log_parser.pl
share/webmin/servers/login.cgi
@@ -1276,6 +1196,7 @@ share/webmin/switch_skill.cgi
share/webmin/switch_user.cgi
share/webmin/thirdparty.pl
share/webmin/ui-lib.pl
+share/webmin/uptracker.cgi
share/webmin/user_chooser.cgi
share/webmin/version
share/webmin/web-lib-funcs.pl
@@ -1289,6 +1210,7 @@ share/webmin/webmin/CHANGELOG
share/webmin/webmin/adminupgrade
share/webmin/webmin/backup_config.pl
share/webmin/webmin/bootup.cgi
+share/webmin/webmin/cache.cgi
share/webmin/webmin/change_access.cgi
share/webmin/webmin/change_advanced.cgi
share/webmin/webmin/change_anon.cgi
@@ -1297,6 +1219,7 @@ share/webmin/webmin/change_ca.cgi
share/webmin/webmin/change_lang.cgi
share/webmin/webmin/change_lock.cgi
share/webmin/webmin/change_log.cgi
+share/webmin/webmin/change_mobile.cgi
share/webmin/webmin/change_os.cgi
share/webmin/webmin/change_osdn.cgi
share/webmin/webmin/change_proxy.cgi
@@ -1307,6 +1230,7 @@ share/webmin/webmin/change_startpage.cgi
share/webmin/webmin/change_syslet.cgi
share/webmin/webmin/change_theme.cgi
share/webmin/webmin/change_ui.cgi
+share/webmin/webmin/clear_cache.cgi
share/webmin/webmin/clone_mod.cgi
share/webmin/webmin/config
share/webmin/webmin/config.info
@@ -1315,11 +1239,14 @@ share/webmin/webmin/config.info.de
share/webmin/webmin/config.info.es
share/webmin/webmin/config.info.fa
share/webmin/webmin/config.info.fr
+share/webmin/webmin/config.info.ja_JP.UTF-8
share/webmin/webmin/config.info.ja_JP.euc
share/webmin/webmin/config.info.ms
share/webmin/webmin/config.info.nl
share/webmin/webmin/config.info.sk
share/webmin/webmin/config.info.tr
+share/webmin/webmin/cpan_modules.pl
+share/webmin/webmin/delete_cache.cgi
share/webmin/webmin/delete_mod.cgi
share/webmin/webmin/edit_access.cgi
share/webmin/webmin/edit_advanced.cgi
@@ -1333,6 +1260,7 @@ share/webmin/webmin/edit_ipkey.cgi
share/webmin/webmin/edit_lang.cgi
share/webmin/webmin/edit_lock.cgi
share/webmin/webmin/edit_log.cgi
+share/webmin/webmin/edit_mobile.cgi
share/webmin/webmin/edit_mods.cgi
share/webmin/webmin/edit_os.cgi
share/webmin/webmin/edit_proxy.cgi
@@ -1346,6 +1274,7 @@ share/webmin/webmin/edit_ui.cgi
share/webmin/webmin/edit_upgrade.cgi
share/webmin/webmin/export_mod.cgi
share/webmin/webmin/feedback_files.pl
+share/webmin/webmin/fix_os.cgi
share/webmin/webmin/gnupg-lib.pl
share/webmin/webmin/images/access.gif
share/webmin/webmin/images/advanced.gif
@@ -1359,6 +1288,7 @@ share/webmin/webmin/images/icon.gif
share/webmin/webmin/images/lang.gif
share/webmin/webmin/images/lock.gif
share/webmin/webmin/images/log.gif
+share/webmin/webmin/images/mobile.gif
share/webmin/webmin/images/mods.gif
share/webmin/webmin/images/os.gif
share/webmin/webmin/images/proxy.gif
@@ -1385,7 +1315,9 @@ share/webmin/webmin/lang/fr
share/webmin/webmin/lang/he
share/webmin/webmin/lang/hu
share/webmin/webmin/lang/it
+share/webmin/webmin/lang/ja_JP.UTF-8
share/webmin/webmin/lang/ja_JP.euc
+share/webmin/webmin/lang/ko_KR.UTF-8
share/webmin/webmin/lang/ko_KR.euc
share/webmin/webmin/lang/ms
share/webmin/webmin/lang/nl
@@ -1400,7 +1332,9 @@ share/webmin/webmin/lang/sv
share/webmin/webmin/lang/tr
share/webmin/webmin/lang/uk_UA
share/webmin/webmin/lang/zh_CN
+share/webmin/webmin/lang/zh_CN.UTF-8
share/webmin/webmin/lang/zh_TW.Big5
+share/webmin/webmin/lang/zh_TW.UTF-8
share/webmin/webmin/log_parser.pl
share/webmin/webmin/low.skill
share/webmin/webmin/medium.skill
@@ -1412,11 +1346,13 @@ share/webmin/webmin/save_categories.cgi
share/webmin/webmin/save_descs.cgi
share/webmin/webmin/save_ipkey.cgi
share/webmin/webmin/save_newmod.cgi
+share/webmin/webmin/savekey.cgi
share/webmin/webmin/setup_ca.cgi
share/webmin/webmin/standard_chooser.cgi
share/webmin/webmin/stop_ca.cgi
share/webmin/webmin/subdir/foo.cgi
share/webmin/webmin/submit.cgi
+share/webmin/webmin/syslog_logs.pl
share/webmin/webmin/third_chooser.cgi
share/webmin/webmin/uninstall.pl
share/webmin/webmin/update.cgi
@@ -1445,7 +1381,9 @@ share/webmin/webminlog/lang/es
share/webmin/webminlog/lang/fr
share/webmin/webminlog/lang/hu
share/webmin/webminlog/lang/it
+share/webmin/webminlog/lang/ja_JP.UTF-8
share/webmin/webminlog/lang/ja_JP.euc
+share/webmin/webminlog/lang/ko_KR.UTF-8
share/webmin/webminlog/lang/ko_KR.euc
share/webmin/webminlog/lang/ms
share/webmin/webminlog/lang/nl
@@ -1459,12 +1397,15 @@ share/webmin/webminlog/lang/sv
share/webmin/webminlog/lang/tr
share/webmin/webminlog/lang/uk_UA
share/webmin/webminlog/lang/zh_CN
+share/webmin/webminlog/lang/zh_CN.UTF-8
share/webmin/webminlog/lang/zh_TW.Big5
+share/webmin/webminlog/lang/zh_TW.UTF-8
share/webmin/webminlog/module.info
share/webmin/webminlog/rollback.cgi
share/webmin/webminlog/search.cgi
share/webmin/webminlog/view.cgi
share/webmin/webminlog/webminlog-lib.pl
+share/webmin/xmlrpc.cgi
@dirrm share/webmin/webminlog/lang
@dirrm share/webmin/webminlog/images
@dirrm share/webmin/webminlog
@@ -1492,7 +1433,6 @@ share/webmin/webminlog/webminlog-lib.pl
@dirrm share/webmin/init/images
@dirrm share/webmin/init/help
@dirrm share/webmin/init
-@dirrm share/webmin/images/letters
@dirrm share/webmin/images
@dirrm share/webmin/cron/lang
@dirrm share/webmin/cron/images
diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo
index 8e8a4dcf93b..3821e513d6c 100644
--- a/sysutils/webmin/distinfo
+++ b/sysutils/webmin/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.11 2006/06/29 17:45:39 xtraeme Exp $
+$NetBSD: distinfo,v 1.12 2007/04/21 05:22:57 obache Exp $
-SHA1 (webmin-1.270-minimal.tar.gz) = 31fa4cf18205a0dac74e38290a03950450abae26
-RMD160 (webmin-1.270-minimal.tar.gz) = 94847d56eb9aebefc234178656dc53daa3af91c6
-Size (webmin-1.270-minimal.tar.gz) = 1301974 bytes
-SHA1 (patch-aa) = c643cb0f568629288584902b942c792652cc366e
-SHA1 (patch-ab) = 5d91a836b0f1dd51feeda60db7c864c4e93d5c3c
-SHA1 (patch-ac) = 12c133cb1beefd2614f4caa15cc2b29cd1721efa
-SHA1 (patch-ad) = 710b6187ed37fe328daa407d2c7b5de7298ede24
-SHA1 (patch-ae) = 34434aa603791f55a18005fd8a0cf2586aca0988
-SHA1 (patch-af) = 8d2c8d60d2c090050aa41f1762ae8375e3e313c4
-SHA1 (patch-ag) = 024c5ba807bb72007ece1ccaec0d3ddaf9ce00ba
-SHA1 (patch-ah) = 2fe613a0100fb7c9ceb3335bf93120703e01fd7b
-SHA1 (patch-ai) = d3c76a331e634f0c873a870fa31855a97ad68b5e
+SHA1 (webmin-1.340.tar.gz) = 530bb583824688f24fc4c6d0b8522d43c7f5bb96
+RMD160 (webmin-1.340.tar.gz) = 5f4cfe51e052c2f46dc7f6813e74fb0e5aebff05
+Size (webmin-1.340.tar.gz) = 15851601 bytes
+SHA1 (patch-aa) = 75b5fe5c5f0a0f83db32e47a3d9bbe277c51decb
+SHA1 (patch-ab) = fa07200462df76af23b9952739388053940c6743
+SHA1 (patch-ad) = ab3975853a0c4815a6c9d0a66bc64ce5018d2301
+SHA1 (patch-ae) = dc32ccf318777410f5cb702ccefb88b0f87fa209
+SHA1 (patch-af) = ccf2054a957808dc301354590e58d44ade3264a7
+SHA1 (patch-ag) = 4a2ba61d26a3f3a9bb0e1a22a8afb65d66e43746
+SHA1 (patch-ah) = 90617e16d08ccad3925d95c60fbe4002c770069b
+SHA1 (patch-ai) = 196df511dbf8e6d80bedd496f5494b13c7625a3b
diff --git a/sysutils/webmin/patches/patch-aa b/sysutils/webmin/patches/patch-aa
index b2553e17887..ba8ced5f28d 100644
--- a/sysutils/webmin/patches/patch-aa
+++ b/sysutils/webmin/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2006/05/16 04:01:28 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2007/04/21 05:22:57 obache Exp $
---- setup.sh.orig 2006-04-04 19:12:35.000000000 -0400
+--- setup.sh.orig 2007-04-09 05:00:00.000000000 +0000
+++ setup.sh
@@ -35,6 +35,11 @@ echo ""
@@ -35,7 +35,7 @@ $NetBSD: patch-aa,v 1.4 2006/05/16 04:01:28 jlam Exp $
if [ "$?" = "0" -a "$config_dir" != "/etc/webmin" ]; then
echo "ERROR: Config directory $config_dir is not empty"
echo ""
-@@ -518,6 +530,12 @@ else
+@@ -522,6 +534,12 @@ else
kfile=$config_dir/miniserv.pem
openssl version >/dev/null 2>&1
@@ -48,13 +48,12 @@ $NetBSD: patch-aa,v 1.4 2006/05/16 04:01:28 jlam Exp $
if [ "$?" = "0" ]; then
# We can generate a new SSL key for this host
host=`hostname`
-@@ -719,32 +737,35 @@ EOF
+@@ -728,31 +746,34 @@ EOF
echo ""
fi
-echo "Changing ownership and permissions .."
-for m in $newmods; do
-- echo Chowning $config_dir/$m
- chown -R root $config_dir/$m
- chgrp -R bin $config_dir/$m
- chmod -R og-rw $config_dir/$m
@@ -83,7 +82,6 @@ $NetBSD: patch-aa,v 1.4 2006/05/16 04:01:28 jlam Exp $
+#
+#echo "Changing ownership and permissions .."
+#for m in $newmods; do
-+# echo Chowning $config_dir/$m
+# chown -R root $config_dir/$m
+# chgrp -R bin $config_dir/$m
+# chmod -R og-rw $config_dir/$m
diff --git a/sysutils/webmin/patches/patch-ab b/sysutils/webmin/patches/patch-ab
index 8cb9400b89e..fe31f86a241 100644
--- a/sysutils/webmin/patches/patch-ab
+++ b/sysutils/webmin/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2006/06/04 14:08:36 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2007/04/21 05:22:57 obache Exp $
---- oschooser.pl.orig 2006-06-04 14:02:49.000000000 +0000
+--- oschooser.pl.orig 2007-04-09 05:00:00.000000000 +0000
+++ oschooser.pl
@@ -107,6 +107,8 @@ if (!$auto) {
}
diff --git a/sysutils/webmin/patches/patch-ac b/sysutils/webmin/patches/patch-ac
deleted file mode 100644
index 98c6e1c9968..00000000000
--- a/sysutils/webmin/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/05/19 17:14:53 jlam Exp $
-
---- run-uninstalls.pl.orig Tue Apr 4 23:12:35 2006
-+++ run-uninstalls.pl
-@@ -6,7 +6,14 @@ $no_acl_check++;
- do './web-lib.pl';
- &init_config();
-
--foreach $m (&get_all_module_infos()) {
-+if (@ARGV > 0) {
-+ @mods = map { local %minfo = &get_module_info($_); \%minfo } @ARGV;
-+ }
-+else {
-+ @mods = &get_all_module_infos();
-+ }
-+
-+foreach $m (@mods) {
- $mdir = &module_root_directory($m->{'dir'});
- if (&check_os_support($m) &&
- -r "$mdir/uninstall.pl") {
diff --git a/sysutils/webmin/patches/patch-ad b/sysutils/webmin/patches/patch-ad
index 911965a2daa..7b5819d54a1 100644
--- a/sysutils/webmin/patches/patch-ad
+++ b/sysutils/webmin/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2006/06/29 17:45:39 xtraeme Exp $
+$NetBSD: patch-ad,v 1.3 2007/04/21 05:22:58 obache Exp $
---- os_list.txt.orig 2006-04-05 01:12:35.000000000 +0200
-+++ os_list.txt 2006-06-29 19:37:59.000000000 +0200
-@@ -217,9 +217,8 @@
+--- os_list.txt.orig 2007-04-09 05:00:00.000000000 +0000
++++ os_list.txt
+@@ -225,18 +225,14 @@ Caixa Magica 10.0 suse-linux 9.2 `cat
# All FreeBSD versions
FreeBSD $1 freebsd $1 $uname =~ /FreeBSD.*?\s([0-9\.]+)/i
@@ -14,11 +14,13 @@ $NetBSD: patch-ad,v 1.2 2006/06/29 17:45:39 xtraeme Exp $
# All OpenBSD versions
OpenBSD $1 openbsd $1 $uname =~ /OpenBSD.*?\s([0-9\.]+)/i
-@@ -229,6 +228,7 @@
- NetBSD 1.6 netbsd 1.6 $uname =~ /NetBSD.*1\.6/i
- NetBSD 2.0 netbsd 2.0 $uname =~ /NetBSD.*2\.0/i
- NetBSD 3.0 netbsd 3.0 $uname =~ /NetBSD.*3\.0/i
-+NetBSD current netbsd 3.99.x $uname =~ /NetBSD.*3\.99*/i
+
+ # All NetBSD versions
+-NetBSD 1.5 netbsd 1.5 $uname =~ /NetBSD.*1\.5/i
+-NetBSD 1.6 netbsd 1.6 $uname =~ /NetBSD.*1\.6/i
+-NetBSD 2.0 netbsd 2.0 $uname =~ /NetBSD.*2\.0/i
+-NetBSD 3.0 netbsd 3.0 $uname =~ /NetBSD.*3\.0/i
++NetBSD $1 netbsd $1 $uname =~ /NetBSD.*?\s([0-9\.]+)/i
# BSDI (may not be detected properly)
BSDI $1 freebsd $1 $uname =~ /BSDI.*\s([0-9\.]+)/i
diff --git a/sysutils/webmin/patches/patch-ae b/sysutils/webmin/patches/patch-ae
index 323142fe8ce..7073a7c9a50 100644
--- a/sysutils/webmin/patches/patch-ae
+++ b/sysutils/webmin/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.1 2006/06/04 14:44:14 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2007/04/21 05:22:58 obache Exp $
---- man/module.info.orig 2006-06-04 14:16:23.000000000 +0000
+--- man/module.info.orig 2007-04-09 05:00:48.000000000 +0000
+++ man/module.info
-@@ -12,7 +12,7 @@ desc_zh_CN=ʹֲ
- desc_pt=Pginas do Manual
+@@ -15,7 +15,7 @@ desc_pt=Pginas do Manual
category=system
+ desc_zh_TW.UTF-8=手冊頁
desc_tr=Klavuz Sayfalar
-os_support=solaris corel-linux debian-linux open-linux redhat-linux mandrake-linux slackware-linux solaris suse-linux united-linux turbo-linux freebsd openbsd cobalt-linux lfs-linux irix aix hpux macos netbsd msc-linux osf1 generic-linux openserver gentoo-linux trustix-linux sol-linux coherent-linux
+os_support=solaris corel-linux debian-linux open-linux redhat-linux mandrake-linux slackware-linux solaris suse-linux united-linux turbo-linux freebsd openbsd cobalt-linux lfs-linux irix aix hpux macos netbsd msc-linux osf1 generic-linux openserver gentoo-linux trustix-linux sol-linux coherent-linux dragonfly
diff --git a/sysutils/webmin/patches/patch-af b/sysutils/webmin/patches/patch-af
index 57a9e4d655e..ed4c5e4b52c 100644
--- a/sysutils/webmin/patches/patch-af
+++ b/sysutils/webmin/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.1 2006/06/04 14:44:14 joerg Exp $
+$NetBSD: patch-af,v 1.2 2007/04/21 05:22:58 obache Exp $
---- servers/servers-lib.pl.orig 2006-06-04 14:16:40.000000000 +0000
+--- servers/servers-lib.pl.orig 2007-04-09 05:00:08.000000000 +0000
+++ servers/servers-lib.pl
-@@ -177,6 +177,7 @@ else {
- [ 'slackware', 'Slackware Linux', 'slackware-linux' ],
+@@ -184,6 +184,7 @@ else {
[ 'linux', 'Linux', '.*-linux' ],
+
[ 'freebsd', 'FreeBSD', 'freebsd' ],
+ [ 'dragonfly', 'DragonFly', 'dragonfly' ],
[ 'solaris', 'Solaris', 'solaris' ],
diff --git a/sysutils/webmin/patches/patch-ag b/sysutils/webmin/patches/patch-ag
index 75eea72700a..a27d8339652 100644
--- a/sysutils/webmin/patches/patch-ag
+++ b/sysutils/webmin/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.1 2006/06/04 14:44:14 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2007/04/21 05:22:58 obache Exp $
---- proc/module.info.orig 2006-06-04 14:17:15.000000000 +0000
+--- proc/module.info.orig 2007-04-09 05:00:48.000000000 +0000
+++ proc/module.info
-@@ -10,7 +10,7 @@ desc_zh_CN=̹
- desc_pt=Processos em Curso
+@@ -13,7 +13,7 @@ desc_pt=Processos em Curso
category=system
+ desc_zh_TW.UTF-8=執行中的程序
desc_tr=alan Sreler
-os_support=solaris *-linux hpux freebsd osf1 irix unixware openserver macos aix netbsd openbsd windows
+os_support=solaris *-linux hpux freebsd osf1 irix unixware openserver macos aix netbsd openbsd windows dragonfly
diff --git a/sysutils/webmin/patches/patch-ah b/sysutils/webmin/patches/patch-ah
index c016ef6200b..6dc8fb14e05 100644
--- a/sysutils/webmin/patches/patch-ah
+++ b/sysutils/webmin/patches/patch-ah
@@ -1,10 +1,10 @@
-$NetBSD: patch-ah,v 1.1 2006/06/04 14:44:14 joerg Exp $
+$NetBSD: patch-ah,v 1.2 2007/04/21 05:22:58 obache Exp $
---- cron/module.info.orig 2006-06-04 14:19:59.000000000 +0000
+--- cron/module.info.orig 2007-04-09 05:00:48.000000000 +0000
+++ cron/module.info
-@@ -11,7 +11,7 @@ desc_pt=Tarefas Agendadas (Cron)
- desc_zh_CN=Cron
+@@ -15,7 +15,7 @@ desc_zh_CN=Cron
category=system
+ desc_zh_TW.UTF-8=定時執行工作 (Cron)
desc_tr=Zamanlandrlm Grevler
-os_support=solaris slackware-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux freebsd osf1 irix unixware openserver macos open-linux turbo-linux openbsd corel-linux cobalt-linux aix netbsd msc-linux generic-linux gentoo-linux trustix-linux sol-linux coherent-linux windows
+os_support=solaris slackware-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux freebsd osf1 irix unixware openserver macos open-linux turbo-linux openbsd corel-linux cobalt-linux aix netbsd msc-linux generic-linux gentoo-linux trustix-linux sol-linux coherent-linux windows dragonfly
diff --git a/sysutils/webmin/patches/patch-ai b/sysutils/webmin/patches/patch-ai
index bbdb3ab1a1d..0af4411745d 100644
--- a/sysutils/webmin/patches/patch-ai
+++ b/sysutils/webmin/patches/patch-ai
@@ -1,10 +1,10 @@
-$NetBSD: patch-ai,v 1.1 2006/06/04 14:44:14 joerg Exp $
+$NetBSD: patch-ai,v 1.2 2007/04/21 05:22:58 obache Exp $
---- init/module.info.orig 2006-06-04 14:19:28.000000000 +0000
+--- init/module.info.orig 2007-04-09 05:00:48.000000000 +0000
+++ init/module.info
-@@ -11,7 +11,7 @@ desc_zh_CN=͹ػ
- desc_pt=Iniciar e Encerrar
+@@ -14,7 +14,7 @@ desc_pt=Iniciar e Encerrar
category=system
+ desc_zh_TW.UTF-8=開機與關機
desc_tr=Al ve Kapan
-os_support=solaris coherent-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux slackware-linux freebsd unixware openserver open-linux turbo-linux openbsd corel-linux cobalt-linux cobalt-linux osf1 irix aix macos netbsd msc-linux generic-linux trustix-linux gentoo-linux windows
+os_support=solaris coherent-linux redhat-linux mandrake-linux debian-linux suse-linux united-linux hpux slackware-linux freebsd unixware openserver open-linux turbo-linux openbsd corel-linux cobalt-linux cobalt-linux osf1 irix aix macos netbsd msc-linux generic-linux trustix-linux gentoo-linux windows dragonfly
diff --git a/sysutils/webmin/version.mk b/sysutils/webmin/version.mk
new file mode 100644
index 00000000000..6ea936344e8
--- /dev/null
+++ b/sysutils/webmin/version.mk
@@ -0,0 +1,3 @@
+# $NetBSD: version.mk,v 1.1 2007/04/21 05:22:57 obache Exp $
+
+WBM_VERSION= 1.340
diff --git a/sysutils/webmin/wbm.mk b/sysutils/webmin/wbm.mk
index 3d23ca814aa..02b6212b097 100644
--- a/sysutils/webmin/wbm.mk
+++ b/sysutils/webmin/wbm.mk
@@ -1,17 +1,50 @@
-# $NetBSD: wbm.mk,v 1.5 2006/06/15 22:13:59 jlam Exp $
+# $NetBSD: wbm.mk,v 1.6 2007/04/21 05:22:57 obache Exp $
#
# Makefile fragment for Webmin modules
+#
+# Then following variables may be set prior to including this file:
+#
+# WBM_NAME Module name.
+#
+# WBM_STD_MODULE if "YES", then this package provided as standard
+# module. defaults to "YES".
+#
+# WBM_MOD_REV Updated revision number since the each release.
+# Updated modules are taken from following URL:
+# http://www.webmin.com/updates.html
+#
+# WBM_DEPEND_MODULES Depending webmin modules.
+#
-PKGNAME?= wbm-${DISTNAME}
-CATEGORIES+= sysutils www
-MASTER_SITES?= http://download.webmin.com/download/modules/
+.include "version.mk"
+
+WBM_STD_MODULE?=YES
+
+.if defined(WBM_MOD_REV) && !empty(WBM_MOD_REV) || !empty(WBM_STD_MODULE:M[Nn][Oo])
+PKGNAME?= wbm-${WBM_NAME}-${WBM_VERSION:S/0$/${WBM_MOD_REV}/}
+DISTNAME?= ${WBM_NAME}-${WBM_VERSION}-${WBM_MOD_REV}
+MASTER_SITES?= http://www.webmin.com/updates/
EXTRACT_SUFX?= .wbm.gz
EXTRACT_OPTS+= -f tar
+WRKSRC?= ${WRKDIR}
+WBMSRC= ${WRKDIR}/${WBM_NAME}
+.else
+PKGNAME= wbm-${WBM_NAME}-${WBM_VERSION}
+DISTNAME= webmin-${WBM_VERSION}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=webadmin/}
+WBMSRC= ${WRKSRC}/${WBM_NAME}
+.endif
+CATEGORIES+= sysutils www
MAINTAINER?= pkgsrc-users@NetBSD.org
+HOMEPAGE?= http://www.webmin.com/standard.html
USE_TOOLS+= perl:run
-DEPENDS+= webmin>=1.270:../../sysutils/webmin
+DEPENDS+= webmin>=${WBM_VERSION}:../../sysutils/webmin
+
+.for m in ${WBM_DEPEND_MODULES}
+DEPENDS+= wbm-${m}>=${WBM_VERSION}:../../sysutils/wbm-${m}
+.endfor
EVAL_PREFIX+= PREFIX.webmin=webmin
WEBMIN_DIR= ${PREFIX.webmin}/share/webmin
@@ -20,22 +53,22 @@ WEBMIN_VARDIR= ${VARBASE}/webmin
WBM_DIR= ${PREFIX}/share/webmin
WBM_EGDIR= ${PREFIX}/share/examples/webmin
-WRKSRC?= ${WRKDIR}/${WBMNAME}
PKG_SYSCONFSUBDIR= webmin
-OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/${WBMNAME} \
+OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/${WBM_NAME} \
${ROOT_USER} ${ROOT_GROUP} 0700
-CONF_FILES_PERMS+= ${WBM_EGDIR}/${WBMNAME}/config \
- ${PKG_SYSCONFDIR}/${WBMNAME}/config \
+CONF_FILES_PERMS+= ${WBM_EGDIR}/${WBM_NAME}/config \
+ ${PKG_SYSCONFDIR}/${WBM_NAME}/config \
${ROOT_USER} ${ROOT_GROUP} 0600
-FILES_SUBST+= WBMNAME=${WBMNAME:Q}
+FILES_SUBST+= WBM_NAME=${WBM_NAME:Q}
FILES_SUBST+= WEBMIN_DIR=${WEBMIN_DIR:Q}
FILES_SUBST+= WEBMIN_VARDIR=${WEBMIN_VARDIR:Q}
+BUILD_DEFS+= VARBASE
DEINSTALL_TEMPLATES+= ${PKGSRCDIR}/sysutils/webmin/files/wbm-deinstall.tmpl
-# WBMNAME is the name of the module directory
-WBMNAME?= ${DISTNAME}
+# WBM_NAME is the name of the module directory
+WBM_NAME?= ${DISTNAME}
WEBMIN_OSTYPE_cmd= ${AWK} '/^os_type=/ {sub("os_type=",""); print}' \
${WEBMIN_EGDIR}/config
WEBMIN_OSVERSION_cmd= ${AWK} '/^os_version=/ {sub("os_version=",""); print}' \
@@ -44,17 +77,17 @@ WEBMIN_OSVERSION_cmd= ${AWK} '/^os_version=/ {sub("os_version=",""); print}' \
.PHONY: wbm-configure wbm-build wbm-install
wbm-configure:
- ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
+ ${FIND} ${WBMSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
wbm-build:
- ${FIND} ${WRKSRC} -name '*.cgi' -print -o -name '*.pl' -print | \
+ ${FIND} ${WBMSRC} -name '*.cgi' -print -o -name '*.pl' -print | \
${PERL5} ${WEBMIN_DIR}/perlpath.pl ${PERL5} -
wbm-install:
- ${CP} -R ${WRKSRC} ${WBM_DIR}/.
+ ${CP} -R ${WBMSRC} ${WBM_DIR}/.
${PERL5} ${WEBMIN_DIR}/copyconfig.pl \
${WEBMIN_OSTYPE_cmd:sh:Q} ${WEBMIN_OSVERSION_cmd:sh:Q} \
- ${WBM_DIR}/${WBM_NAME} ${WBM_EGDIR} ${WBMNAME}
+ ${WBM_DIR} ${WBM_EGDIR} ${WBM_NAME}
do-configure: wbm-configure
do-build: wbm-build