3 files changed, 47 insertions, 169 deletions

diff --git a/mail/qmailadmin-devel/Makefile b/mail/qmailadmin-devel/Makefile
index 6608fcaa6ae1..022174500b6e 100644
--- a/mail/qmailadmin-devel/Makefile
+++ b/mail/qmailadmin-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qmailadmin
-PORTVERSION=	0.39
+PORTVERSION=	0.42
 CATEGORIES=	mail www
 MASTER_SITES=	http://www.inter7.com/qmailadmin/
 
diff --git a/mail/qmailadmin-devel/distinfo b/mail/qmailadmin-devel/distinfo
index 3e13fa3fbce9..7122d6fb15f4 100644
--- a/mail/qmailadmin-devel/distinfo
+++ b/mail/qmailadmin-devel/distinfo
@@ -1 +1 @@
-MD5 (qmailadmin-0.39.tar.gz) = bfe935f378e7ad5e32b1d98e9a862789
+MD5 (qmailadmin-0.42.tar.gz) = c8322703caa200643048d186befae43b
diff --git a/mail/qmailadmin-devel/pkg-plist b/mail/qmailadmin-devel/pkg-plist
index af1203e43ea1..41a60309915f 100644
--- a/mail/qmailadmin-devel/pkg-plist
+++ b/mail/qmailadmin-devel/pkg-plist
@@ -1,176 +1,54 @@
-share/qmailadmin/html/en/add_alias.html
-share/qmailadmin/html/en/add_autorespond.html
-share/qmailadmin/html/en/add_forward.html
-share/qmailadmin/html/en/add_listmod.html
-share/qmailadmin/html/en/add_listuser.html
-share/qmailadmin/html/en/add_mailinglist.html
-share/qmailadmin/html/en/add_user.html
-share/qmailadmin/html/en/del_alias_confirm.html
-share/qmailadmin/html/en/del_autorespond_confirm.html
-share/qmailadmin/html/en/del_forward_confirm.html
-share/qmailadmin/html/en/del_mailinglist_confirm.html
-share/qmailadmin/html/en/del_user_confirm.html
-share/qmailadmin/html/en/html_text
-share/qmailadmin/html/en/main_menu.html
-share/qmailadmin/html/en/main_table.html
-share/qmailadmin/html/en/mod_autorespond.html
-share/qmailadmin/html/en/mod_dotqmail.html
-share/qmailadmin/html/en/mod_user.html
-share/qmailadmin/html/en/show_alias.html
-share/qmailadmin/html/en/show_autorespond.html
-share/qmailadmin/html/en/show_forwards.html
-share/qmailadmin/html/en/show_login.html
-share/qmailadmin/html/en/show_mailinglist.html
-share/qmailadmin/html/en/show_redirect.html
-share/qmailadmin/html/en/show_users.html
-share/qmailadmin/html/ja/add_alias.html
-share/qmailadmin/html/ja/add_autorespond.html
-share/qmailadmin/html/ja/add_forward.html
-share/qmailadmin/html/ja/add_listmod.html
-share/qmailadmin/html/ja/add_listuser.html
-share/qmailadmin/html/ja/add_mailinglist.html
-share/qmailadmin/html/ja/add_user.html
-share/qmailadmin/html/ja/del_alias_confirm.html
-share/qmailadmin/html/ja/del_autorespond_confirm.html
-share/qmailadmin/html/ja/del_forward_confirm.html
-share/qmailadmin/html/ja/del_mailinglist_confirm.html
-share/qmailadmin/html/ja/del_user_confirm.html
-share/qmailadmin/html/ja/html_text
-share/qmailadmin/html/ja/main_menu.html
-share/qmailadmin/html/ja/main_table.html
-share/qmailadmin/html/ja/mod_autorespond.html
-share/qmailadmin/html/ja/mod_dotqmail.html
-share/qmailadmin/html/ja/mod_user.html
-share/qmailadmin/html/ja/qmailadmin.patch
-share/qmailadmin/html/ja/show_alias.html
-share/qmailadmin/html/ja/show_autorespond.html
-share/qmailadmin/html/ja/show_forwards.html
-share/qmailadmin/html/ja/show_login.html
-share/qmailadmin/html/ja/show_mailinglist.html
-share/qmailadmin/html/ja/show_redirect.html
-share/qmailadmin/html/ja/show_users.html
-share/qmailadmin/html/ja/show_users.html.patch
-share/qmailadmin/html/pt-BR/add_alias.html
-share/qmailadmin/html/pt-BR/add_autorespond.html
-share/qmailadmin/html/pt-BR/add_forward.html
-share/qmailadmin/html/pt-BR/add_listmod.html
-share/qmailadmin/html/pt-BR/add_listuser.html
-share/qmailadmin/html/pt-BR/add_mailinglist.html
-share/qmailadmin/html/pt-BR/add_user.html
-share/qmailadmin/html/pt-BR/del_alias_confirm.html
-share/qmailadmin/html/pt-BR/del_autorespond_confirm.html
-share/qmailadmin/html/pt-BR/del_forward_confirm.html
-share/qmailadmin/html/pt-BR/del_mailinglist_confirm.html
-share/qmailadmin/html/pt-BR/del_user_confirm.html
-share/qmailadmin/html/pt-BR/html_text
-share/qmailadmin/html/pt-BR/main_menu.html
-share/qmailadmin/html/pt-BR/main_table.html
-share/qmailadmin/html/pt-BR/mod_autorespond.html
-share/qmailadmin/html/pt-BR/mod_dotqmail.html
-share/qmailadmin/html/pt-BR/mod_user.html
-share/qmailadmin/html/pt-BR/qmailadmin.patch
-share/qmailadmin/html/pt-BR/show_alias.html
-share/qmailadmin/html/pt-BR/show_autorespond.html
-share/qmailadmin/html/pt-BR/show_forwards.html
-share/qmailadmin/html/pt-BR/show_login.html
-share/qmailadmin/html/pt-BR/show_mailinglist.html
-share/qmailadmin/html/pt-BR/show_redirect.html
-share/qmailadmin/html/pt-BR/show_users.html
-share/qmailadmin/html/pt-BR/show_users.html.patch
+share/qmailadmin/html/add_alias.html
+share/qmailadmin/html/add_autorespond.html
+share/qmailadmin/html/add_forward.html
+share/qmailadmin/html/add_listmod.html
+share/qmailadmin/html/add_listuser.html
+share/qmailadmin/html/add_mailinglist-idx.html
+share/qmailadmin/html/add_mailinglist-no-idx.html
+share/qmailadmin/html/add_user.html
+share/qmailadmin/html/de
+share/qmailadmin/html/del_alias_confirm.html
+share/qmailadmin/html/del_autorespond_confirm.html
+share/qmailadmin/html/del_forward_confirm.html
+share/qmailadmin/html/del_mailinglist_confirm.html
+share/qmailadmin/html/del_user_confirm.html
+share/qmailadmin/html/en
+share/qmailadmin/html/fr
+share/qmailadmin/html/ja
+share/qmailadmin/html/main_menu.html
+share/qmailadmin/html/main_table.html
+share/qmailadmin/html/mod_autorespond.html
+share/qmailadmin/html/mod_dotqmail.html
+share/qmailadmin/html/mod_user.html
+share/qmailadmin/html/pt-BR
+share/qmailadmin/html/show_alias.html
+share/qmailadmin/html/show_autorespond.html
+share/qmailadmin/html/show_forwards.html
+share/qmailadmin/html/show_login.html
+share/qmailadmin/html/show_mailinglist.html
+share/qmailadmin/html/show_redirect.html
+share/qmailadmin/html/show_users.html
 www/cgi-bin.default/qmailadmin/qmailadmin
