1 files changed, 73 insertions, 79 deletions

diff --git a/mail/qmailadmin-devel/pkg-plist b/mail/qmailadmin-devel/pkg-plist
index 1e9a574b03d8..eef8a61a9d74 100644
--- a/mail/qmailadmin-devel/pkg-plist
+++ b/mail/qmailadmin-devel/pkg-plist
@@ -1,82 +1,76 @@
-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_listdig.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_noquota.html
-share/qmailadmin/html/add_user_quota.html
-share/qmailadmin/html/colortable
-share/qmailadmin/html/da
-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_listdig.html
-share/qmailadmin/html/del_listmod.html
-share/qmailadmin/html/del_listuser.html
-share/qmailadmin/html/del_mailinglist_confirm.html
-share/qmailadmin/html/del_mod.html
-share/qmailadmin/html/del_user_confirm.html
-share/qmailadmin/html/en
-share/qmailadmin/html/en-us
-share/qmailadmin/html/es
-share/qmailadmin/html/footer.html
-share/qmailadmin/html/fr
-share/qmailadmin/html/header.html
-share/qmailadmin/html/hu
-share/qmailadmin/html/it
-share/qmailadmin/html/ja
-share/qmailadmin/html/main_menu.html
-share/qmailadmin/html/mod_autorespond.html
-share/qmailadmin/html/mod_dotqmail.html
-share/qmailadmin/html/mod_mailinglist-idx.html
-share/qmailadmin/html/mod_user_quota.html
-share/qmailadmin/html/mod_user_noquota.html
-share/qmailadmin/html/no
-share/qmailadmin/html/pt-BR
-share/qmailadmin/html/pl
-share/qmailadmin/html/ru
-share/qmailadmin/html/setremotecatchall.html
-share/qmailadmin/html/show_alias.html
-share/qmailadmin/html/show_autorespond.html
-share/qmailadmin/html/show_digest_subscribers.html
-share/qmailadmin/html/show_forwards.html
-share/qmailadmin/html/show_login.html
-share/qmailadmin/html/show_login_help.html
-share/qmailadmin/html/show_mailinglist.html
-share/qmailadmin/html/show_moderators.html
-share/qmailadmin/html/show_subscribers.html
-share/qmailadmin/html/show_users.html
-share/qmailadmin/html/sv
-share/qmailadmin/html/tr
+%%DATADIR%%/html/add_autorespond.html
+%%DATADIR%%/html/add_forward.html
+%%DATADIR%%/html/add_listmod.html
+%%DATADIR%%/html/add_listdig.html
+%%DATADIR%%/html/add_listuser.html
+%%DATADIR%%/html/add_mailinglist-idx.html
+%%DATADIR%%/html/add_mailinglist-no-idx.html
+%%DATADIR%%/html/add_user.html
+%%DATADIR%%/html/colortable
+%%DATADIR%%/html/da
+%%DATADIR%%/html/de
+%%DATADIR%%/html/del_autorespond_confirm.html
+%%DATADIR%%/html/del_forward_confirm.html
+%%DATADIR%%/html/del_listdig.html
+%%DATADIR%%/html/del_listmod.html
+%%DATADIR%%/html/del_listuser.html
+%%DATADIR%%/html/del_mailinglist_confirm.html
+%%DATADIR%%/html/del_user_confirm.html
+%%DATADIR%%/html/en
+%%DATADIR%%/html/es
+%%DATADIR%%/html/footer.html
+%%DATADIR%%/html/fr
+%%DATADIR%%/html/header.html
+%%DATADIR%%/html/hu
+%%DATADIR%%/html/it
+%%DATADIR%%/html/ja
+%%DATADIR%%/html/main_menu.html
+%%DATADIR%%/html/mod_autorespond.html
+%%DATADIR%%/html/mod_dotqmail.html
+%%DATADIR%%/html/mod_mailinglist-idx.html
+%%DATADIR%%/html/mod_user.html
+%%DATADIR%%/html/nl
+%%DATADIR%%/html/no
+%%DATADIR%%/html/pt-BR
+%%DATADIR%%/html/pl
+%%DATADIR%%/html/ru
+%%DATADIR%%/html/setremotecatchall.html
+%%DATADIR%%/html/show_autorespond.html
+%%DATADIR%%/html/show_digest_subscribers.html
+%%DATADIR%%/html/show_forwards.html
+%%DATADIR%%/html/show_login.html
+%%DATADIR%%/html/show_mailinglist.html
+%%DATADIR%%/html/show_moderators.html
+%%DATADIR%%/html/show_subscribers.html
+%%DATADIR%%/html/show_users.html
+%%DATADIR%%/html/sk
+%%DATADIR%%/html/sv
+%%DATADIR%%/html/tr
 %%CGIBINDIR%%/%%CGIBINSUBDIR%%/qmailadmin
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/delete.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/disabled.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/lowerleft.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/lowermiddle.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/lowerright.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/main1.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/main2.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/middleleft1.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/middleleft2.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/middlelogin.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/middleright1.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/modify.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/pixel.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/radio-on.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/radio-off.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/trash.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/upperleft.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/uppermiddle1.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/uppermiddle2.png
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin/upperright.png
-@dirrm %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/qmailadmin
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/delete.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/disabled.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/lowerleft.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/lowermiddle.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/lowerright.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/main1.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/main2.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/middleleft1.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/middleleft2.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/middlelogin.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/middleright1.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/modify.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/pixel.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/radio-on.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/radio-off.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/trash.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/upperleft.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/uppermiddle1.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/uppermiddle2.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/images/upperright.png
 @dirrm %%WEBDATADIR%%/%%WEBDATASUBDIR%%/images
-@unexec /bin/rmdir %%WEBDATADIR%% 2> /dev/null || true
+@dirrm %%WEBDATADIR%%/%%WEBDATASUBDIR%%
+@unexec /bin/rmdir %D/%%WEBDATADIR%% 2> /dev/null || true
 @dirrm %%CGIBINDIR%%/%%CGIBINSUBDIR%%
-@unexec /bin/rmdir %%CGIBINDIR%% 2> /dev/null || true
-@dirrm share/qmailadmin/html
-@dirrm share/qmailadmin
+@unexec /bin/rmdir %D/%%CGIBINDIR%% 2> /dev/null || true
+@dirrm %%DATADIR%%/html
+@dirrm %%DATADIR%%