Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry

Approved by: krion@ PR: ports/88711 (related)
author: Edwin Groothuis <edwin@FreeBSD.org> 2006-01-22 03:01:03 +0000
committer: Edwin Groothuis <edwin@FreeBSD.org> 2006-01-22 03:01:03 +0000
commit: 508b8d82f4fdfc6889fe17931ef30f047501dfd6 (patch)
tree: f7810d4887e5297c7b7788225e906b99c81d709b /print
parent: Fix pkg-plist. (diff)
38 files changed, 204 insertions, 204 deletions
diff --git a/print/a2ps-letter/pkg-plist b/print/a2ps-letter/pkg-plist
index 7ed8f4b22176..a9aed2df7274 100644
--- a/print/a2ps-letter/pkg-plist
+++ b/print/a2ps-letter/pkg-plist
@@ -272,17 +272,17 @@ share/locale/tr/LC_MESSAGES/a2ps.mo
 @dirrm %%DATADIR%%
 %%WITHEMACS%%@dirrm lib/xemacs/site-lisp
 %%WITHEMACS%%@dirrm lib/xemacs
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ca 2> /dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/cs 2> /dev/null || true
-@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ko 2> /dev/null || true
-@unexec rmdir %D/share/locale/no/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/no 2> /dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/pl 2> /dev/null || true
-@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/pt 2> /dev/null || true
-@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/sl 2> /dev/null || true
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
diff --git a/print/adobe-cmaps/pkg-plist b/print/adobe-cmaps/pkg-plist
index bd9a6791ff4b..fe9e0c85440d 100644
--- a/print/adobe-cmaps/pkg-plist
+++ b/print/adobe-cmaps/pkg-plist
@@ -453,7 +453,7 @@ share/ghostscript/Resource/rksj-cmaps/TCVN-RKSJ-H
 @dirrm share/ghostscript/Resource/CMap
 @exec mkdir -p %D/share/ghostscript/Resource/CIDFont
 @exec mkdir -p %D/share/ghostscript/Resource/Font
-@unexec rmdir %D/share/ghostscript/Resource/Font 2>/dev/null || true
-@unexec rmdir %D/share/ghostscript/Resource/CIDFont 2>/dev/null || true
-@unexec rmdir %D/share/ghostscript/Resource 2>/dev/null || true
-@unexec rmdir %D/share/ghostscript 2>/dev/null || true
+@dirrmtry share/ghostscript/Resource/Font
+@dirrmtry share/ghostscript/Resource/CIDFont
+@dirrmtry share/ghostscript/Resource
+@dirrmtry share/ghostscript
diff --git a/print/axpoint/pkg-plist b/print/axpoint/pkg-plist
index 7e25c924d3c1..a9149d7d0d40 100644
--- a/print/axpoint/pkg-plist
+++ b/print/axpoint/pkg-plist
@@ -1,8 +1,8 @@
 bin/axpoint
 %%SITE_PERL%%/XML/Handler/AxPoint.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/AxPoint/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/XML/Handler 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/XML/Handler
+@dirrmtry %%SITE_PERL%%/XML
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/AxPoint
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/print/bjfilter360/pkg-plist b/print/bjfilter360/pkg-plist
index 7bad862b525a..1048c4db8adf 100644
--- a/print/bjfilter360/pkg-plist
+++ b/print/bjfilter360/pkg-plist
@@ -11,6 +11,6 @@ libexec/bjfilter360/scripts/ja.lc
 usr/lib/bjlib/cnb_0980.tbl
 usr/lib/libcnbpo098.so
 usr/lib/libcnbpo098.so.1.0.0
-@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true
+@dirrmtry usr/lib/bjlib
 @exec /compat/linux/sbin/ldconfig ; true
 @unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/bjfilter850/pkg-plist b/print/bjfilter850/pkg-plist
index a9badf98259d..ad555de6508c 100644
--- a/print/bjfilter850/pkg-plist
+++ b/print/bjfilter850/pkg-plist
@@ -11,6 +11,6 @@ libexec/bjfilter850/scripts/ja.lc
 usr/lib/bjlib/cnb_0740.tbl
 usr/lib/libcnbpo074.so
 usr/lib/libcnbpo074.so.1.0.0
-@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true
+@dirrmtry usr/lib/bjlib
 @exec /compat/linux/sbin/ldconfig ; true
 @unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/bjfilter850ug/pkg-plist b/print/bjfilter850ug/pkg-plist