-www/data.default/images/qmailadmin/en/bg.jpg
-www/data.default/images/qmailadmin/en/but_add.gif
-www/data.default/images/qmailadmin/en/but_addalias.gif
-www/data.default/images/qmailadmin/en/but_addforward.gif
-www/data.default/images/qmailadmin/en/but_changeinfo.gif
-www/data.default/images/qmailadmin/en/but_changepassword.gif
-www/data.default/images/qmailadmin/en/but_confirmdelete.gif
-www/data.default/images/qmailadmin/en/but_createpopuser.gif
-www/data.default/images/qmailadmin/en/but_login.gif
-www/data.default/images/qmailadmin/en/but_logout.gif
-www/data.default/images/qmailadmin/en/but_mainmenu.gif
-www/data.default/images/qmailadmin/en/but_newmaillist.gif
-www/data.default/images/qmailadmin/en/but_newresponder.gif
-www/data.default/images/qmailadmin/en/but_nextpage.gif
-www/data.default/images/qmailadmin/en/but_prevpage.gif
-www/data.default/images/qmailadmin/en/but_refreshmenu.gif
-www/data.default/images/qmailadmin/en/delete.gif
-www/data.default/images/qmailadmin/en/login.gif
-www/data.default/images/qmailadmin/en/lowerleft.gif
-www/data.default/images/qmailadmin/en/lowermiddle.gif
-www/data.default/images/qmailadmin/en/lowerright.gif
-www/data.default/images/qmailadmin/en/main1.gif
-www/data.default/images/qmailadmin/en/main2.gif
-www/data.default/images/qmailadmin/en/middleleft1.gif
-www/data.default/images/qmailadmin/en/middleleft2.gif
-www/data.default/images/qmailadmin/en/middlelogin.gif
-www/data.default/images/qmailadmin/en/middleright1.gif
-www/data.default/images/qmailadmin/en/pixel.gif
-www/data.default/images/qmailadmin/en/upperleft.gif
-www/data.default/images/qmailadmin/en/uppermiddle1.gif
-www/data.default/images/qmailadmin/en/uppermiddle2.gif
-www/data.default/images/qmailadmin/en/upperright.gif
-www/data.default/images/qmailadmin/ja/but_add.gif
-www/data.default/images/qmailadmin/ja/but_addalias.gif
-www/data.default/images/qmailadmin/ja/but_addforward.gif
-www/data.default/images/qmailadmin/ja/but_changeinfo.gif
-www/data.default/images/qmailadmin/ja/but_changepassword.gif
-www/data.default/images/qmailadmin/ja/but_confirmdelete.gif
-www/data.default/images/qmailadmin/ja/but_createpopuser.gif
-www/data.default/images/qmailadmin/ja/but_login.gif
-www/data.default/images/qmailadmin/ja/but_logout.gif
-www/data.default/images/qmailadmin/ja/but_mainmenu.gif
-www/data.default/images/qmailadmin/ja/but_newmaillist.gif
-www/data.default/images/qmailadmin/ja/but_newresponder.gif
-www/data.default/images/qmailadmin/ja/but_nextpage.gif
-www/data.default/images/qmailadmin/ja/but_prevpage.gif
-www/data.default/images/qmailadmin/ja/but_refreshmenu.gif
-www/data.default/images/qmailadmin/ja/delete.gif
-www/data.default/images/qmailadmin/ja/main1.gif
-www/data.default/images/qmailadmin/ja/main2.gif
-www/data.default/images/qmailadmin/pt-BR/bg.jpg
-www/data.default/images/qmailadmin/pt-BR/but_add.gif
-www/data.default/images/qmailadmin/pt-BR/but_addalias.gif
-www/data.default/images/qmailadmin/pt-BR/but_addforward.gif
-www/data.default/images/qmailadmin/pt-BR/but_changeinfo.gif
-www/data.default/images/qmailadmin/pt-BR/but_changepassword.gif
-www/data.default/images/qmailadmin/pt-BR/but_confirmdelete.gif
-www/data.default/images/qmailadmin/pt-BR/but_createpopuser.gif
-www/data.default/images/qmailadmin/pt-BR/but_login.gif
-www/data.default/images/qmailadmin/pt-BR/but_logout.gif
-www/data.default/images/qmailadmin/pt-BR/but_mainmenu.gif
-www/data.default/images/qmailadmin/pt-BR/but_newmaillist.gif
-www/data.default/images/qmailadmin/pt-BR/but_newresponder.gif
-www/data.default/images/qmailadmin/pt-BR/but_nextpage.gif
-www/data.default/images/qmailadmin/pt-BR/but_prevpage.gif
-www/data.default/images/qmailadmin/pt-BR/but_refreshmenu.gif
-www/data.default/images/qmailadmin/pt-BR/delete.gif
-www/data.default/images/qmailadmin/pt-BR/login.gif
-www/data.default/images/qmailadmin/pt-BR/lowerleft.gif
-www/data.default/images/qmailadmin/pt-BR/lowermiddle.gif
-www/data.default/images/qmailadmin/pt-BR/lowerright.gif
-www/data.default/images/qmailadmin/pt-BR/main1.gif
-www/data.default/images/qmailadmin/pt-BR/main2.gif
-www/data.default/images/qmailadmin/pt-BR/middleleft1.gif
-www/data.default/images/qmailadmin/pt-BR/middleleft2.gif
-www/data.default/images/qmailadmin/pt-BR/middlelogin.gif
-www/data.default/images/qmailadmin/pt-BR/middleright1.gif
-www/data.default/images/qmailadmin/pt-BR/pixel.gif
-www/data.default/images/qmailadmin/pt-BR/upperleft.gif
-www/data.default/images/qmailadmin/pt-BR/uppermiddle1.gif
-www/data.default/images/qmailadmin/pt-BR/uppermiddle2.gif
-www/data.default/images/qmailadmin/pt-BR/upperright.gif
-@dirrm www/data.default/images/qmailadmin/pt-BR
-@dirrm www/data.default/images/qmailadmin/ja
-@dirrm www/data.default/images/qmailadmin/en
+www/data.default/images/qmailadmin/delete.gif
+www/data.default/images/qmailadmin/lowerleft.gif
+www/data.default/images/qmailadmin/lowermiddle.gif
+www/data.default/images/qmailadmin/lowerright.gif
+www/data.default/images/qmailadmin/main1.gif
+www/data.default/images/qmailadmin/main2.gif
+www/data.default/images/qmailadmin/middleleft1.gif
+www/data.default/images/qmailadmin/middleleft2.gif
+www/data.default/images/qmailadmin/middlelogin.gif
+www/data.default/images/qmailadmin/middleright1.gif
+www/data.default/images/qmailadmin/pixel.gif
+www/data.default/images/qmailadmin/upperleft.gif
+www/data.default/images/qmailadmin/uppermiddle1.gif
+www/data.default/images/qmailadmin/uppermiddle2.gif
+www/data.default/images/qmailadmin/upperright.gif
 @dirrm www/data.default/images/qmailadmin
 @dirrm www/data.default/images
 @unexec /bin/rmdir %D/www/data.default 2> /dev/null || true
 @dirrm www/cgi-bin.default/qmailadmin
 @unexec /bin/rmdir %D/www/cgi-bin.default 2> /dev/null || true
 @unexec /bin/rmdir %D/www 2> /dev/null || true
-@dirrm share/qmailadmin/html/pt-BR
-@dirrm share/qmailadmin/html/ja
-@dirrm share/qmailadmin/html/en
 @dirrm share/qmailadmin/html
 @dirrm share/qmailadmin