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.

14 files changed, 254 insertions, 286 deletions

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=P�ginas do Manual
+@@ -15,7 +15,7 @@ desc_pt=P�ginas do Manual
  category=system
+ desc_zh_TW.UTF-8=手冊頁
  desc_tr=K�lavuz 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=�al��an S�re�ler
 -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=Zamanland�r�lm�� G�revler
 -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=A��l�� 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