index 947153626b3f..53743f0771bc 100644
--- a/print/bjfilter850ug/pkg-plist
+++ b/print/bjfilter850ug/pkg-plist
@@ -11,6 +11,6 @@ libexec/bjfilter850ug/scripts/ja.lc
 usr/lib/bjlib/cnb_0740.tbl
 usr/lib/libcnbpo074.so
 usr/lib/libcnbpo074.so.1.0.0
-@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true
+@dirrmtry usr/lib/bjlib
 @exec /compat/linux/sbin/ldconfig ; true
 @unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/bjfilter860/pkg-plist b/print/bjfilter860/pkg-plist
index 1d5c5d90c8f8..17096fc1d344 100644
--- a/print/bjfilter860/pkg-plist
+++ b/print/bjfilter860/pkg-plist
@@ -11,6 +11,6 @@ libexec/bjfilter860/scripts/ja.lc
 usr/lib/bjlib/cnb_1050.tbl
 usr/lib/libcnbpo105.so
 usr/lib/libcnbpo105.so.1.0.0
-@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true
+@dirrmtry usr/lib/bjlib
 @exec /compat/linux/sbin/ldconfig ; true
 @unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/bjfilter870/pkg-plist b/print/bjfilter870/pkg-plist
index 60893b60d1fc..2f50e0c4f75b 100644
--- a/print/bjfilter870/pkg-plist
+++ b/print/bjfilter870/pkg-plist
@@ -11,6 +11,6 @@ libexec/bjfilter870/scripts/ja.lc
 usr/lib/bjlib/cnb_1020.tbl
 usr/lib/libcnbpo102.so
 usr/lib/libcnbpo102.so.1.0.0
-@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true
+@dirrmtry usr/lib/bjlib
 @exec /compat/linux/sbin/ldconfig ; true
 @unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/bjfiltercom/pkg-plist b/print/bjfiltercom/pkg-plist
index c143e365de52..aa7127bee842 100644
--- a/print/bjfiltercom/pkg-plist
+++ b/print/bjfiltercom/pkg-plist
@@ -85,14 +85,14 @@ usr/local/share/stsmon/pixmaps/Inkg_sp.xpm
 usr/local/share/stsmon/pixmaps/Inkg_ye.xpm
 @dirrm usr/local/share/stsmon/pixmaps
 @dirrm usr/local/share/stsmon
-@unexec rmdir %D/usr/local/share/printui 2>/dev/null || true
-@unexec rmdir %D/usr/local/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/local/share/locale/ja 2>/dev/null || true
-@unexec rmdir %D/usr/local/share/locale 2>/dev/null || true
-@unexec rmdir %D/usr/local/share 2>/dev/null || true
-@unexec rmdir %D/usr/local 2>/dev/null || true
-@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true
-@unexec rmdir %D/usr/lib 2>/dev/null || true
-@unexec rmdir %D/usr 2>/dev/null || true
+@dirrmtry usr/local/share/printui
+@dirrmtry usr/local/share/locale/ja/LC_MESSAGES
+@dirrmtry usr/local/share/locale/ja
+@dirrmtry usr/local/share/locale
+@dirrmtry usr/local/share
+@dirrmtry usr/local
+@dirrmtry usr/lib/bjlib
+@dirrmtry usr/lib
+@dirrmtry usr
 @exec /compat/linux/sbin/ldconfig ; true
 @unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/bjfilters600/pkg-plist b/print/bjfilters600/pkg-plist
index e683fd9a279c..56ddeda1f6be 100644
--- a/print/bjfilters600/pkg-plist
+++ b/print/bjfilters600/pkg-plist
@@ -11,6 +11,6 @@ libexec/bjfilters600/scripts/ja.lc
 usr/lib/bjlib/cnb_1040.tbl
 usr/lib/libcnbpo104.so
 usr/lib/libcnbpo104.so.1.0.0
-@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true
+@dirrmtry usr/lib/bjlib
 @exec /compat/linux/sbin/ldconfig ; true
 @unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/bjfilters630/pkg-plist b/print/bjfilters630/pkg-plist
index c1cbcffc7a29..cb37cdf6a5c2 100644
--- a/print/bjfilters630/pkg-plist
+++ b/print/bjfilters630/pkg-plist
@@ -11,6 +11,6 @@ libexec/bjfilters630/scripts/ja.lc
 usr/lib/bjlib/cnb_1230.tbl
 usr/lib/libcnbpo123.so
 usr/lib/libcnbpo123.so.1.0.0
