diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2006-01-22 00:30:24 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2006-01-22 00:30:24 +0000 |
| commit | 8782296f87f346e407a9b588c61c901ad331a61b (patch) | |
| tree | 9003db734f5474c93508ccf7f02ac0319bb0d249 | |
| parent | Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry (diff) | |
Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry
Notes
Notes:
svn path=/head/; revision=154105
121 files changed, 293 insertions, 293 deletions
diff --git a/astro/glunarclock/pkg-plist b/astro/glunarclock/pkg-plist index a368d7204f4d..428af5b61f24 100644 --- a/astro/glunarclock/pkg-plist +++ b/astro/glunarclock/pkg-plist @@ -38,11 +38,11 @@ share/locale/wa/LC_MESSAGES/glunarclock-%%VERSION%%.mo @dirrm share/gnome/help/glunarclock-applet-2/C @dirrm share/gnome/help/glunarclock-applet-2 @dirrm share/gnome/glunarclock -@unexec rmdir %D/share/locale/ast_ES/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ast_ES 2> /dev/null || true -@unexec rmdir %D/share/locale/br/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/br 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/wa/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/wa 2> /dev/null || true +@dirrmtry share/locale/ast_ES/LC_MESSAGES +@dirrmtry share/locale/ast_ES +@dirrmtry share/locale/br/LC_MESSAGES +@dirrmtry share/locale/br +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/wa/LC_MESSAGES +@dirrmtry share/locale/wa diff --git a/astro/gpsdrive/pkg-plist b/astro/gpsdrive/pkg-plist index a14b14d15cc0..046333d465ac 100644 --- a/astro/gpsdrive/pkg-plist +++ b/astro/gpsdrive/pkg-plist @@ -61,5 +61,5 @@ share/pixmaps/gpsicon.png %%NLS%%share/locale/tr/LC_MESSAGES/gpsdrive.mo %%NLS%%@unexec rmdir %D/share/locale/gr/LC_MESSAGES 2> /dev/null || true %%NLS%%@unexec rmdir %D/share/locale/gr 2> /dev/null || true -@unexec rmdir %D/share/applications 2> /dev/null || true +@dirrmtry share/applications @dirrm %%DATADIR%% diff --git a/cad/astk-serveur/pkg-plist b/cad/astk-serveur/pkg-plist index f52a60c71669..51e830b0d7c9 100644 --- a/cad/astk-serveur/pkg-plist +++ b/cad/astk-serveur/pkg-plist @@ -257,5 +257,5 @@ %%SERV%%@dirrm %%ASTKDIR%%/conf %%SERV%%@dirrm %%ASTKDIR%%/lib @dirrm %%ASTKDIR%% -@unexec rmdir %D/aster/ASTK 2>/dev/null || true -@unexec rmdir %D/aster 2>/dev/null || true +@dirrmtry aster/ASTK +@dirrmtry aster diff --git a/chinese/FreeWnn-lib/pkg-plist b/chinese/FreeWnn-lib/pkg-plist index b808bcd9a337..e08c4bfd8ecc 100644 --- a/chinese/FreeWnn-lib/pkg-plist +++ b/chinese/FreeWnn-lib/pkg-plist @@ -115,4 +115,4 @@ lib/libcwnn.so.0 @dirrm lib/wnn/zh_CN/rk_p @dirrm lib/wnn/zh_CN/rk @dirrm lib/wnn/zh_CN -@unexec rmdir %D/lib/wnn 2> /dev/null || true +@dirrmtry lib/wnn diff --git a/chinese/big5fs/pkg-plist b/chinese/big5fs/pkg-plist index 4839d6303cc5..b2916b8c5825 100644 --- a/chinese/big5fs/pkg-plist +++ b/chinese/big5fs/pkg-plist @@ -2,4 +2,4 @@ etc/rc.d/big5fs.sh modules/cd9660.ko modules/%%MSDOSFSKO%% modules/ntfs.ko -@unexec rmdir %D/modules 2>/dev/null || true +@dirrmtry modules diff --git a/chinese/c2t/pkg-plist b/chinese/c2t/pkg-plist index 47791017aa9c..2599a95b9d6c 100644 --- a/chinese/c2t/pkg-plist +++ b/chinese/c2t/pkg-plist @@ -1,5 +1,5 @@ @comment $FreeBSD$ bin/c2t share/chinese/gb/TONEPY.tit -@unexec rmdir %D/share/chinese/gb 2>/dev/null || true -@unexec rmdir %D/share/chinese 2>/dev/null || true +@dirrmtry share/chinese/gb +@dirrmtry share/chinese diff --git a/chinese/gb2ps/pkg-plist b/chinese/gb2ps/pkg-plist index f03cd6845b87..8eb5295bec1d 100644 --- a/chinese/gb2ps/pkg-plist +++ b/chinese/gb2ps/pkg-plist @@ -8,5 +8,5 @@ share/chinese/gb/chei24.ccf share/chinese/gb/cfan24.ccf %%PORTDOCS%%share/doc/gb2ps/gb2ps.help %%PORTDOCS%%@dirrm share/doc/gb2ps -@unexec rmdir %D/share/chinese/gb 2>/dev/null || true -@unexec rmdir %D/share/chinese 2>/dev/null || true +@dirrmtry share/chinese/gb +@dirrmtry share/chinese diff --git a/chinese/gbfs/pkg-plist b/chinese/gbfs/pkg-plist index ec0161f0ffd3..583756e02836 100644 --- a/chinese/gbfs/pkg-plist +++ b/chinese/gbfs/pkg-plist @@ -2,4 +2,4 @@ etc/rc.d/gbfs.sh modules/cd9660.ko modules/%%MSDOSFSKO%% modules/ntfs.ko -@unexec rmdir %D/modules 2>/dev/null || true +@dirrmtry modules diff --git a/chinese/gbscript/pkg-plist b/chinese/gbscript/pkg-plist index c0f219d2651e..304a1f475a12 100644 --- a/chinese/gbscript/pkg-plist +++ b/chinese/gbscript/pkg-plist @@ -2,5 +2,5 @@ bin/gbscript share/chinese/gb/gbscript.pro share/chinese/gb/cclib.24 -@unexec rmdir %D/share/chinese/gb 2>/dev/null || true -@unexec rmdir %D/share/chinese 2>/dev/null || true +@dirrmtry share/chinese/gb +@dirrmtry share/chinese diff --git a/chinese/gcin-devel/pkg-plist b/chinese/gcin-devel/pkg-plist index 07bfd4f13968..11fa8ca87ee2 100644 --- a/chinese/gcin-devel/pkg-plist +++ b/chinese/gcin-devel/pkg-plist @@ -50,15 +50,15 @@ share/icons/gcin.png share/icons/gcin/pin-fixed24.png share/icons/gcin/pin-float16.png %%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true -@unexec rmdir %D/share/icons/gcin 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true -@unexec rmdir %D/share/gnome/control-center-2.0/capplets 2>/dev/null || true -@unexec rmdir %D/share/gnome/control-center-2.0 2>/dev/null || true -@unexec rmdir %D/share/gnome 2>/dev/null || true -@unexec rmdir %D/share/applications 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%%/table 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%%/script 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true -@unexec rmdir %D/lib/gtk-2.0/immodules 2>/dev/null || true +@dirrmtry share/icons/gcin +@dirrmtry share/icons +@dirrmtry share/gnome/control-center-2.0/capplets +@dirrmtry share/gnome/control-center-2.0 +@dirrmtry share/gnome +@dirrmtry share/applications +@dirrmtry %%DATADIR%%/table +@dirrmtry %%DATADIR%%/script +@dirrmtry %%DATADIR%% +@dirrmtry lib/gtk-2.0/immodules @exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules @unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist index 07bfd4f13968..11fa8ca87ee2 100644 --- a/chinese/gcin/pkg-plist +++ b/chinese/gcin/pkg-plist @@ -50,15 +50,15 @@ share/icons/gcin.png share/icons/gcin/pin-fixed24.png share/icons/gcin/pin-float16.png %%PORTDOCS%%@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true -@unexec rmdir %D/share/icons/gcin 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true -@unexec rmdir %D/share/gnome/control-center-2.0/capplets 2>/dev/null || true -@unexec rmdir %D/share/gnome/control-center-2.0 2>/dev/null || true -@unexec rmdir %D/share/gnome 2>/dev/null || true -@unexec rmdir %D/share/applications 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%%/table 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%%/script 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true -@unexec rmdir %D/lib/gtk-2.0/immodules 2>/dev/null || true +@dirrmtry share/icons/gcin +@dirrmtry share/icons +@dirrmtry share/gnome/control-center-2.0/capplets +@dirrmtry share/gnome/control-center-2.0 +@dirrmtry share/gnome +@dirrmtry share/applications +@dirrmtry %%DATADIR%%/table +@dirrmtry %%DATADIR%%/script +@dirrmtry %%DATADIR%% +@dirrmtry lib/gtk-2.0/immodules @exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules @unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules diff --git a/chinese/hc/pkg-plist b/chinese/hc/pkg-plist index 61ae1c77d66e..5cf9a8157043 100644 --- a/chinese/hc/pkg-plist +++ b/chinese/hc/pkg-plist @@ -4,4 +4,4 @@ bin/b2g bin/g2b share/chinese/hc.tab share/chinese/hc-supp.tab -@unexec rmdir %D/share/chinese 2>/dev/null || true +@dirrmtry share/chinese diff --git a/chinese/mplayer-fonts/pkg-plist b/chinese/mplayer-fonts/pkg-plist index 5e99f85751b0..ccfc67527d85 100644 --- a/chinese/mplayer-fonts/pkg-plist +++ b/chinese/mplayer-fonts/pkg-plist @@ -223,5 +223,5 @@ @dirrm %%MF%%/gbsn00lp24 @dirrm %%MF%%/gbsn00lp16 @dirrm %%MF%% -@unexec rmdir %D/share/mplayer/fonts 2>/dev/null || true -@unexec rmdir %D/share/mplayer 2>/dev/null || true +@dirrmtry share/mplayer/fonts +@dirrmtry share/mplayer diff --git a/chinese/oicq/pkg-plist b/chinese/oicq/pkg-plist index 0ec1fd3b7de6..b48e9bdb92c5 100644 --- a/chinese/oicq/pkg-plist +++ b/chinese/oicq/pkg-plist @@ -6,6 +6,6 @@ bin/q %%SITE_PERL%%/Net/OICQ/ServerEvent.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OICQ/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OICQ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net @dirrm %%SITE_PERL%%/Net/OICQ -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net diff --git a/chinese/p5-Date-Chinese/pkg-plist b/chinese/p5-Date-Chinese/pkg-plist index 6a7d41c46fce..75c2ce042e70 100644 --- a/chinese/p5-Date-Chinese/pkg-plist +++ b/chinese/p5-Date-Chinese/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Date/Chinese.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Chinese/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Chinese -@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Date +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date diff --git a/chinese/p5-Lingua-ZH-Keywords/pkg-plist b/chinese/p5-Lingua-ZH-Keywords/pkg-plist index e156f7b0c4d5..549332031379 100644 --- a/chinese/p5-Lingua-ZH-Keywords/pkg-plist +++ b/chinese/p5-Lingua-ZH-Keywords/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Lingua/ZH/Keywords.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Keywords/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Keywords -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/ZH 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/ZH +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/chinese/p5-Lingua-ZH-Numbers/pkg-plist b/chinese/p5-Lingua-ZH-Numbers/pkg-plist index a44d996d7fff..8aa456afa6f6 100644 --- a/chinese/p5-Lingua-ZH-Numbers/pkg-plist +++ b/chinese/p5-Lingua-ZH-Numbers/pkg-plist @@ -3,7 +3,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Numbers/.packlist @dirrm %%SITE_PERL%%/Lingua/ZH/Numbers @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Numbers -@unexec rmdir %D/%%SITE_PERL%%/Lingua/ZH 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Lingua/ZH +@dirrmtry %%SITE_PERL%%/Lingua +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua diff --git a/chinese/p5-Lingua-ZH-Summarize/pkg-plist b/chinese/p5-Lingua-ZH-Summarize/pkg-plist index 4647abe32764..c8879accda94 100644 --- a/chinese/p5-Lingua-ZH-Summarize/pkg-plist +++ b/chinese/p5-Lingua-ZH-Summarize/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Lingua/ZH/Summarize.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Summarize/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Summarize -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/ZH 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/ZH +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/chinese/p5-Lingua-ZH-Wrap/pkg-plist b/chinese/p5-Lingua-ZH-Wrap/pkg-plist index 94c6ab8841b1..25c702d8ca9a 100644 --- a/chinese/p5-Lingua-ZH-Wrap/pkg-plist +++ b/chinese/p5-Lingua-ZH-Wrap/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Lingua/ZH/Wrap.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Wrap/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH/Wrap -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/ZH 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/ZH +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/ZH +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/chinese/scim-chewing/pkg-plist b/chinese/scim-chewing/pkg-plist index 8fb4222286d0..6307ec0a3173 100644 --- a/chinese/scim-chewing/pkg-plist +++ b/chinese/scim-chewing/pkg-plist @@ -1,5 +1,5 @@ lib/scim-1.0/IMEngine/chewing.so lib/scim-1.0/SetupUI/chewing-imengine-setup.so share/scim/icons/scim-chewing.png -@unexec rmdir %D/lib/scim-1.0/IMEngine 2>/dev/null || true -@unexec rmdir %D/lib/scim-1.0/SetupUI 2>/dev/null || true +@dirrmtry lib/scim-1.0/IMEngine +@dirrmtry lib/scim-1.0/SetupUI diff --git a/chinese/tocps/pkg-plist b/chinese/tocps/pkg-plist index 76285a0dc6b0..9eb4ff5294cf 100644 --- a/chinese/tocps/pkg-plist +++ b/chinese/tocps/pkg-plist @@ -4,5 +4,5 @@ share/chinese/gb/cfang24.ccf share/chinese/gb/chei24.ccf share/chinese/gb/ckai24.ccf share/chinese/gb/csong24.ccf -@unexec rmdir %D/share/chinese/gb 2>/dev/null || true -@unexec rmdir %D/share/chinese 2>/dev/null || true +@dirrmtry share/chinese/gb +@dirrmtry share/chinese diff --git a/comms/sms_client/pkg-plist b/comms/sms_client/pkg-plist index 88ac3b2ed46c..24d0c931d048 100644 --- a/comms/sms_client/pkg-plist +++ b/comms/sms_client/pkg-plist @@ -162,8 +162,8 @@ etc/sms/sms_services @dirrm var/spool/sms/errors/a1 @dirrm var/spool/sms/errors @dirrm var/spool/sms -@unexec rmdir %D/var/spool 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true +@dirrmtry var/spool +@dirrmtry var @dirrm etc/sms/services @dirrm etc/sms/scripts @dirrm etc/sms diff --git a/converters/p5-Convert-Morse/pkg-plist b/converters/p5-Convert-Morse/pkg-plist index d9b58def8734..0a3a5c62d38b 100644 --- a/converters/p5-Convert-Morse/pkg-plist +++ b/converters/p5-Convert-Morse/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Convert/Morse.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Morse/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Morse -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Convert 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert +@dirrmtry %%SITE_PERL%%/Convert diff --git a/converters/p5-Convert-TNEF/pkg-plist b/converters/p5-Convert-TNEF/pkg-plist index 7b2baea90f21..c46ad45a031e 100644 --- a/converters/p5-Convert-TNEF/pkg-plist +++ b/converters/p5-Convert-TNEF/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/Convert/TNEF.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/TNEF/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/TNEF -@unexec rmdir %D/%%SITE_PERL%%/Convert 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/auto/Convert 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Convert +@dirrmtry %%SITE_PERL%%/auto/Convert +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert diff --git a/converters/p5-String-Multibyte/pkg-plist b/converters/p5-String-Multibyte/pkg-plist index bfc85e464538..9c503ea78720 100644 --- a/converters/p5-String-Multibyte/pkg-plist +++ b/converters/p5-String-Multibyte/pkg-plist @@ -18,7 +18,7 @@ %%SITE_PERL%%/String/Multibyte/Big5.pm %%SITE_PERL%%/String/Multibyte.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Multibyte/.packlist -@unexec rmdir %D/%%SITE_PERL%%/String/Multibyte 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/String 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Multibyte 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/String/Multibyte +@dirrmtry %%SITE_PERL%%/String +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Multibyte +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String diff --git a/converters/p5-Unicode-IMAPUtf7/pkg-plist b/converters/p5-Unicode-IMAPUtf7/pkg-plist index bfca0ddf20ab..a2b567bb260f 100644 --- a/converters/p5-Unicode-IMAPUtf7/pkg-plist +++ b/converters/p5-Unicode-IMAPUtf7/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/IMAPUtf7/.packlist %%SITE_PERL%%/Unicode/IMAPUtf7.pm -@unexec rmdir %D/%%SITE_PERL%%/auto/Unicode/IMAPUtf7 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/auto/Unicode 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Unicode 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/IMAPUtf7 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/Unicode/IMAPUtf7 +@dirrmtry %%SITE_PERL%%/auto/Unicode +@dirrmtry %%SITE_PERL%%/Unicode +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/IMAPUtf7 +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode diff --git a/converters/p5-Unicode-Lite/pkg-plist b/converters/p5-Unicode-Lite/pkg-plist index 43d27499d948..45c295b69012 100644 --- a/converters/p5-Unicode-Lite/pkg-plist +++ b/converters/p5-Unicode-Lite/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Unicode/Lite.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Lite/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Lite -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Unicode 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode +@dirrmtry %%SITE_PERL%%/Unicode diff --git a/converters/p5-Unicode-Map8/pkg-plist b/converters/p5-Unicode-Map8/pkg-plist index 343b78dcc578..6c69b66a8c6a 100644 --- a/converters/p5-Unicode-Map8/pkg-plist +++ b/converters/p5-Unicode-Map8/pkg-plist @@ -185,7 +185,7 @@ bin/umap %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map8/Map8.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map8/Map8.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/Map8 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8/maps @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unicode/Map8 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Unicode 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode diff --git a/databases/fpc-ibase/pkg-plist b/databases/fpc-ibase/pkg-plist index e5008a031872..3a31848cbf55 100644 --- a/databases/fpc-ibase/pkg-plist +++ b/databases/fpc-ibase/pkg-plist @@ -4,7 +4,7 @@ %%INSTDIR%%/ibase60.o %%INSTDIR%%/ibase60.ppu @dirrm %%INSTDIR%% -@unexec rmdir %D/lib/fpc/%%PORTVERSION%%/units/freebsd 2>/dev/null || true -@unexec rmdir %D/lib/fpc/%%PORTVERSION%%/units 2>/dev/null || true -@unexec rmdir %D/lib/fpc/%%PORTVERSION%% 2>/dev/null || true -@unexec rmdir %D/lib/fpc 2>/dev/null || true +@dirrmtry lib/fpc/%%PORTVERSION%%/units/freebsd +@dirrmtry lib/fpc/%%PORTVERSION%%/units +@dirrmtry lib/fpc/%%PORTVERSION%% +@dirrmtry lib/fpc diff --git a/databases/fpc-mysql/pkg-plist b/databases/fpc-mysql/pkg-plist index 816cf786b3e4..fe76ecb3db1d 100644 --- a/databases/fpc-mysql/pkg-plist +++ b/databases/fpc-mysql/pkg-plist @@ -6,7 +6,7 @@ %%INSTDIR%%/mysql_version.o %%INSTDIR%%/mysql_version.ppu @dirrm %%INSTDIR%% -@unexec rmdir %D/lib/fpc/%%PORTVERSION%%/units/freebsd 2>/dev/null || true -@unexec rmdir %D/lib/fpc/%%PORTVERSION%%/units 2>/dev/null || true -@unexec rmdir %D/lib/fpc/%%PORTVERSION%% 2>/dev/null || true -@unexec rmdir %D/lib/fpc 2>/dev/null || true +@dirrmtry lib/fpc/%%PORTVERSION%%/units/freebsd +@dirrmtry lib/fpc/%%PORTVERSION%%/units +@dirrmtry lib/fpc/%%PORTVERSION%% +@dirrmtry lib/fpc diff --git a/databases/gnatsweb4/pkg-plist b/databases/gnatsweb4/pkg-plist index 64b648f94ab4..88b705363f6b 100644 --- a/databases/gnatsweb4/pkg-plist +++ b/databases/gnatsweb4/pkg-plist @@ -2,7 +2,7 @@ @unexec if cmp -s %D/etc/gnatsweb/gnatsweb-site.pl %D/etc/gnatsweb/gnatsweb-site.pl.default; then rm -f %D/etc/gnatsweb/gnatsweb-site.pl; fi etc/gnatsweb/gnatsweb-site.pl.default @exec [ -f %B/gnatsweb-site.pl ] || cp %B/%f %B/gnatsweb-site.pl -@unexec rmdir %D/etc/gnatsweb 2>/dev/null || true +@dirrmtry etc/gnatsweb %%CGI_DIR%%/gnatsweb.pl %%CGI_DIR%%/gnatsweb-site.pl %%CGI_DIR%%/gnatsweb.html diff --git a/databases/libiodbc/pkg-plist b/databases/libiodbc/pkg-plist index 1c9d8d6d21c4..684d91c33b01 100644 --- a/databases/libiodbc/pkg-plist +++ b/databases/libiodbc/pkg-plist @@ -40,4 +40,4 @@ libdata/pkgconfig/libiodbc.pc %%PORTDOCS%%%%EXAMPLESDIR%%/iodbctest.c %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/etc/libiodbc 2>/dev/null || true +@dirrmtry etc/libiodbc diff --git a/databases/namazu2/pkg-plist b/databases/namazu2/pkg-plist index 9184e318a518..70a24bb1b79a 100644 --- a/databases/namazu2/pkg-plist +++ b/databases/namazu2/pkg-plist @@ -145,10 +145,10 @@ share/namazu/template/NMZ.tips.ja share/namazu/template/NMZ.tips.pl @dirrm share/namazu/template @dirrm share/namazu -@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ja_JP.SJIS/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ja_JP.SJIS 2>/dev/null || true -@unexec rmdir %D/var/namazu/index 2>/dev/null || true -@unexec rmdir %D/var/namazu 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true +@dirrmtry share/locale/es/LC_MESSAGES +@dirrmtry share/locale/fr/LC_MESSAGES +@dirrmtry share/locale/ja_JP.SJIS/LC_MESSAGES +@dirrmtry share/locale/ja_JP.SJIS +@dirrmtry var/namazu/index +@dirrmtry var/namazu +@dirrmtry var diff --git a/databases/p5-ApacheDBILogConfig/pkg-plist b/databases/p5-ApacheDBILogConfig/pkg-plist index d83ea4ff9dca..32881ce70fec 100644 --- a/databases/p5-ApacheDBILogConfig/pkg-plist +++ b/databases/p5-ApacheDBILogConfig/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Apache/DBILogConfig.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DBILogConfig/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DBILogConfig -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache +@dirrmtry %%SITE_PERL%%/Apache diff --git a/databases/p5-CDB_File-Generator/pkg-plist b/databases/p5-CDB_File-Generator/pkg-plist index cc017161cb7b..2a620d8aadde 100644 --- a/databases/p5-CDB_File-Generator/pkg-plist +++ b/databases/p5-CDB_File-Generator/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/CDB_File/Generator.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CDB_File/Generator/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CDB_File/Generator -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CDB_File 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/CDB_File 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CDB_File +@dirrmtry %%SITE_PERL%%/CDB_File diff --git a/databases/p5-DBD-Excel/pkg-plist b/databases/p5-DBD-Excel/pkg-plist index a8954cdb34e8..93473bffb585 100644 --- a/databases/p5-DBD-Excel/pkg-plist +++ b/databases/p5-DBD-Excel/pkg-plist @@ -13,7 +13,7 @@ %%PORTDOCS%%share/examples/DBD-Excel/texj.pl %%PORTDOCS%%share/examples/DBD-Excel/thidden.pl %%PORTDOCS%%share/examples/DBD-Excel/thidden.xls -@unexec rmdir %D/%%SITE_PERL%%/DBD 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Excel 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/DBD +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Excel +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD %%PORTDOCS%%@unexec rmdir %D/share/examples/DBD-Excel 2>/dev/null || true diff --git a/databases/p5-DBD-File/pkg-plist b/databases/p5-DBD-File/pkg-plist index bd0b62f57a6f..9139b3bff68a 100644 --- a/databases/p5-DBD-File/pkg-plist +++ b/databases/p5-DBD-File/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/DBD/File.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/File/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/File -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/DBD 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD +@dirrmtry %%SITE_PERL%%/DBD diff --git a/databases/p5-DBD-Google/pkg-plist b/databases/p5-DBD-Google/pkg-plist index 7451f5dca69d..59e4a1fe6b00 100644 --- a/databases/p5-DBD-Google/pkg-plist +++ b/databases/p5-DBD-Google/pkg-plist @@ -6,7 +6,7 @@ %%SITE_PERL%%/DBD/Google/st.pm %%SITE_PERL%%/SQL/Dialects/Google.pm @dirrm %%SITE_PERL%%/DBD/Google -@unexec rmdir %D/%%SITE_PERL%%/DBD 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/DBD %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Google/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Google -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD diff --git a/databases/p5-DBD-RAM/pkg-plist b/databases/p5-DBD-RAM/pkg-plist index 8b8ef341777a..d4ff0b0e101e 100644 --- a/databases/p5-DBD-RAM/pkg-plist +++ b/databases/p5-DBD-RAM/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/DBD/RAM.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/RAM/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/RAM -@unexec rmdir %D/%%SITE_PERL%%/%PERL_ARCH%%/auto/DBD 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/DBD 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%PERL_ARCH%%/auto/DBD +@dirrmtry %%SITE_PERL%%/DBD diff --git a/databases/p5-DBD-Sybase/pkg-plist b/databases/p5-DBD-Sybase/pkg-plist index 85e173cbcbbc..dc7f6df3d8ed 100644 --- a/databases/p5-DBD-Sybase/pkg-plist +++ b/databases/p5-DBD-Sybase/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Sybase/Sybase.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Sybase/Sybase.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Sybase -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/DBD 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/DBD diff --git a/databases/p5-DBI-137/pkg-plist b/databases/p5-DBI-137/pkg-plist index 2e73088e4e53..f362576f7da5 100644 --- a/databases/p5-DBI-137/pkg-plist +++ b/databases/p5-DBI-137/pkg-plist @@ -37,6 +37,6 @@ bin/dbiproxy @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBI/Const/GetInfo @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBI/Const @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBI -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Win32 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/DBD 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Win32 +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/DBD +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle diff --git a/databases/p5-DBIx-AnyDBD/pkg-plist b/databases/p5-DBIx-AnyDBD/pkg-plist index 1a29a7ebf3da..a8e7266dc38d 100644 --- a/databases/p5-DBIx-AnyDBD/pkg-plist +++ b/databases/p5-DBIx-AnyDBD/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/DBIx/AnyDBD.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/AnyDBD/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/AnyDBD -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx +@dirrmtry %%SITE_PERL%%/DBIx diff --git a/databases/p5-DBIx-Password/pkg-plist b/databases/p5-DBIx-Password/pkg-plist index c9ee2de4a4c3..feff512e97c4 100644 --- a/databases/p5-DBIx-Password/pkg-plist +++ b/databases/p5-DBIx-Password/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/DBIx/Password.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Password/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Password -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx +@dirrmtry %%SITE_PERL%%/DBIx diff --git a/databases/p5-DBIx-Table/pkg-plist b/databases/p5-DBIx-Table/pkg-plist index fa709ee90cdf..788459a300c7 100644 --- a/databases/p5-DBIx-Table/pkg-plist +++ b/databases/p5-DBIx-Table/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/DBIx/Table.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Table/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Table 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Table +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx +@dirrmtry %%SITE_PERL%%/DBIx diff --git a/databases/p5-DBIx-XML_RDB/pkg-plist b/databases/p5-DBIx-XML_RDB/pkg-plist index 2889440e2d97..3dc841551d48 100644 --- a/databases/p5-DBIx-XML_RDB/pkg-plist +++ b/databases/p5-DBIx-XML_RDB/pkg-plist @@ -5,5 +5,5 @@ bin/xml2sql.pl %%SITE_PERL%%/DBIx/xml2sql.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/XML_RDB/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/XML_RDB -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/DBIx 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx +@dirrmtry %%SITE_PERL%%/DBIx diff --git a/databases/pgcluster/pkg-plist b/databases/pgcluster/pkg-plist index ca1df40c4305..f4e10f6c120c 100644 --- a/databases/pgcluster/pkg-plist +++ b/databases/pgcluster/pkg-plist @@ -92,4 +92,4 @@ share/postgresql/postgresql.conf.sample @dirrm include/postgresql @dirrm lib/postgresql @dirrm share/postgresql -@unexec rmdir %D/pgsql 2>/dev/null || true +@dirrmtry pgsql diff --git a/databases/ruby-dbd_interbase/pkg-plist b/databases/ruby-dbd_interbase/pkg-plist index f66292896478..a2c942c8fd18 100644 --- a/databases/ruby-dbd_interbase/pkg-plist +++ b/databases/ruby-dbd_interbase/pkg-plist @@ -1,3 +1,3 @@ %%RUBY_SITELIBDIR%%/DBD/InterBase/InterBase.rb @dirrm %%RUBY_SITELIBDIR%%/DBD/InterBase -@unexec rmdir %D/%%RUBY_SITELIBDIR%%/DBD 2>/dev/null || true +@dirrmtry %%RUBY_SITELIBDIR%%/DBD diff --git a/databases/ruby-dbd_mysql/pkg-plist b/databases/ruby-dbd_mysql/pkg-plist index da2327a83d1d..ddaca593ba2a 100644 --- a/databases/ruby-dbd_mysql/pkg-plist +++ b/databases/ruby-dbd_mysql/pkg-plist @@ -3,4 +3,4 @@ %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%% %%RUBY_SITELIBDIR%%/DBD/Mysql/Mysql.rb @dirrm %%RUBY_SITELIBDIR%%/DBD/Mysql -@unexec rmdir %D/%%RUBY_SITELIBDIR%%/DBD 2>/dev/null || true +@dirrmtry %%RUBY_SITELIBDIR%%/DBD diff --git a/databases/ruby-dbd_odbc/pkg-plist b/databases/ruby-dbd_odbc/pkg-plist index 4ad35c935678..49fafe86bdfa 100644 --- a/databases/ruby-dbd_odbc/pkg-plist +++ b/databases/ruby-dbd_odbc/pkg-plist @@ -1,3 +1,3 @@ %%RUBY_SITELIBDIR%%/DBD/ODBC/ODBC.rb @dirrm %%RUBY_SITELIBDIR%%/DBD/ODBC -@unexec rmdir %D/%%RUBY_SITELIBDIR%%/DBD 2>/dev/null || true +@dirrmtry %%RUBY_SITELIBDIR%%/DBD diff --git a/databases/ruby-dbd_pg/pkg-plist b/databases/ruby-dbd_pg/pkg-plist index bc83f43917c0..6eef1b1d5718 100644 --- a/databases/ruby-dbd_pg/pkg-plist +++ b/databases/ruby-dbd_pg/pkg-plist @@ -2,4 +2,4 @@ %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%% %%RUBY_SITELIBDIR%%/DBD/Pg/Pg.rb @dirrm %%RUBY_SITELIBDIR%%/DBD/Pg -@unexec rmdir %D/%%RUBY_SITELIBDIR%%/DBD 2>/dev/null || true +@dirrmtry %%RUBY_SITELIBDIR%%/DBD diff --git a/databases/ruby-dbd_proxy/pkg-plist b/databases/ruby-dbd_proxy/pkg-plist index 0702498b5aa9..880760a132f0 100644 --- a/databases/ruby-dbd_proxy/pkg-plist +++ b/databases/ruby-dbd_proxy/pkg-plist @@ -1,4 +1,4 @@ bin/proxyserver.rb %%RUBY_SITELIBDIR%%/DBD/Proxy/Proxy.rb @dirrm %%RUBY_SITELIBDIR%%/DBD/Proxy -@unexec rmdir %D/%%RUBY_SITELIBDIR%%/DBD 2>/dev/null || true +@dirrmtry %%RUBY_SITELIBDIR%%/DBD diff --git a/databases/ruby-dbd_sqlite/pkg-plist b/databases/ruby-dbd_sqlite/pkg-plist index f30461eee16f..27c7d24be25a 100644 --- a/databases/ruby-dbd_sqlite/pkg-plist +++ b/databases/ruby-dbd_sqlite/pkg-plist @@ -2,4 +2,4 @@ %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%% %%RUBY_SITEARCHLIBDIR%%/DBD/SQLite/SQLite.so @dirrm %%RUBY_SITEARCHLIBDIR%%/DBD/SQLite -@unexec rmdir %D/%%RUBY_SITEARCHLIBDIR%%/DBD 2>/dev/null || true +@dirrmtry %%RUBY_SITEARCHLIBDIR%%/DBD diff --git a/databases/unixODBC/pkg-plist b/databases/unixODBC/pkg-plist index a45194fa3671..7369ccf4749e 100644 --- a/databases/unixODBC/pkg-plist +++ b/databases/unixODBC/pkg-plist @@ -126,4 +126,4 @@ lib/libtemplate.so.1 %%PORTDOCS%%@dirrm %%DOCSDIR%%/AdministratorManual %%PORTDOCS%%@dirrm %%DOCSDIR%% @exec mkdir -p %D/etc/ODBCDataSources 2>/dev/null || true -@unexec rmdir %D/etc/ODBCDataSources 2>/dev/null || true +@dirrmtry etc/ODBCDataSources diff --git a/databases/xmysqladmin/pkg-plist b/databases/xmysqladmin/pkg-plist index 76b5f9e98bbc..a1c63b6a49cf 100644 --- a/databases/xmysqladmin/pkg-plist +++ b/databases/xmysqladmin/pkg-plist @@ -1,3 +1,3 @@ bin/xmysqladmin include/X11/pixmaps/mysql.xpm -@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true +@dirrmtry include/X11/pixmaps diff --git a/deskutils/genius/pkg-plist b/deskutils/genius/pkg-plist index b53bb455a05c..a39a17d7b1fd 100644 --- a/deskutils/genius/pkg-plist +++ b/deskutils/genius/pkg-plist @@ -149,9 +149,9 @@ share/locale/zh_CN/LC_MESSAGES/genius.mo @dirrm share/gnome/genius @dirrm lib/genius @dirrm include/genius -@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 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true +@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 +@dirrmtry share/icons diff --git a/deskutils/knowit/pkg-plist b/deskutils/knowit/pkg-plist index abe49b03af34..7555c180fe1f 100644 --- a/deskutils/knowit/pkg-plist +++ b/deskutils/knowit/pkg-plist @@ -16,17 +16,17 @@ share/locale/pl/LC_MESSAGES/knowit.mo share/locale/ru/LC_MESSAGES/knowit.mo share/locale/sk/LC_MESSAGES/knowit.mo share/locale/zh_CN.GB2312/LC_MESSAGES/knowit.mo -@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true -@unexec rmdir %D/share/mimelnk 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/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/doc/HTML/en/knowit -@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML 2>/dev/null || true +@dirrmtry share/doc/HTML/en +@dirrmtry share/doc/HTML @dirrm share/apps/knowit -@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/applnk/Applications +@dirrmtry share/applnk diff --git a/deskutils/xfce4-taskbar-plugin/pkg-plist b/deskutils/xfce4-taskbar-plugin/pkg-plist index c704068fe82b..2fadb7dff42a 100644 --- a/deskutils/xfce4-taskbar-plugin/pkg-plist +++ b/deskutils/xfce4-taskbar-plugin/pkg-plist @@ -1,2 +1,2 @@ lib/xfce4/panel-plugins/libtaskbar.so -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins diff --git a/deskutils/xfce4-windowlist-plugin/pkg-plist b/deskutils/xfce4-windowlist-plugin/pkg-plist index cd2f2e445b4d..a690b4f8129a 100644 --- a/deskutils/xfce4-windowlist-plugin/pkg-plist +++ b/deskutils/xfce4-windowlist-plugin/pkg-plist @@ -1,4 +1,4 @@ lib/xfce4/panel-plugins/libwindowlist.so lib/xfce4/panel-plugins/libwindowlist.la lib/xfce4/panel-plugins/libwindowlist.a -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins diff --git a/devel/c_c++_reference/pkg-plist b/devel/c_c++_reference/pkg-plist index 31edc7262702..6c7ba43ef81c 100644 --- a/devel/c_c++_reference/pkg-plist +++ b/devel/c_c++_reference/pkg-plist @@ -1062,4 +1062,4 @@ share/doc/HTML/en/kdevelop/reference/GRAPHICS/yellowball.gif @dirrm share/doc/HTML/en/kdevelop/reference/CPLUSPLUS/X_EXAMPLES @dirrm share/doc/HTML/en/kdevelop/reference/CPLUSPLUS @dirrm share/doc/HTML/en/kdevelop/reference/GRAPHICS -@unexec rmdir %D/share/doc/HTML/en/kdevelop/reference/ 2> /dev/null || true +@dirrmtry share/doc/HTML/en/kdevelop/reference/ diff --git a/devel/cweb/pkg-plist b/devel/cweb/pkg-plist index f61984e46e28..c90514112f5d 100644 --- a/devel/cweb/pkg-plist +++ b/devel/cweb/pkg-plist @@ -6,7 +6,7 @@ share/emacs/site-lisp/cweb.el share/texmf/tex/generic/misc/cwebmac.tex @dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/share/texmf/tex/generic/misc 2>/dev/null || true -@unexec rmdir %D/share/texmf/tex/generic 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/generic/misc +@dirrmtry share/texmf/tex/generic +@dirrmtry share/texmf/tex +@dirrmtry share/texmf diff --git a/devel/gauche-gaunit/pkg-plist b/devel/gauche-gaunit/pkg-plist index d791790fe518..dc01c969a777 100644 --- a/devel/gauche-gaunit/pkg-plist +++ b/devel/gauche-gaunit/pkg-plist @@ -9,7 +9,7 @@ share/gauche/site/lib/test/unit/ui/gtk.scm share/gauche/site/lib/test/unit/ui/text.scm @dirrm share/gauche/site/lib/test/unit/ui @dirrm share/gauche/site/lib/test/unit -@unexec rmdir %D/share/gauche/site/lib/test 2>/dev/null || true +@dirrmtry share/gauche/site/lib/test %%EXAMPLESDIR%%/site-lisp/run-test-setting.el %%EXAMPLESDIR%%/site-lisp/run-test.el %%EXAMPLESDIR%%/symdiff/lib/symdiff.scm diff --git a/devel/mingw-bin-msvcrt/pkg-plist b/devel/mingw-bin-msvcrt/pkg-plist index d5c6c48e68ad..0919658facac 100644 --- a/devel/mingw-bin-msvcrt/pkg-plist +++ b/devel/mingw-bin-msvcrt/pkg-plist @@ -284,4 +284,4 @@ i386-mingw32msvc/lib/libwst.a @dirrm i386-mingw32msvc/include/sys @dirrm i386-mingw32msvc/include @dirrm i386-mingw32msvc/lib -@unexec rmdir %D/i386-mingw32msvc 2>/dev/null || true +@dirrmtry i386-mingw32msvc diff --git a/devel/mingw-gcc/pkg-plist b/devel/mingw-gcc/pkg-plist index 85ccf60b6e33..cc254d1ea204 100644 --- a/devel/mingw-gcc/pkg-plist +++ b/devel/mingw-gcc/pkg-plist @@ -228,4 +228,4 @@ lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/vector.h @dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-6 @dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%% @dirrm lib/gcc-lib/i386-mingw32msvc -@unexec rmdir %D/lib/gcc-lib 2>/dev/null || true +@dirrmtry lib/gcc-lib diff --git a/devel/p5-Algorithm-Annotate/pkg-plist b/devel/p5-Algorithm-Annotate/pkg-plist index 75be75d4bcd9..a6387c9696ac 100644 --- a/devel/p5-Algorithm-Annotate/pkg-plist +++ b/devel/p5-Algorithm-Annotate/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Algorithm/Annotate.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Annotate/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Algorithm 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Annotate 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Algorithm +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Annotate +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm diff --git a/devel/p5-Algorithm-Evolutionary/pkg-plist b/devel/p5-Algorithm-Evolutionary/pkg-plist index eddfe3182285..44d5fd1b890d 100644 --- a/devel/p5-Algorithm-Evolutionary/pkg-plist +++ b/devel/p5-Algorithm-Evolutionary/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Evolutionary/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/Evolutionary -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm %%SITE_PERL%%/Algorithm/Evolutionary.pm %%SITE_PERL%%/Algorithm/Evolutionary/Experiment.pm %%SITE_PERL%%/Algorithm/Evolutionary/Individual/Base.pm @@ -39,4 +39,4 @@ @dirrm %%SITE_PERL%%/Algorithm/Evolutionary/Individual @dirrm %%SITE_PERL%%/Algorithm/Evolutionary/Op @dirrm %%SITE_PERL%%/Algorithm/Evolutionary -@unexec rmdir %D/%%SITE_PERL%%/Algorithm 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Algorithm diff --git a/devel/p5-Algorithm-MDiff/pkg-plist b/devel/p5-Algorithm-MDiff/pkg-plist index 78925d600a40..f2322d65aeb8 100644 --- a/devel/p5-Algorithm-MDiff/pkg-plist +++ b/devel/p5-Algorithm-MDiff/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/MDiff/MDiff.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/MDiff/autosplit.ix @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm/MDiff -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Algorithm 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Algorithm +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Algorithm diff --git a/devel/p5-Algorithm-MarkovChain/pkg-plist b/devel/p5-Algorithm-MarkovChain/pkg-plist index d937807dfb08..9590beae9d97 100644 --- a/devel/p5-Algorithm-MarkovChain/pkg-plist +++ b/devel/p5-Algorithm-MarkovChain/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/Algorithm/MarkovChain.pm %%SITE_PERL%%/Algorithm/MarkovChain/Base.pm @dirrm %%SITE_PERL%%/Algorithm/MarkovChain -@unexec rmdir %D/%%SITE_PERL%%/Algorithm 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Algorithm diff --git a/devel/p5-AppConfig-Std/pkg-plist b/devel/p5-AppConfig-Std/pkg-plist index 4965e6bf5bef..e44ebdbbaec8 100644 --- a/devel/p5-AppConfig-Std/pkg-plist +++ b/devel/p5-AppConfig-Std/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/AppConfig/Std.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AppConfig/Std/.packlist -@unexec rmdir %D/%%SITE_PERL%%/AppConfig 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/AppConfig @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AppConfig/Std -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AppConfig 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AppConfig diff --git a/devel/p5-B-Graph/pkg-plist b/devel/p5-B-Graph/pkg-plist index b76ec491d4f4..52156fba0dfa 100644 --- a/devel/p5-B-Graph/pkg-plist +++ b/devel/p5-B-Graph/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/B/Graph.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Graph/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/Graph -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/B 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/B +@dirrmtry %%SITE_PERL%%/B diff --git a/devel/p5-C-Scan/pkg-plist b/devel/p5-C-Scan/pkg-plist index 34a1bd7c3967..7fb35bf6954a 100644 --- a/devel/p5-C-Scan/pkg-plist +++ b/devel/p5-C-Scan/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/C/Scan.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/C/Scan/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/C/Scan -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/C 2> /dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/C 2> /dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/C +@dirrmtry %%SITE_PERL%%/C diff --git a/devel/p5-Class-MakeMethods/pkg-plist b/devel/p5-Class-MakeMethods/pkg-plist index 654d3bef300c..b607b616beae 100644 --- a/devel/p5-Class-MakeMethods/pkg-plist +++ b/devel/p5-Class-MakeMethods/pkg-plist @@ -60,15 +60,15 @@ %%SITE_PERL%%/Class/MakeMethods/Utility/Ref.pm %%SITE_PERL%%/Class/MakeMethods/Utility/TextBuilder.pm -@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Basic 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Composite 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Docs 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Emulator 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Evaled 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Standard 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Template 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods/Utility 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Class/MakeMethods 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MakeMethods 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Class/MakeMethods/Basic +@dirrmtry %%SITE_PERL%%/Class/MakeMethods/Composite +@dirrmtry %%SITE_PERL%%/Class/MakeMethods/Docs +@dirrmtry %%SITE_PERL%%/Class/MakeMethods/Emulator +@dirrmtry %%SITE_PERL%%/Class/MakeMethods/Evaled +@dirrmtry %%SITE_PERL%%/Class/MakeMethods/Standard +@dirrmtry %%SITE_PERL%%/Class/MakeMethods/Template +@dirrmtry %%SITE_PERL%%/Class/MakeMethods/Utility +@dirrmtry %%SITE_PERL%%/Class/MakeMethods +@dirrmtry %%SITE_PERL%%/Class +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/MakeMethods +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class diff --git a/devel/p5-Class-Roles/pkg-plist b/devel/p5-Class-Roles/pkg-plist index 08aaf32ebbb4..0365241e2560 100644 --- a/devel/p5-Class-Roles/pkg-plist +++ b/devel/p5-Class-Roles/pkg-plist @@ -1,2 +1,2 @@ %%SITE_PERL%%/Class/Roles.pm -@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Class diff --git a/devel/p5-Class-Singleton/pkg-plist b/devel/p5-Class-Singleton/pkg-plist index 429f35e5b447..8fa3042790af 100644 --- a/devel/p5-Class-Singleton/pkg-plist +++ b/devel/p5-Class-Singleton/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Class/Singleton.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Singleton/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Singleton -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class +@dirrmtry %%SITE_PERL%%/Class diff --git a/devel/p5-Data-Hexdumper/pkg-plist b/devel/p5-Data-Hexdumper/pkg-plist index c218d67bfcff..b61fc613f304 100644 --- a/devel/p5-Data-Hexdumper/pkg-plist +++ b/devel/p5-Data-Hexdumper/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Data/Hexdumper.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Hexdumper/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Hexdumper -@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Data +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data diff --git a/devel/p5-Data-Properties/pkg-plist b/devel/p5-Data-Properties/pkg-plist index ad985a0bd276..0630c2d75fcc 100644 --- a/devel/p5-Data-Properties/pkg-plist +++ b/devel/p5-Data-Properties/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Properties/.packlist %%SITE_PERL%%/Data/Properties.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Properties -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data +@dirrmtry %%SITE_PERL%%/Data diff --git a/devel/p5-Data-ShowTable/pkg-plist b/devel/p5-Data-ShowTable/pkg-plist index d401bab5ae4d..9364100f03d5 100644 --- a/devel/p5-Data-ShowTable/pkg-plist +++ b/devel/p5-Data-ShowTable/pkg-plist @@ -2,5 +2,5 @@ bin/showtable %%SITE_PERL%%/Data/ShowTable.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ShowTable/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ShowTable -@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Data +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data diff --git a/devel/p5-Date-ISO/pkg-plist b/devel/p5-Date-ISO/pkg-plist index f5425e6a3388..c31cdc274efb 100644 --- a/devel/p5-Date-ISO/pkg-plist +++ b/devel/p5-Date-ISO/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Date/ISO.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/ISO/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Date @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/ISO -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date diff --git a/devel/p5-Date-Pcalc/pkg-plist b/devel/p5-Date-Pcalc/pkg-plist index ce74c2508d1f..f5f37723be81 100644 --- a/devel/p5-Date-Pcalc/pkg-plist +++ b/devel/p5-Date-Pcalc/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Date/Pcalc.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Pcalc/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Pcalc -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Date 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date +@dirrmtry %%SITE_PERL%%/Date diff --git a/devel/p5-DateConvert/pkg-plist b/devel/p5-DateConvert/pkg-plist index ce4d4935f615..4d72fdf4c94c 100644 --- a/devel/p5-DateConvert/pkg-plist +++ b/devel/p5-DateConvert/pkg-plist @@ -2,4 +2,4 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Convert/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date/Convert @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Date -@unexec rmdir %D/%%SITE_PERL%%/Date 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Date diff --git a/devel/p5-Devel-StealthDebug/pkg-plist b/devel/p5-Devel-StealthDebug/pkg-plist index c5c26f50e175..c1f15b0d2600 100644 --- a/devel/p5-Devel-StealthDebug/pkg-plist +++ b/devel/p5-Devel-StealthDebug/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/StealthDebug/.packlist %%SITE_PERL%%/Devel/StealthDebug.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/StealthDebug -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel +@dirrmtry %%SITE_PERL%%/Devel diff --git a/devel/p5-Devel-ptkdb/pkg-plist b/devel/p5-Devel-ptkdb/pkg-plist index 31426f7cedd4..b800bc2004a1 100644 --- a/devel/p5-Devel-ptkdb/pkg-plist +++ b/devel/p5-Devel-ptkdb/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Devel/ptkdb.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/ptkdb/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/ptkdb -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel +@dirrmtry %%SITE_PERL%%/Devel diff --git a/devel/p5-File-BasicFlock/pkg-plist b/devel/p5-File-BasicFlock/pkg-plist index e02c155292f8..18adf3b17a33 100644 --- a/devel/p5-File-BasicFlock/pkg-plist +++ b/devel/p5-File-BasicFlock/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/File/BasicFlock.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/BasicFlock/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/BasicFlock -@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/File +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File diff --git a/devel/p5-File-Binary/pkg-plist b/devel/p5-File-Binary/pkg-plist index fa939ef3d0ee..bf42fe16ad3a 100644 --- a/devel/p5-File-Binary/pkg-plist +++ b/devel/p5-File-Binary/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/File/Binary.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Binary/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Binary -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File +@dirrmtry %%SITE_PERL%%/File diff --git a/devel/p5-File-Cache/pkg-plist b/devel/p5-File-Cache/pkg-plist index 9ccefad85b4f..7a30f04dc31e 100644 --- a/devel/p5-File-Cache/pkg-plist +++ b/devel/p5-File-Cache/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/File/Cache.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Cache/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Cache -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File +@dirrmtry %%SITE_PERL%%/File diff --git a/devel/p5-File-DirSync/pkg-plist b/devel/p5-File-DirSync/pkg-plist index 118fcd539572..ac6e8fed2311 100644 --- a/devel/p5-File-DirSync/pkg-plist +++ b/devel/p5-File-DirSync/pkg-plist @@ -2,5 +2,5 @@ bin/dirsync %%SITE_PERL%%/File/DirSync.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/DirSync/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/DirSync -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File +@dirrmtry %%SITE_PERL%%/File diff --git a/devel/p5-File-FTS/pkg-plist b/devel/p5-File-FTS/pkg-plist index fecd548aacbf..da0b6b43689f 100644 --- a/devel/p5-File-FTS/pkg-plist +++ b/devel/p5-File-FTS/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/FTS/.packlist %%SITE_PERL%%/File/FTS.pm -@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/FTS 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/File +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/FTS +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File diff --git a/devel/p5-Getargs-Long/pkg-plist b/devel/p5-Getargs-Long/pkg-plist index 5d3305bae512..310bc6b255a6 100644 --- a/devel/p5-Getargs-Long/pkg-plist +++ b/devel/p5-Getargs-Long/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Getargs/Long.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getargs/Long/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getargs/Long -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getargs 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Getargs 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getargs +@dirrmtry %%SITE_PERL%%/Getargs diff --git a/devel/p5-Getopt-Mixed/pkg-plist b/devel/p5-Getopt-Mixed/pkg-plist index ad95e668fdc2..92824667e6a9 100644 --- a/devel/p5-Getopt-Mixed/pkg-plist +++ b/devel/p5-Getopt-Mixed/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Mixed/.packlist %%SITE_PERL%%/Getopt/Mixed.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt/Mixed -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mixed 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Getopt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mixed +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Getopt +@dirrmtry %%SITE_PERL%%/Getopt diff --git a/devel/p5-IO-Stty/pkg-plist b/devel/p5-IO-Stty/pkg-plist index eb22f3ad2d55..8aeeabde96ed 100644 --- a/devel/p5-IO-Stty/pkg-plist +++ b/devel/p5-IO-Stty/pkg-plist @@ -2,5 +2,5 @@ %%SITE_PERL%%/IO/Stty.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Stty/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Stty -@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/IO +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO diff --git a/devel/p5-IPC-Cache/pkg-plist b/devel/p5-IPC-Cache/pkg-plist index bfa316da4f13..bd9408b9ecb2 100644 --- a/devel/p5-IPC-Cache/pkg-plist +++ b/devel/p5-IPC-Cache/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/IPC/Cache.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Cache/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC/Cache -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/IPC 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IPC +@dirrmtry %%SITE_PERL%%/IPC diff --git a/devel/p5-Inline-Java/pkg-plist b/devel/p5-Inline-Java/pkg-plist index 5e983f199ccf..5c1c0e578414 100644 --- a/devel/p5-Inline-Java/pkg-plist +++ b/devel/p5-Inline-Java/pkg-plist @@ -12,5 +12,5 @@ %%SITE_PERL%%/Inline/Java/Protocol.pm @dirrm %%SITE_PERL%%/Inline/Java @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline/Java -@unexec rmdir %D/%%SITE_PERL%%/Inline 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Inline +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Inline diff --git a/devel/p5-Locale-PGetText/pkg-plist b/devel/p5-Locale-PGetText/pkg-plist index 04724c42f9c2..cdbab07e2284 100644 --- a/devel/p5-Locale-PGetText/pkg-plist +++ b/devel/p5-Locale-PGetText/pkg-plist @@ -3,5 +3,5 @@ bin/MsgFormat %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/PGetText/.packlist %%SITE_PERL%%/Locale/PGetText.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale/PGetText -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Locale 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Locale +@dirrmtry %%SITE_PERL%%/Locale diff --git a/devel/p5-Log-Agent-Logger/pkg-plist b/devel/p5-Log-Agent-Logger/pkg-plist index c24d734b08e0..7a9044f45020 100644 --- a/devel/p5-Log-Agent-Logger/pkg-plist +++ b/devel/p5-Log-Agent-Logger/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent/Logger/.packlist %%SITE_PERL%%/Log/Agent/Logger.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent/Logger -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Agent diff --git a/devel/p5-Log-Dispatch-Config/pkg-plist b/devel/p5-Log-Dispatch-Config/pkg-plist index 09c39a29a5cb..c502375bdea2 100644 --- a/devel/p5-Log-Dispatch-Config/pkg-plist +++ b/devel/p5-Log-Dispatch-Config/pkg-plist @@ -3,8 +3,8 @@ %%SITE_PERL%%/Log/Dispatch/Config.pm %%SITE_PERL%%/Log/Dispatch/Configurator/AppConfig.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch/Config -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Log 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Log/Dispatch/Configurator 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Log/Dispatch 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Log 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log/Dispatch +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Log +@dirrmtry %%SITE_PERL%%/Log/Dispatch/Configurator +@dirrmtry %%SITE_PERL%%/Log/Dispatch +@dirrmtry %%SITE_PERL%%/Log diff --git a/devel/p5-Memoize-ExpireLRU/pkg-plist b/devel/p5-Memoize-ExpireLRU/pkg-plist index a5b811a3c7df..2d2fc5de693b 100644 --- a/devel/p5-Memoize-ExpireLRU/pkg-plist +++ b/devel/p5-Memoize-ExpireLRU/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/auto/Memoize/ExpireLRU/autosplit.ix %%SITE_PERL%%/Memoize/ExpireLRU.pm @dirrm %%SITE_PERL%%/auto/Memoize/ExpireLRU -@unexec rmdir %D/%%SITE_PERL%%/auto/Memoize 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Memoize/ExpireLRU 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/Memoize +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Memoize/ExpireLRU diff --git a/devel/p5-Module-Versions-Report/pkg-plist b/devel/p5-Module-Versions-Report/pkg-plist index a2ed491598f9..dbfe3cf4a545 100644 --- a/devel/p5-Module-Versions-Report/pkg-plist +++ b/devel/p5-Module-Versions-Report/pkg-plist @@ -2,4 +2,4 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module-Versions-Report/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module-Versions-Report @dirrm %%SITE_PERL%%/Module/Versions -@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Module diff --git a/devel/p5-ORBit/pkg-plist b/devel/p5-ORBit/pkg-plist index 786218567871..30142f108fc4 100644 --- a/devel/p5-ORBit/pkg-plist +++ b/devel/p5-ORBit/pkg-plist @@ -9,5 +9,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/CORBA/ORBit/ORBit.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CORBA/ORBit @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/CORBA/ORBit -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CORBA 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/CORBA 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CORBA +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/CORBA diff --git a/devel/p5-PCSC-Card/pkg-plist b/devel/p5-PCSC-Card/pkg-plist index 49e6458171c8..bc5dabf9807a 100644 --- a/devel/p5-PCSC-Card/pkg-plist +++ b/devel/p5-PCSC-Card/pkg-plist @@ -5,7 +5,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC/Card.pm %%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC.pod %%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC.pm -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard/PCSC 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Chipcard 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard/PCSC +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chipcard +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Chipcard/PCSC +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Chipcard diff --git a/devel/p5-POE-Component-TSTP/pkg-plist b/devel/p5-POE-Component-TSTP/pkg-plist index 2c2da69144b1..b188fe9266ac 100644 --- a/devel/p5-POE-Component-TSTP/pkg-plist +++ b/devel/p5-POE-Component-TSTP/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/POE/Component/TSTP.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/TSTP/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/TSTP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component +@dirrmtry %%SITE_PERL%%/POE/Component +@dirrmtry %%SITE_PERL%%/POE diff --git a/devel/p5-Penguin/pkg-plist b/devel/p5-Penguin/pkg-plist index d12f4b68de92..94b7e50174c8 100644 --- a/devel/p5-Penguin/pkg-plist +++ b/devel/p5-Penguin/pkg-plist @@ -36,9 +36,9 @@ lib/perl5/site_perl/Penguin/doc/TODO @dirrm %%SITE_PERL%%/Penguin/Frame @dirrm %%SITE_PERL%%/Penguin/Trivial @dirrm %%SITE_PERL%%/Penguin/Wrapper -@unexec rmdir %D/%%SITE_PERL%%/Penguin 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Penguin @dirrm lib/perl5/site_perl/Penguin/bin @dirrm lib/perl5/site_perl/Penguin/misc @dirrm lib/perl5/site_perl/Penguin/doc -@unexec rmdir %D/lib/perl5/site_perl/Penguin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Penguin 2>/dev/null || true +@dirrmtry lib/perl5/site_perl/Penguin +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Penguin diff --git a/devel/p5-Proc-ProcessTable/pkg-plist b/devel/p5-Proc-ProcessTable/pkg-plist index 4ce2bbdfdeea..558c508b4c47 100644 --- a/devel/p5-Proc-ProcessTable/pkg-plist +++ b/devel/p5-Proc-ProcessTable/pkg-plist @@ -10,5 +10,5 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/ProcessTable/Process @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc/ProcessTable @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Proc/ProcessTable -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Proc 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Proc +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Proc diff --git a/devel/p5-Set-Array/pkg-plist b/devel/p5-Set-Array/pkg-plist index c6988fa4409a..ea93519bbff6 100644 --- a/devel/p5-Set-Array/pkg-plist +++ b/devel/p5-Set-Array/pkg-plist @@ -1,2 +1,2 @@ %%SITE_PERL%%/Set/Array.pm -@unexec rmdir %D/%%SITE_PERL%%/Set 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Set diff --git a/devel/p5-Sort-ArrayOfArrays/pkg-plist b/devel/p5-Sort-ArrayOfArrays/pkg-plist index e0f755cedfc2..9848aa689730 100644 --- a/devel/p5-Sort-ArrayOfArrays/pkg-plist +++ b/devel/p5-Sort-ArrayOfArrays/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Sort/ArrayOfArrays.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/ArrayOfArrays/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/ArrayOfArrays -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Sort 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort +@dirrmtry %%SITE_PERL%%/Sort diff --git a/devel/p5-String-Approx/pkg-plist b/devel/p5-String-Approx/pkg-plist index 526fa974e73a..dcef536e1792 100644 --- a/devel/p5-String-Approx/pkg-plist +++ b/devel/p5-String-Approx/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Approx/Approx.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Approx/Approx.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Approx -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/String 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/String diff --git a/devel/p5-String-CRC32/pkg-plist b/devel/p5-String-CRC32/pkg-plist index dac75c334bec..e1230b967fcd 100644 --- a/devel/p5-String-CRC32/pkg-plist +++ b/devel/p5-String-CRC32/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/CRC32/CRC32.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/CRC32/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/CRC32 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/String 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/String diff --git a/devel/p5-String-Checker/pkg-plist b/devel/p5-String-Checker/pkg-plist index 911be55bbfff..6d8e5d3409cd 100644 --- a/devel/p5-String-Checker/pkg-plist +++ b/devel/p5-String-Checker/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/String/Checker.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Checker/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Checker -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/String 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String +@dirrmtry %%SITE_PERL%%/String diff --git a/devel/p5-String-Ediff/pkg-plist b/devel/p5-String-Ediff/pkg-plist index 4a717dfaf784..0a517e292cca 100644 --- a/devel/p5-String-Ediff/pkg-plist +++ b/devel/p5-String-Ediff/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Ediff/Ediff.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Ediff/Ediff.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Ediff -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/String 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/String diff --git a/devel/p5-String-Random/pkg-plist b/devel/p5-String-Random/pkg-plist index afcf12cf0563..54542cc223da 100644 --- a/devel/p5-String-Random/pkg-plist +++ b/devel/p5-String-Random/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/String/Random.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Random/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Random -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/String 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String +@dirrmtry %%SITE_PERL%%/String diff --git a/devel/p5-String-RexxParse/pkg-plist b/devel/p5-String-RexxParse/pkg-plist index 31b9f77618d6..3fdb4879285a 100644 --- a/devel/p5-String-RexxParse/pkg-plist +++ b/devel/p5-String-RexxParse/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/String/RexxParse.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/RexxParse/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/RexxParse -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/String 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String +@dirrmtry %%SITE_PERL%%/String diff --git a/devel/p5-Term-ANSIScreen/pkg-plist b/devel/p5-Term-ANSIScreen/pkg-plist index 6ab46793b0cd..77facb684b52 100644 --- a/devel/p5-Term-ANSIScreen/pkg-plist +++ b/devel/p5-Term-ANSIScreen/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Term/ANSIScreen.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ANSIScreen/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/ANSIScreen -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Term 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term +@dirrmtry %%SITE_PERL%%/Term diff --git a/devel/p5-Term-Query/pkg-plist b/devel/p5-Term-Query/pkg-plist index 3776eb0e2d70..8fd1491180b5 100644 --- a/devel/p5-Term-Query/pkg-plist +++ b/devel/p5-Term-Query/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/Term/Query_Test.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Query/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term/Query -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Term 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Term 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Term +@dirrmtry %%SITE_PERL%%/Term diff --git a/devel/p5-Tie-IxHash/pkg-plist b/devel/p5-Tie-IxHash/pkg-plist index ff6998167a43..5fa6a694775e 100644 --- a/devel/p5-Tie-IxHash/pkg-plist +++ b/devel/p5-Tie-IxHash/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Tie/IxHash.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/IxHash/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/IxHash -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie +@dirrmtry %%SITE_PERL%%/Tie diff --git a/devel/p5-TraceFuncs/pkg-plist b/devel/p5-TraceFuncs/pkg-plist index aa157782d0d1..eaf1ddffa293 100644 --- a/devel/p5-TraceFuncs/pkg-plist +++ b/devel/p5-TraceFuncs/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/Devel/TraceFuncs.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Devel +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel diff --git a/devel/p5-Tree-DAG_Node/pkg-plist b/devel/p5-Tree-DAG_Node/pkg-plist index 292d9d8a0624..a8262608efc8 100644 --- a/devel/p5-Tree-DAG_Node/pkg-plist +++ b/devel/p5-Tree-DAG_Node/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Tree/DAG_Node.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/DAG_Node/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/DAG_Node -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Tree 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree +@dirrmtry %%SITE_PERL%%/Tree diff --git a/devel/p5-VCP-autrijus/pkg-plist b/devel/p5-VCP-autrijus/pkg-plist index 99c98558f3c9..89786c5d5891 100644 --- a/devel/p5-VCP-autrijus/pkg-plist +++ b/devel/p5-VCP-autrijus/pkg-plist @@ -83,4 +83,4 @@ bin/vcp @dirrm %%SITE_PERL%%/VCP/Utils @dirrm %%SITE_PERL%%/VCP %%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/VCP diff --git a/devel/pear-apd/pkg-plist b/devel/pear-apd/pkg-plist index 516b5b0b1d8c..5f88185efd50 100644 --- a/devel/pear-apd/pkg-plist +++ b/devel/pear-apd/pkg-plist @@ -2,4 +2,4 @@ bin/pprofp %%EXTDIR%%/apd.so %%PKGREGDIR%%/package.xml @dirrm %%PKGREGDIR%% -@unexec rmdir %D/%%PEARDIR%%/packages 2>/dev/null || true +@dirrmtry %%PEARDIR%%/packages diff --git a/devel/pmk/pkg-plist b/devel/pmk/pkg-plist index 515ae825dc77..6ae1284e5450 100644 --- a/devel/pmk/pkg-plist +++ b/devel/pmk/pkg-plist @@ -4,7 +4,7 @@ bin/pmkpc bin/pmkscan @unexec if cmp -s %D/etc/pmk/pmk.conf %D/etc/pmk/pmk.conf.dist; then rm -f %D/etc/pmk/pmk.conf; fi @unexec rm -f %D/etc/pmk/pmk.conf.dist -@unexec rmdir %D/etc/pmk 2>/dev/null || true +@dirrmtry etc/pmk bin/pmksetup %%DATADIR%%/pmkcfgtool.dat %%DATADIR%%/pmkcomp.dat diff --git a/devel/ruby-io-reactor/pkg-plist b/devel/ruby-io-reactor/pkg-plist index 7c7fbf690d8b..98f488af48a4 100644 --- a/devel/ruby-io-reactor/pkg-plist +++ b/devel/ruby-io-reactor/pkg-plist @@ -1,5 +1,5 @@ %%RUBY_SITELIBDIR%%/io/reactor.rb -@unexec rmdir %D/%%RUBY_SITELIBDIR%%/io 2>/dev/null || true +@dirrmtry %%RUBY_SITELIBDIR%%/io %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%% diff --git a/dns/p5-DNS-Config/pkg-plist b/dns/p5-DNS-Config/pkg-plist index b1ed00eae1f7..45abd59d304f 100644 --- a/dns/p5-DNS-Config/pkg-plist +++ b/dns/p5-DNS-Config/pkg-plist @@ -14,4 +14,4 @@ @dirrm %%SITE_PERL%%/DNS/Config/Statement @dirrm %%SITE_PERL%%/DNS/Config/File @dirrm %%SITE_PERL%%/DNS/Config -@unexec rmdir %D/%%SITE_PERL%%/DNS 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/DNS diff --git a/dns/p5-DNS-Zone/pkg-plist b/dns/p5-DNS-Zone/pkg-plist index 994ca3850915..781d1a1ce93f 100644 --- a/dns/p5-DNS-Zone/pkg-plist +++ b/dns/p5-DNS-Zone/pkg-plist @@ -9,4 +9,4 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DNS-Zone @dirrm %%SITE_PERL%%/DNS/Zone/File @dirrm %%SITE_PERL%%/DNS/Zone -@unexec rmdir %D/%%SITE_PERL%%/DNS 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/DNS diff --git a/dns/p5-Tie-DNS/pkg-plist b/dns/p5-Tie-DNS/pkg-plist index fab71504d04d..0073ed6e5a77 100644 --- a/dns/p5-Tie-DNS/pkg-plist +++ b/dns/p5-Tie-DNS/pkg-plist @@ -7,7 +7,7 @@ %%PORTDOCS%%share/examples/p5-Tie-DNS/example5.pl %%PORTDOCS%%share/examples/p5-Tie-DNS/example6.pl %%PORTDOCS%%share/examples/p5-Tie-DNS/example7.pl -@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DNS 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Tie +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/DNS +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie %%PORTDOCS%%@unexec rmdir %D/share/examples/p5-Tie-DNS 2>/dev/null || true |