4 files changed, 13 insertions, 271 deletions

diff --git a/mail/squirrelmail-translations/pkg-plist b/mail/squirrelmail-translations/pkg-plist
index d62fc2d458ec..11c2df96b295 100644
--- a/mail/squirrelmail-translations/pkg-plist
+++ b/mail/squirrelmail-translations/pkg-plist
@@ -2785,202 +2785,6 @@
 %%SQUIRRELDIR%%/locale/zh_TW/LC_MESSAGES/squirrelmail.mo
 %%SQUIRRELDIR%%/locale/zh_TW/LC_MESSAGES/squirrelmail.po
 %%SQUIRRELDIR%%/locale/zh_TW/setup.php
-@dirrmtry %%SQUIRRELDIR%%/locale/zh_TW/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/zh_TW/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/zh_TW
-@dirrmtry %%SQUIRRELDIR%%/locale/zh_CN/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/zh_CN/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/zh_CN
-@dirrmtry %%SQUIRRELDIR%%/locale/vi_VN/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/vi_VN/LC_MESSAGES/extra
-@dirrmtry %%SQUIRRELDIR%%/locale/vi_VN/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/vi_VN
-@dirrmtry %%SQUIRRELDIR%%/locale/uk_UA/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/uk_UA/LC_MESSAGES/extra
-@dirrmtry %%SQUIRRELDIR%%/locale/uk_UA/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/uk_UA
-@dirrmtry %%SQUIRRELDIR%%/locale/ug/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/ug
-@dirrmtry %%SQUIRRELDIR%%/locale/tr_TR/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/tr_TR/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/tr_TR
-@dirrmtry %%SQUIRRELDIR%%/locale/tl_PH/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/tl_PH/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/tl_PH
-@dirrmtry %%SQUIRRELDIR%%/locale/th_TH/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/th_TH/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/th_TH
-@dirrmtry %%SQUIRRELDIR%%/locale/ta_LK/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/ta_LK
-@dirrmtry %%SQUIRRELDIR%%/locale/sv_SE/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/sv_SE/LC_MESSAGES/extra
-@dirrmtry %%SQUIRRELDIR%%/locale/sv_SE/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/sv_SE
-@dirrmtry %%SQUIRRELDIR%%/locale/sr_YU/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/sr_YU/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/sr_YU
-@dirrmtry %%SQUIRRELDIR%%/locale/sl_SI/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/sl_SI/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/sl_SI
-@dirrmtry %%SQUIRRELDIR%%/locale/sk_SK/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/sk_SK/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/sk_SK
-@dirrmtry %%SQUIRRELDIR%%/locale/si_LK/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/si_LK
-@dirrmtry %%SQUIRRELDIR%%/locale/ru_UA/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/ru_UA/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/ru_UA
-@dirrmtry %%SQUIRRELDIR%%/locale/ru_RU/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/ru_RU/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/ru_RU
-@dirrmtry %%SQUIRRELDIR%%/locale/ro_RO/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/ro_RO/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/ro_RO
-@dirrmtry %%SQUIRRELDIR%%/locale/pt_PT/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/pt_PT/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/pt_PT
-@dirrmtry %%SQUIRRELDIR%%/locale/pt_BR/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/pt_BR/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/pt_BR
-@dirrmtry %%SQUIRRELDIR%%/locale/pl_PL/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/pl_PL/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/pl_PL
-@dirrmtry %%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES/extra
-@dirrmtry %%SQUIRRELDIR%%/locale/nn_NO/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/nn_NO
-@dirrmtry %%SQUIRRELDIR%%/locale/nl_NL/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/nl_NL/LC_MESSAGES/extra
-@dirrmtry %%SQUIRRELDIR%%/locale/nl_NL/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/nl_NL
-@dirrmtry %%SQUIRRELDIR%%/locale/nb_NO/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/nb_NO/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/nb_NO
-@dirrmtry %%SQUIRRELDIR%%/locale/ms_MY/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/ms_MY/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/ms_MY
-@dirrmtry %%SQUIRRELDIR%%/locale/mk/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/mk
-@dirrmtry %%SQUIRRELDIR%%/locale/lv_LV/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/lv_LV/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/lv_LV
-@dirrmtry %%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES/extra
-@dirrmtry %%SQUIRRELDIR%%/locale/lt_LT/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/lt_LT
-@dirrmtry %%SQUIRRELDIR%%/locale/ko_KR/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/ko_KR/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/ko_KR
-@dirrmtry %%SQUIRRELDIR%%/locale/km/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/km/LC_MESSAGES/extra
-@dirrmtry %%SQUIRRELDIR%%/locale/km/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/km
-@dirrmtry %%SQUIRRELDIR%%/locale/ka/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/ka
-@dirrmtry %%SQUIRRELDIR%%/locale/ja_JP/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/ja_JP/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/ja_JP
-@dirrmtry %%SQUIRRELDIR%%/locale/it_IT/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/it_IT/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/it_IT
-@dirrmtry %%SQUIRRELDIR%%/locale/is_IS/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/is_IS/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/is_IS
-@dirrmtry %%SQUIRRELDIR%%/locale/id_ID/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/id_ID/LC_MESSAGES/extra
-@dirrmtry %%SQUIRRELDIR%%/locale/id_ID/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/id_ID
-@dirrmtry %%SQUIRRELDIR%%/locale/hu_HU/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/hu_HU/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/hu_HU
-@dirrmtry %%SQUIRRELDIR%%/locale/hr_HR/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/hr_HR/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/hr_HR
-@dirrmtry %%SQUIRRELDIR%%/locale/he_IL/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/he_IL/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/he_IL
-@dirrmtry %%SQUIRRELDIR%%/locale/fy/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/fy/LC_MESSAGES/extra
-@dirrmtry %%SQUIRRELDIR%%/locale/fy/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/fy
-@dirrmtry %%SQUIRRELDIR%%/locale/fr_FR/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/fr_FR/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/fr_FR
-@dirrmtry %%SQUIRRELDIR%%/locale/fo_FO/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/fo_FO/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/fo_FO
-@dirrmtry %%SQUIRRELDIR%%/locale/fi_FI/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/fi_FI/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/fi_FI
-@dirrmtry %%SQUIRRELDIR%%/locale/fa_IR/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/fa_IR/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/fa_IR
-@dirrmtry %%SQUIRRELDIR%%/locale/eu_ES/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/eu_ES
-@dirrmtry %%SQUIRRELDIR%%/locale/et_EE/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/et_EE/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/et_EE
-@dirrmtry %%SQUIRRELDIR%%/locale/es_ES/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/es_ES/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/es_ES
-@dirrmtry %%SQUIRRELDIR%%/locale/en_GB/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/en_GB
-@dirrmtry %%SQUIRRELDIR%%/locale/el_GR/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/el_GR/LC_MESSAGES/extra
-@dirrmtry %%SQUIRRELDIR%%/locale/el_GR/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/el_GR
-@dirrmtry %%SQUIRRELDIR%%/locale/de_DE/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/de_DE/LC_MESSAGES/extra
-@dirrmtry %%SQUIRRELDIR%%/locale/de_DE/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/de_DE
-@dirrmtry %%SQUIRRELDIR%%/locale/da_DK/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/da_DK/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/da_DK
-@dirrmtry %%SQUIRRELDIR%%/locale/cy_GB/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/cy_GB/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/cy_GB
-@dirrmtry %%SQUIRRELDIR%%/locale/cs_CZ/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/cs_CZ/LC_MESSAGES/extra
-@dirrmtry %%SQUIRRELDIR%%/locale/cs_CZ/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/cs_CZ
-@dirrmtry %%SQUIRRELDIR%%/locale/ca_ES/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/ca_ES/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/ca_ES
-@dirrmtry %%SQUIRRELDIR%%/locale/bn_IN/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/bn_IN
-@dirrmtry %%SQUIRRELDIR%%/locale/bn_BD/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/bn_BD
-@dirrmtry %%SQUIRRELDIR%%/locale/bg_BG/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/bg_BG/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/bg_BG
-@dirrmtry %%SQUIRRELDIR%%/locale/ar/LC_MESSAGES/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale/ar/LC_MESSAGES
-@dirrmtry %%SQUIRRELDIR%%/locale/ar
-@dirrmtry %%SQUIRRELDIR%%/help/zh_CN
-@dirrmtry %%SQUIRRELDIR%%/help/uk_UA
-@dirrmtry %%SQUIRRELDIR%%/help/th_TH
-@dirrmtry %%SQUIRRELDIR%%/help/sv_SE
-@dirrmtry %%SQUIRRELDIR%%/help/sr_YU
-@dirrmtry %%SQUIRRELDIR%%/help/sl_SI
-@dirrmtry %%SQUIRRELDIR%%/help/sk_SK
-@dirrmtry %%SQUIRRELDIR%%/help/ru_RU
-@dirrmtry %%SQUIRRELDIR%%/help/pt_PT
-@dirrmtry %%SQUIRRELDIR%%/help/pt_BR
-@dirrmtry %%SQUIRRELDIR%%/help/pl_PL
-@dirrmtry %%SQUIRRELDIR%%/help/nl_NL
-@dirrmtry %%SQUIRRELDIR%%/help/lt_LT
-@dirrmtry %%SQUIRRELDIR%%/help/ko_KR
-@dirrmtry %%SQUIRRELDIR%%/help/ja_JP
-@dirrmtry %%SQUIRRELDIR%%/help/it_IT
-@dirrmtry %%SQUIRRELDIR%%/help/id_ID
-@dirrmtry %%SQUIRRELDIR%%/help/fr_FR
-@dirrmtry %%SQUIRRELDIR%%/help/fi_FI
-@dirrmtry %%SQUIRRELDIR%%/help/fa_IR
-@dirrmtry %%SQUIRRELDIR%%/help/es_ES
-@dirrmtry %%SQUIRRELDIR%%/help/en_GB
-@dirrmtry %%SQUIRRELDIR%%/help/de_DE
-@dirrmtry %%SQUIRRELDIR%%/help/da_DK
-@dirrmtry %%SQUIRRELDIR%%/help/cy_GB
-@dirrmtry %%SQUIRRELDIR%%/help/cs_CZ
-@dirrmtry %%SQUIRRELDIR%%/help/ca_ES
-@dirrmtry %%SQUIRRELDIR%%/help/bg_BG
+@dir %%SQUIRRELDIR%%/locale/el_GR/LC_MESSAGES/extra
+@dir %%SQUIRRELDIR%%/locale/tl_PH/LC_MESSAGES/plugins
+@dir %%SQUIRRELDIR%%/locale/uk_UA/LC_MESSAGES/extra
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index bdb71afb3864..eb50fefb0f7a 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	squirrelmail
-PORTVERSION=	20140717
-PORTREVISION=	1
+PORTVERSION=	20141107
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	adamw/squirrelmail
diff --git a/mail/squirrelmail/distinfo b/mail/squirrelmail/distinfo
index e089c4b05bbd..a7b7c204ee03 100644
--- a/mail/squirrelmail/distinfo
+++ b/mail/squirrelmail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (squirrelmail/squirrelmail-20140717_0200-SVN.stable.tar.bz2) = d7d42a6714a2e42a517b179b904e1860dbc5bf8ba1fc4c3923b0830002d1ef7f
-SIZE (squirrelmail/squirrelmail-20140717_0200-SVN.stable.tar.bz2) = 552821
+SHA256 (squirrelmail/squirrelmail-20141107_0200-SVN.stable.tar.bz2) = 8cda2d1f1793706ac783a8f344d65e2d5fd12d2877cb20259dd2360d7ef55b9b
+SIZE (squirrelmail/squirrelmail-20141107_0200-SVN.stable.tar.bz2) = 553770
diff --git a/mail/squirrelmail/pkg-plist b/mail/squirrelmail/pkg-plist
index 398fd3e02e23..a4828a83d5f1 100644
--- a/mail/squirrelmail/pkg-plist
+++ b/mail/squirrelmail/pkg-plist
@@ -464,83 +464,22 @@ etc/periodic/daily/111.clean-squirrelmail
 %%PORTDOCS%%%%DOCSDIR%%/security.txt
 %%PORTDOCS%%%%DOCSDIR%%/translating.txt
 %%PORTDOCS%%%%DOCSDIR%%/translating_help.txt