-@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true
+@dirrmtry usr/lib/bjlib
 @exec /compat/linux/sbin/ldconfig ; true
 @unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/bjfilters6300/pkg-plist b/print/bjfilters6300/pkg-plist
index 0bd484554e50..e3e672d47809 100644
--- a/print/bjfilters6300/pkg-plist
+++ b/print/bjfilters6300/pkg-plist
@@ -11,6 +11,6 @@ libexec/bjfilters6300/scripts/ja.lc
 usr/lib/bjlib/cnb_1130.tbl
 usr/lib/libcnbpo113.so
 usr/lib/libcnbpo113.so.1.0.0
-@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true
+@dirrmtry usr/lib/bjlib
 @exec /compat/linux/sbin/ldconfig ; true
 @unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/cjk-lyx/pkg-plist b/print/cjk-lyx/pkg-plist
index 93d60c051b0c..e127caa69d65 100644
--- a/print/cjk-lyx/pkg-plist
+++ b/print/cjk-lyx/pkg-plist
@@ -938,22 +938,22 @@ share/locale/ko/LC_MESSAGES/lyx.mo
 %%DATADIR%%/encodings
 %%DATADIR%%/languages
 %%DATADIR%%/symbols
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/nn/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nn 2>/dev/null || true
-@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/no 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sl 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ko 2>/dev/null || true
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
 @dirrm %%DATADIR%%/reLyX/Text
 @dirrm %%DATADIR%%/reLyX
 @dirrm %%DATADIR%%/bind
diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist
index 334295f09d91..cce1325d55c7 100644
--- a/print/cups-base/pkg-plist
+++ b/print/cups-base/pkg-plist
@@ -544,30 +544,30 @@ share/locale/sv/cups_sv
 share/locale/uk/cups_uk
 share/locale/uk_UA/cups_uk_UA
 share/locale/zh_CN/cups_zh_CN
-@unexec rmdir %D/man/fr/man8 2>/dev/null || true
-@unexec rmdir %D/man/fr/man5 2>/dev/null || true
-@unexec rmdir %D/man/fr/man1 2>/dev/null || true
-@unexec rmdir %D/man/fr 2>/dev/null || true
-@unexec rmdir %D/man/es/man8 2>/dev/null || true
-@unexec rmdir %D/man/es/man5 2>/dev/null || true
-@unexec rmdir %D/man/es/man1 2>/dev/null || true
-@unexec rmdir %D/man/es 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk_UA 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru_RU 2>/dev/null || true
-@unexec rmdir %D/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/share/locale/he 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/share/locale/en 2>/dev/null || true
-@unexec rmdir %D/share/locale/en_US 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/be 2>/dev/null || true
-@unexec rmdir %D/share/locale/C 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
+@dirrmtry man/fr/man8
+@dirrmtry man/fr/man5
+@dirrmtry man/fr/man1
+@dirrmtry man/fr
+@dirrmtry man/es/man8
+@dirrmtry man/es/man5
+@dirrmtry man/es/man1
+@dirrmtry man/es
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk_UA
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sv
+@dirrmtry share/locale/ru_RU
+@dirrmtry share/locale/it
+@dirrmtry share/locale/he
+@dirrmtry share/locale/fr
+@dirrmtry share/locale/es
+@dirrmtry share/locale/en
+@dirrmtry share/locale/en_US
+@dirrmtry share/locale/de
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/be
+@dirrmtry share/locale/C
+@dirrmtry share/locale
 @dirrm share/doc/cups/images
 @dirrm share/doc/cups/be/images
 @dirrm share/doc/cups/be
@@ -604,4 +604,4 @@ share/locale/zh_CN/cups_zh_CN
 @exec mkdir %D/etc/cups/ppd || true
 @exec mkdir %D/etc/cups/interfaces || true
 @unexec rm -rf /var/spool/cups
-@unexec rmdir %D/etc/cups 2>/dev/null || true
+@dirrmtry etc/cups
diff --git a/print/ec-fonts-mftraced/pkg-plist b/print/ec-fonts-mftraced/pkg-plist
index dc9fc59a2c29..a4f097bd60e4 100644
--- a/print/ec-fonts-mftraced/pkg-plist
+++ b/print/ec-fonts-mftraced/pkg-plist
@@ -113,14 +113,14 @@
 %%TEXMFLOCALDIR%%/fonts/type1/public/ec-fonts-mftraced/ectt8.pfa
 %%TEXMFLOCALDIR%%/fonts/type1/public/ec-fonts-mftraced/ectt9.pfa
 @dirrm %%TEXMFLOCALDIR%%/fonts/type1/public/ec-fonts-mftraced
