diff --git a/audio/beast/pkg-plist b/audio/beast/pkg-plist index ac9bc2f6eff0..11770ec8cd8a 100644 --- a/audio/beast/pkg-plist +++ b/audio/beast/pkg-plist @@ -282,7 +282,7 @@ share/mime/packages/beast.xml @dirrm share/gnome/bse/v0.6.6/scripts @dirrm share/gnome/bse/v0.6.6 @dirrm share/gnome/bse -@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/rw 2>/dev/null || true +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime diff --git a/audio/easytag/pkg-plist b/audio/easytag/pkg-plist index d981db394e03..ecb5d391babc 100644 --- a/audio/easytag/pkg-plist +++ b/audio/easytag/pkg-plist @@ -17,8 +17,8 @@ share/locale/ru/LC_MESSAGES/easytag.mo share/locale/sv/LC_MESSAGES/easytag.mo share/locale/uk/LC_MESSAGES/easytag.mo share/pixmaps/EasyTAG.xpm -@unexec rmdir %D/share/pixmaps 2>/dev/null || true -@unexec rmdir %D/share/gnome/apps/Multimedia 2>/dev/null || true -@unexec rmdir %D/share/gnome/apps 2>/dev/null || true -@unexec rmdir %D/share/gnome 2>/dev/null || true +@dirrmtry share/pixmaps +@dirrmtry share/gnome/apps/Multimedia +@dirrmtry share/gnome/apps +@dirrmtry share/gnome @dirrm share/easytag diff --git a/audio/eawpats/pkg-plist b/audio/eawpats/pkg-plist index 29c31504427f..c6db6aba6208 100644 --- a/audio/eawpats/pkg-plist +++ b/audio/eawpats/pkg-plist @@ -383,7 +383,7 @@ share/timidity/timidity.cfg-eawpats @dirrm %%DATADIR%%/gsdrum08 @dirrm %%DATADIR%%/ethnic @dirrm %%DATADIR%% -@unexec rmdir %D/share/timidity 2>/dev/null || true +@dirrmtry share/timidity %%PORTDOCS%%@dirrm %%DOCSDIR%%/wime %%PORTDOCS%%@dirrm %%DOCSDIR%%/power %%PORTDOCS%%@dirrm %%DOCSDIR%%/gsdrum40 diff --git a/audio/eawplus/pkg-plist b/audio/eawplus/pkg-plist index 0a61ac79ddd9..2a8ada63290c 100644 --- a/audio/eawplus/pkg-plist +++ b/audio/eawplus/pkg-plist @@ -31,7 +31,7 @@ %%PORTDOCS%%%%DOCSDIR%%/ReadMe-j.txt.gz %%PORTDOCS%%%%DOCSDIR%%/VupHistory-j.txt.gz %%PORTDOCS%%%%DOCSDIR%%/changelog.txt.gz -@unexec rmdir %D/%%TIMIDITY_DATADIR%% 2>/dev/null || true +@dirrmtry %%TIMIDITY_DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%%/inst/tamupat @dirrm %%DATADIR%%/inst/GUS/power diff --git a/audio/festlex-ifd/pkg-plist b/audio/festlex-ifd/pkg-plist index 28123503f071..824a87b4b489 100644 --- a/audio/festlex-ifd/pkg-plist +++ b/audio/festlex-ifd/pkg-plist @@ -1,4 +1,4 @@ share/festival/lib/dicts/ifd/lex.out share/festival/lib/dicts/ifd/lex.out-README @dirrm share/festival/lib/dicts/ifd -@unexec rmdir %D/share/festival/lib/dicts 2>/dev/null || true +@dirrmtry share/festival/lib/dicts diff --git a/audio/festvox-el11/pkg-plist b/audio/festvox-el11/pkg-plist index 43cdcb117731..ee885e10b2e9 100644 --- a/audio/festvox-el11/pkg-plist +++ b/audio/festvox-el11/pkg-plist @@ -7,5 +7,5 @@ share/festival/lib/voices/spanish/el_diphone/festvox/spanint.scm share/festival/lib/voices/spanish/el_diphone/festvox/sptoken.scm @dirrm share/festival/lib/voices/spanish/el_diphone/festvox @dirrm share/festival/lib/voices/spanish/el_diphone -@unexec rmdir %D/share/festival/lib/voices/spanish 2>/dev/null || true -@unexec rmdir %D/share/festival/lib/voices 2>/dev/null || true +@dirrmtry share/festival/lib/voices/spanish +@dirrmtry share/festival/lib/voices diff --git a/audio/festvox-lp/pkg-plist b/audio/festvox-lp/pkg-plist index 9d13de5f7e0d..1bda9b999c12 100644 --- a/audio/festvox-lp/pkg-plist +++ b/audio/festvox-lp/pkg-plist @@ -4,5 +4,5 @@ share/festival/lib/voices/italian/lp_ogi_diphone/group/lp_ogi_diphone.group-READ @dirrm share/festival/lib/voices/italian/lp_ogi_diphone/festvox @dirrm share/festival/lib/voices/italian/lp_ogi_diphone/group @dirrm share/festival/lib/voices/italian/lp_ogi_diphone -@unexec rmdir %D/share/festival/lib/voices/italian 2>/dev/null || true -@unexec rmdir %D/share/festival/lib/voices 2>/dev/null || true +@dirrmtry share/festival/lib/voices/italian +@dirrmtry share/festival/lib/voices diff --git a/audio/festvox-pc/pkg-plist b/audio/festvox-pc/pkg-plist index 894ef0bffa81..073b534a6cc2 100644 --- a/audio/festvox-pc/pkg-plist +++ b/audio/festvox-pc/pkg-plist @@ -4,5 +4,5 @@ share/festival/lib/voices/italian/pc_ogi_diphone/group/pc_ogi_diphone.group-READ @dirrm share/festival/lib/voices/italian/pc_ogi_diphone/festvox @dirrm share/festival/lib/voices/italian/pc_ogi_diphone/group @dirrm share/festival/lib/voices/italian/pc_ogi_diphone -@unexec rmdir %D/share/festival/lib/voices/italian 2>/dev/null || true -@unexec rmdir %D/share/festival/lib/voices 2>/dev/null || true +@dirrmtry share/festival/lib/voices/italian +@dirrmtry share/festival/lib/voices diff --git a/audio/gdesklets-cornerxmms/pkg-plist b/audio/gdesklets-cornerxmms/pkg-plist index aed094f84dc7..b07673ed40b6 100644 --- a/audio/gdesklets-cornerxmms/pkg-plist +++ b/audio/gdesklets-cornerxmms/pkg-plist @@ -40,4 +40,4 @@ share/gnome/gdesklets/Displays/CornerXMMS/gfx/textmask-br1.png @dirrm share/gnome/gdesklets/Controls/KXmms @dirrm share/gnome/gdesklets/Displays/CornerXMMS/gfx @dirrm share/gnome/gdesklets/Displays/CornerXMMS -@unexec rmdir %D/share/gnome/gdesklets/Controls 2>/dev/null || true +@dirrmtry share/gnome/gdesklets/Controls diff --git a/audio/gnomoradio/pkg-plist b/audio/gnomoradio/pkg-plist index 1eb757c526ed..aa2a6aaba9eb 100644 --- a/audio/gnomoradio/pkg-plist +++ b/audio/gnomoradio/pkg-plist @@ -39,4 +39,4 @@ share/gnome/pixmaps/gnomoradio/gnomoradio-heart.png @dirrm include/rainbow @dirrm include/roboradio @dirrm share/gnome/pixmaps/gnomoradio -@unexec rmdir %D/sbin 2>/dev/null || true +@dirrmtry sbin diff --git a/audio/goobox/pkg-plist b/audio/goobox/pkg-plist index 258b86715678..8d517a48227c 100644 --- a/audio/goobox/pkg-plist +++ b/audio/goobox/pkg-plist @@ -39,7 +39,7 @@ share/locale/sq/LC_MESSAGES/goobox.mo share/locale/sv/LC_MESSAGES/goobox.mo share/locale/zh_CN/LC_MESSAGES/goobox.mo share/locale/zh_TW/LC_MESSAGES/goobox.mo -@unexec rmdir %D/share/locale/ar 2> /dev/null || true +@dirrmtry share/locale/ar @dirrm share/gnome/omf/goobox @dirrm share/gnome/help/goobox/C @dirrm share/gnome/help/goobox diff --git a/audio/gqmpeg-devel/pkg-plist b/audio/gqmpeg-devel/pkg-plist index c20037e4d157..d2747a5914e2 100644 --- a/audio/gqmpeg-devel/pkg-plist +++ b/audio/gqmpeg-devel/pkg-plist @@ -76,7 +76,7 @@ share/locale/fr/LC_MESSAGES/gqmpeg.mo share/locale/ja/LC_MESSAGES/gqmpeg.mo share/locale/pt_BR/LC_MESSAGES/gqmpeg.mo share/locale/zh_TW/LC_MESSAGES/gqmpeg.mo -@unexec rmdir %D/share/applications 2>/dev/null || true +@dirrmtry share/applications @dirrm share/gqmpeg/skins/mrclean @dirrm share/gqmpeg/skins @dirrm share/gqmpeg diff --git a/audio/grip/pkg-plist b/audio/grip/pkg-plist index 4e7a117f99c4..3f0e1ce4d3d8 100644 --- a/audio/grip/pkg-plist +++ b/audio/grip/pkg-plist @@ -63,7 +63,7 @@ share/locale/ru/LC_MESSAGES/grip-2.2.mo share/locale/zh_CN/LC_MESSAGES/grip-2.2.mo share/locale/zh_HK/LC_MESSAGES/grip-2.2.mo share/locale/zh_TW/LC_MESSAGES/grip-2.2.mo -@unexec rmdir %D/share/locale/zh_HK/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_HK 2>/dev/null || true +@dirrmtry share/locale/zh_HK/LC_MESSAGES +@dirrmtry share/locale/zh_HK @dirrm share/gnome/help/grip/C @dirrm share/gnome/help/grip diff --git a/audio/gtick/pkg-plist b/audio/gtick/pkg-plist index c37e81180f6d..1bcbccadca6f 100644 --- a/audio/gtick/pkg-plist +++ b/audio/gtick/pkg-plist @@ -11,7 +11,7 @@ share/locale/ga/LC_MESSAGES/gtick.mo share/locale/nl/LC_MESSAGES/gtick.mo share/locale/ro/LC_MESSAGES/gtick.mo share/locale/ru/LC_MESSAGES/gtick.mo -@unexec rmdir %D/share/locale/en@boldquot/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/en@boldquot 2> /dev/null || true -@unexec rmdir %D/share/locale/en@quot/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/en@quot 2> /dev/null || true +@dirrmtry share/locale/en@boldquot/LC_MESSAGES +@dirrmtry share/locale/en@boldquot +@dirrmtry share/locale/en@quot/LC_MESSAGES +@dirrmtry share/locale/en@quot diff --git a/audio/guspat/pkg-plist b/audio/guspat/pkg-plist index a0d7cabf9576..ec7a8435a52d 100644 --- a/audio/guspat/pkg-plist +++ b/audio/guspat/pkg-plist @@ -523,7 +523,7 @@ %%DATADIR%%/release.cfg %%DATADIR%%/sfx.cfg %%DATADIR%%/timidity.cfg -@unexec rmdir %D/%%TIMIDITY_DATADIR%% 2>/dev/null || true +@dirrmtry %%TIMIDITY_DATADIR%% @dirrm %%DATADIR%%/inst/wowpats @dirrm %%DATADIR%%/inst/wime @dirrm %%DATADIR%%/inst/roland diff --git a/audio/klira/pkg-plist b/audio/klira/pkg-plist index aab2e7593dce..5f0feb9448e0 100644 --- a/audio/klira/pkg-plist +++ b/audio/klira/pkg-plist @@ -7,18 +7,18 @@ share/doc/HTML/en/klira/index.docbook share/icons/hicolor/16x16/apps/klira.png share/icons/hicolor/32x32/apps/klira.png share/icons/hicolor/64x64/apps/klira.png -@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/64x64 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/icons/hicolor/64x64/apps +@dirrmtry share/icons/hicolor/64x64 +@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/klira -@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/klira -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/apps +@dirrmtry share/applnk/Utilities +@dirrmtry share/applnk diff --git a/audio/libsndfile/pkg-plist b/audio/libsndfile/pkg-plist index 8f3aafa198be..6ab414a9d875 100644 --- a/audio/libsndfile/pkg-plist +++ b/audio/libsndfile/pkg-plist @@ -30,7 +30,7 @@ libdata/pkgconfig/sndfile.pc share/octave/site/m/sndfile_load.m share/octave/site/m/sndfile_play.m share/octave/site/m/sndfile_save.m -@unexec rmdir %D/share/octave/site/m 2>/dev/null || true -@unexec rmdir %D/share/octave/site 2>/dev/null || true -@unexec rmdir %D/share/octave 2>/dev/null || true +@dirrmtry share/octave/site/m +@dirrmtry share/octave/site +@dirrmtry share/octave %%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/audio/mp3c/pkg-plist b/audio/mp3c/pkg-plist index 8afd0cab4454..38d5dceb3fa5 100644 --- a/audio/mp3c/pkg-plist +++ b/audio/mp3c/pkg-plist @@ -5,7 +5,7 @@ share/locale/es/LC_MESSAGES/mp3c.mo share/locale/it/LC_MESSAGES/mp3c.mo share/locale/pl/LC_MESSAGES/mp3c.mo share/locale/pt/LC_MESSAGES/mp3c.mo -@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 +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt diff --git a/audio/p5-Audio-Scrobbler/pkg-plist b/audio/p5-Audio-Scrobbler/pkg-plist index b152cebdac17..82e3e369e4dd 100644 --- a/audio/p5-Audio-Scrobbler/pkg-plist +++ b/audio/p5-Audio-Scrobbler/pkg-plist @@ -1,8 +1,8 @@ bin/scrobbler-helper %%SITE_PERL%%/mach/auto/Audio/Scrobbler/.packlist %%SITE_PERL%%/Audio/Scrobbler.pm -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Audio/Scrobbler 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Audio 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/mach/auto 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/mach 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Audio 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/mach/auto/Audio/Scrobbler +@dirrmtry %%SITE_PERL%%/mach/auto/Audio +@dirrmtry %%SITE_PERL%%/mach/auto +@dirrmtry %%SITE_PERL%%/mach +@dirrmtry %%SITE_PERL%%/Audio diff --git a/audio/p5-Audio-WMA/pkg-plist b/audio/p5-Audio-WMA/pkg-plist index 2149c0cc7ef3..2bfe79723099 100644 --- a/audio/p5-Audio-WMA/pkg-plist +++ b/audio/p5-Audio-WMA/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Audio/WMA.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/WMA/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/WMA -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Audio 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio +@dirrmtry %%SITE_PERL%%/Audio diff --git a/audio/p5-Audio-Wav/pkg-plist b/audio/p5-Audio-Wav/pkg-plist index 80e2d90c8f6c..dd08bc0780eb 100644 --- a/audio/p5-Audio-Wav/pkg-plist +++ b/audio/p5-Audio-Wav/pkg-plist @@ -8,5 +8,5 @@ @dirrm %%SITE_PERL%%/Audio/Wav/Write @dirrm %%SITE_PERL%%/Audio/Wav @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Wav -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Audio 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio +@dirrmtry %%SITE_PERL%%/Audio diff --git a/audio/p5-CDDB-File/pkg-plist b/audio/p5-CDDB-File/pkg-plist index 8c18d0f774cb..2c936d15d2b7 100644 --- a/audio/p5-CDDB-File/pkg-plist +++ b/audio/p5-CDDB-File/pkg-plist @@ -2,4 +2,4 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/CDDB/File/.packlist @dirrm %%SITE_PERL%%/CDDB @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CDDB/File -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CDDB 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CDDB diff --git a/audio/p5-Filesys-Virtual-DAAP/pkg-plist b/audio/p5-Filesys-Virtual-DAAP/pkg-plist index b2d821570681..d87dd656afae 100644 --- a/audio/p5-Filesys-Virtual-DAAP/pkg-plist +++ b/audio/p5-Filesys-Virtual-DAAP/pkg-plist @@ -1,3 +1,3 @@ %%SITE_PERL%%/Filesys/Virtual/DAAP.pm -@unexec rmdir %D/%%SITE_PERL%%/Filesys/Virtual 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Filesys 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Filesys/Virtual +@dirrmtry %%SITE_PERL%%/Filesys diff --git a/audio/p5-MP3-Info/pkg-plist b/audio/p5-MP3-Info/pkg-plist index 63928eebea6d..02e6d15d00ae 100644 --- a/audio/p5-MP3-Info/pkg-plist +++ b/audio/p5-MP3-Info/pkg-plist @@ -2,6 +2,6 @@ %%SITE_PERL%%/MPEG/MP3Info.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/Info/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/Info -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/MPEG 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/MP3 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3 +@dirrmtry %%SITE_PERL%%/MPEG +@dirrmtry %%SITE_PERL%%/MP3 diff --git a/audio/p5-MP3-Tag/pkg-plist b/audio/p5-MP3-Tag/pkg-plist index 219c8158334c..3f84a49dba0b 100644 --- a/audio/p5-MP3-Tag/pkg-plist +++ b/audio/p5-MP3-Tag/pkg-plist @@ -12,5 +12,5 @@ bin/mp3info2 %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/Tag/.packlist @dirrm %%SITE_PERL%%/MP3/Tag @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/Tag -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/MP3 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3 +@dirrmtry %%SITE_PERL%%/MP3 diff --git a/audio/p5-MPEG-ID3v2Tag/pkg-plist b/audio/p5-MPEG-ID3v2Tag/pkg-plist index f2ec2be19731..5e0ddc515d60 100644 --- a/audio/p5-MPEG-ID3v2Tag/pkg-plist +++ b/audio/p5-MPEG-ID3v2Tag/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/MPEG/ID3v2Tag.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MPEG/ID3v2Tag/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MPEG/ID3v2Tag -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MPEG 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/MPEG 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MPEG +@dirrmtry %%SITE_PERL%%/MPEG diff --git a/audio/p5-MusicBrainz-Client/pkg-plist b/audio/p5-MusicBrainz-Client/pkg-plist index 9607023ff0b8..8ef5f71ddefa 100644 --- a/audio/p5-MusicBrainz-Client/pkg-plist +++ b/audio/p5-MusicBrainz-Client/pkg-plist @@ -4,12 +4,12 @@ %%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz/Client/Simple/Album.pm %%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz/Client/Simple/Artist.pm %%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz/Client/Simple/Track.pm -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz/Client/Simple 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz/Client 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz/Client/Simple +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz/Client +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz %%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz/Client/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz/Client/Client.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz/Client/Client.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz/Client/autosplit.ix @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz/Client -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz diff --git a/audio/p5-MusicBrainz-Queries/pkg-plist b/audio/p5-MusicBrainz-Queries/pkg-plist index 782892be7af6..ecbb0bf5ac87 100644 --- a/audio/p5-MusicBrainz-Queries/pkg-plist +++ b/audio/p5-MusicBrainz-Queries/pkg-plist @@ -1,8 +1,8 @@ %%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz/Queries.pm -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz %%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz/Queries/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz/Queries/Queries.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz/Queries/Queries.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz/Queries/autosplit.ix @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz/Queries -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz diff --git a/audio/p5-MusicBrainz-TRM/pkg-plist b/audio/p5-MusicBrainz-TRM/pkg-plist index 0556a535d45a..97b868df9a03 100644 --- a/audio/p5-MusicBrainz-TRM/pkg-plist +++ b/audio/p5-MusicBrainz-TRM/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz/TRM.pm -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/MusicBrainz %%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz/TRM/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz/TRM/TRM.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz/TRM/TRM.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz/TRM -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MusicBrainz diff --git a/audio/p5-Net-DAAP-Client/pkg-plist b/audio/p5-Net-DAAP-Client/pkg-plist index ab646a8c09ee..fde278219a0b 100644 --- a/audio/p5-Net-DAAP-Client/pkg-plist +++ b/audio/p5-Net-DAAP-Client/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/Net/DAAP/Client.pm %%SITE_PERL%%/Net/DAAP/Client/v2.pm %%SITE_PERL%%/Net/DAAP/Client/v3.pm -@unexec rmdir %D/%%SITE_PERL%%/Net/DAAP/Client 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net/DAAP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net/DAAP/Client +@dirrmtry %%SITE_PERL%%/Net/DAAP +@dirrmtry %%SITE_PERL%%/Net diff --git a/audio/p5-Net-DAAP-DMAP/pkg-plist b/audio/p5-Net-DAAP-DMAP/pkg-plist index 7897bc3c1019..2cb6cefaeea0 100644 --- a/audio/p5-Net-DAAP-DMAP/pkg-plist +++ b/audio/p5-Net-DAAP-DMAP/pkg-plist @@ -1,3 +1,3 @@ %%SITE_PERL%%/Net/DAAP/DMAP.pm -@unexec rmdir %D/%%SITE_PERL%%/Net/DAAP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net/DAAP +@dirrmtry %%SITE_PERL%%/Net diff --git a/audio/p5-Net-FreeDB/pkg-plist b/audio/p5-Net-FreeDB/pkg-plist index 0bc547df87c1..688bbb060dd0 100644 --- a/audio/p5-Net-FreeDB/pkg-plist +++ b/audio/p5-Net-FreeDB/pkg-plist @@ -4,7 +4,7 @@ %%SITE_PERL%%/mach/auto/Net/FreeDB/FreeDB.so %%SITE_PERL%%/mach/auto/Net/FreeDB/autosplit.ix @dirrm %%SITE_PERL%%/mach/auto/Net/FreeDB -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/mach/auto 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/mach/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/mach 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/mach/auto/Net +@dirrmtry %%SITE_PERL%%/mach/auto +@dirrmtry %%SITE_PERL%%/mach/Net +@dirrmtry %%SITE_PERL%%/mach diff --git a/audio/p5-Ogg-Vorbis-Header/pkg-plist b/audio/p5-Ogg-Vorbis-Header/pkg-plist index 3c69a9c98a75..89d27de39b49 100644 --- a/audio/p5-Ogg-Vorbis-Header/pkg-plist +++ b/audio/p5-Ogg-Vorbis-Header/pkg-plist @@ -3,7 +3,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/Header/Header.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/Header/Header.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis/Header -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Ogg/Vorbis 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Ogg 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg/Vorbis +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ogg +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Ogg/Vorbis +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Ogg diff --git a/audio/p5-Shout/pkg-plist b/audio/p5-Shout/pkg-plist index 6e4d1d631857..5f842ede2d8c 100644 --- a/audio/p5-Shout/pkg-plist +++ b/audio/p5-Shout/pkg-plist @@ -9,4 +9,4 @@ %%PORTDOCS%%%%DOCSDIR%%/example2.pl %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Shout -@unexec rmdir %D/%%SITE_PERL%%/mach 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/mach diff --git a/audio/sdl_sound/pkg-plist b/audio/sdl_sound/pkg-plist index 48c4f54305c5..6bd0edf116c7 100644 --- a/audio/sdl_sound/pkg-plist +++ b/audio/sdl_sound/pkg-plist @@ -3,4 +3,4 @@ include/SDL11/SDL_sound.h lib/libSDL_sound-1.0.so.1 lib/libSDL_sound.a lib/libSDL_sound.so -@unexec rmdir %D/include/SDL11 2>/dev/null || true +@dirrmtry include/SDL11 diff --git a/audio/taglib/pkg-plist b/audio/taglib/pkg-plist index 6338b18c280e..2e8f4b87f41c 100644 --- a/audio/taglib/pkg-plist +++ b/audio/taglib/pkg-plist @@ -54,4 +54,4 @@ lib/libtag_c.la lib/libtag_c.so lib/libtag_c.so.0 @dirrm include/taglib -@unexec rmdir %D/lib/pkgconfig 2>/dev/null || true +@dirrmtry lib/pkgconfig diff --git a/audio/timidity++/pkg-plist b/audio/timidity++/pkg-plist index dfafbc80c6ca..08abdc451464 100644 --- a/audio/timidity++/pkg-plist +++ b/audio/timidity++/pkg-plist @@ -13,5 +13,5 @@ bin/timidity %%PORTDOCS%%@dirrm %%DOCSDIR%% @exec mkdir -p %D/%%TIMID_LIBDIR%% @exec mkdir -p %D/share/timidity -@unexec rmdir %D/%%TIMID_LIBDIR%% 2>/dev/null || true -@unexec rmdir %D/share/timidity 2>/dev/null || true +@dirrmtry %%TIMID_LIBDIR%% +@dirrmtry share/timidity diff --git a/audio/xfce4-mixer/pkg-plist b/audio/xfce4-mixer/pkg-plist index b7edd9626980..24cb0dd0a22a 100644 --- a/audio/xfce4-mixer/pkg-plist +++ b/audio/xfce4-mixer/pkg-plist @@ -54,13 +54,13 @@ share/locale/uk/LC_MESSAGES/xfce4-mixer.mo share/locale/vi/LC_MESSAGES/xfce4-mixer.mo share/locale/zh_CN/LC_MESSAGES/xfce4-mixer.mo share/locale/zh_TW/LC_MESSAGES/xfce4-mixer.mo -@unexec rmdir %D/lib/xfce4/modules 2>/dev/null || true -@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true -@unexec rmdir %D/lib/xfce4 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/locale/nb_NO/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/nb_NO 2>/dev/null || true +@dirrmtry lib/xfce4/modules +@dirrmtry lib/xfce4/mcs-plugins +@dirrmtry lib/xfce4/panel-plugins +@dirrmtry lib/xfce4 +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/nb_NO/LC_MESSAGES +@dirrmtry share/locale/nb_NO