-@dirrm %%SQUIRRELDIR%%/themes/css
-@dirrm %%SQUIRRELDIR%%/themes
-@dirrm %%SQUIRRELDIR%%/src
-@dirrm %%SQUIRRELDIR%%/scripts
-@dirrm %%SQUIRRELDIR%%/po
-@dirrm %%SQUIRRELDIR%%/plugins/translate
-@dirrm %%SQUIRRELDIR%%/plugins/test
-@dirrm %%SQUIRRELDIR%%/plugins/squirrelspell/modules
-@dirrm %%SQUIRRELDIR%%/plugins/squirrelspell/js
-@dirrm %%SQUIRRELDIR%%/plugins/squirrelspell
-@dirrm %%SQUIRRELDIR%%/plugins/spamcop
-@dirrm %%SQUIRRELDIR%%/plugins/sent_subfolders
-@dirrm %%SQUIRRELDIR%%/plugins/newmail/sounds
-@dirrm %%SQUIRRELDIR%%/plugins/newmail
-@dirrm %%SQUIRRELDIR%%/plugins/message_details
-@dirrm %%SQUIRRELDIR%%/plugins/mail_fetch
-@dirrm %%SQUIRRELDIR%%/plugins/listcommands
-@dirrm %%SQUIRRELDIR%%/plugins/info
-@dirrm %%SQUIRRELDIR%%/plugins/fortune
-@dirrm %%SQUIRRELDIR%%/plugins/filters/bulkquery
-@dirrm %%SQUIRRELDIR%%/plugins/filters
-@dirrm %%SQUIRRELDIR%%/plugins/demo
-@dirrm %%SQUIRRELDIR%%/plugins/delete_move_next
-@dirrm %%SQUIRRELDIR%%/plugins/calendar
-@dirrm %%SQUIRRELDIR%%/plugins/bug_report
-@dirrm %%SQUIRRELDIR%%/plugins/administrator
-@dirrmtry %%SQUIRRELDIR%%/plugins
-@dirrmtry %%SQUIRRELDIR%%/locale
-@dirrm %%SQUIRRELDIR%%/include/options
-@dirrm %%SQUIRRELDIR%%/include
-@dirrmtry %%SQUIRRELDIR%%/images
-@dirrm %%SQUIRRELDIR%%/help/en_US
-@dirrmtry %%SQUIRRELDIR%%/help
-@dirrm %%SQUIRRELDIR%%/functions/encode
-@dirrm %%SQUIRRELDIR%%/functions/decode
-@dirrm %%SQUIRRELDIR%%/functions
 @owner %%SMUSER%%
 @group %%SMGROUP%%
 @mode 0750