-@unexec rmdir %D/%%TEXMFLOCALDIR%%/fonts/type1/public 2>/dev/null || true
-@unexec rmdir %D/%%TEXMFLOCALDIR%%/fonts/type1 2>/dev/null || true
+@dirrmtry %%TEXMFLOCALDIR%%/fonts/type1/public
+@dirrmtry %%TEXMFLOCALDIR%%/fonts/type1
 @dirrm %%TEXMFLOCALDIR%%/fonts/tfm/public/ec-fonts-mftraced
-@unexec rmdir %D/%%TEXMFLOCALDIR%%/fonts/tfm/public 2>/dev/null || true
-@unexec rmdir %D/%%TEXMFLOCALDIR%%/fonts/tfm 2>/dev/null || true
+@dirrmtry %%TEXMFLOCALDIR%%/fonts/tfm/public
+@dirrmtry %%TEXMFLOCALDIR%%/fonts/tfm
 @dirrm %%TEXMFLOCALDIR%%/fonts/map/dvips/ec-fonts-mftraced
-@unexec rmdir %D/%%TEXMFLOCALDIR%%/fonts/map/dvips 2>/dev/null || true
-@unexec rmdir %D/%%TEXMFLOCALDIR%%/fonts/map 2>/dev/null || true
-@unexec rmdir %D/%%TEXMFLOCALDIR%%/fonts 2>/dev/null || true
-@unexec rmdir %D/%%TEXMFLOCALDIR%%/dvips 2>/dev/null || true
-@unexec rmdir %D/%%TEXMFLOCALDIR%% 2>/dev/null || true
+@dirrmtry %%TEXMFLOCALDIR%%/fonts/map/dvips
+@dirrmtry %%TEXMFLOCALDIR%%/fonts/map
+@dirrmtry %%TEXMFLOCALDIR%%/fonts
+@dirrmtry %%TEXMFLOCALDIR%%/dvips
+@dirrmtry %%TEXMFLOCALDIR%%
diff --git a/print/foomatic-db-engine/pkg-plist b/print/foomatic-db-engine/pkg-plist
index 944f9b22b283..4b590a10bc65 100644
--- a/print/foomatic-db-engine/pkg-plist
+++ b/print/foomatic-db-engine/pkg-plist
@@ -25,6 +25,6 @@ share/foomatic/templates/pjl_num_option.xml
 @dirrm %%SITE_PERL%%/Foomatic
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Foomatic
 @dirrm share/foomatic/templates
-@unexec rmdir %D/share/foomatic 2>/dev/null || true
+@dirrmtry share/foomatic
 @unexec rmdir %D/etc/foomatic
 @exec mkdir -p %D/etc/foomatic
diff --git a/print/ghostscript-afpl/pkg-plist b/print/ghostscript-afpl/pkg-plist
index 64051a47c178..5874df19174e 100644
--- a/print/ghostscript-afpl/pkg-plist
+++ b/print/ghostscript-afpl/pkg-plist
@@ -510,8 +510,8 @@ bin/wftopfa
 @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace
 @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/CMap
 @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource
-@unexec rmdir %D/%%DATADIR%%/%%GS_VERSION%% 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%/%%GS_VERSION%%
+@dirrmtry %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/mjc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/md2k
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/lxm3200
diff --git a/print/ghostscript-gnu/pkg-plist b/print/ghostscript-gnu/pkg-plist
index 4f496a9e2637..0f4f7afd190f 100644
--- a/print/ghostscript-gnu/pkg-plist
+++ b/print/ghostscript-gnu/pkg-plist
@@ -365,7 +365,7 @@ share/ghostscript/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
 @dirrm share/ghostscript/%%GS_VERSION%%/examples
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
 @dirrm share/ghostscript/%%GS_VERSION%%
-@unexec rmdir %D/share/ghostscript 2>/dev/null || true
+@dirrmtry share/ghostscript
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/pcl3
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/mjc
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/md2k
diff --git a/print/ghostscript-gpl/pkg-plist b/print/ghostscript-gpl/pkg-plist
index 62279dab99f8..8ec960682bc1 100644
--- a/print/ghostscript-gpl/pkg-plist
+++ b/print/ghostscript-gpl/pkg-plist
@@ -514,8 +514,8 @@ bin/wftopfa
 @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace
 @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/CMap
 @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource
-@unexec rmdir %D/%%DATADIR%%/%%GS_VERSION%% 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%/%%GS_VERSION%%
+@dirrmtry %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/pcl3
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/mjc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/md2k
diff --git a/print/ghostscript7/pkg-plist b/print/ghostscript7/pkg-plist
index 4f496a9e2637..0f4f7afd190f 100644
--- a/print/ghostscript7/pkg-plist
+++ b/print/ghostscript7/pkg-plist
@@ -365,7 +365,7 @@ share/ghostscript/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
 @dirrm share/ghostscript/%%GS_VERSION%%/examples
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
 @dirrm share/ghostscript/%%GS_VERSION%%
-@unexec rmdir %D/share/ghostscript 2>/dev/null || true
+@dirrmtry share/ghostscript
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/pcl3
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/mjc
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/md2k
diff --git a/print/ghostscript8/pkg-plist b/print/ghostscript8/pkg-plist
index 62279dab99f8..8ec960682bc1 100644
--- a/print/ghostscript8/pkg-plist
+++ b/print/ghostscript8/pkg-plist
@@ -514,8 +514,8 @@ bin/wftopfa
 @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace
 @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/CMap
 @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource
-@unexec rmdir %D/%%DATADIR%%/%%GS_VERSION%% 2>/dev/null || true
-@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
+@dirrmtry %%DATADIR%%/%%GS_VERSION%%
+@dirrmtry %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/pcl3
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/mjc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/md2k
diff --git a/print/gsfonts/pkg-plist b/print/gsfonts/pkg-plist
index 55286a549b7c..b2cd1846f227 100644
--- a/print/gsfonts/pkg-plist
+++ b/print/gsfonts/pkg-plist
@@ -158,4 +158,4 @@
 %%PORTDOCS%%share/doc/gsfonts/TODO
 @dirrm %%FONTSDIR%%
 %%PORTDOCS%%@dirrm share/doc/gsfonts
-@unexec rmdir %D/share/ghostscript 2>/dev/null || true
+@dirrmtry share/ghostscript
diff --git a/print/gtklp/pkg-plist b/print/gtklp/pkg-plist
index 4640524b2a97..de8831d8ccfc 100644
--- a/print/gtklp/pkg-plist
+++ b/print/gtklp/pkg-plist
@@ -17,9 +17,9 @@ share/locale/pt_BR/LC_MESSAGES/gtklp.mo
 share/locale/ru/LC_MESSAGES/gtklp.mo
 share/locale/zh_CN/LC_MESSAGES/gtklp.mo
 share/locale/zh_TW/LC_MESSAGES/gtklp.mo
-@unexec rmdir %D/share/locale/cz/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/cz 2> /dev/null || true
-@unexec rmdir %D/share/locale/cht/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/cht 2> /dev/null || true
-@unexec rmdir %D/share/locale/chs/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/chs 2> /dev/null || true
+@dirrmtry share/locale/cz/LC_MESSAGES
+@dirrmtry share/locale/cz
+@dirrmtry share/locale/cht/LC_MESSAGES
+@dirrmtry share/locale/cht
+@dirrmtry share/locale/chs/LC_MESSAGES
+@dirrmtry share/locale/chs
diff --git a/print/jadetex/pkg-plist b/print/jadetex/pkg-plist
index 8758f3254724..243e8a993803 100644
--- a/print/jadetex/pkg-plist
+++ b/print/jadetex/pkg-plist
@@ -7,6 +7,6 @@ share/texmf/tex/jadetex/dsssl.def
 share/texmf/tex/jadetex/jadetex.ltx
 share/texmf/web2c/jadetex.fmt
 share/texmf/web2c/pdfjadetex.fmt
-@unexec rmdir %D/share/texmf/tex/jadetex 2> /dev/null || true
+@dirrmtry share/texmf/tex/jadetex
 @exec %D/bin/mktexlsr
 @unexec %D/bin/mktexlsr
diff --git a/print/kcdlabel/pkg-plist b/print/kcdlabel/pkg-plist
index a4b64a3c1726..af5fac156753 100644
--- a/print/kcdlabel/pkg-plist
+++ b/print/kcdlabel/pkg-plist
@@ -15,17 +15,17 @@ share/locale/de/LC_MESSAGES/kcdlabel.mo
 share/locale/fr/LC_MESSAGES/kcdlabel.mo
 share/locale/hu/LC_MESSAGES/kcdlabel.mo
 share/locale/it/LC_MESSAGES/kcdlabel.mo
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/icons/small/locolor/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/small/locolor 2>/dev/null || true
-@unexec rmdir %D/share/icons/small 2>/dev/null || true
-@unexec rmdir %D/share/icons/medium/locolor/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/medium/locolor 2>/dev/null || true
-@unexec rmdir %D/share/icons/medium 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/icons/small/locolor/apps
+@dirrmtry share/icons/small/locolor
+@dirrmtry share/icons/small
+@dirrmtry share/icons/medium/locolor/apps
+@dirrmtry share/icons/medium/locolor
+@dirrmtry share/icons/medium
+@dirrmtry share/icons
 @dirrm share/doc/HTML/en/kcdlabel
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Multimedia 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
+@dirrmtry share/applnk/Multimedia
+@dirrmtry share/applnk
diff --git a/print/kover/pkg-plist b/print/kover/pkg-plist
index 88e51e9f8a41..a4e732029ab4 100644
--- a/print/kover/pkg-plist
+++ b/print/kover/pkg-plist
@@ -21,23 +21,23 @@ share/locale/nb/LC_MESSAGES/kover.mo
 share/locale/no/LC_MESSAGES/kover.mo
 share/locale/pl/LC_MESSAGES/kover.mo
 share/mimelnk/application/x-kover.desktop
-@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
-@unexec rmdir %D/share/mimelnk 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrmtry share/mimelnk/application
+@dirrmtry share/mimelnk
+@dirrmtry share/icons/locolor/32x32/apps
+@dirrmtry share/icons/locolor/32x32
+@dirrmtry share/icons/locolor/16x16/apps
+@dirrmtry share/icons/locolor/16x16
+@dirrmtry share/icons/locolor
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrm share/apps/kover/pics
 @dirrm share/apps/kover
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Multimedia 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/apps
+@dirrmtry share/applnk/Multimedia
+@dirrmtry share/applnk
diff --git a/print/latex/pkg-plist b/print/latex/pkg-plist
index 626320b3ab6c..ebdb6b98bf06 100644
--- a/print/latex/pkg-plist
+++ b/print/latex/pkg-plist
@@ -1035,6 +1035,6 @@ share/texmf/web2c/latex.fmt
 @dirrm share/texmf/fonts/vf/adobe
 @dirrm share/texmf/tex/latex/psnfss
 @dirrm share/texmf/tex/latex
-@unexec rmdir %D/share/texmf/makeindx 2>/dev/null || true
-@unexec rmdir %D/share/texmf/documentation 2>/dev/null || true
-@unexec rmdir %D/share/texmf/fonts/vf 2>/dev/null || true
+@dirrmtry share/texmf/makeindx
+@dirrmtry share/texmf/documentation
+@dirrmtry share/texmf/fonts/vf
diff --git a/print/lgrind/pkg-plist b/print/lgrind/pkg-plist
index fa1a105e0b6f..2c075ed50dbd 100644
--- a/print/lgrind/pkg-plist
+++ b/print/lgrind/pkg-plist
@@ -3,9 +3,9 @@ share/texmf/doc/latex/lgrind/lgrind.dvi
 share/texmf/tex/latex/lgrind/lgrind.sty
 share/texmf/tex/latex/lgrind/lgrindef
 @dirrm share/texmf/tex/latex/lgrind
-@unexec rmdir %D/share/texmf/tex/latex 2>/dev/null || true
-@unexec rmdir %D/share/texmf/tex 2>/dev/null || true
+@dirrmtry share/texmf/tex/latex
+@dirrmtry share/texmf/tex
 @dirrm share/texmf/doc/latex/lgrind
-@unexec rmdir %D/share/texmf/doc/latex 2>/dev/null || true
-@unexec rmdir %D/share/texmf/doc 2>/dev/null || true
-@unexec rmdir %D/share/texmf 2>/dev/null || true
+@dirrmtry share/texmf/doc/latex
+@dirrmtry share/texmf/doc
+@dirrmtry share/texmf
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index 783bea79666b..c5d1cadeb8e6 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -152,14 +152,14 @@ share/locale/wa/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 share/locale/xh/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo
-@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/xh 2>/dev/null || true
-@unexec rmdir %D/share/locale/te/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/te 2>/dev/null || true
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/rw 2>/dev/null || true
-@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/mr 2>/dev/null || true
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrm share/gnome/libgnomeprint/%%VERSION%%/printers/uninstalled
 @dirrm share/gnome/libgnomeprint/%%VERSION%%/printers
 @dirrm share/gnome/libgnomeprint/%%VERSION%%/models/uninstalled