-@dirrm %%SQUIRRELDIR%%/data
+@dir %%SQUIRRELDIR%%/data
 @group
 @owner
 @mode 0755
-@dirrmtry %%SQUIRRELDIR%%/config
-@dirrm %%SQUIRRELDIR%%/class/mime
-@dirrm %%SQUIRRELDIR%%/class/helper
-@dirrm %%SQUIRRELDIR%%/class/deliver
-@dirrm %%SQUIRRELDIR%%/class
+@dir %%SQUIRRELDIR%%/config
+@dir %%SQUIRRELDIR%%/class/mime
+@dir %%SQUIRRELDIR%%/class/helper
+@dir %%SQUIRRELDIR%%/class/deliver
+@dir %%SQUIRRELDIR%%/class
 @owner %%SMUSER%%
 @group %%SMGROUP%%
 @mode 0730
-@dirrmtry %%SQUIRRELDIR%%/attach
+@dir %%SQUIRRELDIR%%/attach
 @mode
 @group
 @owner
-@dirrmtry %%SQUIRRELDIR%%
-@dirrmtry etc/periodic/daily
-@dirrmtry etc/periodic
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/release_notes_archive/1.4
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/release_notes_archive/1.3
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/release_notes_archive/1.2
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/release_notes_archive
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/translate
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/test
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/squirrelspell
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/spamcop
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/newmail
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/mail_fetch
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/listcommands
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/info
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/fortune
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/filters/bulkquery
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/filters
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/demo
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/delete_move_next
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/calendar
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/bug_report
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/plugins/administrator
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/plugins
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%