diff --git a/print/makeindex/pkg-plist b/print/makeindex/pkg-plist
index 72db3a965674..4da192b0b64f 100644
--- a/print/makeindex/pkg-plist
+++ b/print/makeindex/pkg-plist
@@ -16,4 +16,4 @@ share/texmf/makeindx/german/wb.ist
 @dirrm share/texmf/makeindx/english
 @dirrm share/texmf/makeindx/german
 @dirrm share/texmf/makeindx
-@unexec rmdir %D/share/texmf 2>/dev/null || true
+@dirrmtry share/texmf
diff --git a/print/musixtex/pkg-plist b/print/musixtex/pkg-plist
index f4b0e150b27a..449c3aa27c82 100644
--- a/print/musixtex/pkg-plist
+++ b/print/musixtex/pkg-plist
@@ -273,5 +273,5 @@ share/texmf/tex/musixtex.tex
 share/texmf/tex/musixtri.tex
 @exec %D/bin/texhash || true
 @dirrm share/texmf/documentation/musixtex.examples
-@unexec rmdir %D/share/texmf/documentation 2>/dev/null || true
+@dirrmtry share/texmf/documentation
 @unexec %D/bin/texhash || true
diff --git a/print/p5-Net-Printer/pkg-plist b/print/p5-Net-Printer/pkg-plist
index e19a26568bba..1bbb9368b381 100644
--- a/print/p5-Net-Printer/pkg-plist
+++ b/print/p5-Net-Printer/pkg-plist
@@ -2,7 +2,7 @@
 %%SITE_PERL%%/auto/Net/Printer/autosplit.ix
 %%SITE_PERL%%/mach/auto/Net/Printer/.packlist
 @dirrm %%SITE_PERL%%/mach/auto/Net/Printer
-@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/mach/auto/Net
 @dirrm %%SITE_PERL%%/auto/Net/Printer
-@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/auto/Net
+@dirrmtry %%SITE_PERL%%/Net
diff --git a/print/p5-PostScript-Simple/pkg-plist b/print/p5-PostScript-Simple/pkg-plist
index 964b3137da06..15051c4afcba 100644
--- a/print/p5-PostScript-Simple/pkg-plist
+++ b/print/p5-PostScript-Simple/pkg-plist
@@ -3,5 +3,5 @@
 %%SITE_PERL%%/PostScript/Simple/EPS.pm
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript/Simple
 @dirrm %%SITE_PERL%%/PostScript/Simple
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/PostScript 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript
+@dirrmtry %%SITE_PERL%%/PostScript
diff --git a/print/p5-Text-PDF/pkg-plist b/print/p5-Text-PDF/pkg-plist
index 90a4fe7407fb..fc02546a1fa3 100644
--- a/print/p5-Text-PDF/pkg-plist
+++ b/print/p5-Text-PDF/pkg-plist
@@ -31,7 +31,7 @@ bin/pdfstamp.plx
 %%SITE_PERL%%/Text/PDF/examples/test.pdf
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/PDF/.packlist
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/PDF
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
 @dirrm %%SITE_PERL%%/Text/PDF/examples
 @dirrm %%SITE_PERL%%/Text/PDF
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/print/texinfo/pkg-plist b/print/texinfo/pkg-plist
index 7fcdc1a6a4ad..741f7a76e03e 100644
--- a/print/texinfo/pkg-plist
+++ b/print/texinfo/pkg-plist
@@ -42,25 +42,25 @@ share/locale/zh_TW/LC_MESSAGES/texinfo.mo
 %%TEXMFLOCAL%%/tex/texinfo/txi-pt.tex
 %%TEXMFLOCAL%%/tex/texinfo/txi-tr.tex
 @dirrm %%TEXMFLOCAL%%/tex/texinfo
-@unexec rmdir %D/%%TEXMFLOCAL%%/tex/generic/dvips 2> /dev/null || true
-@unexec rmdir %D/%%TEXMFLOCAL%%/tex/generic 2> /dev/null || true
-@unexec rmdir %D/%%TEXMFLOCAL%%/tex 2> /dev/null || true
-@unexec rmdir %D/%%TEXMFLOCAL%%/pdftex/plain/misc 2> /dev/null || true
-@unexec rmdir %D/%%TEXMFLOCAL%%/pdftex/plain 2> /dev/null || true
-@unexec rmdir %D/%%TEXMFLOCAL%%/pdftex 2> /dev/null || true
-@unexec rmdir %D/%%TEXMFLOCAL%% 2> /dev/null || true
+@dirrmtry %%TEXMFLOCAL%%/tex/generic/dvips
+@dirrmtry %%TEXMFLOCAL%%/tex/generic
+@dirrmtry %%TEXMFLOCAL%%/tex
+@dirrmtry %%TEXMFLOCAL%%/pdftex/plain/misc
+@dirrmtry %%TEXMFLOCAL%%/pdftex/plain
+@dirrmtry %%TEXMFLOCAL%%/pdftex
+@dirrmtry %%TEXMFLOCAL%%
 @dirrm %%DATADIR%%
-@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_TW 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2> /dev/null || true
-@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/ro 2> /dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/pl 2> /dev/null || true
-@unexec rmdir %D/share/locale/no/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/no 2> /dev/null || true
-@unexec rmdir %D/share/locale/de_AT/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/de_AT 2> /dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/cs 2> /dev/null || true
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/de_AT/LC_MESSAGES
+@dirrmtry share/locale/de_AT
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
diff --git a/print/tr2latex/pkg-plist b/print/tr2latex/pkg-plist
index b156f1193e1c..6592121875ab 100644
--- a/print/tr2latex/pkg-plist
+++ b/print/tr2latex/pkg-plist
@@ -1,7 +1,7 @@
 bin/tr2latex
 share/texmf/tex/latex/misc/troffman.sty
 share/texmf/tex/latex/misc/troffms.sty
-@unexec rmdir %D/share/texmf/tex/latex/misc 2> /dev/null || true
-@unexec rmdir %D/share/texmf/tex/latex 2> /dev/null || true
-@unexec rmdir %D/share/texmf/tex 2> /dev/null || true
-@unexec rmdir %D/share/texmf 2> /dev/null || true
+@dirrmtry share/texmf/tex/latex/misc
+@dirrmtry share/texmf/tex/latex
+@dirrmtry share/texmf/tex
+@dirrmtry share/texmf
diff --git a/print/transfig/pkg-plist b/print/transfig/pkg-plist
index 6d0fcdf73b43..815dc51100dd 100644
--- a/print/transfig/pkg-plist
+++ b/print/transfig/pkg-plist
@@ -88,5 +88,5 @@ lib/X11/xfig/bitmaps/vert_rightshingle.bmp
 lib/X11/xfig/bitmaps/vert_saw.bmp
 lib/X11/xfig/bitmaps/vertical.bmp
 @dirrm lib/X11/xfig/bitmaps
-@unexec rmdir %D/lib/X11/xfig 2> /dev/null || true
+@dirrmtry lib/X11/xfig
 @dirrm lib/X11/fig2dev
diff --git a/print/xfce4-print/pkg-plist b/print/xfce4-print/pkg-plist
index 4150d2fbef21..0cfb49813ab4 100644
--- a/print/xfce4-print/pkg-plist
+++ b/print/xfce4-print/pkg-plist
@@ -80,19 +80,19 @@ share/xfce4/doc/he/images/xfprint_prettyprinting.png
 share/xfce4/doc/he/images/xfprint_sheets.png
 share/xfce4/doc/he/images/xfprint_virtualpages.png
 share/xfce4/doc/he/xfprint.html
-@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4/xfprint-plugins 2>/dev/null || true
-@unexec rmdir %D/lib/xfce4 2>/dev/null || true 
-@unexec rmdir %D/share/applications 2>/dev/null || true
-@unexec rmdir %D/share/locale/bn_IN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/bn_IN 2>/dev/null || true
-@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/mr 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/he/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/he 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true
-@unexec rmdir %D/share/xfce4 2>/dev/null || true
+@dirrmtry lib/xfce4/mcs-plugins
+@dirrmtry lib/xfce4/xfprint-plugins
+@dirrmtry lib/xfce4 
+@dirrmtry share/applications
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/xfce4/doc/C/images
+@dirrmtry share/xfce4/doc/C
+@dirrmtry share/xfce4/doc/fr/images
+@dirrmtry share/xfce4/doc/fr
+@dirrmtry share/xfce4/doc/he/images
+@dirrmtry share/xfce4/doc/he
+@dirrmtry share/xfce4/doc
+@dirrmtry share/xfce4
author	Edwin Groothuis <edwin@FreeBSD.org>	2006-01-22 03:01:03 +0000
committer	Edwin Groothuis <edwin@FreeBSD.org>	2006-01-22 03:01:03 +0000
commit	508b8d82f4fdfc6889fe17931ef30f047501dfd6 (patch)
tree	f7810d4887e5297c7b7788225e906b99c81d709b /print
parent	Fix pkg-plist. (diff)