diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2006-01-22 03:01:03 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2006-01-22 03:01:03 +0000 |
| commit | 508b8d82f4fdfc6889fe17931ef30f047501dfd6 (patch) | |
| tree | f7810d4887e5297c7b7788225e906b99c81d709b | |
| parent | 4008c7e23fe847e2c8ade0ecb5d86f943d84c917 (diff) | |
| download | ports-508b8d82f4fdfc6889fe17931ef30f047501dfd6.tar.gz ports-508b8d82f4fdfc6889fe17931ef30f047501dfd6.zip | |
Notes
1374 files changed, 4897 insertions, 4897 deletions
diff --git a/databases/p5-POE-Component-RRDTool/pkg-plist b/databases/p5-POE-Component-RRDTool/pkg-plist index ae6853c7d35f..529453770de0 100644 --- a/databases/p5-POE-Component-RRDTool/pkg-plist +++ b/databases/p5-POE-Component-RRDTool/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/RRDTool/.packlist %%SITE_PERL%%/POE/Component/RRDTool.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/RRDTool -@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/POE/Component +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component +@dirrmtry %%SITE_PERL%%/POE +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE diff --git a/net-im/amsn/pkg-plist b/net-im/amsn/pkg-plist index 807c9db29bba..12496c314412 100644 --- a/net-im/amsn/pkg-plist +++ b/net-im/amsn/pkg-plist @@ -623,14 +623,14 @@ share/icons/hicolor/64x64/aMSN_64.png share/icons/hicolor/64x64/tux-64x64.png share/icons/hicolor/96x96/aMSN_96.png share/icons/hicolor/96x96/tux-96x96.png -@unexec rmdir %D/share/icons/hicolor/96x96 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/128x128 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true -@unexec rmdir %D/share/applications 2>/dev/null || true +@dirrmtry share/icons/hicolor/96x96 +@dirrmtry share/icons/hicolor/64x64 +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor/128x128 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons +@dirrmtry share/applications @dirrm share/amsn/docs @dirrm share/amsn/icons/128x128 @dirrm share/amsn/icons/32x32 diff --git a/net-im/gaim-ignorance/pkg-plist b/net-im/gaim-ignorance/pkg-plist index 3d44d048c0ae..9c10225f4401 100644 --- a/net-im/gaim-ignorance/pkg-plist +++ b/net-im/gaim-ignorance/pkg-plist @@ -5,4 +5,4 @@ lib/gaim/ignorance.so etc/gaim/ignorance.conf.sample @exec [ -f %B/ignorance.conf ] || cp %B/%f %B/ignorance.conf @dirrm %%EXAMPLESDIR%% -@unexec rmdir %D/etc/gaim/ 2>/dev/null || true +@dirrmtry etc/gaim/ diff --git a/net-im/gaim-openq/pkg-plist b/net-im/gaim-openq/pkg-plist index 72df34e3ae3b..5e5095092eb8 100644 --- a/net-im/gaim-openq/pkg-plist +++ b/net-im/gaim-openq/pkg-plist @@ -527,5 +527,5 @@ share/gnome/pixmaps/gaim/status/default/qq_p_group_unexit.png share/gnome/pixmaps/gaim/status/default/qqshow_default.gif share/locale/zh_CN/LC_MESSAGES/openq.mo @dirrm share/gnome/pixmaps/gaim/smileys/2003iii -@unexec rmdir %D/share/gnome/doc 2> /dev/null || true -@unexec rmdir %D/share/gnome/gaim 2> /dev/null || true +@dirrmtry share/gnome/doc +@dirrmtry share/gnome/gaim diff --git a/net-im/ickle/pkg-plist b/net-im/ickle/pkg-plist index 34a72a94f0fc..b7b1b48aee2a 100644 --- a/net-im/ickle/pkg-plist +++ b/net-im/ickle/pkg-plist @@ -146,7 +146,7 @@ @dirrm %%ICKLEDATADIR%%ickle/icons/doors @dirrm %%ICKLEDATADIR%%ickle/icons @dirrm %%ICKLEDATADIR%%ickle -@unexec rmdir %D/%%ICKLEDATADIR%%applets/Network 2>/dev/null || true -@unexec rmdir %D/%%ICKLEDATADIR%%applets 2>/dev/null || true -@unexec rmdir %D/etc/CORBA/servers 2>/dev/null || true -@unexec rmdir %D/etc/CORBA 2>/dev/null || true +@dirrmtry %%ICKLEDATADIR%%applets/Network +@dirrmtry %%ICKLEDATADIR%%applets +@dirrmtry etc/CORBA/servers +@dirrmtry etc/CORBA diff --git a/net-im/jabber-pyicq/pkg-plist b/net-im/jabber-pyicq/pkg-plist index 36d835d87b1a..78c0001f850e 100644 --- a/net-im/jabber-pyicq/pkg-plist +++ b/net-im/jabber-pyicq/pkg-plist @@ -40,6 +40,6 @@ lib/jabber/pyicq/xmlconfig.py @dirrm lib/jabber/pyicq/tlib @dirrm lib/jabber/pyicq/webadmin @dirrm lib/jabber/pyicq -@unexec rmdir %D/lib/jabber 2>/dev/null || true +@dirrmtry lib/jabber @dirrm %%EXAMPLESDIR%%/etc @dirrm %%EXAMPLESDIR%% diff --git a/net-im/jabber-pymsn/pkg-plist b/net-im/jabber-pymsn/pkg-plist index 144efe30f491..63ba883d1de6 100644 --- a/net-im/jabber-pymsn/pkg-plist +++ b/net-im/jabber-pymsn/pkg-plist @@ -47,6 +47,6 @@ lib/jabber/pymsn/xmlconfig.py @dirrm lib/jabber/pymsn/legacy @dirrm lib/jabber/pymsn/baseproto @dirrm lib/jabber/pymsn -@unexec rmdir %D/lib/jabber 2>/dev/null || true +@dirrmtry lib/jabber @dirrm %%EXAMPLESDIR%%/etc @dirrm %%EXAMPLESDIR%% diff --git a/net-im/jabber-users-agent/pkg-plist b/net-im/jabber-users-agent/pkg-plist index 7e8e8052a252..68b7279ddd30 100644 --- a/net-im/jabber-users-agent/pkg-plist +++ b/net-im/jabber-users-agent/pkg-plist @@ -2,7 +2,7 @@ lib/jabber/users-agent/createDB lib/jabber/users-agent/users-agent @dirrm lib/jabber/users-agent -@unexec rmdir %D/lib/jabber 2>/dev/null || true +@dirrmtry lib/jabber @unexec if cmp -s %D/etc/jabber-users-agent.xml %D/etc/jabber-users-agent.xml.sample; then rm -f %D/etc/jabber-users-agent.xml; fi etc/jabber-users-agent.xml.sample @exec [ -f %B/jabber-users-agent.xml ] || cp %B/%f %B/jabber-users-agent.xml diff --git a/net-im/jabberd/pkg-plist b/net-im/jabberd/pkg-plist index 1deafcfe4e18..28009d733bfa 100644 --- a/net-im/jabberd/pkg-plist +++ b/net-im/jabberd/pkg-plist @@ -24,5 +24,5 @@ etc/jabberd/templates/roster.xml.dist %%DATADIR%%/db-setup.mysql %%DATADIR%%/db-setup.pgsql @dirrm %%DATADIR%% -@unexec rmdir %D/etc/jabberd/templates 2> /dev/null || true -@unexec rmdir %D/etc/jabberd 2> /dev/null || true +@dirrmtry etc/jabberd/templates +@dirrmtry etc/jabberd diff --git a/net-im/jit/pkg-plist b/net-im/jit/pkg-plist index 81557808af4d..693be2c4abf9 100644 --- a/net-im/jit/pkg-plist +++ b/net-im/jit/pkg-plist @@ -4,4 +4,4 @@ sbin/jit etc/jabber-icq.example etc/rc.d/jit.sh @dirrm lib/jabber/jit -@unexec rmdir %D/lib/jabber 2>/dev/null || true +@dirrmtry lib/jabber diff --git a/net-im/jwchat/pkg-plist b/net-im/jwchat/pkg-plist index 1770dddf84ac..1e3c86d76a37 100644 --- a/net-im/jwchat/pkg-plist +++ b/net-im/jwchat/pkg-plist @@ -776,5 +776,5 @@ @dirrm %%WWW_ROOT%%/jwchat/images/emoticons @dirrm %%WWW_ROOT%%/jwchat/images/CVS @dirrm %%WWW_ROOT%%/jwchat/images -@unexec rmdir %D/%%WWW_ROOT%%/jwchat 2> /dev/null || true +@dirrmtry %%WWW_ROOT%%/jwchat @dirrm %%DATADIR%% diff --git a/net-im/kf/pkg-plist b/net-im/kf/pkg-plist index 6fd57fe6f08b..cff918b19250 100644 --- a/net-im/kf/pkg-plist +++ b/net-im/kf/pkg-plist @@ -126,4 +126,4 @@ share/locale/ru/LC_MESSAGES/kf.mo share/pixmaps/kf.png @dirrm %%DATADIR%%/emoticons @dirrm %%DATADIR%% -@unexec rmdir %D/share/applications 2> /dev/null || true +@dirrmtry share/applications diff --git a/net-im/kmerlin/pkg-plist b/net-im/kmerlin/pkg-plist index e84a3b08f46b..5f65c2c4d079 100644 --- a/net-im/kmerlin/pkg-plist +++ b/net-im/kmerlin/pkg-plist @@ -81,10 +81,10 @@ share/locale/zh-TW/LC_MESSAGES/kmerlin.mo share/icons/locolor/32x32/apps/kmerlin.png share/icons/locolor/16x16/apps/kmerlin.png share/applnk/Internet/kmerlin.desktop -@unexec rmdir %D/share/locale/zh-CN/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zh-CN 2> /dev/null || true -@unexec rmdir %D/share/locale/zh-TW/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zh-TW 2> /dev/null || true +@dirrmtry share/locale/zh-CN/LC_MESSAGES +@dirrmtry share/locale/zh-CN +@dirrmtry share/locale/zh-TW/LC_MESSAGES +@dirrmtry share/locale/zh-TW @dirrm share/doc/HTML/en/kmerlin @dirrm share/apps/kmerlin/icons/hicolor/16x16/actions @dirrm share/apps/kmerlin/icons/hicolor/16x16 diff --git a/net-im/ocaml-jabbr/pkg-plist b/net-im/ocaml-jabbr/pkg-plist index ad02d0cd737d..463924383cdf 100644 --- a/net-im/ocaml-jabbr/pkg-plist +++ b/net-im/ocaml-jabbr/pkg-plist @@ -51,4 +51,4 @@ lib/ocaml/xmlstream.cmi %%PORTDOCS%%share/doc/jabbr/type_Xmlstream.xml_stream_reader.html %%PORTDOCS%%share/doc/jabbr/type_Xmlstream.xml_stream_writer.html %%PORTDOCS%%@dirrm share/doc/jabbr -@unexec rmdir %D/lib/ocaml 2>/dev/null || true +@dirrmtry lib/ocaml diff --git a/net-im/p5-Net-AIM/pkg-plist b/net-im/p5-Net-AIM/pkg-plist index 3bb9b194db29..132ee470a8d9 100644 --- a/net-im/p5-Net-AIM/pkg-plist +++ b/net-im/p5-Net-AIM/pkg-plist @@ -3,6 +3,6 @@ %%SITE_PERL%%/Net/AIM/Event.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AIM/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AIM -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net @dirrm %%SITE_PERL%%/Net/AIM -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net diff --git a/net-im/p5-Net-AOLIM/pkg-plist b/net-im/p5-Net-AOLIM/pkg-plist index a77414bb513f..d4019bd116ac 100644 --- a/net-im/p5-Net-AOLIM/pkg-plist +++ b/net-im/p5-Net-AOLIM/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/Net/AOLIM.pm %%SITE_PERL%%/Net/example.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AOLIM/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/AOLIM -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net diff --git a/net-im/p5-Net-ICQ2000/pkg-plist b/net-im/p5-Net-ICQ2000/pkg-plist index c12fde127c95..778a72f302c9 100644 --- a/net-im/p5-Net-ICQ2000/pkg-plist +++ b/net-im/p5-Net-ICQ2000/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Net/ICQ2000.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ICQ2000/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ICQ2000 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2> /dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2> /dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net-im/p5-Net-Jabber/pkg-plist b/net-im/p5-Net-Jabber/pkg-plist index 5a7bd0993fd5..66a33988b5d1 100644 --- a/net-im/p5-Net-Jabber/pkg-plist +++ b/net-im/p5-Net-Jabber/pkg-plist @@ -21,5 +21,5 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Jabber @dirrm %%SITE_PERL%%/Net/Jabber/Dialback @dirrm %%SITE_PERL%%/Net/Jabber -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net diff --git a/net-im/p5-Net-MSN/pkg-plist b/net-im/p5-Net-MSN/pkg-plist index 09913d0e3076..4752afc02b75 100644 --- a/net-im/p5-Net-MSN/pkg-plist +++ b/net-im/p5-Net-MSN/pkg-plist @@ -7,7 +7,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/MSN/.packlist @dirrm %%SITE_PERL%%/Net/MSN @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/MSN -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/MSN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net/MSN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/MSN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net/MSN +@dirrmtry %%SITE_PERL%%/Net diff --git a/net-im/p5-Net-NetSend/pkg-plist b/net-im/p5-Net-NetSend/pkg-plist index 7c3ad6a92ac4..1b8922cddcb7 100644 --- a/net-im/p5-Net-NetSend/pkg-plist +++ b/net-im/p5-Net-NetSend/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Net/NetSend.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/NetSend/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/NetSend -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net-im/p5-Net-OSCAR/pkg-plist b/net-im/p5-Net-OSCAR/pkg-plist index b2fc025b73a9..0924568a91f0 100644 --- a/net-im/p5-Net-OSCAR/pkg-plist +++ b/net-im/p5-Net-OSCAR/pkg-plist @@ -18,4 +18,4 @@ @dirrm %%SITE_PERL%%/Net/OSCAR/XML @dirrm %%SITE_PERL%%/Net/OSCAR/Connection @dirrm %%SITE_PERL%%/Net/OSCAR -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net diff --git a/net-im/p5-Net-XMPP/pkg-plist b/net-im/p5-Net-XMPP/pkg-plist index ac6e30beec51..f010ca234798 100644 --- a/net-im/p5-Net-XMPP/pkg-plist +++ b/net-im/p5-Net-XMPP/pkg-plist @@ -13,6 +13,6 @@ %%SITE_PERL%%/Net/XMPP/Stanza.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/XMPP/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/XMPP -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/mach/auto/Net @dirrm %%SITE_PERL%%/Net/XMPP -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net diff --git a/net-im/sim-im/pkg-plist b/net-im/sim-im/pkg-plist index 4555cb2b01a5..6bcdfbcf88f7 100644 --- a/net-im/sim-im/pkg-plist +++ b/net-im/sim-im/pkg-plist @@ -107,36 +107,36 @@ share/locale/uk/LC_MESSAGES/sim.mo share/locale/zh_TW/LC_MESSAGES/sim.mo share/mimelnk/application/x-icq.desktop share/services/simctrl.desktop -@unexec rmdir %D/share/services 2>/dev/null || true -@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true -@unexec rmdir %D/share/mimelnk 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/22x22/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/22x22 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/22x22 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 -@unexec rmdir %D/share/locale/sw/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/sw 2> /dev/null || true +@dirrmtry share/services +@dirrmtry share/mimelnk/application +@dirrmtry share/mimelnk +@dirrmtry share/icons/locolor/32x32/apps +@dirrmtry share/icons/locolor/32x32 +@dirrmtry share/icons/locolor/22x22/apps +@dirrmtry share/icons/locolor/22x22 +@dirrmtry share/icons/locolor/16x16/apps +@dirrmtry share/icons/locolor/16x16 +@dirrmtry share/icons/locolor +@dirrmtry share/icons/hicolor/64x64/apps +@dirrmtry share/icons/hicolor/64x64 +@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/22x22/apps +@dirrmtry share/icons/hicolor/22x22 +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons +@dirrmtry share/locale/sw/LC_MESSAGES +@dirrmtry share/locale/sw @dirrm share/apps/sim/styles @dirrm share/apps/sim/sounds @dirrm share/apps/sim/pict @dirrm share/apps/sim -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Internet 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/apps +@dirrmtry share/applnk/Internet +@dirrmtry share/applnk @dirrm lib/sim -@unexec rmdir %D/lib/menu 2>/dev/null || true +@dirrmtry lib/menu diff --git a/net-im/simicq/pkg-plist b/net-im/simicq/pkg-plist index 4555cb2b01a5..6bcdfbcf88f7 100644 --- a/net-im/simicq/pkg-plist +++ b/net-im/simicq/pkg-plist @@ -107,36 +107,36 @@ share/locale/uk/LC_MESSAGES/sim.mo share/locale/zh_TW/LC_MESSAGES/sim.mo share/mimelnk/application/x-icq.desktop share/services/simctrl.desktop -@unexec rmdir %D/share/services 2>/dev/null || true -@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true -@unexec rmdir %D/share/mimelnk 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/22x22/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/22x22 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/22x22 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 -@unexec rmdir %D/share/locale/sw/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/sw 2> /dev/null || true +@dirrmtry share/services +@dirrmtry share/mimelnk/application +@dirrmtry share/mimelnk +@dirrmtry share/icons/locolor/32x32/apps +@dirrmtry share/icons/locolor/32x32 +@dirrmtry share/icons/locolor/22x22/apps +@dirrmtry share/icons/locolor/22x22 +@dirrmtry share/icons/locolor/16x16/apps +@dirrmtry share/icons/locolor/16x16 +@dirrmtry share/icons/locolor +@dirrmtry share/icons/hicolor/64x64/apps +@dirrmtry share/icons/hicolor/64x64 +@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/22x22/apps +@dirrmtry share/icons/hicolor/22x22 +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons +@dirrmtry share/locale/sw/LC_MESSAGES +@dirrmtry share/locale/sw @dirrm share/apps/sim/styles @dirrm share/apps/sim/sounds @dirrm share/apps/sim/pict @dirrm share/apps/sim -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Internet 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/apps +@dirrmtry share/applnk/Internet +@dirrmtry share/applnk @dirrm lib/sim -@unexec rmdir %D/lib/menu 2>/dev/null || true +@dirrmtry lib/menu diff --git a/net-im/vicq/pkg-plist b/net-im/vicq/pkg-plist index b8b31b16b64b..328a1adc517b 100644 --- a/net-im/vicq/pkg-plist +++ b/net-im/vicq/pkg-plist @@ -4,5 +4,5 @@ bin/vicq share/examples/vicq/vicqrc.example @dirrm share/examples/vicq @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/vICQ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2> /dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2> /dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net-mgmt/bandwidthd/pkg-plist b/net-mgmt/bandwidthd/pkg-plist index ecacdc36a557..490c5e9a77b2 100644 --- a/net-mgmt/bandwidthd/pkg-plist +++ b/net-mgmt/bandwidthd/pkg-plist @@ -4,6 +4,6 @@ bandwidthd/bandwidthd bandwidthd/htdocs/legend.gif bandwidthd/htdocs/logo.gif etc/rc.d/bandwidthd.sh.sample -@unexec rmdir %D/bandwidthd/etc 2> /dev/null || true -@unexec rmdir %D/bandwidthd/htdocs 2> /dev/null || true +@dirrmtry bandwidthd/etc +@dirrmtry bandwidthd/htdocs @unexec rmdir %D/bandwidthd 2> /dev/null || echo "If you do not plan on reinstalling bandwidthd, you can safely remove %D/bandwidthd" diff --git a/net-mgmt/bpft/pkg-plist b/net-mgmt/bpft/pkg-plist index d91739088830..66e9b0b1d808 100644 --- a/net-mgmt/bpft/pkg-plist +++ b/net-mgmt/bpft/pkg-plist @@ -10,6 +10,6 @@ etc/rc.d/trafd.sh etc/traflog.format %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/WhatsNew -@unexec rmdir %D/var/bpft 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true +@dirrmtry var/bpft +@dirrmtry var %%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/net-mgmt/check_snmp_pkgvuln/pkg-plist b/net-mgmt/check_snmp_pkgvuln/pkg-plist index f17dd8c006b8..515c1fd26d40 100644 --- a/net-mgmt/check_snmp_pkgvuln/pkg-plist +++ b/net-mgmt/check_snmp_pkgvuln/pkg-plist @@ -1,2 +1,2 @@ %%NAGIOS_PLUGIN_DIR%%/check_snmp_pkgvuln -@unexec rmdir %D/%%NAGIOS_PLUGIN_DIR%% 2>/dev/null || true +@dirrmtry %%NAGIOS_PLUGIN_DIR%% diff --git a/net-mgmt/flowscan/pkg-plist b/net-mgmt/flowscan/pkg-plist index f7cc316fe16f..9f65ba96a377 100644 --- a/net-mgmt/flowscan/pkg-plist +++ b/net-mgmt/flowscan/pkg-plist @@ -26,6 +26,6 @@ share/doc/flowscan/flowscan.sample @dirrm var/db/flows/graphs @dirrm var/db/flows/bin @dirrm var/db/flows -@unexec rmdir %D/var/db 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true +@dirrmtry var/db +@dirrmtry var @dirrm share/doc/flowscan diff --git a/net-mgmt/ifgraph/pkg-plist b/net-mgmt/ifgraph/pkg-plist index 9f7fc5035436..5be709646661 100644 --- a/net-mgmt/ifgraph/pkg-plist +++ b/net-mgmt/ifgraph/pkg-plist @@ -23,9 +23,9 @@ ifgraph/templates/pt-br/main-trailer.html @dirrm ifgraph/templates/pt-br/ @dirrm ifgraph/templates @dirrm ifgraph/htdocs -@unexec rmdir %D/ifgraph 2>/dev/null || true -@unexec rmdir %D/var/ifgraph 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true +@dirrmtry ifgraph +@dirrmtry var/ifgraph +@dirrmtry var %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG %%PORTDOCS%%%%DOCSDIR%%/INSTALACAO %%PORTDOCS%%%%DOCSDIR%%/INSTALL diff --git a/net-mgmt/iog/pkg-plist b/net-mgmt/iog/pkg-plist index 599f74e62128..01aba84a50f6 100644 --- a/net-mgmt/iog/pkg-plist +++ b/net-mgmt/iog/pkg-plist @@ -11,5 +11,5 @@ iog/iog-%%VERSION%%/iog.cfg.sample iog/iog-%%VERSION%%/ioglogo.gif iog/iog-%%VERSION%%/out.gif iog/iog -@unexec rmdir %D/iog/iog-%%VERSION%% 2>/dev/null || true -@unexec rmdir %D/iog 2>/dev/null || true +@dirrmtry iog/iog-%%VERSION%% +@dirrmtry iog diff --git a/net-mgmt/nagios-plugins/pkg-plist b/net-mgmt/nagios-plugins/pkg-plist index 6799bcdf7a02..3b39940b97d0 100644 --- a/net-mgmt/nagios-plugins/pkg-plist +++ b/net-mgmt/nagios-plugins/pkg-plist @@ -61,7 +61,7 @@ libexec/nagios/negate libexec/nagios/urlize libexec/nagios/utils.pm libexec/nagios/utils.sh -@unexec rmdir %D/libexec/nagios 2>/dev/null || true +@dirrmtry libexec/nagios share/nagios/locale/de/LC_MESSAGES/nagios-plugins.mo share/nagios/locale/fr/LC_MESSAGES/nagios-plugins.mo @dirrm share/nagios/locale/de/LC_MESSAGES @@ -69,4 +69,4 @@ share/nagios/locale/fr/LC_MESSAGES/nagios-plugins.mo @dirrm share/nagios/locale/de @dirrm share/nagios/locale/fr @dirrm share/nagios/locale -@unexec rmdir %D/share/nagios 2>/dev/null || true +@dirrmtry share/nagios diff --git a/net-mgmt/nagios-silfreed-plugins/pkg-plist b/net-mgmt/nagios-silfreed-plugins/pkg-plist index 32aa4fbfd4fd..70b831d31376 100644 --- a/net-mgmt/nagios-silfreed-plugins/pkg-plist +++ b/net-mgmt/nagios-silfreed-plugins/pkg-plist @@ -12,7 +12,7 @@ libexec/nagios/gen_check_snmp_if_services %%EXPECTTOOLS%%libexec/nagios/pm3.exp %%EXPECTTOOLS%%libexec/nagios/tnt %%EXPECTTOOLS%%libexec/nagios/tnt.exp -@unexec rmdir %D/libexec/nagios 2>/dev/null || true +@dirrmtry libexec/nagios %%EXAMPLESDIR%%/services-check_snmp_if.template @dirrm %%EXAMPLESDIR%% %%PORTDOCS%%%%DOCSDIR%%/check_snmp_counter-0.5.0.README diff --git a/net-mgmt/nagios-snmp-plugins/pkg-plist b/net-mgmt/nagios-snmp-plugins/pkg-plist index 7269ac2333b0..c05e0cfbe1c4 100644 --- a/net-mgmt/nagios-snmp-plugins/pkg-plist +++ b/net-mgmt/nagios-snmp-plugins/pkg-plist @@ -1,5 +1,5 @@ libexec/nagios/check_snmp_disk libexec/nagios/check_snmp_proc -@unexec rmdir %D/libexec/nagios 2>/dev/null || true +@dirrmtry libexec/nagios %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/net-mgmt/nagios/pkg-plist b/net-mgmt/nagios/pkg-plist index 098d6696861e..f2b4d4334ddf 100644 --- a/net-mgmt/nagios/pkg-plist +++ b/net-mgmt/nagios/pkg-plist @@ -286,7 +286,7 @@ etc/nagios/resource.cfg-sample %%NAGIOSWWWDIR%%/stylesheets/summary.css %%NAGIOSWWWDIR%%/stylesheets/tac.css %%NAGIOSWWWDIR%%/stylesheets/trends.css -@unexec rmdir %D/etc/nagios 2>/dev/null || true +@dirrmtry etc/nagios @dirrm %%NAGIOSWWWDIR%%/cgi-bin @dirrm %%NAGIOSWWWDIR%%/contexthelp @dirrm %%NAGIOSWWWDIR%%/docs/images @@ -296,7 +296,7 @@ etc/nagios/resource.cfg-sample @dirrm %%NAGIOSWWWDIR%%/media @dirrm %%NAGIOSWWWDIR%%/ssi @dirrm %%NAGIOSWWWDIR%%/stylesheets -@unexec rmdir %D/%%NAGIOSWWWDIR%% 2>/dev/null || true +@dirrmtry %%NAGIOSWWWDIR%% @unexec rmdir %%NAGIOSDIR%%/archives 2>/dev/null || true @unexec rmdir %%NAGIOSDIR%%/rw 2>/dev/null || true @unexec rmdir %%NAGIOSDIR%% 2>/dev/null || true diff --git a/net-mgmt/nagios12/pkg-plist b/net-mgmt/nagios12/pkg-plist index 0da4352e5755..471ff25a1211 100644 --- a/net-mgmt/nagios12/pkg-plist +++ b/net-mgmt/nagios12/pkg-plist @@ -298,7 +298,7 @@ share/nagios/stylesheets/statusmap.css share/nagios/stylesheets/summary.css share/nagios/stylesheets/tac.css share/nagios/stylesheets/trends.css -@unexec rmdir %D/etc/nagios 2>/dev/null || true +@dirrmtry etc/nagios @dirrm share/nagios/cgi-bin @dirrm share/nagios/contexthelp @dirrm share/nagios/docs/images diff --git a/net-mgmt/nagios2/pkg-plist b/net-mgmt/nagios2/pkg-plist index 098d6696861e..f2b4d4334ddf 100644 --- a/net-mgmt/nagios2/pkg-plist +++ b/net-mgmt/nagios2/pkg-plist @@ -286,7 +286,7 @@ etc/nagios/resource.cfg-sample %%NAGIOSWWWDIR%%/stylesheets/summary.css %%NAGIOSWWWDIR%%/stylesheets/tac.css %%NAGIOSWWWDIR%%/stylesheets/trends.css -@unexec rmdir %D/etc/nagios 2>/dev/null || true +@dirrmtry etc/nagios @dirrm %%NAGIOSWWWDIR%%/cgi-bin @dirrm %%NAGIOSWWWDIR%%/contexthelp @dirrm %%NAGIOSWWWDIR%%/docs/images @@ -296,7 +296,7 @@ etc/nagios/resource.cfg-sample @dirrm %%NAGIOSWWWDIR%%/media @dirrm %%NAGIOSWWWDIR%%/ssi @dirrm %%NAGIOSWWWDIR%%/stylesheets -@unexec rmdir %D/%%NAGIOSWWWDIR%% 2>/dev/null || true +@dirrmtry %%NAGIOSWWWDIR%% @unexec rmdir %%NAGIOSDIR%%/archives 2>/dev/null || true @unexec rmdir %%NAGIOSDIR%%/rw 2>/dev/null || true @unexec rmdir %%NAGIOSDIR%% 2>/dev/null || true diff --git a/net-mgmt/nav/pkg-plist b/net-mgmt/nav/pkg-plist index fbbdcb37cee0..89bad457af25 100644 --- a/net-mgmt/nav/pkg-plist +++ b/net-mgmt/nav/pkg-plist @@ -578,12 +578,12 @@ nav/lib/python/rotater.py @exec install -d -m 0755 -o navcron -g nav %D/nav/var/rrd %D/nav/var/run %D/nav/var/pg_backup %D/nav/var/log @unexec rm %D/nav/var/log/thresholdMon.log 2>/dev/null || true @unexec rm %D/nav/var/run/*.pid 2>/dev/null || true -@unexec rmdir %D/nav/var/log/* 2>/dev/null || true -@unexec rmdir %D/nav/var/log 2>/dev/null || true -@unexec rmdir %D/nav/var/rrd 2>/dev/null || true -@unexec rmdir %D/nav/var/run 2>/dev/null || true -@unexec rmdir %D/nav/var/pg_backup 2>/dev/null || true -@unexec rmdir %D/nav/var 2>/dev/null || true +@dirrmtry nav/var/log/* +@dirrmtry nav/var/log +@dirrmtry nav/var/rrd +@dirrmtry nav/var/run +@dirrmtry nav/var/pg_backup +@dirrmtry nav/var @unexec find %D/nav/lib/python/nav -type f -name "*.pyc" -delete 2>/dev/null || true @dirrm nav/apache/tools @dirrm nav/apache/webapps @@ -675,5 +675,5 @@ nav/lib/python/rotater.py @dirrm nav/lib/python/nav @dirrm nav/lib/python @dirrm nav/lib -@unexec rmdir %D/nav 2>/dev/null || true +@dirrmtry nav @unexec echo "Some files/directories may be left in %D/nav/var." diff --git a/net-mgmt/net-snmp-devel/pkg-plist b/net-mgmt/net-snmp-devel/pkg-plist index 48a1d50bf3cb..34b9322dbe6c 100644 --- a/net-mgmt/net-snmp-devel/pkg-plist +++ b/net-mgmt/net-snmp-devel/pkg-plist @@ -404,8 +404,8 @@ sbin/snmptrapd @dirrm %%DATADIR%%/snmpconf-data/snmpd-data @dirrm %%DATADIR%%/snmpconf-data/snmp-data @dirrm %%DATADIR%%/snmpconf-data -@unexec rmdir %D/%%DATADIR%%/mibs 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true +@dirrmtry %%DATADIR%%/mibs +@dirrmtry %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store @@ -425,4 +425,4 @@ sbin/snmptrapd @dirrm include/net-snmp/library @dirrm include/net-snmp/agent @dirrm include/net-snmp -@unexec rmdir %D/etc/snmp 2>/dev/null || true +@dirrmtry etc/snmp diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist index 48a1d50bf3cb..34b9322dbe6c 100644 --- a/net-mgmt/net-snmp/pkg-plist +++ b/net-mgmt/net-snmp/pkg-plist @@ -404,8 +404,8 @@ sbin/snmptrapd @dirrm %%DATADIR%%/snmpconf-data/snmpd-data @dirrm %%DATADIR%%/snmpconf-data/snmp-data @dirrm %%DATADIR%%/snmpconf-data -@unexec rmdir %D/%%DATADIR%%/mibs 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true +@dirrmtry %%DATADIR%%/mibs +@dirrmtry %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store @@ -425,4 +425,4 @@ sbin/snmptrapd @dirrm include/net-snmp/library @dirrm include/net-snmp/agent @dirrm include/net-snmp -@unexec rmdir %D/etc/snmp 2>/dev/null || true +@dirrmtry etc/snmp diff --git a/net-mgmt/net-snmp4/pkg-plist b/net-mgmt/net-snmp4/pkg-plist index 9afa3688e2d0..75c49651f610 100644 --- a/net-mgmt/net-snmp4/pkg-plist +++ b/net-mgmt/net-snmp4/pkg-plist @@ -143,4 +143,4 @@ share/snmp/snmpconf/snmptrapd.conf/traphandle @dirrm share/snmp/snmpconf/snmpd.conf @dirrm share/snmp/snmpconf/snmptrapd.conf @dirrm share/snmp/snmpconf -@unexec rmdir %D/share/snmp 2>/dev/null || true +@dirrmtry share/snmp diff --git a/net-mgmt/net-snmp53/pkg-plist b/net-mgmt/net-snmp53/pkg-plist index 48a1d50bf3cb..34b9322dbe6c 100644 --- a/net-mgmt/net-snmp53/pkg-plist +++ b/net-mgmt/net-snmp53/pkg-plist @@ -404,8 +404,8 @@ sbin/snmptrapd @dirrm %%DATADIR%%/snmpconf-data/snmpd-data @dirrm %%DATADIR%%/snmpconf-data/snmp-data @dirrm %%DATADIR%%/snmpconf-data -@unexec rmdir %D/%%DATADIR%%/mibs 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true +@dirrmtry %%DATADIR%%/mibs +@dirrmtry %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SNMP %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetSNMP/default_store @@ -425,4 +425,4 @@ sbin/snmptrapd @dirrm include/net-snmp/library @dirrm include/net-snmp/agent @dirrm include/net-snmp -@unexec rmdir %D/etc/snmp 2>/dev/null || true +@dirrmtry etc/snmp diff --git a/net-mgmt/netsaint/pkg-plist b/net-mgmt/netsaint/pkg-plist index 577913c6eba7..5aa3f5f888c3 100644 --- a/net-mgmt/netsaint/pkg-plist +++ b/net-mgmt/netsaint/pkg-plist @@ -280,7 +280,7 @@ share/netsaint/stylesheets/status.css share/netsaint/stylesheets/statusmap.css share/netsaint/stylesheets/tac.css share/netsaint/stylesheets/trends.css -@unexec rmdir %D/etc/netsaint 2>/dev/null || true +@dirrmtry etc/netsaint @dirrm share/netsaint/docs/developer/images @dirrm share/netsaint/docs/developer @dirrm share/netsaint/docs/images @@ -291,7 +291,7 @@ share/netsaint/stylesheets/trends.css @dirrm share/netsaint/sbin @dirrm share/netsaint/stylesheets @dirrm share/netsaint -@unexec rmdir %D/var/netsaint/archives 2>/dev/null || true -@unexec rmdir %D/var/netsaint/rw 2>/dev/null || true -@unexec rmdir %D/var/netsaint 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true +@dirrmtry var/netsaint/archives +@dirrmtry var/netsaint/rw +@dirrmtry var/netsaint +@dirrmtry var diff --git a/net-mgmt/nfsen-devel/pkg-plist b/net-mgmt/nfsen-devel/pkg-plist index 8d36389bb8f1..3b824342b6b2 100644 --- a/net-mgmt/nfsen-devel/pkg-plist +++ b/net-mgmt/nfsen-devel/pkg-plist @@ -99,9 +99,9 @@ var/%%PORTNAME%%/profiles/live/profile.dat @exec mkdir -p %D/var/%%PORTNAME%%/filters @dirrm var/%%PORTNAME%%/run @dirrm var/%%PORTNAME%%/filters -@unexec rmdir %D/var/%%PORTNAME%%/profiles/live/upstream1 2>/dev/null || true -@unexec rmdir %D/var/%%PORTNAME%%/profiles/live 2>/dev/null || true -@unexec rmdir %D/var/%%PORTNAME%%/profiles 2>/dev/null || true -@unexec rmdir %D/var/%%PORTNAME%% 2>/dev/null || true +@dirrmtry var/%%PORTNAME%%/profiles/live/upstream1 +@dirrmtry var/%%PORTNAME%%/profiles/live +@dirrmtry var/%%PORTNAME%%/profiles +@dirrmtry var/%%PORTNAME%% @dirrm libexec/%%PORTNAME%%/plugins @dirrm libexec/%%PORTNAME%% diff --git a/net-mgmt/nfsen/pkg-plist b/net-mgmt/nfsen/pkg-plist index 8d36389bb8f1..3b824342b6b2 100644 --- a/net-mgmt/nfsen/pkg-plist +++ b/net-mgmt/nfsen/pkg-plist @@ -99,9 +99,9 @@ var/%%PORTNAME%%/profiles/live/profile.dat @exec mkdir -p %D/var/%%PORTNAME%%/filters @dirrm var/%%PORTNAME%%/run @dirrm var/%%PORTNAME%%/filters -@unexec rmdir %D/var/%%PORTNAME%%/profiles/live/upstream1 2>/dev/null || true -@unexec rmdir %D/var/%%PORTNAME%%/profiles/live 2>/dev/null || true -@unexec rmdir %D/var/%%PORTNAME%%/profiles 2>/dev/null || true -@unexec rmdir %D/var/%%PORTNAME%% 2>/dev/null || true +@dirrmtry var/%%PORTNAME%%/profiles/live/upstream1 +@dirrmtry var/%%PORTNAME%%/profiles/live +@dirrmtry var/%%PORTNAME%%/profiles +@dirrmtry var/%%PORTNAME%% @dirrm libexec/%%PORTNAME%%/plugins @dirrm libexec/%%PORTNAME%% diff --git a/net-mgmt/ng_ipacct/pkg-plist b/net-mgmt/ng_ipacct/pkg-plist index 5e24ce8b1465..1c1bb2cc8b04 100644 --- a/net-mgmt/ng_ipacct/pkg-plist +++ b/net-mgmt/ng_ipacct/pkg-plist @@ -1,6 +1,6 @@ include/netgraph/ng_ipacct.h etc/ng_ipacct.conf sbin/ipacctctl -@unexec rmdir %D/include/netgraph 2>/dev/null || true +@dirrmtry include/netgraph @cwd / %%KMODDIR%%/ng_ipacct.ko diff --git a/net-mgmt/nrpep/pkg-plist b/net-mgmt/nrpep/pkg-plist index f480a40ce910..ab66806f93bc 100644 --- a/net-mgmt/nrpep/pkg-plist +++ b/net-mgmt/nrpep/pkg-plist @@ -4,5 +4,5 @@ libexec/netsaint/check_nrpep etc/netsaint/check_nrpep.cfg share/doc/nrpep/README @dirrm share/doc/nrpep -@unexec rmdir %D/libexec/netsaint 2>/dev/null || true -@unexec rmdir %D/etc/netsaint 2>/dev/null || true +@dirrmtry libexec/netsaint +@dirrmtry etc/netsaint diff --git a/net-mgmt/p5-NSNMP/pkg-plist b/net-mgmt/p5-NSNMP/pkg-plist index 35eaf7af1611..dd3e4ef5f214 100644 --- a/net-mgmt/p5-NSNMP/pkg-plist +++ b/net-mgmt/p5-NSNMP/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/NSNMP/Mapper.pm %%SITE_PERL%%/NSNMP/Simple.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NSNMP/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/NSNMP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/NSNMP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NSNMP +@dirrmtry %%SITE_PERL%%/NSNMP diff --git a/net-mgmt/p5-Net-CIDR/pkg-plist b/net-mgmt/p5-Net-CIDR/pkg-plist index cb70ad77e5a0..9948997b2120 100644 --- a/net-mgmt/p5-Net-CIDR/pkg-plist +++ b/net-mgmt/p5-Net-CIDR/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Net/CIDR.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net-mgmt/p5-Net-IP/pkg-plist b/net-mgmt/p5-Net-IP/pkg-plist index 2845219738ab..216c811f7ba3 100644 --- a/net-mgmt/p5-Net-IP/pkg-plist +++ b/net-mgmt/p5-Net-IP/pkg-plist @@ -2,6 +2,6 @@ bin/iptab bin/ipcount %%SITE_PERL%%/Net/IP.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net diff --git a/net-mgmt/p5-Net-IPv4Addr/pkg-plist b/net-mgmt/p5-Net-IPv4Addr/pkg-plist index 44e353284e09..e318a3dd047f 100644 --- a/net-mgmt/p5-Net-IPv4Addr/pkg-plist +++ b/net-mgmt/p5-Net-IPv4Addr/pkg-plist @@ -4,6 +4,6 @@ bin/ipv4calc %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv4Addr/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv4Addr @dirrm %%SITE_PERL%%/auto/Net/IPv4Addr -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net-mgmt/p5-Net-IPv6Addr/pkg-plist b/net-mgmt/p5-Net-IPv6Addr/pkg-plist index a572beffdd37..1d0cf77ed40c 100644 --- a/net-mgmt/p5-Net-IPv6Addr/pkg-plist +++ b/net-mgmt/p5-Net-IPv6Addr/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Net/IPv6Addr.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv6Addr/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/IPv6Addr -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net-mgmt/p5-Net-Netmask/pkg-plist b/net-mgmt/p5-Net-Netmask/pkg-plist index 99bfc80a6892..e7967d6f58de 100644 --- a/net-mgmt/p5-Net-Netmask/pkg-plist +++ b/net-mgmt/p5-Net-Netmask/pkg-plist @@ -2,5 +2,5 @@ %%SITE_PERL%%/Net/Netmask.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Netmask/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Netmask -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net-mgmt/p5-Net-SNMP/pkg-plist b/net-mgmt/p5-Net-SNMP/pkg-plist index 8150f3eff2b8..68dae4d4af92 100644 --- a/net-mgmt/p5-Net-SNMP/pkg-plist +++ b/net-mgmt/p5-Net-SNMP/pkg-plist @@ -14,8 +14,8 @@ bin/snmpkey %%SITE_PERL%%/Net/SNMP/Transport/UDP6.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNMP/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNMP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net @dirrm %%SITE_PERL%%/Net/SNMP/Transport @dirrm %%SITE_PERL%%/Net/SNMP/Security @dirrm %%SITE_PERL%%/Net/SNMP -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net diff --git a/net-mgmt/p5-Net-SNMP3/pkg-plist b/net-mgmt/p5-Net-SNMP3/pkg-plist index a78720eea4eb..57d20de75059 100644 --- a/net-mgmt/p5-Net-SNMP3/pkg-plist +++ b/net-mgmt/p5-Net-SNMP3/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/Net/SNMP.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNMP/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNMP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net-mgmt/p5-POE-Component-SNMP/pkg-plist b/net-mgmt/p5-POE-Component-SNMP/pkg-plist index 3585d42a87f2..b6bc259f77b6 100644 --- a/net-mgmt/p5-POE-Component-SNMP/pkg-plist +++ b/net-mgmt/p5-POE-Component-SNMP/pkg-plist @@ -2,8 +2,8 @@ %%SITE_PERL%%/POE/Component/SNMP.pm %%SITE_PERL%%/POE/Component/SNMP/Dispatcher.pm @dirrm %%SITE_PERL%%/POE/Component/SNMP -@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/POE/Component +@dirrmtry %%SITE_PERL%%/POE @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/SNMP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE diff --git a/net-mgmt/p5-SNMP-MIB-Compiler/pkg-plist b/net-mgmt/p5-SNMP-MIB-Compiler/pkg-plist index b8538a087372..7d754ba6d348 100644 --- a/net-mgmt/p5-SNMP-MIB-Compiler/pkg-plist +++ b/net-mgmt/p5-SNMP-MIB-Compiler/pkg-plist @@ -10,4 +10,4 @@ bin/mibcompiler @dirrm %%SITE_PERL%%/SNMP @dirrm %%SITE_PERL%%/Bundle/SNMP/MIB @dirrm %%SITE_PERL%%/Bundle/SNMP -@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Bundle diff --git a/net-mgmt/p5-Telnet-Cisco/pkg-plist b/net-mgmt/p5-Telnet-Cisco/pkg-plist index a47cbba36307..1efc6f4ad99e 100644 --- a/net-mgmt/p5-Telnet-Cisco/pkg-plist +++ b/net-mgmt/p5-Telnet-Cisco/pkg-plist @@ -2,10 +2,10 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco/.packlist %%SITE_PERL%%/auto/Net/Telnet/Cisco/autosplit.ix @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/Cisco -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net/Telnet 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/auto/Net/Telnet/Cisco 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/auto/Net/Telnet 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net/Telnet +@dirrmtry %%SITE_PERL%%/Net +@dirrmtry %%SITE_PERL%%/auto/Net/Telnet/Cisco +@dirrmtry %%SITE_PERL%%/auto/Net/Telnet +@dirrmtry %%SITE_PERL%%/auto/Net diff --git a/net-mgmt/p5-Tie-NetAddr-IP/pkg-plist b/net-mgmt/p5-Tie-NetAddr-IP/pkg-plist index 4e9c26fc9341..120c772bad33 100644 --- a/net-mgmt/p5-Tie-NetAddr-IP/pkg-plist +++ b/net-mgmt/p5-Tie-NetAddr-IP/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/NetAddr/IP/.packlist %%SITE_PERL%%/Tie/NetAddr/IP.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/NetAddr/IP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/NetAddr 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Tie/NetAddr 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/NetAddr +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie +@dirrmtry %%SITE_PERL%%/Tie/NetAddr +@dirrmtry %%SITE_PERL%%/Tie diff --git a/net-mgmt/pancho/pkg-plist b/net-mgmt/pancho/pkg-plist index 857919ea67bd..bd86cf06fd9a 100644 --- a/net-mgmt/pancho/pkg-plist +++ b/net-mgmt/pancho/pkg-plist @@ -14,9 +14,9 @@ etc/pancho.conf.sample %%SITE_PERL%%/Pancho/Plugins/Baystack.pm %%SITE_PERL%%/Pancho/Plugins/Passport.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pancho/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Pancho/Plugins 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Pancho 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pancho 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Pancho/Plugins +@dirrmtry %%SITE_PERL%%/Pancho +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pancho %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.plugins %%PORTDOCS%%%%DOCSDIR%%/Plugin.sample diff --git a/net-mgmt/pfpro/pkg-plist b/net-mgmt/pfpro/pkg-plist index 2c2848d0e5dc..f06014b0f4d4 100644 --- a/net-mgmt/pfpro/pkg-plist +++ b/net-mgmt/pfpro/pkg-plist @@ -12,7 +12,7 @@ share/xml/pfpro/firewall.xsd share/xsl/pfpro/001to010.xsl share/xsl/pfpro/xml2pf.xsl @dirrm share/xsl/pfpro -@unexec rmdir %D/share/xsl 2>/dev/null || true +@dirrmtry share/xsl @dirrm share/xml/pfpro @dirrm %%EXAMPLESDIR%% @dirrm %%DOCSDIR%% diff --git a/net-mgmt/rancid-devel/pkg-plist b/net-mgmt/rancid-devel/pkg-plist index 5566b9b79d16..30e9fdf886e2 100644 --- a/net-mgmt/rancid-devel/pkg-plist +++ b/net-mgmt/rancid-devel/pkg-plist @@ -1,6 +1,6 @@ @exec mkdir -p %D/var/rancid @exec chmod 775 %D/var/rancid -@unexec rmdir %D/var 2>/dev/null || true +@dirrmtry var bin/rancid-cvs bin/rancid-run libexec/rancid/alogin diff --git a/net-mgmt/rancid/pkg-plist b/net-mgmt/rancid/pkg-plist index 5566b9b79d16..30e9fdf886e2 100644 --- a/net-mgmt/rancid/pkg-plist +++ b/net-mgmt/rancid/pkg-plist @@ -1,6 +1,6 @@ @exec mkdir -p %D/var/rancid @exec chmod 775 %D/var/rancid -@unexec rmdir %D/var 2>/dev/null || true +@dirrmtry var bin/rancid-cvs bin/rancid-run libexec/rancid/alogin diff --git a/net-mgmt/smokeping/pkg-plist b/net-mgmt/smokeping/pkg-plist index c05739f99e48..564a10446dc3 100644 --- a/net-mgmt/smokeping/pkg-plist +++ b/net-mgmt/smokeping/pkg-plist @@ -145,13 +145,13 @@ smokeping/lib/Smokeping/probes/skel.pm smokeping/lib/Smokeping/Examples.pm smokeping/lib/Smokeping/RRDtools.pm smokeping/lib/Config/Grammar.pm -@unexec rmdir %D/etc/smokeping 2>/dev/null || true +@dirrmtry etc/smokeping @exec mkdir -p %D/smokeping/htdocs/img; chown www:www %D/smokeping/htdocs/img @unexec rm -rf %D/smokeping/htdocs/img 2>/dev/null || true @exec mkdir -p %D/var/smokeping @exec chown smokeping:smokeping %D/var/smokeping -@unexec rmdir %D/var/smokeping 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true +@dirrmtry var/smokeping +@dirrmtry var @dirrm smokeping/htdocs @dirrm smokeping/lib/Config @dirrm smokeping/lib/Smokeping/probes @@ -164,4 +164,4 @@ smokeping/lib/Config/Grammar.pm %%PORTDOCS%%@dirrm %%DOCSDIR%%/Smokeping %%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% -@unexec rmdir %D/smokeping 2>/dev/null || true +@dirrmtry smokeping diff --git a/net-mgmt/trafd/pkg-plist b/net-mgmt/trafd/pkg-plist index b0d384d59596..48ef0926ea94 100644 --- a/net-mgmt/trafd/pkg-plist +++ b/net-mgmt/trafd/pkg-plist @@ -13,6 +13,6 @@ etc/rc.d/trafd.sh.sample @exec mkdir %D/var 2>/dev/null || true @exec mkdir %D/var/log 2>/dev/null || true @exec mkdir %D/var/trafd 2>/dev/null || true -@unexec rmdir %D/var/trafd 2>/dev/null || true -@unexec rmdir %D/var/log 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true +@dirrmtry var/trafd +@dirrmtry var/log +@dirrmtry var diff --git a/net-p2p/amule-devel/pkg-plist b/net-p2p/amule-devel/pkg-plist index aec2e898ca9b..b579ccf62f0d 100644 --- a/net-p2p/amule-devel/pkg-plist +++ b/net-p2p/amule-devel/pkg-plist @@ -33,14 +33,14 @@ share/locale/it_CH/LC_MESSAGES/amule.mo share/locale/pt_PT/LC_MESSAGES/amule.mo share/locale/hr/LC_MESSAGES/amule.mo share/locale/sl/LC_MESSAGES/amule.mo -@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/en_US 2>/dev/null || true -@unexec rmdir %D/share/locale/et_EE/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/et_EE 2>/dev/null || true -@unexec rmdir %D/share/locale/it_CH/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/it_CH 2>/dev/null || true -@unexec rmdir %D/share/locale/ko_KR/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ko_KR 2>/dev/null || true +@dirrmtry share/locale/en_US/LC_MESSAGES +@dirrmtry share/locale/en_US +@dirrmtry share/locale/et_EE/LC_MESSAGES +@dirrmtry share/locale/et_EE +@dirrmtry share/locale/it_CH/LC_MESSAGES +@dirrmtry share/locale/it_CH +@dirrmtry share/locale/ko_KR/LC_MESSAGES +@dirrmtry share/locale/ko_KR share/gnome/doc/aMule-2.1.0/ABOUT-NLS share/gnome/doc/aMule-2.1.0/amulesig.txt share/gnome/doc/aMule-2.1.0/amule-win32.HOWTO.txt @@ -53,15 +53,15 @@ share/gnome/doc/aMule-2.1.0/README share/gnome/doc/aMule-2.1.0/TODO share/gnome/doc/aMule-2.1.0/EC_Protocol.txt share/gnome/doc/aMule-2.1.0/socks4.protocol -@unexec rmdir %D/share/gnome/doc/aMule-2.1.0 2>/dev/null || true -@unexec rmdir %D/share/gnome/doc 2>/dev/null || true +@dirrmtry share/gnome/doc/aMule-2.1.0 +@dirrmtry share/gnome/doc %%PL_CAS%%share/gnome/cas/tmp.html %%PL_CAS%%share/gnome/cas/stat.png %%PL_CAS%%@unexec rmdir %D/share/gnome/cas 2>/dev/null || true %%PL_CAS%%share/gnome/pixmaps/wxcas.xpm %%PL_ALC%%share/gnome/pixmaps/alc.xpm share/gnome/pixmaps/amule.xpm -@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true +@dirrmtry share/gnome/pixmaps %%PL_CAS%%share/gnome/applications/wxcas.desktop %%PL_ALC%%share/gnome/applications/alc.desktop share/gnome/applications/amule.desktop @@ -231,8 +231,8 @@ share/gnome/applications/amule.desktop %%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver 2>/dev/null || true %%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule 2>/dev/null || true lib/xchat/plugins/xas.pl -@unexec rmdir %D/lib/xchat/plugins 2>/dev/null || true -@unexec rmdir %D/lib/xchat 2>/dev/null || true +@dirrmtry lib/xchat/plugins +@dirrmtry lib/xchat %%PL_CAS%%bin/cas %%PL_CAS%%bin/wxcas %%PL_ALC%%bin/alc diff --git a/net-p2p/amule/pkg-plist b/net-p2p/amule/pkg-plist index aec2e898ca9b..b579ccf62f0d 100644 --- a/net-p2p/amule/pkg-plist +++ b/net-p2p/amule/pkg-plist @@ -33,14 +33,14 @@ share/locale/it_CH/LC_MESSAGES/amule.mo share/locale/pt_PT/LC_MESSAGES/amule.mo share/locale/hr/LC_MESSAGES/amule.mo share/locale/sl/LC_MESSAGES/amule.mo -@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/en_US 2>/dev/null || true -@unexec rmdir %D/share/locale/et_EE/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/et_EE 2>/dev/null || true -@unexec rmdir %D/share/locale/it_CH/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/it_CH 2>/dev/null || true -@unexec rmdir %D/share/locale/ko_KR/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ko_KR 2>/dev/null || true +@dirrmtry share/locale/en_US/LC_MESSAGES +@dirrmtry share/locale/en_US +@dirrmtry share/locale/et_EE/LC_MESSAGES +@dirrmtry share/locale/et_EE +@dirrmtry share/locale/it_CH/LC_MESSAGES +@dirrmtry share/locale/it_CH +@dirrmtry share/locale/ko_KR/LC_MESSAGES +@dirrmtry share/locale/ko_KR share/gnome/doc/aMule-2.1.0/ABOUT-NLS share/gnome/doc/aMule-2.1.0/amulesig.txt share/gnome/doc/aMule-2.1.0/amule-win32.HOWTO.txt @@ -53,15 +53,15 @@ share/gnome/doc/aMule-2.1.0/README share/gnome/doc/aMule-2.1.0/TODO share/gnome/doc/aMule-2.1.0/EC_Protocol.txt share/gnome/doc/aMule-2.1.0/socks4.protocol -@unexec rmdir %D/share/gnome/doc/aMule-2.1.0 2>/dev/null || true -@unexec rmdir %D/share/gnome/doc 2>/dev/null || true +@dirrmtry share/gnome/doc/aMule-2.1.0 +@dirrmtry share/gnome/doc %%PL_CAS%%share/gnome/cas/tmp.html %%PL_CAS%%share/gnome/cas/stat.png %%PL_CAS%%@unexec rmdir %D/share/gnome/cas 2>/dev/null || true %%PL_CAS%%share/gnome/pixmaps/wxcas.xpm %%PL_ALC%%share/gnome/pixmaps/alc.xpm share/gnome/pixmaps/amule.xpm -@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true +@dirrmtry share/gnome/pixmaps %%PL_CAS%%share/gnome/applications/wxcas.desktop %%PL_ALC%%share/gnome/applications/alc.desktop share/gnome/applications/amule.desktop @@ -231,8 +231,8 @@ share/gnome/applications/amule.desktop %%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver 2>/dev/null || true %%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule 2>/dev/null || true lib/xchat/plugins/xas.pl -@unexec rmdir %D/lib/xchat/plugins 2>/dev/null || true -@unexec rmdir %D/lib/xchat 2>/dev/null || true +@dirrmtry lib/xchat/plugins +@dirrmtry lib/xchat %%PL_CAS%%bin/cas %%PL_CAS%%bin/wxcas %%PL_ALC%%bin/alc diff --git a/net-p2p/amule1/pkg-plist b/net-p2p/amule1/pkg-plist index 72e8096fc80d..69e7a99512d6 100644 --- a/net-p2p/amule1/pkg-plist +++ b/net-p2p/amule1/pkg-plist @@ -74,8 +74,8 @@ share/locale/pl/LC_MESSAGES/amule.mo share/locale/pt_BR/LC_MESSAGES/amule.mo share/locale/ru/LC_MESSAGES/amule.mo @dirrm share/gnome/doc/aMule-1.2.8 -@unexec rmdir %D/share/gnome/doc 2>/dev/null || true -@unexec rmdir %D/share/locale/ee/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ee 2>/dev/null || true +@dirrmtry share/gnome/doc +@dirrmtry share/locale/ee/LC_MESSAGES +@dirrmtry share/locale/ee @dirrm share/gnome/amuleweb/webserver @dirrm share/gnome/amuleweb diff --git a/net-p2p/amule2/pkg-plist b/net-p2p/amule2/pkg-plist index aec2e898ca9b..b579ccf62f0d 100644 --- a/net-p2p/amule2/pkg-plist +++ b/net-p2p/amule2/pkg-plist @@ -33,14 +33,14 @@ share/locale/it_CH/LC_MESSAGES/amule.mo share/locale/pt_PT/LC_MESSAGES/amule.mo share/locale/hr/LC_MESSAGES/amule.mo share/locale/sl/LC_MESSAGES/amule.mo -@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/en_US 2>/dev/null || true -@unexec rmdir %D/share/locale/et_EE/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/et_EE 2>/dev/null || true -@unexec rmdir %D/share/locale/it_CH/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/it_CH 2>/dev/null || true -@unexec rmdir %D/share/locale/ko_KR/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ko_KR 2>/dev/null || true +@dirrmtry share/locale/en_US/LC_MESSAGES +@dirrmtry share/locale/en_US +@dirrmtry share/locale/et_EE/LC_MESSAGES +@dirrmtry share/locale/et_EE +@dirrmtry share/locale/it_CH/LC_MESSAGES +@dirrmtry share/locale/it_CH +@dirrmtry share/locale/ko_KR/LC_MESSAGES +@dirrmtry share/locale/ko_KR share/gnome/doc/aMule-2.1.0/ABOUT-NLS share/gnome/doc/aMule-2.1.0/amulesig.txt share/gnome/doc/aMule-2.1.0/amule-win32.HOWTO.txt @@ -53,15 +53,15 @@ share/gnome/doc/aMule-2.1.0/README share/gnome/doc/aMule-2.1.0/TODO share/gnome/doc/aMule-2.1.0/EC_Protocol.txt share/gnome/doc/aMule-2.1.0/socks4.protocol -@unexec rmdir %D/share/gnome/doc/aMule-2.1.0 2>/dev/null || true -@unexec rmdir %D/share/gnome/doc 2>/dev/null || true +@dirrmtry share/gnome/doc/aMule-2.1.0 +@dirrmtry share/gnome/doc %%PL_CAS%%share/gnome/cas/tmp.html %%PL_CAS%%share/gnome/cas/stat.png %%PL_CAS%%@unexec rmdir %D/share/gnome/cas 2>/dev/null || true %%PL_CAS%%share/gnome/pixmaps/wxcas.xpm %%PL_ALC%%share/gnome/pixmaps/alc.xpm share/gnome/pixmaps/amule.xpm -@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true +@dirrmtry share/gnome/pixmaps %%PL_CAS%%share/gnome/applications/wxcas.desktop %%PL_ALC%%share/gnome/applications/alc.desktop share/gnome/applications/amule.desktop @@ -231,8 +231,8 @@ share/gnome/applications/amule.desktop %%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver 2>/dev/null || true %%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule 2>/dev/null || true lib/xchat/plugins/xas.pl -@unexec rmdir %D/lib/xchat/plugins 2>/dev/null || true -@unexec rmdir %D/lib/xchat 2>/dev/null || true +@dirrmtry lib/xchat/plugins +@dirrmtry lib/xchat %%PL_CAS%%bin/cas %%PL_CAS%%bin/wxcas %%PL_ALC%%bin/alc diff --git a/net-p2p/apollon/pkg-plist b/net-p2p/apollon/pkg-plist index cc482ed5dbe9..f096221ec703 100644 --- a/net-p2p/apollon/pkg-plist +++ b/net-p2p/apollon/pkg-plist @@ -53,28 +53,28 @@ share/applnk/Applications/Apollon.desktop %%PORTDOCS%%share/doc/HTML/en/apollon/credits.docbook %%PORTDOCS%%share/doc/HTML/en/apollon/index.cache.bz2 %%PORTDOCS%%share/doc/HTML/en/apollon/common -@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pt_br/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pt_br 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 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 -@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16/actions 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/64x64/filesystems 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/64x64/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/48x48/filesystems 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/32x32/filesystems 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/22x22/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/16x16/filesystems 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/128x128/filesystems 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/128x128/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/pt_br/LC_MESSAGES +@dirrmtry share/locale/pt_br +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/nb_NO/LC_MESSAGES +@dirrmtry share/locale/nb_NO +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16/actions +@dirrmtry share/icons/crystalsvg/64x64/filesystems +@dirrmtry share/icons/crystalsvg/64x64/apps +@dirrmtry share/icons/crystalsvg/48x48/filesystems +@dirrmtry share/icons/crystalsvg/48x48/apps +@dirrmtry share/icons/crystalsvg/32x32/filesystems +@dirrmtry share/icons/crystalsvg/32x32/apps +@dirrmtry share/icons/crystalsvg/22x22/apps +@dirrmtry share/icons/crystalsvg/16x16/filesystems +@dirrmtry share/icons/crystalsvg/16x16/apps +@dirrmtry share/icons/crystalsvg/128x128/filesystems +@dirrmtry share/icons/crystalsvg/128x128/apps +@dirrmtry share/applnk/Applications %%PORTDOCS%%@unexec rmdir %D/share/doc/HTML/en/apollon %%PORTDOCS%%@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true diff --git a/net-p2p/bnbt/pkg-plist b/net-p2p/bnbt/pkg-plist index 16496f2e9a49..7d52743957b0 100644 --- a/net-p2p/bnbt/pkg-plist +++ b/net-p2p/bnbt/pkg-plist @@ -1,4 +1,4 @@ bin/bnbt @exec mkdir -p /var/log/bnbt @exec mkdir -p %D/etc/bnbt -@unexec rmdir %D/etc/bnbt 2>/dev/null || true +@dirrmtry etc/bnbt diff --git a/net-p2p/dcd/pkg-plist b/net-p2p/dcd/pkg-plist index fc4ed235eaf4..5a91762c0485 100644 --- a/net-p2p/dcd/pkg-plist +++ b/net-p2p/dcd/pkg-plist @@ -12,6 +12,6 @@ etc/dcd/dcd.welcome.default etc/dcd/nicks.allow.default @exec install -d -m 751 -o daemon -g daemon /var/log/dcd @unexec rmdir /var/log/dcd 2>/dev/null || true -@unexec rmdir %D/etc/dcd 2>/dev/null || true -@unexec rmdir %D/man/pl.ISO8859-2/man8 2>/dev/null || true -@unexec rmdir %D/man/pl.ISO8859-2 2>/dev/null || true +@dirrmtry etc/dcd +@dirrmtry man/pl.ISO8859-2/man8 +@dirrmtry man/pl.ISO8859-2 diff --git a/net-p2p/dctc-gui/pkg-plist b/net-p2p/dctc-gui/pkg-plist index 455c8cb1185d..6bccd6512052 100644 --- a/net-p2p/dctc-gui/pkg-plist +++ b/net-p2p/dctc-gui/pkg-plist @@ -28,11 +28,11 @@ share/locale/sv/LC_MESSAGES/dc_gui.mo @unexec %D/share/locale/de/LC_MESSAGES 2>/dev/null || true @unexec %D/share/locale/de 2>/dev/null || true @dirrm share/gnome/pixmaps/dc_gui -@unexec rmdir %D/share/gnome/help/dc_gui/nl/images 2>/dev/null || true +@dirrmtry share/gnome/help/dc_gui/nl/images @dirrm share/gnome/help/dc_gui/nl -@unexec rmdir %D/share/gnome/help/dc_gui/es/images 2>/dev/null || true +@dirrmtry share/gnome/help/dc_gui/es/images @dirrm share/gnome/help/dc_gui/es -@unexec rmdir %D/share/gnome/help/dc_gui/C/images 2>/dev/null || true +@dirrmtry share/gnome/help/dc_gui/C/images @dirrm share/gnome/help/dc_gui/C @dirrm share/gnome/help/dc_gui %%PORTDOCS%%@dirrm share/doc/dctc-gui diff --git a/net-p2p/gtk-gnutella/pkg-plist b/net-p2p/gtk-gnutella/pkg-plist index 6346d1147d2f..cb117c9078c4 100644 --- a/net-p2p/gtk-gnutella/pkg-plist +++ b/net-p2p/gtk-gnutella/pkg-plist @@ -50,7 +50,7 @@ share/locale/nl/LC_MESSAGES/gtk-gnutella.mo share/locale/hu/LC_MESSAGES/gtk-gnutella.mo share/locale/uk/LC_MESSAGES/gtk-gnutella.mo share/locale/zh_CN/LC_MESSAGES/gtk-gnutella.mo -@unexec rmdir %D/share/applications 2>/dev/null || true +@dirrmtry share/applications @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%%/el @dirrm %%DATADIR%%/en diff --git a/net-p2p/javadc/pkg-plist b/net-p2p/javadc/pkg-plist index 7ef9a72e99fd..306e674fde79 100644 --- a/net-p2p/javadc/pkg-plist +++ b/net-p2p/javadc/pkg-plist @@ -6,4 +6,4 @@ bin/javadc %%JAR_DIR%%/%%JAR_FILE%% @dirrm %%JAR_DIR%% %%PORTDOCS%%@dirrm share/doc/javadc -@unexec rmdir %D/share/java/jar 2>/dev/null || true +@dirrmtry share/java/jar diff --git a/net-p2p/kmldonkey/pkg-plist b/net-p2p/kmldonkey/pkg-plist index 192584d496d4..70903c3fd1d5 100644 --- a/net-p2p/kmldonkey/pkg-plist +++ b/net-p2p/kmldonkey/pkg-plist @@ -118,65 +118,65 @@ share/services/magnet.protocol share/services/mldonkey.protocol share/services/sig2dat.protocol share/servicetypes/kmldonkey_plugin.desktop -@unexec rmdir %D/share/servicetypes 2>/dev/null || true -@unexec rmdir %D/share/services/kded 2>/dev/null || true -@unexec rmdir %D/share/services 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true -@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ro 2>/dev/null || true -@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pt 2>/dev/null || true -@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/el 2>/dev/null || true -@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ca 2>/dev/null || true -@unexec rmdir %D/share/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/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/22x22/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/22x22 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/128x128/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/128x128 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/servicetypes +@dirrmtry share/services/kded +@dirrmtry share/services +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/icons/hicolor/64x64/apps +@dirrmtry share/icons/hicolor/64x64 +@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/22x22/apps +@dirrmtry share/icons/hicolor/22x22 +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor/128x128/apps +@dirrmtry share/icons/hicolor/128x128 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons @dirrm share/doc/HTML/sv/kmldonkey -@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true +@dirrmtry share/doc/HTML/sv @dirrm share/doc/HTML/ru/kmldonkey -@unexec rmdir %D/share/doc/HTML/ru 2>/dev/null || true +@dirrmtry share/doc/HTML/ru @dirrm share/doc/HTML/pt/kmldonkey -@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true +@dirrmtry share/doc/HTML/pt @dirrm share/doc/HTML/nl/kmldonkey -@unexec rmdir %D/share/doc/HTML/nl 2>/dev/null || true +@dirrmtry share/doc/HTML/nl @dirrm share/doc/HTML/it/kmldonkey -@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true +@dirrmtry share/doc/HTML/it @dirrm share/doc/HTML/et/kmldonkey -@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true +@dirrmtry share/doc/HTML/et @dirrm share/doc/HTML/en/kmldonkey-apidocs/src/html @dirrm share/doc/HTML/en/kmldonkey-apidocs/src @dirrm share/doc/HTML/en/kmldonkey-apidocs -@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true +@dirrmtry share/doc/HTML/en @dirrm share/doc/HTML/de/kmldonkey -@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML 2>/dev/null || true +@dirrmtry share/doc/HTML/de +@dirrmtry share/doc/HTML @dirrm share/apps/mldonkeyapplet/pics @dirrm share/apps/mldonkeyapplet -@unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true -@unexec rmdir %D/share/apps/konqueror 2>/dev/null || true +@dirrmtry share/apps/konqueror/servicemenus +@dirrmtry share/apps/konqueror @dirrm share/apps/kmldonkey/images/networks @dirrm share/apps/kmldonkey/images @dirrm share/apps/kmldonkey -@unexec rmdir %D/share/apps/kicker/applets 2>/dev/null || true -@unexec rmdir %D/share/apps/kicker 2>/dev/null || true -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Settings/Network 2>/dev/null || true -@unexec rmdir %D/share/applnk/Settings 2>/dev/null || true -@unexec rmdir %D/share/applnk/Internet 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true -@unexec rmdir %D/lib/kde3 2>/dev/null || true +@dirrmtry share/apps/kicker/applets +@dirrmtry share/apps/kicker +@dirrmtry share/apps +@dirrmtry share/applnk/Settings/Network +@dirrmtry share/applnk/Settings +@dirrmtry share/applnk/Internet +@dirrmtry share/applnk +@dirrmtry lib/kde3 @dirrm include/kmldonkey diff --git a/net-p2p/ktorrent-devel/pkg-plist b/net-p2p/ktorrent-devel/pkg-plist index f464420ded53..022059df4460 100644 --- a/net-p2p/ktorrent-devel/pkg-plist +++ b/net-p2p/ktorrent-devel/pkg-plist @@ -81,20 +81,20 @@ share/services/ktpartfileimportplugin.desktop share/services/ktsearchplugin.desktop share/services/ktupnpplugin.desktop share/servicetypes/ktorrentplugin.desktop -@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true -@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/uk 2>/dev/null || true -@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sr 2>/dev/null || true -@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pt 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pl 2>/dev/null || true -@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/el 2>/dev/null || true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cs 2>/dev/null || true +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs @dirrm share/apps/ktorrent/icons/hicolor/scalable/apps @dirrm share/apps/ktorrent/icons/hicolor/scalable @dirrm share/apps/ktorrent/icons/hicolor/64x64/filesystems @@ -116,4 +116,4 @@ share/servicetypes/ktorrentplugin.desktop @dirrm share/apps/ktorrent/icons/hicolor @dirrm share/apps/ktorrent/icons @dirrm share/apps/ktorrent -@unexec rmdir %D/share/applications/kde 2>/dev/null || true +@dirrmtry share/applications/kde diff --git a/net-p2p/ktorrent/pkg-plist b/net-p2p/ktorrent/pkg-plist index f464420ded53..022059df4460 100644 --- a/net-p2p/ktorrent/pkg-plist +++ b/net-p2p/ktorrent/pkg-plist @@ -81,20 +81,20 @@ share/services/ktpartfileimportplugin.desktop share/services/ktsearchplugin.desktop share/services/ktupnpplugin.desktop share/servicetypes/ktorrentplugin.desktop -@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true -@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/uk 2>/dev/null || true -@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sr 2>/dev/null || true -@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pt 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pl 2>/dev/null || true -@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/el 2>/dev/null || true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cs 2>/dev/null || true +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs @dirrm share/apps/ktorrent/icons/hicolor/scalable/apps @dirrm share/apps/ktorrent/icons/hicolor/scalable @dirrm share/apps/ktorrent/icons/hicolor/64x64/filesystems @@ -116,4 +116,4 @@ share/servicetypes/ktorrentplugin.desktop @dirrm share/apps/ktorrent/icons/hicolor @dirrm share/apps/ktorrent/icons @dirrm share/apps/ktorrent -@unexec rmdir %D/share/applications/kde 2>/dev/null || true +@dirrmtry share/applications/kde diff --git a/net-p2p/ktorrent2/pkg-plist b/net-p2p/ktorrent2/pkg-plist index f464420ded53..022059df4460 100644 --- a/net-p2p/ktorrent2/pkg-plist +++ b/net-p2p/ktorrent2/pkg-plist @@ -81,20 +81,20 @@ share/services/ktpartfileimportplugin.desktop share/services/ktsearchplugin.desktop share/services/ktupnpplugin.desktop share/servicetypes/ktorrentplugin.desktop -@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true -@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/uk 2>/dev/null || true -@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sr 2>/dev/null || true -@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pt 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pl 2>/dev/null || true -@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/el 2>/dev/null || true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cs 2>/dev/null || true +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs @dirrm share/apps/ktorrent/icons/hicolor/scalable/apps @dirrm share/apps/ktorrent/icons/hicolor/scalable @dirrm share/apps/ktorrent/icons/hicolor/64x64/filesystems @@ -116,4 +116,4 @@ share/servicetypes/ktorrentplugin.desktop @dirrm share/apps/ktorrent/icons/hicolor @dirrm share/apps/ktorrent/icons @dirrm share/apps/ktorrent -@unexec rmdir %D/share/applications/kde 2>/dev/null || true +@dirrmtry share/applications/kde diff --git a/net-p2p/liberator/pkg-plist b/net-p2p/liberator/pkg-plist index f3144e976b3c..75197217e8fb 100644 --- a/net-p2p/liberator/pkg-plist +++ b/net-p2p/liberator/pkg-plist @@ -24,4 +24,4 @@ lib/ocaml/hlfreenet.mli %%DATADIR%%/liber_mimetypes @dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/lib/ocaml 2>/dev/null || true +@dirrmtry lib/ocaml diff --git a/net-p2p/p5-pdonkey/pkg-plist b/net-p2p/p5-pdonkey/pkg-plist index be125504d81b..d14d033d72ef 100644 --- a/net-p2p/p5-pdonkey/pkg-plist +++ b/net-p2p/p5-pdonkey/pkg-plist @@ -7,5 +7,5 @@ @dirrm %%SITE_PERL%%/P2P/pDonkey %%SITE_PERL%%/%%PERL_ARCH%%/auto/P2P/pDonkey/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/P2P/pDonkey -@unexec rmdir %D/%%SITE_PERL%%/P2P 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/P2P 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/P2P +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/P2P diff --git a/net-p2p/py-bittorrent-devel/pkg-plist b/net-p2p/py-bittorrent-devel/pkg-plist index 4e772ea657c3..bcfa49a10b54 100644 --- a/net-p2p/py-bittorrent-devel/pkg-plist +++ b/net-p2p/py-bittorrent-devel/pkg-plist @@ -260,32 +260,32 @@ share/locale/zh_TW/LC_MESSAGES/bittorrent.mo %%GUI%%@dirrm share/pixmaps/BitTorrent/logo %%GUI%%@dirrm share/pixmaps/BitTorrent %%GUI%%@unexec rmdir %D/share/pixmaps 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true -@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sl 2>/dev/null || true -@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sk 2>/dev/null || true -@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ro 2>/dev/null || true -@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pt 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pl 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 -@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ko 2>/dev/null || true -@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/el 2>/dev/null || true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cs 2>/dev/null || true -@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ca 2>/dev/null || true +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nb_NO/LC_MESSAGES +@dirrmtry share/locale/nb_NO +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca @dirrm %%DATADIR%% @dirrm %%PYTHON_SITELIBDIR%%/khashmir @dirrm %%PYTHON_SITELIBDIR%%/BitTorrent -@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true -@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true +@dirrmtry %%PYTHON_SITELIBDIR%% +@dirrmtry %%PYTHON_LIBDIR%% diff --git a/net-p2p/py-bittorrent/pkg-plist b/net-p2p/py-bittorrent/pkg-plist index 7127a0489c16..f480ab4cef60 100644 --- a/net-p2p/py-bittorrent/pkg-plist +++ b/net-p2p/py-bittorrent/pkg-plist @@ -259,42 +259,42 @@ share/locale/zh_TW/LC_MESSAGES/bittorrent.mo %%GUI%%@dirrm share/pixmaps/BitTorrent/logo %%GUI%%@dirrm share/pixmaps/BitTorrent %%GUI%%@unexec rmdir %D/share/pixmaps 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true -@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/uk 2>/dev/null || true -@unexec rmdir %D/share/locale/tlh/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/tlh 2>/dev/null || true -@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sl 2>/dev/null || true -@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sk 2>/dev/null || true -@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ro 2>/dev/null || true -@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pt 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pl 2>/dev/null || true -@unexec rmdir %D/share/locale/nb_NO/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/nb_NO 2>/dev/null || true -@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ko 2>/dev/null || true -@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/hy 2>/dev/null || true -@unexec rmdir %D/share/locale/he_IL/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/he_IL 2>/dev/null || true -@unexec rmdir %D/share/locale/gr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/gr 2>/dev/null || true -@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/fi 2>/dev/null || true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cs 2>/dev/null || true -@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ca 2>/dev/null || true +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/tlh/LC_MESSAGES +@dirrmtry share/locale/tlh +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nb_NO/LC_MESSAGES +@dirrmtry share/locale/nb_NO +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy +@dirrmtry share/locale/he_IL/LC_MESSAGES +@dirrmtry share/locale/he_IL +@dirrmtry share/locale/gr/LC_MESSAGES +@dirrmtry share/locale/gr +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca @dirrm %%DATADIR%% @dirrm %%PYTHON_SITELIBDIR%%/khashmir @dirrm %%PYTHON_SITELIBDIR%%/BitTorrent -@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true -@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true +@dirrmtry %%PYTHON_SITELIBDIR%% +@dirrmtry %%PYTHON_LIBDIR%% diff --git a/net-p2p/py-kenosis-bittorrent/pkg-plist b/net-p2p/py-kenosis-bittorrent/pkg-plist index 1976e19b5c6f..66bdeaf54f65 100644 --- a/net-p2p/py-kenosis-bittorrent/pkg-plist +++ b/net-p2p/py-kenosis-bittorrent/pkg-plist @@ -91,5 +91,5 @@ libexec/kenosis-BitTorrent/btunittest.py %%PYTHON_SITELIBDIR%%/kenosis_BitTorrent/zurllib.pyo @dirrm libexec/kenosis-BitTorrent @dirrm %%PYTHON_SITELIBDIR%%/kenosis_BitTorrent -@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true -@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true +@dirrmtry %%PYTHON_SITELIBDIR%% +@dirrmtry %%PYTHON_LIBDIR%% diff --git a/net-p2p/py-kenosis/pkg-plist b/net-p2p/py-kenosis/pkg-plist index 551bbfa713e3..333ce43d1269 100644 --- a/net-p2p/py-kenosis/pkg-plist +++ b/net-p2p/py-kenosis/pkg-plist @@ -142,5 +142,5 @@ @dirrm %%PYTHON_SITELIBDIR%%/kenosis/ds @dirrm %%PYTHON_SITELIBDIR%%/kenosis/dns @dirrm %%PYTHON_SITELIBDIR%%/kenosis -@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true -@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true +@dirrmtry %%PYTHON_SITELIBDIR%% +@dirrmtry %%PYTHON_LIBDIR%% diff --git a/net-p2p/torrentflux/pkg-plist b/net-p2p/torrentflux/pkg-plist index 88f07382edca..633904dee2fc 100644 --- a/net-p2p/torrentflux/pkg-plist +++ b/net-p2p/torrentflux/pkg-plist @@ -5,6 +5,6 @@ etc/tfconfig.php.default etc/rc.d/torrentflux.sh libexec/btphptornado.py %%DATADIR%%/torrentflux.sqlite -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true +@dirrmtry %%DATADIR%% %%PORTDOCS%%%%DOCSDIR%%/install.txt %%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/net-p2p/xmule/pkg-plist b/net-p2p/xmule/pkg-plist index 07e8bdbe6030..d659dc5859ab 100644 --- a/net-p2p/xmule/pkg-plist +++ b/net-p2p/xmule/pkg-plist @@ -11,7 +11,7 @@ share/locale/it/LC_MESSAGES/xmule.mo share/locale/ko/LC_MESSAGES/xmule.mo share/locale/pl/LC_MESSAGES/xmule.mo share/locale/tr/LC_MESSAGES/xmule.mo -@unexec rmdir %D/share/locale/ee/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ee 2>/dev/null || true -@unexec rmdir %D/share/locale 2>/dev/null || true -@unexec rmdir %D/share/gnome/locale 2>/dev/null || true +@dirrmtry share/locale/ee/LC_MESSAGES +@dirrmtry share/locale/ee +@dirrmtry share/locale +@dirrmtry share/gnome/locale diff --git a/net/DarwinStreamingServer/pkg-plist b/net/DarwinStreamingServer/pkg-plist index 4c7324be4788..356d8fdfb327 100644 --- a/net/DarwinStreamingServer/pkg-plist +++ b/net/DarwinStreamingServer/pkg-plist @@ -156,11 +156,11 @@ etc/streaming/streamingserver.xml-dist @dirrm %%DATADIR%%/AdminHtml/images @dirrm %%DATADIR%%/AdminHtml/html_en @dirrm %%DATADIR%%/AdminHtml -@unexec rmdir %D/%%DATADIR%%/movies 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true -@unexec rmdir %D/libexec/StreamingServerModules 2>/dev/null || true +@dirrmtry %%DATADIR%%/movies +@dirrmtry %%DATADIR%% +@dirrmtry libexec/StreamingServerModules @exec mkdir %D/libexec/StreamingServerModules 2>/dev/null || true -@unexec rmdir %D/etc/streaming 2>/dev/null || true +@dirrmtry etc/streaming @unexec rmdir /var/spool/streaming.playlists 2>/dev/null || true @exec mkdir /var/spool/streaming.playlists 2>/dev/null || true @unexec rmdir /var/log/streaming 2>/dev/null || true diff --git a/net/GeoIP/pkg-plist b/net/GeoIP/pkg-plist index 649ee10630f5..642a853d2dd1 100644 --- a/net/GeoIP/pkg-plist +++ b/net/GeoIP/pkg-plist @@ -13,4 +13,4 @@ lib/libGeoIPUpdate.a lib/libGeoIPUpdate.so lib/libGeoIPUpdate.so.0 %%DATADIR%%/GeoIP.dat -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true +@dirrmtry %%DATADIR%% diff --git a/net/amule1/pkg-plist b/net/amule1/pkg-plist index 72e8096fc80d..69e7a99512d6 100644 --- a/net/amule1/pkg-plist +++ b/net/amule1/pkg-plist @@ -74,8 +74,8 @@ share/locale/pl/LC_MESSAGES/amule.mo share/locale/pt_BR/LC_MESSAGES/amule.mo share/locale/ru/LC_MESSAGES/amule.mo @dirrm share/gnome/doc/aMule-1.2.8 -@unexec rmdir %D/share/gnome/doc 2>/dev/null || true -@unexec rmdir %D/share/locale/ee/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ee 2>/dev/null || true +@dirrmtry share/gnome/doc +@dirrmtry share/locale/ee/LC_MESSAGES +@dirrmtry share/locale/ee @dirrm share/gnome/amuleweb/webserver @dirrm share/gnome/amuleweb diff --git a/net/amule2/pkg-plist b/net/amule2/pkg-plist index aec2e898ca9b..b579ccf62f0d 100644 --- a/net/amule2/pkg-plist +++ b/net/amule2/pkg-plist @@ -33,14 +33,14 @@ share/locale/it_CH/LC_MESSAGES/amule.mo share/locale/pt_PT/LC_MESSAGES/amule.mo share/locale/hr/LC_MESSAGES/amule.mo share/locale/sl/LC_MESSAGES/amule.mo -@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/en_US 2>/dev/null || true -@unexec rmdir %D/share/locale/et_EE/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/et_EE 2>/dev/null || true -@unexec rmdir %D/share/locale/it_CH/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/it_CH 2>/dev/null || true -@unexec rmdir %D/share/locale/ko_KR/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ko_KR 2>/dev/null || true +@dirrmtry share/locale/en_US/LC_MESSAGES +@dirrmtry share/locale/en_US +@dirrmtry share/locale/et_EE/LC_MESSAGES +@dirrmtry share/locale/et_EE +@dirrmtry share/locale/it_CH/LC_MESSAGES +@dirrmtry share/locale/it_CH +@dirrmtry share/locale/ko_KR/LC_MESSAGES +@dirrmtry share/locale/ko_KR share/gnome/doc/aMule-2.1.0/ABOUT-NLS share/gnome/doc/aMule-2.1.0/amulesig.txt share/gnome/doc/aMule-2.1.0/amule-win32.HOWTO.txt @@ -53,15 +53,15 @@ share/gnome/doc/aMule-2.1.0/README share/gnome/doc/aMule-2.1.0/TODO share/gnome/doc/aMule-2.1.0/EC_Protocol.txt share/gnome/doc/aMule-2.1.0/socks4.protocol -@unexec rmdir %D/share/gnome/doc/aMule-2.1.0 2>/dev/null || true -@unexec rmdir %D/share/gnome/doc 2>/dev/null || true +@dirrmtry share/gnome/doc/aMule-2.1.0 +@dirrmtry share/gnome/doc %%PL_CAS%%share/gnome/cas/tmp.html %%PL_CAS%%share/gnome/cas/stat.png %%PL_CAS%%@unexec rmdir %D/share/gnome/cas 2>/dev/null || true %%PL_CAS%%share/gnome/pixmaps/wxcas.xpm %%PL_ALC%%share/gnome/pixmaps/alc.xpm share/gnome/pixmaps/amule.xpm -@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true +@dirrmtry share/gnome/pixmaps %%PL_CAS%%share/gnome/applications/wxcas.desktop %%PL_ALC%%share/gnome/applications/alc.desktop share/gnome/applications/amule.desktop @@ -231,8 +231,8 @@ share/gnome/applications/amule.desktop %%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule/webserver 2>/dev/null || true %%PL_AMULEWEBSRV%%@unexec rmdir %D/share/gnome/amule 2>/dev/null || true lib/xchat/plugins/xas.pl -@unexec rmdir %D/lib/xchat/plugins 2>/dev/null || true -@unexec rmdir %D/lib/xchat 2>/dev/null || true +@dirrmtry lib/xchat/plugins +@dirrmtry lib/xchat %%PL_CAS%%bin/cas %%PL_CAS%%bin/wxcas %%PL_ALC%%bin/alc diff --git a/net/apache-soap/pkg-plist b/net/apache-soap/pkg-plist index d1f0968e3d9c..b3d705cb00f6 100644 --- a/net/apache-soap/pkg-plist +++ b/net/apache-soap/pkg-plist @@ -676,5 +676,5 @@ share/doc/apache-soap @dirrm %%T%%/docs/trouble @dirrm %%T%%/docs @dirrm %%T%% -@unexec rmdir %D/share/java/classes 2>/dev/null || true -@unexec rmdir %D/share/java 2>/dev/null || true +@dirrmtry share/java/classes +@dirrmtry share/java diff --git a/net/apollon/pkg-plist b/net/apollon/pkg-plist index cc482ed5dbe9..f096221ec703 100644 --- a/net/apollon/pkg-plist +++ b/net/apollon/pkg-plist @@ -53,28 +53,28 @@ share/applnk/Applications/Apollon.desktop %%PORTDOCS%%share/doc/HTML/en/apollon/credits.docbook %%PORTDOCS%%share/doc/HTML/en/apollon/index.cache.bz2 %%PORTDOCS%%share/doc/HTML/en/apollon/common -@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pt_br/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pt_br 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 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 -@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16/actions 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/64x64/filesystems 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/64x64/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/48x48/filesystems 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/32x32/filesystems 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/22x22/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/16x16/filesystems 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/128x128/filesystems 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/128x128/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/pt_br/LC_MESSAGES +@dirrmtry share/locale/pt_br +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/nb_NO/LC_MESSAGES +@dirrmtry share/locale/nb_NO +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16/actions +@dirrmtry share/icons/crystalsvg/64x64/filesystems +@dirrmtry share/icons/crystalsvg/64x64/apps +@dirrmtry share/icons/crystalsvg/48x48/filesystems +@dirrmtry share/icons/crystalsvg/48x48/apps +@dirrmtry share/icons/crystalsvg/32x32/filesystems +@dirrmtry share/icons/crystalsvg/32x32/apps +@dirrmtry share/icons/crystalsvg/22x22/apps +@dirrmtry share/icons/crystalsvg/16x16/filesystems +@dirrmtry share/icons/crystalsvg/16x16/apps +@dirrmtry share/icons/crystalsvg/128x128/filesystems +@dirrmtry share/icons/crystalsvg/128x128/apps +@dirrmtry share/applnk/Applications %%PORTDOCS%%@unexec rmdir %D/share/doc/HTML/en/apollon %%PORTDOCS%%@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true diff --git a/net/arla/pkg-plist b/net/arla/pkg-plist index 9d33df6c1380..5c5879f5150e 100644 --- a/net/arla/pkg-plist +++ b/net/arla/pkg-plist @@ -111,4 +111,4 @@ share/gnats/stacken @dirrm include/rxkad @dirrm include/ss @dirrm share/gnats -@unexec rmdir %D/cache 2>/dev/null || true +@dirrmtry cache diff --git a/net/beacon/pkg-plist b/net/beacon/pkg-plist index e34c01a04f27..5c1f285a6f26 100644 --- a/net/beacon/pkg-plist +++ b/net/beacon/pkg-plist @@ -4,9 +4,9 @@ %%SITE_PERL%%/%%PERL_ARCH%%/Net/Multicast/Beacon.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Multicast/Beacon @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Multicast/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/Multicast/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net www/beacon-%%VERSION%%/beacon @dirrm www/beacon-%%VERSION%% etc/beacon.conf.sample diff --git a/net/blam/pkg-plist b/net/blam/pkg-plist index 6159826c77e4..7e493c757313 100644 --- a/net/blam/pkg-plist +++ b/net/blam/pkg-plist @@ -51,8 +51,8 @@ share/locale/tr/LC_MESSAGES/blam.mo share/locale/uk/LC_MESSAGES/blam.mo share/locale/zh_CN/LC_MESSAGES/blam.mo share/locale/zh_TW/LC_MESSAGES/blam.mo -@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 @dirrm share/gnome/blam/images @dirrm share/gnome/blam @dirrm lib/blam diff --git a/net/bnbt/pkg-plist b/net/bnbt/pkg-plist index 16496f2e9a49..7d52743957b0 100644 --- a/net/bnbt/pkg-plist +++ b/net/bnbt/pkg-plist @@ -1,4 +1,4 @@ bin/bnbt @exec mkdir -p /var/log/bnbt @exec mkdir -p %D/etc/bnbt -@unexec rmdir %D/etc/bnbt 2>/dev/null || true +@dirrmtry etc/bnbt diff --git a/net/c3270/pkg-plist b/net/c3270/pkg-plist index a7d3c04376fa..b18aa5613a08 100644 --- a/net/c3270/pkg-plist +++ b/net/c3270/pkg-plist @@ -6,4 +6,4 @@ etc/x3270/ibm_hosts %%DBCS%%etc/x3270/icudt28l_ibm-1027_P100-1995.cnv %%DBCS%%etc/x3270/icudt28l_ibm-300_P110-1997.cnv %%DBCS%%etc/x3270/icudt28l_ibm-837_P100-2000.cnv -@unexec rmdir %D/etc/x3270 2>/dev/null || true +@dirrmtry etc/x3270 diff --git a/net/cnupm/pkg-plist b/net/cnupm/pkg-plist index 297e7d1236e4..6074f09129e5 100644 --- a/net/cnupm/pkg-plist +++ b/net/cnupm/pkg-plist @@ -6,4 +6,4 @@ sbin/cnupmstat @exec pw usershow %%CNUPM_OWN%% 2>/dev/null || pw useradd -n %%CNUPM_OWN%% -c 'Cnupm traffic collector' -g %%CNUPM_GRP%% -s /sbin/nologin @exec install -o %%CNUPM_OWN%% -g %%CNUPM_GRP%% -m 750 -d %D/var/cnupm @exec pw usermod -n %%CNUPM_OWN%% -d %D/var/cnupm -@unexec rmdir %D/var/cnupm 2>/dev/null || true +@dirrmtry var/cnupm diff --git a/net/ct/pkg-plist b/net/ct/pkg-plist index 9efdfb660adc..4bf9ab2f6b19 100644 --- a/net/ct/pkg-plist +++ b/net/ct/pkg-plist @@ -2353,7 +2353,7 @@ v6eval/ct/tunnel/tunnel.pm v6eval/doc/00README.ct v6eval/doc/CHANGELOG.ct v6eval/doc/INSTALL.ct -@unexec rmdir %D/v6eval/doc 2>/dev/null || true +@dirrmtry v6eval/doc @dirrm v6eval/ct/dd @dirrm v6eval/ct/default-addr-select @dirrm v6eval/ct/icmp diff --git a/net/dcd/pkg-plist b/net/dcd/pkg-plist index fc4ed235eaf4..5a91762c0485 100644 --- a/net/dcd/pkg-plist +++ b/net/dcd/pkg-plist @@ -12,6 +12,6 @@ etc/dcd/dcd.welcome.default etc/dcd/nicks.allow.default @exec install -d -m 751 -o daemon -g daemon /var/log/dcd @unexec rmdir /var/log/dcd 2>/dev/null || true -@unexec rmdir %D/etc/dcd 2>/dev/null || true -@unexec rmdir %D/man/pl.ISO8859-2/man8 2>/dev/null || true -@unexec rmdir %D/man/pl.ISO8859-2 2>/dev/null || true +@dirrmtry etc/dcd +@dirrmtry man/pl.ISO8859-2/man8 +@dirrmtry man/pl.ISO8859-2 diff --git a/net/dctc-gui/pkg-plist b/net/dctc-gui/pkg-plist index 455c8cb1185d..6bccd6512052 100644 --- a/net/dctc-gui/pkg-plist +++ b/net/dctc-gui/pkg-plist @@ -28,11 +28,11 @@ share/locale/sv/LC_MESSAGES/dc_gui.mo @unexec %D/share/locale/de/LC_MESSAGES 2>/dev/null || true @unexec %D/share/locale/de 2>/dev/null || true @dirrm share/gnome/pixmaps/dc_gui -@unexec rmdir %D/share/gnome/help/dc_gui/nl/images 2>/dev/null || true +@dirrmtry share/gnome/help/dc_gui/nl/images @dirrm share/gnome/help/dc_gui/nl -@unexec rmdir %D/share/gnome/help/dc_gui/es/images 2>/dev/null || true +@dirrmtry share/gnome/help/dc_gui/es/images @dirrm share/gnome/help/dc_gui/es -@unexec rmdir %D/share/gnome/help/dc_gui/C/images 2>/dev/null || true +@dirrmtry share/gnome/help/dc_gui/C/images @dirrm share/gnome/help/dc_gui/C @dirrm share/gnome/help/dc_gui %%PORTDOCS%%@dirrm share/doc/dctc-gui diff --git a/net/diradmin/pkg-plist b/net/diradmin/pkg-plist index c72ea42efb4a..c01186ec2b6d 100644 --- a/net/diradmin/pkg-plist +++ b/net/diradmin/pkg-plist @@ -20,4 +20,4 @@ share/gnome/pixmaps/directory_administrator/old-group-icon.xpm share/gnome/pixmaps/directory_administrator/old-user-icon.xpm share/gnome/pixmaps/directory_administrator/user-icon.xpm @dirrm share/gnome/pixmaps/directory_administrator -@unexec rmdir %D/share/applications 2>/dev/null || true +@dirrmtry share/applications diff --git a/net/gnu-radius/pkg-plist b/net/gnu-radius/pkg-plist index f8abae2cb945..32545a05ee48 100644 --- a/net/gnu-radius/pkg-plist +++ b/net/gnu-radius/pkg-plist @@ -110,7 +110,7 @@ share/locale/ru/LC_MESSAGES/radius.mo %%PORTDOCS%%%%EXAMPLESDIR%%/pam.conf %%PORTDOCS%%%%EXAMPLESDIR%%/radius.php @dirrm etc/raddb/dict -@unexec rmdir %D/etc/raddb 2>/dev/null || true +@dirrmtry etc/raddb @dirrm include/radius %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% @dirrm %%DATADIR%%/%%PORTVERSION%%/scheme @@ -118,7 +118,7 @@ share/locale/ru/LC_MESSAGES/radius.mo @dirrm %%DATADIR%%/%%PORTVERSION%%/modules @dirrm %%DATADIR%%/%%PORTVERSION%% @dirrm %%DATADIR%% -@unexec rmdir %D/lib/security 2>/dev/null || true +@dirrmtry lib/security @unexec rm -f /var/run/radiusd.pid @unexec rm -rf /var/log/radius @unexec echo "Leaving /var/run/radutmp, /var/log/radwtmp and /var/log/radstat alone." diff --git a/net/gtk-gnutella/pkg-plist b/net/gtk-gnutella/pkg-plist index 6346d1147d2f..cb117c9078c4 100644 --- a/net/gtk-gnutella/pkg-plist +++ b/net/gtk-gnutella/pkg-plist @@ -50,7 +50,7 @@ share/locale/nl/LC_MESSAGES/gtk-gnutella.mo share/locale/hu/LC_MESSAGES/gtk-gnutella.mo share/locale/uk/LC_MESSAGES/gtk-gnutella.mo share/locale/zh_CN/LC_MESSAGES/gtk-gnutella.mo -@unexec rmdir %D/share/applications 2>/dev/null || true +@dirrmtry share/applications @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%%/el @dirrm %%DATADIR%%/en diff --git a/net/javadc/pkg-plist b/net/javadc/pkg-plist index 7ef9a72e99fd..306e674fde79 100644 --- a/net/javadc/pkg-plist +++ b/net/javadc/pkg-plist @@ -6,4 +6,4 @@ bin/javadc %%JAR_DIR%%/%%JAR_FILE%% @dirrm %%JAR_DIR%% %%PORTDOCS%%@dirrm share/doc/javadc -@unexec rmdir %D/share/java/jar 2>/dev/null || true +@dirrmtry share/java/jar diff --git a/net/jwhois/pkg-plist b/net/jwhois/pkg-plist index 525eb0f0be15..eb1d00673ee5 100644 --- a/net/jwhois/pkg-plist +++ b/net/jwhois/pkg-plist @@ -19,9 +19,9 @@ etc/jwhois.conf.sample %%NLS%%share/locale/zh_TW/LC_MESSAGES/jwhois.mo @exec mkdir -p %D/var/jwhois 2>/dev/null || true @unexec rm -f %D/var/jwhois/jwhois.db 2>/dev/null || true -@unexec rmdir %D/var/jwhois 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true -@unexec rmdir %D/man/sv/man1 2>/dev/null || true -@unexec rmdir %D/man/sv 2>/dev/null || true +@dirrmtry var/jwhois +@dirrmtry var +@dirrmtry man/sv/man1 +@dirrmtry man/sv @unexec rmdir %D/share/locale/rw/LC_MESSAGES @unexec rmdir %D/share/locale/rw diff --git a/net/kmldonkey/pkg-plist b/net/kmldonkey/pkg-plist index 192584d496d4..70903c3fd1d5 100644 --- a/net/kmldonkey/pkg-plist +++ b/net/kmldonkey/pkg-plist @@ -118,65 +118,65 @@ share/services/magnet.protocol share/services/mldonkey.protocol share/services/sig2dat.protocol share/servicetypes/kmldonkey_plugin.desktop -@unexec rmdir %D/share/servicetypes 2>/dev/null || true -@unexec rmdir %D/share/services/kded 2>/dev/null || true -@unexec rmdir %D/share/services 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true -@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ro 2>/dev/null || true -@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pt 2>/dev/null || true -@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/el 2>/dev/null || true -@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ca 2>/dev/null || true -@unexec rmdir %D/share/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/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/22x22/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/22x22 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/128x128/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/128x128 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/servicetypes +@dirrmtry share/services/kded +@dirrmtry share/services +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/icons/hicolor/64x64/apps +@dirrmtry share/icons/hicolor/64x64 +@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/22x22/apps +@dirrmtry share/icons/hicolor/22x22 +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor/128x128/apps +@dirrmtry share/icons/hicolor/128x128 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons @dirrm share/doc/HTML/sv/kmldonkey -@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true +@dirrmtry share/doc/HTML/sv @dirrm share/doc/HTML/ru/kmldonkey -@unexec rmdir %D/share/doc/HTML/ru 2>/dev/null || true +@dirrmtry share/doc/HTML/ru @dirrm share/doc/HTML/pt/kmldonkey -@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true +@dirrmtry share/doc/HTML/pt @dirrm share/doc/HTML/nl/kmldonkey -@unexec rmdir %D/share/doc/HTML/nl 2>/dev/null || true +@dirrmtry share/doc/HTML/nl @dirrm share/doc/HTML/it/kmldonkey -@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true +@dirrmtry share/doc/HTML/it @dirrm share/doc/HTML/et/kmldonkey -@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true +@dirrmtry share/doc/HTML/et @dirrm share/doc/HTML/en/kmldonkey-apidocs/src/html @dirrm share/doc/HTML/en/kmldonkey-apidocs/src @dirrm share/doc/HTML/en/kmldonkey-apidocs -@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true +@dirrmtry share/doc/HTML/en @dirrm share/doc/HTML/de/kmldonkey -@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML 2>/dev/null || true +@dirrmtry share/doc/HTML/de +@dirrmtry share/doc/HTML @dirrm share/apps/mldonkeyapplet/pics @dirrm share/apps/mldonkeyapplet -@unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true -@unexec rmdir %D/share/apps/konqueror 2>/dev/null || true +@dirrmtry share/apps/konqueror/servicemenus +@dirrmtry share/apps/konqueror @dirrm share/apps/kmldonkey/images/networks @dirrm share/apps/kmldonkey/images @dirrm share/apps/kmldonkey -@unexec rmdir %D/share/apps/kicker/applets 2>/dev/null || true -@unexec rmdir %D/share/apps/kicker 2>/dev/null || true -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Settings/Network 2>/dev/null || true -@unexec rmdir %D/share/applnk/Settings 2>/dev/null || true -@unexec rmdir %D/share/applnk/Internet 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true -@unexec rmdir %D/lib/kde3 2>/dev/null || true +@dirrmtry share/apps/kicker/applets +@dirrmtry share/apps/kicker +@dirrmtry share/apps +@dirrmtry share/applnk/Settings/Network +@dirrmtry share/applnk/Settings +@dirrmtry share/applnk/Internet +@dirrmtry share/applnk +@dirrmtry lib/kde3 @dirrm include/kmldonkey diff --git a/net/knemo-kde4/pkg-plist b/net/knemo-kde4/pkg-plist index 6b4b4b4d21b5..781728f2f7ee 100644 --- a/net/knemo-kde4/pkg-plist +++ b/net/knemo-kde4/pkg-plist @@ -45,18 +45,18 @@ share/locale/pt_BR/LC_MESSAGES/knemod.mo share/locale/ru/LC_MESSAGES/kcm_knemo.mo share/locale/ru/LC_MESSAGES/knemod.mo share/services/kded/knemod.desktop -@unexec rmdir %D/share/services/kded 2>/dev/null || true -@unexec rmdir %D/share/services 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/22x22/actions 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true +@dirrmtry share/services/kded +@dirrmtry share/services +@dirrmtry share/icons/crystalsvg/32x32/apps +@dirrmtry share/icons/crystalsvg/32x32 +@dirrmtry share/icons/crystalsvg/22x22/actions +@dirrmtry share/icons/crystalsvg/22x22 +@dirrmtry share/icons/crystalsvg/16x16/apps +@dirrmtry share/icons/crystalsvg/16x16 +@dirrmtry share/icons/crystalsvg +@dirrmtry share/icons @dirrm share/apps/knemo -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Settings/Network 2>/dev/null || true -@unexec rmdir %D/share/applnk/Settings 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/apps +@dirrmtry share/applnk/Settings/Network +@dirrmtry share/applnk/Settings +@dirrmtry share/applnk diff --git a/net/knemo/pkg-plist b/net/knemo/pkg-plist index 6b4b4b4d21b5..781728f2f7ee 100644 --- a/net/knemo/pkg-plist +++ b/net/knemo/pkg-plist @@ -45,18 +45,18 @@ share/locale/pt_BR/LC_MESSAGES/knemod.mo share/locale/ru/LC_MESSAGES/kcm_knemo.mo share/locale/ru/LC_MESSAGES/knemod.mo share/services/kded/knemod.desktop -@unexec rmdir %D/share/services/kded 2>/dev/null || true -@unexec rmdir %D/share/services 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/22x22/actions 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true +@dirrmtry share/services/kded +@dirrmtry share/services +@dirrmtry share/icons/crystalsvg/32x32/apps +@dirrmtry share/icons/crystalsvg/32x32 +@dirrmtry share/icons/crystalsvg/22x22/actions +@dirrmtry share/icons/crystalsvg/22x22 +@dirrmtry share/icons/crystalsvg/16x16/apps +@dirrmtry share/icons/crystalsvg/16x16 +@dirrmtry share/icons/crystalsvg +@dirrmtry share/icons @dirrm share/apps/knemo -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Settings/Network 2>/dev/null || true -@unexec rmdir %D/share/applnk/Settings 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/apps +@dirrmtry share/applnk/Settings/Network +@dirrmtry share/applnk/Settings +@dirrmtry share/applnk diff --git a/net/ktorrent/pkg-plist b/net/ktorrent/pkg-plist index f464420ded53..022059df4460 100644 --- a/net/ktorrent/pkg-plist +++ b/net/ktorrent/pkg-plist @@ -81,20 +81,20 @@ share/services/ktpartfileimportplugin.desktop share/services/ktsearchplugin.desktop share/services/ktupnpplugin.desktop share/servicetypes/ktorrentplugin.desktop -@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true -@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/uk 2>/dev/null || true -@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sr 2>/dev/null || true -@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pt 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pl 2>/dev/null || true -@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/el 2>/dev/null || true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cs 2>/dev/null || true +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/sr/LC_MESSAGES +@dirrmtry share/locale/sr +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs @dirrm share/apps/ktorrent/icons/hicolor/scalable/apps @dirrm share/apps/ktorrent/icons/hicolor/scalable @dirrm share/apps/ktorrent/icons/hicolor/64x64/filesystems @@ -116,4 +116,4 @@ share/servicetypes/ktorrentplugin.desktop @dirrm share/apps/ktorrent/icons/hicolor @dirrm share/apps/ktorrent/icons @dirrm share/apps/ktorrent -@unexec rmdir %D/share/applications/kde 2>/dev/null || true +@dirrmtry share/applications/kde diff --git a/net/ldapscripts/pkg-plist b/net/ldapscripts/pkg-plist index aa2b5d8e83d6..06e6a9dc3f4a 100644 --- a/net/ldapscripts/pkg-plist +++ b/net/ldapscripts/pkg-plist @@ -5,7 +5,7 @@ etc/ldapscripts/CHANGELOG etc/ldapscripts/COPYING etc/ldapscripts/VERSION etc/ldapscripts/TODO -@unexec rmdir %D/etc/ldapscripts 2>/dev/null || true +@dirrmtry etc/ldapscripts bin/_ldapdeletemachine bin/_ldapinit bin/_lsldap diff --git a/net/liberator/pkg-plist b/net/liberator/pkg-plist index f3144e976b3c..75197217e8fb 100644 --- a/net/liberator/pkg-plist +++ b/net/liberator/pkg-plist @@ -24,4 +24,4 @@ lib/ocaml/hlfreenet.mli %%DATADIR%%/liber_mimetypes @dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/lib/ocaml 2>/dev/null || true +@dirrmtry lib/ocaml diff --git a/net/linux-nx-client/pkg-plist b/net/linux-nx-client/pkg-plist index c49686389a83..3ceca9880521 100644 --- a/net/linux-nx-client/pkg-plist +++ b/net/linux-nx-client/pkg-plist @@ -70,15 +70,15 @@ share/gnome/pixmaps/nxclient-wizard.png @dirrm lib/linux-nx-client/share/images @dirrm lib/linux-nx-client/share @dirrm lib/linux-nx-client -@unexec rmdir %D/share/applications 2>/dev/null || true -@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true -@unexec rmdir %D/share/gnome 2>/dev/null || true +@dirrmtry share/applications +@dirrmtry share/gnome/pixmaps +@dirrmtry share/gnome @cwd %%LOCALBASE%% share/icons/crystalsvg/48x48/nx-desktop.png share/icons/crystalsvg/32x32/nx.png share/icons/crystalsvg/32x32/nxclient-admin.png share/icons/crystalsvg/32x32/nxclient-wizard.png -@unexec rmdir %D/share/icons/crystalsvg/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true +@dirrmtry share/icons/crystalsvg/48x48 +@dirrmtry share/icons/crystalsvg/32x32 +@dirrmtry share/icons/crystalsvg +@dirrmtry share/icons diff --git a/net/openam/pkg-plist b/net/openam/pkg-plist index 9b8b8802aa5f..f5c7503ca4a4 100644 --- a/net/openam/pkg-plist +++ b/net/openam/pkg-plist @@ -2,5 +2,5 @@ bin/openam share/doc/openh323/openam/ReadMe.txt share/doc/openh323/openam/sample_message.wav share/doc/openh323/openam/sample_message_g7231.wav -@unexec rmdir %D/share/doc/openh323/openam 2>/dev/null || true -@unexec rmdir %D/share/doc/openh323 2>/dev/null || true +@dirrmtry share/doc/openh323/openam +@dirrmtry share/doc/openh323 diff --git a/net/openldap23-server/pkg-plist b/net/openldap23-server/pkg-plist index baf21f640357..cef57dc538b9 100644 --- a/net/openldap23-server/pkg-plist +++ b/net/openldap23-server/pkg-plist @@ -45,7 +45,7 @@ etc/openldap/DB_CONFIG.example %%BACK_SQL%%libexec/openldap/back_sql-2.3.so.1 libexec/slapd libexec/slurpd -@unexec rmdir %D/libexec/openldap 2>/dev/null || true +@dirrmtry libexec/openldap sbin/slapacl sbin/slapadd sbin/slapauth diff --git a/net/openldap24-server/pkg-plist b/net/openldap24-server/pkg-plist index baf21f640357..cef57dc538b9 100644 --- a/net/openldap24-server/pkg-plist +++ b/net/openldap24-server/pkg-plist @@ -45,7 +45,7 @@ etc/openldap/DB_CONFIG.example %%BACK_SQL%%libexec/openldap/back_sql-2.3.so.1 libexec/slapd libexec/slurpd -@unexec rmdir %D/libexec/openldap 2>/dev/null || true +@dirrmtry libexec/openldap sbin/slapacl sbin/slapadd sbin/slapauth diff --git a/net/openmcu/pkg-plist b/net/openmcu/pkg-plist index 7e5c9a195c8f..43fe50d03d4f 100644 --- a/net/openmcu/pkg-plist +++ b/net/openmcu/pkg-plist @@ -1,4 +1,4 @@ bin/openmcu share/doc/openh323/openmcu/ReadMe.txt -@unexec rmdir %D/share/doc/openh323/openmcu 2>/dev/null || true -@unexec rmdir %D/share/doc/openh323 2>/dev/null || true +@dirrmtry share/doc/openh323/openmcu +@dirrmtry share/doc/openh323 diff --git a/net/openmpi/pkg-plist b/net/openmpi/pkg-plist index 9693a918bf82..c3793d8ea71b 100644 --- a/net/openmpi/pkg-plist +++ b/net/openmpi/pkg-plist @@ -183,5 +183,5 @@ @dirrm %%MPIDIR%%/include @dirrm %%MPIDIR%%/etc @dirrm %%MPIDIR%%/bin -@unexec rmdir %D/%%MPIDIR%% 2>/dev/null || true -@unexec rmdir %D/%%MPIBASE%% 2>/dev/null || true +@dirrmtry %%MPIDIR%% +@dirrmtry %%MPIBASE%% diff --git a/net/p5-EasyTCP/pkg-plist b/net/p5-EasyTCP/pkg-plist index f3b8acec892c..38ad8f637783 100644 --- a/net/p5-EasyTCP/pkg-plist +++ b/net/p5-EasyTCP/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Net/EasyTCP.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/EasyTCP/.packlist -@unexec rmdir %D/%%SITE_PERL%%/auto/Net/EasyTCP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/EasyTCP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/Net/EasyTCP +@dirrmtry %%SITE_PERL%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/EasyTCP +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net diff --git a/net/p5-File-Rsync/pkg-plist b/net/p5-File-Rsync/pkg-plist index 36f0a4adb00f..bab2c396c8cb 100644 --- a/net/p5-File-Rsync/pkg-plist +++ b/net/p5-File-Rsync/pkg-plist @@ -2,6 +2,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/File/Rsync/Config.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Rsync/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Rsync -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/File/Rsync -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/File 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/File diff --git a/net/p5-File-RsyncP/pkg-plist b/net/p5-File-RsyncP/pkg-plist index f8c7a333ac0a..690da5273f56 100644 --- a/net/p5-File-RsyncP/pkg-plist +++ b/net/p5-File-RsyncP/pkg-plist @@ -9,9 +9,9 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP/FileList/FileList.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP/FileList/autosplit.ix %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP/Digest 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP/FileList 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/File/RsyncP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/File 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP/Digest +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP/FileList +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/RsyncP +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/File/RsyncP +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/File diff --git a/net/p5-Filesys-SmbClient/pkg-plist b/net/p5-Filesys-SmbClient/pkg-plist index 4478c0bb5ea7..c3d4699486b5 100644 --- a/net/p5-Filesys-SmbClient/pkg-plist +++ b/net/p5-Filesys-SmbClient/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/SmbClient/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/Filesys/SmbClient.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys/SmbClient -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Filesys 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filesys +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Filesys diff --git a/net/p5-Geo-IPfree/pkg-plist b/net/p5-Geo-IPfree/pkg-plist index cd4cdf101233..9b19b518f5bf 100644 --- a/net/p5-Geo-IPfree/pkg-plist +++ b/net/p5-Geo-IPfree/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/Geo/ipscountry.dat %%SITE_PERL%%/Geo/ipct2txt.pl @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo/IPfree -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Geo 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Geo +@dirrmtry %%SITE_PERL%%/Geo diff --git a/net/p5-Gopher-Server/pkg-plist b/net/p5-Gopher-Server/pkg-plist index 19c9d6a22064..96d13abfa83e 100644 --- a/net/p5-Gopher-Server/pkg-plist +++ b/net/p5-Gopher-Server/pkg-plist @@ -4,8 +4,8 @@ %%SITE_PERL%%/Gopher/Server/TypeMapper.pm %%SITE_PERL%%/Gopher/Server/RequestHandler/DBI.pm %%SITE_PERL%%/Gopher/Server/RequestHandler/File.pm -@unexec rmdir %D/%%SITE_PERL%%/Gopher 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gopher 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Gopher +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gopher @dirrm %%SITE_PERL%%/Gopher/Server/RequestHandler @dirrm %%SITE_PERL%%/Gopher/Server -@unexec rmdir %D/%%SITE_PERL%%/Gopher 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Gopher diff --git a/net/p5-IO-INET6/pkg-plist b/net/p5-IO-INET6/pkg-plist index c55dad737f54..aea89e1b2ff9 100644 --- a/net/p5-IO-INET6/pkg-plist +++ b/net/p5-IO-INET6/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/IO/Socket/INET6.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/IO/Socket 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO +@dirrmtry %%SITE_PERL%%/IO/Socket +@dirrmtry %%SITE_PERL%%/IO diff --git a/net/p5-IO-Interface/pkg-plist b/net/p5-IO-Interface/pkg-plist index 26670440e552..e1f4c13c4380 100644 --- a/net/p5-IO-Interface/pkg-plist +++ b/net/p5-IO-Interface/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interface/Interface.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interface/autosplit.ix @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Interface -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/IO 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO diff --git a/net/p5-IO-Socket-INET6/pkg-plist b/net/p5-IO-Socket-INET6/pkg-plist index c55dad737f54..aea89e1b2ff9 100644 --- a/net/p5-IO-Socket-INET6/pkg-plist +++ b/net/p5-IO-Socket-INET6/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/IO/Socket/INET6.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/IO/Socket 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO +@dirrmtry %%SITE_PERL%%/IO/Socket +@dirrmtry %%SITE_PERL%%/IO diff --git a/net/p5-IO-Socket-Multicast/pkg-plist b/net/p5-IO-Socket-Multicast/pkg-plist index b9cca8662d50..83935f961e61 100644 --- a/net/p5-IO-Socket-Multicast/pkg-plist +++ b/net/p5-IO-Socket-Multicast/pkg-plist @@ -3,7 +3,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast/Multicast.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast/Multicast.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/Multicast -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/IO/Socket 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/IO 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO/Socket +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/IO +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO diff --git a/net/p5-IP-Country/pkg-plist b/net/p5-IP-Country/pkg-plist index 9e96d6fd0da6..478f93947a04 100644 --- a/net/p5-IP-Country/pkg-plist +++ b/net/p5-IP-Country/pkg-plist @@ -15,4 +15,4 @@ bin/ip2cc @dirrm %%SITE_PERL%%/IP/Country/Fast @dirrm %%SITE_PERL%%/IP/Country @dirrm %%SITE_PERL%%/IP/Authority -@unexec rmdir %D/%%SITE_PERL%%/IP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/IP diff --git a/net/p5-Net-Amazon/pkg-plist b/net/p5-Net-Amazon/pkg-plist index d82c489830db..a885318ee3e9 100644 --- a/net/p5-Net-Amazon/pkg-plist +++ b/net/p5-Net-Amazon/pkg-plist @@ -45,6 +45,6 @@ @dirrm %%SITE_PERL%%/Net/Amazon/Request @dirrm %%SITE_PERL%%/Net/Amazon @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Amazon -@unexec rmdir %D/%%SITE_PERL%%/Net/Amazon 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net/Amazon +@dirrmtry %%SITE_PERL%%/Net +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net diff --git a/net/p5-Net-BGP/pkg-plist b/net/p5-Net-BGP/pkg-plist index 9d0f2fccdf1b..bb6298d89727 100644 --- a/net/p5-Net-BGP/pkg-plist +++ b/net/p5-Net-BGP/pkg-plist @@ -10,5 +10,5 @@ %%SITE_PERL%%/Net/BGP/Update.pm @dirrm %%SITE_PERL%%/Net/BGP @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/BGP -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net diff --git a/net/p5-Net-Blogger/pkg-plist b/net/p5-Net-Blogger/pkg-plist index 5f91c5026bb4..c393b2e93f10 100644 --- a/net/p5-Net-Blogger/pkg-plist +++ b/net/p5-Net-Blogger/pkg-plist @@ -1,5 +1,5 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Blogger -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net %%SITE_PERL%%/Net/Blogger.pm %%SITE_PERL%%/Net/Blogger/API/Extended.pm %%SITE_PERL%%/Net/Blogger/API/Core.pm @@ -19,4 +19,4 @@ @dirrm %%SITE_PERL%%/Net/Blogger/Engine/Userland @dirrm %%SITE_PERL%%/Net/Blogger/Engine @dirrm %%SITE_PERL%%/Net/Blogger -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-CIDR-Lite/pkg-plist b/net/p5-Net-CIDR-Lite/pkg-plist index d0dca4469ed7..c10e92c21ca5 100644 --- a/net/p5-Net-CIDR-Lite/pkg-plist +++ b/net/p5-Net-CIDR-Lite/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Net/CIDR/Lite.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR/Lite/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR/Lite -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/CIDR +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net @dirrm %%SITE_PERL%%/Net/CIDR -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-DHCPClient/pkg-plist b/net/p5-Net-DHCPClient/pkg-plist index 54239328cedd..7c234fba84c1 100644 --- a/net/p5-Net-DHCPClient/pkg-plist +++ b/net/p5-Net-DHCPClient/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Net/DHCPClient.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DHCPClient/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DHCPClient -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net diff --git a/net/p5-Net-DLookup/pkg-plist b/net/p5-Net-DLookup/pkg-plist index b8c7bbff12c2..863d55235660 100644 --- a/net/p5-Net-DLookup/pkg-plist +++ b/net/p5-Net-DLookup/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Net/DLookup.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DLookup/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DLookup 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/DLookup +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-Daemon/pkg-plist b/net/p5-Net-Daemon/pkg-plist index 1259cfa1324a..e420a98eaff4 100644 --- a/net/p5-Net-Daemon/pkg-plist +++ b/net/p5-Net-Daemon/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Daemon/.packlist @dirrm %%SITE_PERL%%/Net/Daemon @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Daemon -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-Delicious/pkg-plist b/net/p5-Net-Delicious/pkg-plist index 1a8251b44cf8..e96453b794a7 100644 --- a/net/p5-Net-Delicious/pkg-plist +++ b/net/p5-Net-Delicious/pkg-plist @@ -10,7 +10,7 @@ %%SITE_PERL%%/Net/Delicious/Subscription.pm %%SITE_PERL%%/Net/Delicious/Tag.pm %%SITE_PERL%%/Net/Delicious/User.pm -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net @dirrm %%SITE_PERL%%/Net/Delicious/Constants @dirrm %%SITE_PERL%%/Net/Delicious -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-Dict/pkg-plist b/net/p5-Net-Dict/pkg-plist index 9fb70754470d..3295d55c0bf9 100644 --- a/net/p5-Net-Dict/pkg-plist +++ b/net/p5-Net-Dict/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/Net/Dict.pm %%SITE_PERL%%/Net/Dict.pod %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Dict/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Dict -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net diff --git a/net/p5-Net-Divert/pkg-plist b/net/p5-Net-Divert/pkg-plist index df9266792210..f7a936d0e630 100644 --- a/net/p5-Net-Divert/pkg-plist +++ b/net/p5-Net-Divert/pkg-plist @@ -2,7 +2,7 @@ %%SITE_PERL%%/Net/Divert.pm %%SITE_PERL%%/auto/Net/Divert/autosplit.ix @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Divert -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net @dirrm %%SITE_PERL%%/auto/Net/Divert -@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-Finger/pkg-plist b/net/p5-Net-Finger/pkg-plist index 70ec68021e50..2597a097ff9a 100644 --- a/net/p5-Net-Finger/pkg-plist +++ b/net/p5-Net-Finger/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Net/Finger.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Finger/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Finger -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net diff --git a/net/p5-Net-Gnats/pkg-plist b/net/p5-Net-Gnats/pkg-plist index 3dc9832bb9c7..9aee9e629f5f 100644 --- a/net/p5-Net-Gnats/pkg-plist +++ b/net/p5-Net-Gnats/pkg-plist @@ -7,6 +7,6 @@ @dirrm %%SITE_PERL%%/auto/Net/Gnats/PR @dirrm %%SITE_PERL%%/auto/Net/Gnats @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gnats -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net +@dirrmtry %%SITE_PERL%%/auto/Net +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net diff --git a/net/p5-Net-Google/pkg-plist b/net/p5-Net-Google/pkg-plist index 2f218c778397..41112bfea147 100644 --- a/net/p5-Net-Google/pkg-plist +++ b/net/p5-Net-Google/pkg-plist @@ -6,4 +6,4 @@ %%SITE_PERL%%/Net/Google/Service.pm %%SITE_PERL%%/Net/Google/Spelling.pm @dirrm %%SITE_PERL%%/Net/Google -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-Gopher/pkg-plist b/net/p5-Net-Gopher/pkg-plist index 46a1e11a2e87..385e64c265c6 100644 --- a/net/p5-Net-Gopher/pkg-plist +++ b/net/p5-Net-Gopher/pkg-plist @@ -8,9 +8,9 @@ %%SITE_PERL%%/Net/Gopher/Response/MenuItem.pm %%SITE_PERL%%/Net/Gopher/Utility.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gopher/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gopher -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net @dirrm %%SITE_PERL%%/Net/Gopher/Response @dirrm %%SITE_PERL%%/Net/Gopher -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-HL7/pkg-plist b/net/p5-Net-HL7/pkg-plist index 9b4abda54ff4..4c9f247f4bfe 100644 --- a/net/p5-Net-HL7/pkg-plist +++ b/net/p5-Net-HL7/pkg-plist @@ -11,5 +11,5 @@ @dirrm %%SITE_PERL%%/mach/auto/Net-HL7/ @dirrm %%SITE_PERL%%/Net/HL7/Segments @dirrm %%SITE_PERL%%/Net/HL7/Messages -@unexec rmdir %D/%%SITE_PERL%%/Net/HL7 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net/HL7 +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-Ident/pkg-plist b/net/p5-Net-Ident/pkg-plist index 54fede5a8c44..534242a577f1 100644 --- a/net/p5-Net-Ident/pkg-plist +++ b/net/p5-Net-Ident/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Net/Ident.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ident/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ident -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-MovableType/pkg-plist b/net/p5-Net-MovableType/pkg-plist index 01e19f66515a..5cabffa84004 100644 --- a/net/p5-Net-MovableType/pkg-plist +++ b/net/p5-Net-MovableType/pkg-plist @@ -3,5 +3,5 @@ bin/mt-upload %%SITE_PERL%%/Net/MovableType.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/MovableType/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/MovableType -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-OpenDHT/pkg-plist b/net/p5-Net-OpenDHT/pkg-plist index 1c0bc0a52077..2be4c04d705b 100644 --- a/net/p5-Net-OpenDHT/pkg-plist +++ b/net/p5-Net-OpenDHT/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Net/OpenDHT.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenDHT/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenDHT -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-Packet/pkg-plist b/net/p5-Net-Packet/pkg-plist index 996c7d4a1862..0e2e8e51175a 100644 --- a/net/p5-Net-Packet/pkg-plist +++ b/net/p5-Net-Packet/pkg-plist @@ -31,5 +31,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Packet/autosplit.ix @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/Packet @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Packet -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net diff --git a/net/p5-Net-ParseWhois/pkg-plist b/net/p5-Net-ParseWhois/pkg-plist index 263a943d2e11..58ca3813979a 100644 --- a/net/p5-Net-ParseWhois/pkg-plist +++ b/net/p5-Net-ParseWhois/pkg-plist @@ -15,8 +15,8 @@ %%SITE_PERL%%/Net/ParseWhois/Domain/Registrar/Unknown.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ParseWhois/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/ParseWhois -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net @dirrm %%SITE_PERL%%/Net/ParseWhois/Domain/Registrar @dirrm %%SITE_PERL%%/Net/ParseWhois/Domain @dirrm %%SITE_PERL%%/Net/ParseWhois -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-Patricia/pkg-plist b/net/p5-Net-Patricia/pkg-plist index 2b97bb53b1a8..09ff08e7f292 100644 --- a/net/p5-Net-Patricia/pkg-plist +++ b/net/p5-Net-Patricia/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Patricia/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/Net/Patricia.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Patricia -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net diff --git a/net/p5-Net-Pcap/pkg-plist b/net/p5-Net-Pcap/pkg-plist index 970c8f3558ca..b2345459c397 100644 --- a/net/p5-Net-Pcap/pkg-plist +++ b/net/p5-Net-Pcap/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Pcap/Pcap.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Pcap/Pcap.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Pcap -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net diff --git a/net/p5-Net-PcapUtils/pkg-plist b/net/p5-Net-PcapUtils/pkg-plist index d989b53e2bd4..4aecb5d1d138 100644 --- a/net/p5-Net-PcapUtils/pkg-plist +++ b/net/p5-Net-PcapUtils/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/PcapUtils/.packlist %%SITE_PERL%%/Net/PcapUtils.pm -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/PcapUtils -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net diff --git a/net/p5-Net-Ping-External/pkg-plist b/net/p5-Net-Ping-External/pkg-plist index 70ef9a15c95c..324aba6cf583 100644 --- a/net/p5-Net-Ping-External/pkg-plist +++ b/net/p5-Net-Ping-External/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Net/Ping/External.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ping/External/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Net/Ping 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net/Ping +@dirrmtry %%SITE_PERL%%/Net @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ping/External -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ping 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Ping +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net diff --git a/net/p5-Net-Radius/pkg-plist b/net/p5-Net-Radius/pkg-plist index 475275470ded..c65d3e457ae8 100644 --- a/net/p5-Net-Radius/pkg-plist +++ b/net/p5-Net-Radius/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Radius/.packlist @dirrm %%SITE_PERL%%/Net/Radius @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Radius -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net diff --git a/net/p5-Net-Random/pkg-plist b/net/p5-Net-Random/pkg-plist index 6d1dd361bc66..d3bee6583c47 100644 --- a/net/p5-Net-Random/pkg-plist +++ b/net/p5-Net-Random/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Net/Random.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Random/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Random -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-RawIP/pkg-plist b/net/p5-Net-RawIP/pkg-plist index 4e9ecf499d10..97feb74db01e 100644 --- a/net/p5-Net-RawIP/pkg-plist +++ b/net/p5-Net-RawIP/pkg-plist @@ -6,5 +6,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawIP/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawIP @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/RawIP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net diff --git a/net/p5-Net-RawSock/pkg-plist b/net/p5-Net-RawSock/pkg-plist index a3aec16ca2f4..561385e4473d 100644 --- a/net/p5-Net-RawSock/pkg-plist +++ b/net/p5-Net-RawSock/pkg-plist @@ -2,9 +2,9 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawSock/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawSock/RawSock.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawSock/RawSock.bs -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawSock/ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/RawSock/ +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net %%PORTDOCS%%share/doc/p5-Net-RawSock/README %%PORTDOCS%%share/doc/p5-Net-RawSock/demo.pl %%PORTDOCS%%@dirrm share/doc/p5-Net-RawSock diff --git a/net/p5-Net-Rendezvous/pkg-plist b/net/p5-Net-Rendezvous/pkg-plist index d8cdc3664245..245451a2fb63 100644 --- a/net/p5-Net-Rendezvous/pkg-plist +++ b/net/p5-Net-Rendezvous/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Rendezvous/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Rendezvous @dirrm %%SITE_PERL%%/Net/Rendezvous -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-Rsh/pkg-plist b/net/p5-Net-Rsh/pkg-plist index 5bf5a7d87d14..68ef4ba58749 100644 --- a/net/p5-Net-Rsh/pkg-plist +++ b/net/p5-Net-Rsh/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Net/Rsh.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Rsh/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Rsh -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-SAP/pkg-plist b/net/p5-Net-SAP/pkg-plist index 75d827c34a31..28a06ca456e1 100644 --- a/net/p5-Net-SAP/pkg-plist +++ b/net/p5-Net-SAP/pkg-plist @@ -4,6 +4,6 @@ bin/psapd %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SAP/SAP.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SAP/SAP.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SAP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/SAP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net diff --git a/net/p5-Net-SCP/pkg-plist b/net/p5-Net-SCP/pkg-plist index 2b1aeb85092a..187cb45fb985 100644 --- a/net/p5-Net-SCP/pkg-plist +++ b/net/p5-Net-SCP/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Net/SCP.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SCP/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SCP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-SDP/pkg-plist b/net/p5-Net-SDP/pkg-plist index 5429fa62d48a..ba17eee4f026 100644 --- a/net/p5-Net-SDP/pkg-plist +++ b/net/p5-Net-SDP/pkg-plist @@ -3,4 +3,4 @@ bin/sdp2rat %%SITE_PERL%%/Net/SDP/Media.pm %%SITE_PERL%%/Net/SDP/Time.pm @dirrm %%SITE_PERL%%/Net/SDP -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-SFTP/pkg-plist b/net/p5-Net-SFTP/pkg-plist index 30c4e0466b04..e5eb78cb7166 100644 --- a/net/p5-Net-SFTP/pkg-plist +++ b/net/p5-Net-SFTP/pkg-plist @@ -5,6 +5,6 @@ %%SITE_PERL%%/Net/SFTP/Util.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SFTP/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SFTP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net @dirrm %%SITE_PERL%%/Net/SFTP -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-SMPP/pkg-plist b/net/p5-Net-SMPP/pkg-plist index e58ebb46e4c1..6c7c42f40142 100644 --- a/net/p5-Net-SMPP/pkg-plist +++ b/net/p5-Net-SMPP/pkg-plist @@ -7,5 +7,5 @@ %%SITE_PERL%%/Net/esme.pl %%SITE_PERL%%/Net/bind-hammer.pl @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SMPP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-SNPP/pkg-plist b/net/p5-Net-SNPP/pkg-plist index 1895e2aa4057..e8a69e71eeb5 100644 --- a/net/p5-Net-SNPP/pkg-plist +++ b/net/p5-Net-SNPP/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/Net/SNPP/HylaFAX.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SNPP @dirrm %%SITE_PERL%%/Net/SNPP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-SSH-Perl/pkg-plist b/net/p5-Net-SSH-Perl/pkg-plist index 1c56d75bb460..c2da195efee5 100644 --- a/net/p5-Net-SSH-Perl/pkg-plist +++ b/net/p5-Net-SSH-Perl/pkg-plist @@ -46,8 +46,8 @@ %%SITE_PERL%%/Net/SSH/Perl/Util/Term.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH/Perl/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH/Perl -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net @dirrm %%SITE_PERL%%/Net/SSH/Perl/Util @dirrm %%SITE_PERL%%/Net/SSH/Perl/Key @dirrm %%SITE_PERL%%/Net/SSH/Perl/Kex @@ -56,5 +56,5 @@ @dirrm %%SITE_PERL%%/Net/SSH/Perl/Cipher @dirrm %%SITE_PERL%%/Net/SSH/Perl/Auth @dirrm %%SITE_PERL%%/Net/SSH/Perl -@unexec rmdir %D/%%SITE_PERL%%/Net/SSH 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net/SSH +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-SSH/pkg-plist b/net/p5-Net-SSH/pkg-plist index c7494f0c65e6..0e6402098c05 100644 --- a/net/p5-Net-SSH/pkg-plist +++ b/net/p5-Net-SSH/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Net/SSH.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSH -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-Server/pkg-plist b/net/p5-Net-Server/pkg-plist index 222e9f284fdd..98bd17bb0c5a 100644 --- a/net/p5-Net-Server/pkg-plist +++ b/net/p5-Net-Server/pkg-plist @@ -15,7 +15,7 @@ %%SITE_PERL%%/Net/Server/Single.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Server -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net @dirrm %%SITE_PERL%%/Net/Server/Proto @dirrm %%SITE_PERL%%/Net/Server -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-Services/pkg-plist b/net/p5-Net-Services/pkg-plist index f868261143b3..082563fce103 100644 --- a/net/p5-Net-Services/pkg-plist +++ b/net/p5-Net-Services/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Net/Services.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Services/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Services -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-TCLink/pkg-plist b/net/p5-Net-TCLink/pkg-plist index 4865f78281fa..edcf68c507a8 100644 --- a/net/p5-Net-TCLink/pkg-plist +++ b/net/p5-Net-TCLink/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/TCLink/TCLink.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/TCLink/autosplit.ix @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/TCLink -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net diff --git a/net/p5-Net-Telnet/pkg-plist b/net/p5-Net-Telnet/pkg-plist index 6dd1cfd55f80..1c968f834005 100644 --- a/net/p5-Net-Telnet/pkg-plist +++ b/net/p5-Net-Telnet/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Net/Telnet.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Telnet -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-Traceroute/pkg-plist b/net/p5-Net-Traceroute/pkg-plist index 16b451b78c4e..b092b8962e5b 100644 --- a/net/p5-Net-Traceroute/pkg-plist +++ b/net/p5-Net-Traceroute/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Net/Traceroute.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-Traceroute6/pkg-plist b/net/p5-Net-Traceroute6/pkg-plist index 2c1eac3fcbe4..6e48ce90b209 100644 --- a/net/p5-Net-Traceroute6/pkg-plist +++ b/net/p5-Net-Traceroute6/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Net/Traceroute6.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute6/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Traceroute6 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-Wake/pkg-plist b/net/p5-Net-Wake/pkg-plist index 16b211c5a758..c7a27eb3f809 100644 --- a/net/p5-Net-Wake/pkg-plist +++ b/net/p5-Net-Wake/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Net/Wake.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Wake/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Wake -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-Whois-RIPE/pkg-plist b/net/p5-Net-Whois-RIPE/pkg-plist index af14c9a57094..a8ab4998366e 100644 --- a/net/p5-Net-Whois-RIPE/pkg-plist +++ b/net/p5-Net-Whois-RIPE/pkg-plist @@ -8,9 +8,9 @@ %%SITE_PERL%%/Net/Whois/RIPE/Object/Template.pm @dirrm %%SITE_PERL%%/Net/Whois/RIPE/Object @dirrm %%SITE_PERL%%/Net/Whois/RIPE -@unexec rmdir %D/%%SITE_PERL%%/Net/Whois 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net/Whois +@dirrmtry %%SITE_PERL%%/Net %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/RIPE/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/RIPE -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net diff --git a/net/p5-Net-Whois-Raw/pkg-plist b/net/p5-Net-Whois-Raw/pkg-plist index 18fdbbe4a749..b7edda94dcb1 100644 --- a/net/p5-Net-Whois-Raw/pkg-plist +++ b/net/p5-Net-Whois-Raw/pkg-plist @@ -2,9 +2,9 @@ bin/pwhois %%SITE_PERL%%/Net/Whois/Raw.pm %%SITE_PERL%%/Net/Whois/Raw/Data.pm @dirrm %%SITE_PERL%%/Net/Whois/Raw -@unexec rmdir %D/%%SITE_PERL%%/Net/Whois 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net/Whois +@dirrmtry %%SITE_PERL%%/Net %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/Raw/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/Raw -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net diff --git a/net/p5-Net-Whois/pkg-plist b/net/p5-Net-Whois/pkg-plist index 508cac6a217a..5b2833986685 100644 --- a/net/p5-Net-Whois/pkg-plist +++ b/net/p5-Net-Whois/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Net/Whois.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Whois -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-XWhois/pkg-plist b/net/p5-Net-XWhois/pkg-plist index 4ff57bc815a9..7b9e5eef1111 100644 --- a/net/p5-Net-XWhois/pkg-plist +++ b/net/p5-Net-XWhois/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Net/XWhois.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/XWhois/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/XWhois 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/XWhois +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Net-Z3950-SimpleServer/pkg-plist b/net/p5-Net-Z3950-SimpleServer/pkg-plist index d85bd035f2dd..6f26d0f6cf46 100644 --- a/net/p5-Net-Z3950-SimpleServer/pkg-plist +++ b/net/p5-Net-Z3950-SimpleServer/pkg-plist @@ -10,5 +10,5 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950/SimpleServer @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Z3950 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/Z3950 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net diff --git a/net/p5-Net-ext/pkg-plist b/net/p5-Net-ext/pkg-plist index a39dcbafd6f9..6a673f2f826f 100644 --- a/net/p5-Net-ext/pkg-plist +++ b/net/p5-Net-ext/pkg-plist @@ -63,11 +63,11 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/autosplit.ix %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/bind.al %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX/setdebug.al -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net/TCP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net/UNIX 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net/TCP +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net/UNIX +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Gen +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Inet +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UDP +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/UNIX +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net diff --git a/net/p5-Net/pkg-plist b/net/p5-Net/pkg-plist index 8d4d2cdbcd77..dd3759ba1739 100644 --- a/net/p5-Net/pkg-plist +++ b/net/p5-Net/pkg-plist @@ -15,6 +15,6 @@ %%SITE_PERL%%/Net/libnet.cfg %%SITE_PERL%%/Net/libnetFAQ.pod %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net @dirrm %%SITE_PERL%%/Net/FTP -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-NetAddr-IP-Count/pkg-plist b/net/p5-NetAddr-IP-Count/pkg-plist index 22e5c2b9bb50..dfac41b9984b 100644 --- a/net/p5-NetAddr-IP-Count/pkg-plist +++ b/net/p5-NetAddr-IP-Count/pkg-plist @@ -2,4 +2,4 @@ %%SITE_PERL%%/NetAddr/IP/sample.pl %%SITE_PERL%%/NetAddr/IP/Count.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Count -@unexec rmdir %D/%%SITE_PERL%%/NetAddr/IP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/NetAddr/IP diff --git a/net/p5-POE-Component-Client-Keepalive/pkg-plist b/net/p5-POE-Component-Client-Keepalive/pkg-plist index 28361142b8e5..50e569b865a7 100644 --- a/net/p5-POE-Component-Client-Keepalive/pkg-plist +++ b/net/p5-POE-Component-Client-Keepalive/pkg-plist @@ -2,9 +2,9 @@ %%SITE_PERL%%/POE/Component/Connection/Keepalive.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Keepalive/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Keepalive -@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Client 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Connection 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/POE/Component/Client +@dirrmtry %%SITE_PERL%%/POE/Component/Connection +@dirrmtry %%SITE_PERL%%/POE +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE diff --git a/net/p5-POE-Component-Client-Ping/pkg-plist b/net/p5-POE-Component-Client-Ping/pkg-plist index b58ec262f1d1..ed90cd7e9329 100644 --- a/net/p5-POE-Component-Client-Ping/pkg-plist +++ b/net/p5-POE-Component-Client-Ping/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/POE/Component/Client/Ping.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Ping/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/Ping -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Client 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/Client +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE +@dirrmtry %%SITE_PERL%%/POE/Component/Client +@dirrmtry %%SITE_PERL%%/POE/Component +@dirrmtry %%SITE_PERL%%/POE diff --git a/net/p5-POE-Component-Jabber/pkg-plist b/net/p5-POE-Component-Jabber/pkg-plist index 0c5936c70473..e70d9883ff9b 100644 --- a/net/p5-POE-Component-Jabber/pkg-plist +++ b/net/p5-POE-Component-Jabber/pkg-plist @@ -21,12 +21,12 @@ %%PORTDOCS%%%%EXAMPLESDIR%%/XMPPTester.pl %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Jabber -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE @dirrm %%SITE_PERL%%/POE/Component/Jabber/Server/Socket @dirrm %%SITE_PERL%%/POE/Component/Jabber/Server @dirrm %%SITE_PERL%%/POE/Component/Jabber/Client/XMPP @dirrm %%SITE_PERL%%/POE/Component/Jabber/Client @dirrm %%SITE_PERL%%/POE/Component/Jabber -@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/POE/Component +@dirrmtry %%SITE_PERL%%/POE diff --git a/net/p5-POE-Component-Pcap/pkg-plist b/net/p5-POE-Component-Pcap/pkg-plist index 371401577a37..cef2433c907b 100644 --- a/net/p5-POE-Component-Pcap/pkg-plist +++ b/net/p5-POE-Component-Pcap/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Pcap/.packlist %%SITE_PERL%%/POE/Component/Pcap.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Pcap -@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/POE/Component +@dirrmtry %%SITE_PERL%%/POE +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE diff --git a/net/p5-POE-Component-RRDTool/pkg-plist b/net/p5-POE-Component-RRDTool/pkg-plist index ae6853c7d35f..529453770de0 100644 --- a/net/p5-POE-Component-RRDTool/pkg-plist +++ b/net/p5-POE-Component-RRDTool/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/RRDTool/.packlist %%SITE_PERL%%/POE/Component/RRDTool.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/RRDTool -@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/POE/Component +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component +@dirrmtry %%SITE_PERL%%/POE +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE diff --git a/net/p5-POE-Component-Spread/pkg-plist b/net/p5-POE-Component-Spread/pkg-plist index 77b334461c42..f62c8e0d3007 100644 --- a/net/p5-POE-Component-Spread/pkg-plist +++ b/net/p5-POE-Component-Spread/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/POE/Component/Spread.pm %%SITE_PERL%%/POE/Driver/Spread.pm %%SITE_PERL%%/POE/Filter/Spread.pm -@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE/Driver 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/POE/Component +@dirrmtry %%SITE_PERL%%/POE/Driver +@dirrmtry %%SITE_PERL%%/POE/Filter +@dirrmtry %%SITE_PERL%%/POE diff --git a/net/p5-Parallel-MPI/pkg-plist b/net/p5-Parallel-MPI/pkg-plist index bad6f623ee8d..e1b6b2a1abfd 100644 --- a/net/p5-Parallel-MPI/pkg-plist +++ b/net/p5-Parallel-MPI/pkg-plist @@ -3,6 +3,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/MPI/MPI.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/MPI/MPI.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/MPI/autosplit.ix -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Parallel 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/MPI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Parallel +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/MPI +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel diff --git a/net/p5-Parallel-Pvm/pkg-plist b/net/p5-Parallel-Pvm/pkg-plist index 425cfecc9e89..f2f14b26bd8e 100644 --- a/net/p5-Parallel-Pvm/pkg-plist +++ b/net/p5-Parallel-Pvm/pkg-plist @@ -6,5 +6,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/Pvm/code2symbol.al %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/Pvm/code2text.al @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel/Pvm -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Parallel 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Parallel +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parallel diff --git a/net/p5-PlRPC/pkg-plist b/net/p5-PlRPC/pkg-plist index 76a0f2d0c85b..a0259be6ead0 100644 --- a/net/p5-PlRPC/pkg-plist +++ b/net/p5-PlRPC/pkg-plist @@ -8,6 +8,6 @@ @dirrm %%SITE_PERL%%/RPC/PlServer @dirrm %%SITE_PERL%%/RPC/PlClient @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC/PlServer -@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/RPC 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Bundle +@dirrmtry %%SITE_PERL%%/RPC +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC diff --git a/net/p5-RPC-XML/pkg-plist b/net/p5-RPC-XML/pkg-plist index c03b5df88354..ccecd8a6ae35 100644 --- a/net/p5-RPC-XML/pkg-plist +++ b/net/p5-RPC-XML/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC/XML/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC/XML -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RPC %%SITE_PERL%%/auto/RPC/XML/Server/timeout.al %%SITE_PERL%%/auto/RPC/XML/Server/share_procs.al %%SITE_PERL%%/auto/RPC/XML/Server/share_methods.al @@ -42,7 +42,7 @@ %%SITE_PERL%%/auto/RPC/XML/Function/autosplit.ix @dirrm %%SITE_PERL%%/auto/RPC/XML/Function @dirrm %%SITE_PERL%%/auto/RPC/XML -@unexec rmdir %D/%%SITE_PERL%%/auto/RPC 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/RPC %%SITE_PERL%%/RPC/XML.pm %%SITE_PERL%%/RPC/XML/status.xpl %%SITE_PERL%%/RPC/XML/multicall.xpl @@ -58,10 +58,10 @@ %%SITE_PERL%%/RPC/XML/Function.pm %%SITE_PERL%%/RPC/XML/Client.pm @dirrm %%SITE_PERL%%/RPC/XML -@unexec rmdir %D/%%SITE_PERL%%/RPC 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/RPC %%SITE_PERL%%/Apache/RPC/status.xpl %%SITE_PERL%%/Apache/RPC/Status.pm %%SITE_PERL%%/Apache/RPC/Server.pm @dirrm %%SITE_PERL%%/Apache/RPC -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Apache bin/make_method diff --git a/net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist b/net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist index ea041a51d096..0d78152f7430 100644 --- a/net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist +++ b/net/p5-ResourcePool-Resource-Net-LDAP/pkg-plist @@ -5,8 +5,8 @@ %%SITE_PERL%%/ResourcePool/Factory/Net/LDAP.pod @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/Net/LDAP @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/Net -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource @dirrm %%SITE_PERL%%/ResourcePool/Resource/Net -@unexec rmdir %D/%%SITE_PERL%%/ResourcePool/Resource 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/ResourcePool/Resource @dirrm %%SITE_PERL%%/ResourcePool/Factory/Net -@unexec rmdir %D/%%SITE_PERL%%/ResourcePool/Factory 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/ResourcePool/Factory diff --git a/net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist b/net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist index 9f8f9dda7819..7fe4d497b9b1 100644 --- a/net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist +++ b/net/p5-ResourcePool-Resource-SOAP-Lite/pkg-plist @@ -6,10 +6,10 @@ %%SITE_PERL%%/ResourcePool/Factory/SOAP/Lite.pod @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/SOAP/Lite @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource/SOAP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ResourcePool/Resource @dirrm %%SITE_PERL%%/ResourcePool/Command/SOAP/Lite @dirrm %%SITE_PERL%%/ResourcePool/Command/SOAP @dirrm %%SITE_PERL%%/ResourcePool/Resource/SOAP -@unexec rmdir %D/%%SITE_PERL%%/ResourcePool/Resource 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/ResourcePool/Resource @dirrm %%SITE_PERL%%/ResourcePool/Factory/SOAP -@unexec rmdir %D/%%SITE_PERL%%/ResourcePool/Factory 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/ResourcePool/Factory diff --git a/net/p5-SOAP-Data-Builder/pkg-plist b/net/p5-SOAP-Data-Builder/pkg-plist index f8576169305a..5865accc2288 100644 --- a/net/p5-SOAP-Data-Builder/pkg-plist +++ b/net/p5-SOAP-Data-Builder/pkg-plist @@ -2,8 +2,8 @@ %%SITE_PERL%%/SOAP/Data/Builder/Element.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Data/Builder/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Data/Builder -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Data 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Data +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP @dirrm %%SITE_PERL%%/SOAP/Data/Builder -@unexec rmdir %D/%%SITE_PERL%%/SOAP/Data 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/SOAP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/SOAP/Data +@dirrmtry %%SITE_PERL%%/SOAP diff --git a/net/p5-SOAP-Lite/pkg-plist b/net/p5-SOAP-Lite/pkg-plist index d537be594310..6f01639d23b0 100644 --- a/net/p5-SOAP-Lite/pkg-plist +++ b/net/p5-SOAP-Lite/pkg-plist @@ -25,14 +25,14 @@ bin/stubmaker.pl %%SITE_PERL%%/XMLRPC/Transport/TCP.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Lite/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP/Lite -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP @dirrm %%SITE_PERL%%/Apache/XMLRPC @dirrm %%SITE_PERL%%/SOAP/Transport @dirrm %%SITE_PERL%%/UDDI @dirrm %%SITE_PERL%%/XMLRPC/Transport @dirrm %%SITE_PERL%%/XMLRPC -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/SOAP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML/Parser 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Apache +@dirrmtry %%SITE_PERL%%/IO +@dirrmtry %%SITE_PERL%%/SOAP +@dirrmtry %%SITE_PERL%%/XML/Parser +@dirrmtry %%SITE_PERL%%/XML diff --git a/net/p5-SOAP/pkg-plist b/net/p5-SOAP/pkg-plist index 65422beedb8b..aeca35825067 100644 --- a/net/p5-SOAP/pkg-plist +++ b/net/p5-SOAP/pkg-plist @@ -23,5 +23,5 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP @dirrm %%SITE_PERL%%/SOAP/Transport/HTTP @dirrm %%SITE_PERL%%/SOAP/Transport -@unexec rmdir %D/%%SITE_PERL%%/SOAP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/SOAP +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SOAP diff --git a/net/p5-Socks/pkg-plist b/net/p5-Socks/pkg-plist index b1c97b391aba..be4b5baa9bfd 100644 --- a/net/p5-Socks/pkg-plist +++ b/net/p5-Socks/pkg-plist @@ -20,6 +20,6 @@ %%SITE_PERL%%/auto/Net/SOCKS/_validate.al @dirrm %%SITE_PERL%%/auto/Net/SOCKS @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SOCKS -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/net/p5-Spread-Session/pkg-plist b/net/p5-Spread-Session/pkg-plist index acb5bc782b78..b3474ef340d9 100644 --- a/net/p5-Spread-Session/pkg-plist +++ b/net/p5-Spread-Session/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Spread/Session.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Session/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Session -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Spread 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread +@dirrmtry %%SITE_PERL%%/Spread diff --git a/net/p5-Validate-Net/pkg-plist b/net/p5-Validate-Net/pkg-plist index 02752c853ac3..ce0e56e82bb4 100644 --- a/net/p5-Validate-Net/pkg-plist +++ b/net/p5-Validate-Net/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Validate/Net/.packlist %%SITE_PERL%%/Validate/Net.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Validate/Net -@unexec rmdir %D/%%SITE_PERL%%/Validate 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Validate 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Validate +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Validate diff --git a/net/p5-X500-DN/pkg-plist b/net/p5-X500-DN/pkg-plist index eb8626490f13..531948b2e4ac 100644 --- a/net/p5-X500-DN/pkg-plist +++ b/net/p5-X500-DN/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/X500/RDN.pm %%SITE_PERL%%/X500/RDN.pod @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/X500/DN -@unexec rmdir %D/%%SITE_PERL%%/X500 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/X500 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/X500 +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/X500 diff --git a/net/p5-pdonkey/pkg-plist b/net/p5-pdonkey/pkg-plist index be125504d81b..d14d033d72ef 100644 --- a/net/p5-pdonkey/pkg-plist +++ b/net/p5-pdonkey/pkg-plist @@ -7,5 +7,5 @@ @dirrm %%SITE_PERL%%/P2P/pDonkey %%SITE_PERL%%/%%PERL_ARCH%%/auto/P2P/pDonkey/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/P2P/pDonkey -@unexec rmdir %D/%%SITE_PERL%%/P2P 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/P2P 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/P2P +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/P2P diff --git a/net/p5-perl-ldap/pkg-plist b/net/p5-perl-ldap/pkg-plist index caf6e6dfbbf3..c6d8931b8325 100644 --- a/net/p5-perl-ldap/pkg-plist +++ b/net/p5-perl-ldap/pkg-plist @@ -47,7 +47,7 @@ @dirrm %%SITE_PERL%%/Net/LDAP @dirrm %%SITE_PERL%%/Bundle/Net @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/perl-ldap -@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/LWP/Protocol 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/LWP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Bundle +@dirrmtry %%SITE_PERL%%/Net +@dirrmtry %%SITE_PERL%%/LWP/Protocol +@dirrmtry %%SITE_PERL%%/LWP diff --git a/net/poptop/pkg-plist b/net/poptop/pkg-plist index 8e9e8b623c1d..12de09d629f6 100644 --- a/net/poptop/pkg-plist +++ b/net/poptop/pkg-plist @@ -3,4 +3,4 @@ sbin/pptpd sbin/pptpctrl lib/pptpd/pptpd-logwtmp.so etc/pptpd.conf.sample -@unexec rmdir %D/lib/pptpd 2> /dev/null || true +@dirrmtry lib/pptpd diff --git a/net/py-bittorrent-devel/pkg-plist b/net/py-bittorrent-devel/pkg-plist index 4e772ea657c3..bcfa49a10b54 100644 --- a/net/py-bittorrent-devel/pkg-plist +++ b/net/py-bittorrent-devel/pkg-plist @@ -260,32 +260,32 @@ share/locale/zh_TW/LC_MESSAGES/bittorrent.mo %%GUI%%@dirrm share/pixmaps/BitTorrent/logo %%GUI%%@dirrm share/pixmaps/BitTorrent %%GUI%%@unexec rmdir %D/share/pixmaps 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true -@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sl 2>/dev/null || true -@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sk 2>/dev/null || true -@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ro 2>/dev/null || true -@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pt 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pl 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 -@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ko 2>/dev/null || true -@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/el 2>/dev/null || true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cs 2>/dev/null || true -@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ca 2>/dev/null || true +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nb_NO/LC_MESSAGES +@dirrmtry share/locale/nb_NO +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca @dirrm %%DATADIR%% @dirrm %%PYTHON_SITELIBDIR%%/khashmir @dirrm %%PYTHON_SITELIBDIR%%/BitTorrent -@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true -@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true +@dirrmtry %%PYTHON_SITELIBDIR%% +@dirrmtry %%PYTHON_LIBDIR%% diff --git a/net/py-bittorrent/pkg-plist b/net/py-bittorrent/pkg-plist index 7127a0489c16..f480ab4cef60 100644 --- a/net/py-bittorrent/pkg-plist +++ b/net/py-bittorrent/pkg-plist @@ -259,42 +259,42 @@ share/locale/zh_TW/LC_MESSAGES/bittorrent.mo %%GUI%%@dirrm share/pixmaps/BitTorrent/logo %%GUI%%@dirrm share/pixmaps/BitTorrent %%GUI%%@unexec rmdir %D/share/pixmaps 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true -@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/uk 2>/dev/null || true -@unexec rmdir %D/share/locale/tlh/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/tlh 2>/dev/null || true -@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sl 2>/dev/null || true -@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sk 2>/dev/null || true -@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ro 2>/dev/null || true -@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pt 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pl 2>/dev/null || true -@unexec rmdir %D/share/locale/nb_NO/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/nb_NO 2>/dev/null || true -@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ko 2>/dev/null || true -@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/hy 2>/dev/null || true -@unexec rmdir %D/share/locale/he_IL/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/he_IL 2>/dev/null || true -@unexec rmdir %D/share/locale/gr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/gr 2>/dev/null || true -@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/fi 2>/dev/null || true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cs 2>/dev/null || true -@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ca 2>/dev/null || true +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk/LC_MESSAGES +@dirrmtry share/locale/uk +@dirrmtry share/locale/tlh/LC_MESSAGES +@dirrmtry share/locale/tlh +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/nb_NO/LC_MESSAGES +@dirrmtry share/locale/nb_NO +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy +@dirrmtry share/locale/he_IL/LC_MESSAGES +@dirrmtry share/locale/he_IL +@dirrmtry share/locale/gr/LC_MESSAGES +@dirrmtry share/locale/gr +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca @dirrm %%DATADIR%% @dirrm %%PYTHON_SITELIBDIR%%/khashmir @dirrm %%PYTHON_SITELIBDIR%%/BitTorrent -@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true -@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true +@dirrmtry %%PYTHON_SITELIBDIR%% +@dirrmtry %%PYTHON_LIBDIR%% diff --git a/net/py-kenosis-bittorrent/pkg-plist b/net/py-kenosis-bittorrent/pkg-plist index 1976e19b5c6f..66bdeaf54f65 100644 --- a/net/py-kenosis-bittorrent/pkg-plist +++ b/net/py-kenosis-bittorrent/pkg-plist @@ -91,5 +91,5 @@ libexec/kenosis-BitTorrent/btunittest.py %%PYTHON_SITELIBDIR%%/kenosis_BitTorrent/zurllib.pyo @dirrm libexec/kenosis-BitTorrent @dirrm %%PYTHON_SITELIBDIR%%/kenosis_BitTorrent -@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true -@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true +@dirrmtry %%PYTHON_SITELIBDIR%% +@dirrmtry %%PYTHON_LIBDIR%% diff --git a/net/py-kenosis/pkg-plist b/net/py-kenosis/pkg-plist index 551bbfa713e3..333ce43d1269 100644 --- a/net/py-kenosis/pkg-plist +++ b/net/py-kenosis/pkg-plist @@ -142,5 +142,5 @@ @dirrm %%PYTHON_SITELIBDIR%%/kenosis/ds @dirrm %%PYTHON_SITELIBDIR%%/kenosis/dns @dirrm %%PYTHON_SITELIBDIR%%/kenosis -@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true -@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true +@dirrmtry %%PYTHON_SITELIBDIR%% +@dirrmtry %%PYTHON_LIBDIR%% diff --git a/net/rdesktop/pkg-plist b/net/rdesktop/pkg-plist index 95f26f69c523..65a18567161e 100644 --- a/net/rdesktop/pkg-plist +++ b/net/rdesktop/pkg-plist @@ -46,5 +46,5 @@ bin/rdesktop %%DATADIR%%/keymaps/sv %%DATADIR%%/keymaps/th %%DATADIR%%/keymaps/tr -@unexec rmdir %D/%%DATADIR%%/keymaps 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true +@dirrmtry %%DATADIR%%/keymaps +@dirrmtry %%DATADIR%% diff --git a/net/roadrunner/pkg-plist b/net/roadrunner/pkg-plist index fb767a49c658..aff260799abd 100644 --- a/net/roadrunner/pkg-plist +++ b/net/roadrunner/pkg-plist @@ -78,5 +78,5 @@ share/gtk-doc/html/roadrunner/x9.html @dirrm include/roadrunner-1.0/librr/message @dirrm include/roadrunner-1.0/librr @dirrm include/roadrunner-1.0 -@unexec rmdir %D/share/gtk-doc/html 2>/dev/null || true -@unexec rmdir %D/share/gtk-doc 2>/dev/null || true +@dirrmtry share/gtk-doc/html +@dirrmtry share/gtk-doc diff --git a/net/silc-client/pkg-plist b/net/silc-client/pkg-plist index 7eb5cdb2e72b..d05d5ca2ed41 100644 --- a/net/silc-client/pkg-plist +++ b/net/silc-client/pkg-plist @@ -111,4 +111,4 @@ share/silc/scripts/silc-mime.pl @dirrm share/silc/scripts @dirrm share/silc %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/etc/silc 2>/dev/null || true +@dirrmtry etc/silc diff --git a/net/silc-server/pkg-plist b/net/silc-server/pkg-plist index d356c60b7a91..7ff0db593ebd 100644 --- a/net/silc-server/pkg-plist +++ b/net/silc-server/pkg-plist @@ -10,5 +10,5 @@ etc/rc.d/silcd.sh-dist %%PORTDOCS%%%%EXAMPLESDIR%%/cell_server1.conf %%PORTDOCS%%%%EXAMPLESDIR%%/cell_server2.conf %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% -@unexec rmdir %D/etc/silc 2>/dev/null || true -@unexec rmdir %D/var/log/silc 2>/dev/null || true +@dirrmtry etc/silc +@dirrmtry var/log/silc diff --git a/net/smbldap-tools/pkg-plist b/net/smbldap-tools/pkg-plist index f15b4e1398c2..4b23fc03a4ec 100644 --- a/net/smbldap-tools/pkg-plist +++ b/net/smbldap-tools/pkg-plist @@ -39,6 +39,6 @@ sbin/smbldap-usershow %%PORTDOCS%%%%DOCSDIR%%/html/smbldap-tools010.html %%PORTDOCS%%@dirrm %%DOCSDIR%%/html %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/etc/smbldap-tools 2> /dev/null || true +@dirrmtry etc/smbldap-tools @dirrm %%EXAMPLESDIR%%/etc @dirrm %%EXAMPLESDIR%% diff --git a/net/smokeping/pkg-plist b/net/smokeping/pkg-plist index c05739f99e48..564a10446dc3 100644 --- a/net/smokeping/pkg-plist +++ b/net/smokeping/pkg-plist @@ -145,13 +145,13 @@ smokeping/lib/Smokeping/probes/skel.pm smokeping/lib/Smokeping/Examples.pm smokeping/lib/Smokeping/RRDtools.pm smokeping/lib/Config/Grammar.pm -@unexec rmdir %D/etc/smokeping 2>/dev/null || true +@dirrmtry etc/smokeping @exec mkdir -p %D/smokeping/htdocs/img; chown www:www %D/smokeping/htdocs/img @unexec rm -rf %D/smokeping/htdocs/img 2>/dev/null || true @exec mkdir -p %D/var/smokeping @exec chown smokeping:smokeping %D/var/smokeping -@unexec rmdir %D/var/smokeping 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true +@dirrmtry var/smokeping +@dirrmtry var @dirrm smokeping/htdocs @dirrm smokeping/lib/Config @dirrm smokeping/lib/Smokeping/probes @@ -164,4 +164,4 @@ smokeping/lib/Config/Grammar.pm %%PORTDOCS%%@dirrm %%DOCSDIR%%/Smokeping %%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% -@unexec rmdir %D/smokeping 2>/dev/null || true +@dirrmtry smokeping diff --git a/net/spread/pkg-plist b/net/spread/pkg-plist index c207bc6e1a48..c914635c6aa1 100644 --- a/net/spread/pkg-plist +++ b/net/spread/pkg-plist @@ -27,5 +27,5 @@ sbin/spread %%EXAMPLESDIR%%/test.pl @exec mkdir -p /var/run/spread %B/var/run @unexec rmdir /var/run/spread 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true -@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread +@dirrmtry %%EXAMPLESDIR%% diff --git a/net/spread4/pkg-plist b/net/spread4/pkg-plist index c207bc6e1a48..c914635c6aa1 100644 --- a/net/spread4/pkg-plist +++ b/net/spread4/pkg-plist @@ -27,5 +27,5 @@ sbin/spread %%EXAMPLESDIR%%/test.pl @exec mkdir -p /var/run/spread %B/var/run @unexec rmdir /var/run/spread 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true -@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread +@dirrmtry %%EXAMPLESDIR%% diff --git a/net/ssltunnel-client/pkg-plist b/net/ssltunnel-client/pkg-plist index b6b31712b259..b76fdea45a5c 100644 --- a/net/ssltunnel-client/pkg-plist +++ b/net/ssltunnel-client/pkg-plist @@ -4,4 +4,4 @@ etc/ssltunnel/client.conf.sample %%PORTDOCS%%%%DOCSDIR%%/LISEZ-MOI %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/etc/ssltunnel 2>/dev/null || true +@dirrmtry etc/ssltunnel diff --git a/net/tcpick/pkg-plist b/net/tcpick/pkg-plist index 81e4e11cdb05..0683581371cb 100644 --- a/net/tcpick/pkg-plist +++ b/net/tcpick/pkg-plist @@ -1,3 +1,3 @@ bin/tcpick -@unexec rmdir %D/man/it/man8 2>/dev/null || true -@unexec rmdir %D/man/it 2>/dev/null || true +@dirrmtry man/it/man8 +@dirrmtry man/it diff --git a/net/torrentflux/pkg-plist b/net/torrentflux/pkg-plist index 88f07382edca..633904dee2fc 100644 --- a/net/torrentflux/pkg-plist +++ b/net/torrentflux/pkg-plist @@ -5,6 +5,6 @@ etc/tfconfig.php.default etc/rc.d/torrentflux.sh libexec/btphptornado.py %%DATADIR%%/torrentflux.sqlite -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true +@dirrmtry %%DATADIR%% %%PORTDOCS%%%%DOCSDIR%%/install.txt %%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/net/tsclient/pkg-plist b/net/tsclient/pkg-plist index 3386615d22e9..d92380046468 100644 --- a/net/tsclient/pkg-plist +++ b/net/tsclient/pkg-plist @@ -47,16 +47,16 @@ share/locale/se/LC_MESSAGES/tsclient.mo share/locale/xh/LC_MESSAGES/tsclient.mo share/locale/zh_CN/LC_MESSAGES/tsclient.mo share/locale/zh_TW/LC_MESSAGES/tsclient.mo -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/xh 2>/dev/null || true -@unexec rmdir %D/share/locale/se/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/se 2>/dev/null || true -@unexec rmdir %D/share/locale/pl_PL/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pl_PL 2>/dev/null || true -@unexec rmdir %D/share/locale/no_nb/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/no_nb 2>/dev/null || true -@unexec rmdir %D/share/locale/nl_NL/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/nl_NL 2>/dev/null || true -@unexec rmdir %D/share/locale/gr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/gr 2>/dev/null || true +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/se/LC_MESSAGES +@dirrmtry share/locale/se +@dirrmtry share/locale/pl_PL/LC_MESSAGES +@dirrmtry share/locale/pl_PL +@dirrmtry share/locale/no_nb/LC_MESSAGES +@dirrmtry share/locale/no_nb +@dirrmtry share/locale/nl_NL/LC_MESSAGES +@dirrmtry share/locale/nl_NL +@dirrmtry share/locale/gr/LC_MESSAGES +@dirrmtry share/locale/gr @dirrm share/gnome/pixmaps/tsclient diff --git a/net/v6eval/pkg-plist b/net/v6eval/pkg-plist index c20e597e9f7e..cd416d5e6a7a 100644 --- a/net/v6eval/pkg-plist +++ b/net/v6eval/pkg-plist @@ -133,7 +133,7 @@ v6eval/man/man1/pktsend.1.gz @dirrm v6eval/include @dirrm v6eval/man/man1 @dirrm v6eval/man -@unexec rmdir %D/v6eval/etc 2>/dev/null || true +@dirrmtry v6eval/etc @dirrm v6eval lib/perl5/%%PERL_VERSION%%/man/man3/V6evalRemote.3 lib/perl5/%%PERL_VERSION%%/man/man3/V6evalTool.3 @@ -143,6 +143,6 @@ lib/perl5/%%PERL_VERSION%%/man/man3/V6evalTool.3 %%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalCommon/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalRemote/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalTool/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalCommon 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalRemote 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalTool 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalCommon +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalRemote +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/V6evalTool diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist index c3823708470b..b0791a558051 100644 --- a/net/vino/pkg-plist +++ b/net/vino/pkg-plist @@ -67,5 +67,5 @@ share/locale/xh/LC_MESSAGES/vino.mo share/locale/zh_CN/LC_MESSAGES/vino.mo share/locale/zh_TW/LC_MESSAGES/vino.mo @dirrm share/gnome/vino -@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ug 2> /dev/null || true +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug diff --git a/net/xmule/pkg-plist b/net/xmule/pkg-plist index 07e8bdbe6030..d659dc5859ab 100644 --- a/net/xmule/pkg-plist +++ b/net/xmule/pkg-plist @@ -11,7 +11,7 @@ share/locale/it/LC_MESSAGES/xmule.mo share/locale/ko/LC_MESSAGES/xmule.mo share/locale/pl/LC_MESSAGES/xmule.mo share/locale/tr/LC_MESSAGES/xmule.mo -@unexec rmdir %D/share/locale/ee/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ee 2>/dev/null || true -@unexec rmdir %D/share/locale 2>/dev/null || true -@unexec rmdir %D/share/gnome/locale 2>/dev/null || true +@dirrmtry share/locale/ee/LC_MESSAGES +@dirrmtry share/locale/ee +@dirrmtry share/locale +@dirrmtry share/gnome/locale diff --git a/news/inn-current/pkg-plist b/news/inn-current/pkg-plist index d4a3f148f280..d8f992bcf5c3 100644 --- a/news/inn-current/pkg-plist +++ b/news/inn-current/pkg-plist @@ -227,7 +227,7 @@ news/lib/libstorage.a %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/news/tmp 2>/dev/null || true +@dirrmtry news/tmp @dirrm news/spool/overview @dirrm news/spool/outgoing @dirrm news/spool/innfeed @@ -241,7 +241,7 @@ news/lib/libstorage.a @dirrm news/lib @dirrm news/include/inn @dirrm news/include -@unexec rmdir %D/%%ETCDIR%% 2>/dev/null || true +@dirrmtry %%ETCDIR%% @dirrm news/doc @dirrm news/db @dirrm news/bin/rnews.libexec diff --git a/news/inn-stable/pkg-plist b/news/inn-stable/pkg-plist index c0e5eeac4caf..441dde381bb5 100644 --- a/news/inn-stable/pkg-plist +++ b/news/inn-stable/pkg-plist @@ -249,7 +249,7 @@ news/lib/libstorage.a %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/news/tmp 2>/dev/null || true +@dirrmtry news/tmp @dirrm news/spool/overview @dirrm news/spool/outgoing @dirrm news/spool/innfeed @@ -263,9 +263,9 @@ news/lib/libstorage.a @dirrm news/lib @dirrm news/include/inn @dirrm news/include -@unexec rmdir %D/%%ETCDIR%% 2>/dev/null || true +@dirrmtry %%ETCDIR%% @dirrm news/doc -@unexec rmdir %D/news/db 2>/dev/null || true +@dirrmtry news/db @dirrm news/bin/rnews.libexec @dirrm news/bin/filter @dirrm news/bin/control diff --git a/news/inn/pkg-plist b/news/inn/pkg-plist index 38345dc582f3..7e1f117a9be5 100644 --- a/news/inn/pkg-plist +++ b/news/inn/pkg-plist @@ -248,7 +248,7 @@ news/lib/libstorage.a %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/news/tmp 2>/dev/null || true +@dirrmtry news/tmp @dirrm news/spool/overview @dirrm news/spool/outgoing @dirrm news/spool/innfeed @@ -262,9 +262,9 @@ news/lib/libstorage.a @dirrm news/lib @dirrm news/include/inn @dirrm news/include -@unexec rmdir %D/%%ETCDIR%% 2>/dev/null || true +@dirrmtry %%ETCDIR%% @dirrm news/doc -@unexec rmdir %D/news/db 2>/dev/null || true +@dirrmtry news/db @dirrm news/bin/rnews.libexec @dirrm news/bin/filter @dirrm news/bin/control diff --git a/news/newsx/pkg-plist b/news/newsx/pkg-plist index d5bc44736a1c..eb7453bb0833 100644 --- a/news/newsx/pkg-plist +++ b/news/newsx/pkg-plist @@ -10,5 +10,5 @@ bin/newsq %%PORTDOCS%%share/doc/newsx/TODO %%PORTDOCS%%@dirrm share/doc/newsx @dirrm news/spool/inhosts -@unexec rmdir %D/news/spool 2> /dev/null || true -@unexec rmdir %D/news 2> /dev/null || true +@dirrmtry news/spool +@dirrmtry news diff --git a/news/p5-Gateway/pkg-plist b/news/p5-Gateway/pkg-plist index 31f45353e237..bb8b15d85c12 100644 --- a/news/p5-Gateway/pkg-plist +++ b/news/p5-Gateway/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/News/Gateway.pm %%SITE_PERL%%/News/Gateway.pod -@unexec rmdir %D/%%SITE_PERL%%/News 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/News %%SITE_PERL%%/auto/News/Gateway/anykeyword.al %%SITE_PERL%%/auto/News/Gateway/bodyheaders.al %%SITE_PERL%%/auto/News/Gateway/cleanbody.al @@ -20,8 +20,8 @@ %%SITE_PERL%%/auto/News/Gateway/post.al %%SITE_PERL%%/auto/News/Gateway/previoushop.al %%SITE_PERL%%/auto/News/Gateway/whitelist.al -@unexec rmdir %D/%%SITE_PERL%%/auto/News/Gateway 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/auto/News 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/News/Gateway +@dirrmtry %%SITE_PERL%%/auto/News %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Gateway/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Gateway share/examples/Gateway/listgate diff --git a/news/p5-NNTPClient/pkg-plist b/news/p5-NNTPClient/pkg-plist index 30f5bb0f3c8b..7c51cdb6f8b5 100644 --- a/news/p5-NNTPClient/pkg-plist +++ b/news/p5-NNTPClient/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/News/NNTPClient.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/NNTPClient/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/NNTPClient -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/News 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/News 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/News +@dirrmtry %%SITE_PERL%%/News diff --git a/news/p5-News-Article-NoCeM/pkg-plist b/news/p5-News-Article-NoCeM/pkg-plist index 28a6afd0216b..8932268129fa 100644 --- a/news/p5-News-Article-NoCeM/pkg-plist +++ b/news/p5-News-Article-NoCeM/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/News/Article/NoCeM.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Article/NoCeM/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Article/NoCeM -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Article 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/News/Article 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Article +@dirrmtry %%SITE_PERL%%/News/Article diff --git a/news/p5-News-Article/pkg-plist b/news/p5-News-Article/pkg-plist index 6825491b9154..e5b4a8b1c6b8 100644 --- a/news/p5-News-Article/pkg-plist +++ b/news/p5-News-Article/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/News/FormReply.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Article/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Article -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/News 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/News 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/News +@dirrmtry %%SITE_PERL%%/News diff --git a/news/p5-News-Newsrc/pkg-plist b/news/p5-News-Newsrc/pkg-plist index 2366b1d0c678..6e94f91b2c6c 100644 --- a/news/p5-News-Newsrc/pkg-plist +++ b/news/p5-News-Newsrc/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/News/Newsrc.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Newsrc/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/News/Newsrc -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/News 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/News 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/News +@dirrmtry %%SITE_PERL%%/News diff --git a/news/p5-NewsLib/pkg-plist b/news/p5-NewsLib/pkg-plist index 837a0eb6dd8e..aa51f1a854c2 100644 --- a/news/p5-NewsLib/pkg-plist +++ b/news/p5-NewsLib/pkg-plist @@ -8,6 +8,6 @@ %%SITE_PERL%%/Net/NNTP/Proxy.pm %%SITE_PERL%%/Net/NNTP/Client.pm %%SITE_PERL%%/Net/NNTP/Functions.pm -@unexec rmdir %D/%%SITE_PERL%%/News/Article 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/News/Article @dirrm %%SITE_PERL%%/Net/NNTP @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NewsLib diff --git a/news/p5-POE-Component-Client-NNTP/pkg-plist b/news/p5-POE-Component-Client-NNTP/pkg-plist index 3fe2b976abcb..b43623a49c17 100644 --- a/news/p5-POE-Component-Client-NNTP/pkg-plist +++ b/news/p5-POE-Component-Client-NNTP/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/POE/Component/Client/NNTP.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/NNTP/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/NNTP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Client 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/Client +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE +@dirrmtry %%SITE_PERL%%/POE/Component/Client +@dirrmtry %%SITE_PERL%%/POE/Component +@dirrmtry %%SITE_PERL%%/POE diff --git a/news/slurp/pkg-plist b/news/slurp/pkg-plist index 9094f01cd881..b3d771012ab8 100644 --- a/news/slurp/pkg-plist +++ b/news/slurp/pkg-plist @@ -1,5 +1,5 @@ news/bin/slurp news/lib/slurp.sys.sample -@unexec rmdir %D/news/lib 2> /dev/null || true -@unexec rmdir %D/news/bin 2> /dev/null || true -@unexec rmdir %D/news 2> /dev/null || true +@dirrmtry news/lib +@dirrmtry news/bin +@dirrmtry news diff --git a/palm/jpilot/pkg-plist b/palm/jpilot/pkg-plist index 81fa32df1426..912f72c8245f 100644 --- a/palm/jpilot/pkg-plist +++ b/palm/jpilot/pkg-plist @@ -19,4 +19,4 @@ share/applications/jpilot.desktop %%NLS%%share/locale/vi/LC_MESSAGES/jpilot.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/jpilot.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/jpilot.mo -@unexec rmdir %D/share/applications 2>/dev/null || true +@dirrmtry share/applications diff --git a/palm/synce-gnomevfs/pkg-plist b/palm/synce-gnomevfs/pkg-plist index 82338cde5ac7..40e090b7c8fa 100644 --- a/palm/synce-gnomevfs/pkg-plist +++ b/palm/synce-gnomevfs/pkg-plist @@ -5,5 +5,5 @@ share/gnome/synce/synce-in-computer-folder.sh lib/gnome-vfs-2.0/modules/libsyncevfs.a lib/gnome-vfs-2.0/modules/libsyncevfs.la lib/gnome-vfs-2.0/modules/libsyncevfs.so -@unexec rmdir %D/share/gnome/pixmaps/synce 2> /dev/null || true -@unexec rmdir %D/share/gnome/synce 2> /dev/null || true +@dirrmtry share/gnome/pixmaps/synce +@dirrmtry share/gnome/synce diff --git a/palm/synce-gvfs/pkg-plist b/palm/synce-gvfs/pkg-plist index 82338cde5ac7..40e090b7c8fa 100644 --- a/palm/synce-gvfs/pkg-plist +++ b/palm/synce-gvfs/pkg-plist @@ -5,5 +5,5 @@ share/gnome/synce/synce-in-computer-folder.sh lib/gnome-vfs-2.0/modules/libsyncevfs.a lib/gnome-vfs-2.0/modules/libsyncevfs.la lib/gnome-vfs-2.0/modules/libsyncevfs.so -@unexec rmdir %D/share/gnome/pixmaps/synce 2> /dev/null || true -@unexec rmdir %D/share/gnome/synce 2> /dev/null || true +@dirrmtry share/gnome/pixmaps/synce +@dirrmtry share/gnome/synce diff --git a/palm/synce-multisync/pkg-plist b/palm/synce-multisync/pkg-plist index 02922dc4e4c6..443f5c7507ed 100644 --- a/palm/synce-multisync/pkg-plist +++ b/palm/synce-multisync/pkg-plist @@ -3,4 +3,4 @@ lib/multisync/libsynce_plugin.so lib/multisync/libsynce_plugin.so.0 share/gnome/synce/synce_multisync_plugin.glade @dirrm share/gnome/synce -@unexec rmdir %D/lib/multisync 2>/dev/null || true +@dirrmtry lib/multisync diff --git a/palm/synce-trayicon/pkg-plist b/palm/synce-trayicon/pkg-plist index ceeb07051651..165fb37ed135 100644 --- a/palm/synce-trayicon/pkg-plist +++ b/palm/synce-trayicon/pkg-plist @@ -5,4 +5,4 @@ share/pixmaps/synce/synce-color-small.png share/pixmaps/synce/synce-gray-small.png share/synce/synce_trayicon_properties.glade @dirrm share/pixmaps/synce -@unexec rmdir %D/share/synce 2> /dev/null || true +@dirrmtry share/synce diff --git a/polish/ekg/pkg-plist b/polish/ekg/pkg-plist index 87d17234f06d..60c65f0de995 100644 --- a/polish/ekg/pkg-plist +++ b/polish/ekg/pkg-plist @@ -20,7 +20,7 @@ libdata/pkgconfig/libgadu.pc %%DATADIR%%/themes/sic.theme %%DATADIR%%/themes/tohver.theme %%DATADIR%%/vars.txt -@unexec rmdir %D/man/pl/man1 2>/dev/null || true -@unexec rmdir %D/man/pl 2>/dev/null || true +@dirrmtry man/pl/man1 +@dirrmtry man/pl @dirrm %%DATADIR%%/themes @dirrm %%DATADIR%% diff --git a/polish/kadu/pkg-plist b/polish/kadu/pkg-plist index 8c9ecde067ce..d10e00e28f1d 100644 --- a/polish/kadu/pkg-plist +++ b/polish/kadu/pkg-plist @@ -559,19 +559,19 @@ share/icons/hicolor/22x22/apps/kadu.png share/icons/hicolor/24x24/apps/kadu.png share/icons/hicolor/32x32/apps/kadu.png share/icons/hicolor/48x48/apps/kadu.png -@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/22x22/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/24x24/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/24x24 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/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true -@unexec rmdir %D/share/applications 2>/dev/null || true +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor/22x22/apps +@dirrmtry share/icons/hicolor/22x22 +@dirrmtry share/icons/hicolor/24x24/apps +@dirrmtry share/icons/hicolor/24x24 +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons +@dirrmtry share/applications @dirrm %%DATADIR%%/translations @dirrm %%DATADIR%%/themes/sounds/default @dirrm %%DATADIR%%/themes/sounds diff --git a/ports-mgmt/jailaudit/pkg-plist b/ports-mgmt/jailaudit/pkg-plist index 447a2b0a3746..43a7a083dd0d 100644 --- a/ports-mgmt/jailaudit/pkg-plist +++ b/ports-mgmt/jailaudit/pkg-plist @@ -1,11 +1,11 @@ bin/jailaudit etc/jailaudit.conf.sample %%PERIODICDIR%%/security/410.jailaudit -@unexec rmdir %D/%%PERIODICDIR%%/security 2>/dev/null || true -@unexec rmdir %D/%%PERIODICDIR%% 2>/dev/null || true +@dirrmtry %%PERIODICDIR%%/security +@dirrmtry %%PERIODICDIR%% @exec mkdir -p %D/%%REPORTDIR%% -@unexec rmdir %D/%%REPORTDIR%% 2>/dev/null || true +@dirrmtry %%REPORTDIR%% @exec mkdir -p %D/%%TMPDIR%% -@unexec rmdir %D/%%TMPDIR%% 2>/dev/null || true +@dirrmtry %%TMPDIR%% @unexec rmdir %DPDIR%% 2>/dev/null || true -@unexec rmdir %D/jailaudit 2>/dev/null || true +@dirrmtry jailaudit diff --git a/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist b/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist index 3e2d25069968..49c2158a11ab 100644 --- a/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist +++ b/ports-mgmt/p5-FreeBSD-Portindex/pkg-plist @@ -11,5 +11,5 @@ etc/portindex.cfg.sample %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Portindex/.packlist @dirrm %%SITE_PERL%%/FreeBSD/Portindex @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Portindex -@unexec rmdir %D/%%SITE_PERL%%/FreeBSD 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/FreeBSD +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD diff --git a/ports-mgmt/portaudit/pkg-plist b/ports-mgmt/portaudit/pkg-plist index 84b4ccaaf52e..8edf7bb6dbc8 100644 --- a/ports-mgmt/portaudit/pkg-plist +++ b/ports-mgmt/portaudit/pkg-plist @@ -1,7 +1,7 @@ sbin/portaudit etc/portaudit.conf.sample %%PERIODICDIR%%/security/410.portaudit -@unexec rmdir %D/%%PERIODICDIR%%/security 2>/dev/null || true -@unexec rmdir %D/%%PERIODICDIR%% 2>/dev/null || true +@dirrmtry %%PERIODICDIR%%/security +@dirrmtry %%PERIODICDIR%% @exec mkdir -p %%DATABASEDIR%% @unexec rmdir %%DATABASEDIR%% 2>/dev/null || true diff --git a/ports-mgmt/portmanager/pkg-plist b/ports-mgmt/portmanager/pkg-plist index a59e63569925..dac7ae1fd888 100644 --- a/ports-mgmt/portmanager/pkg-plist +++ b/ports-mgmt/portmanager/pkg-plist @@ -24,5 +24,5 @@ lib/libMG.so lib/libMG.so.2 lib/libMGPM.so lib/libMGPM.so.1 -@unexec rmdir %D/etc/portmanager 2>/dev/null || true -@unexec rmdir %D/share/portmanager 2>/dev/null || true +@dirrmtry etc/portmanager +@dirrmtry share/portmanager diff --git a/ports-mgmt/portupgrade-devel/pkg-plist b/ports-mgmt/portupgrade-devel/pkg-plist index 03dffce2b2fa..3892dddc2c3d 100644 --- a/ports-mgmt/portupgrade-devel/pkg-plist +++ b/ports-mgmt/portupgrade-devel/pkg-plist @@ -30,7 +30,7 @@ etc/pkgtools.conf.sample etc/pkgtools.status-pkg.sh share/zsh/site-functions/_pkgtools @unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true -@unexec rmdir %D/share/zsh 2>/dev/null || true +@dirrmtry share/zsh %%PORTDOCS%%share/examples/pkgtools/bash/complete.sample %%PORTDOCS%%@dirrm share/examples/pkgtools/bash %%PORTDOCS%%share/examples/pkgtools/tcsh/complete.sample diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist index 03dffce2b2fa..3892dddc2c3d 100644 --- a/ports-mgmt/portupgrade/pkg-plist +++ b/ports-mgmt/portupgrade/pkg-plist @@ -30,7 +30,7 @@ etc/pkgtools.conf.sample etc/pkgtools.status-pkg.sh share/zsh/site-functions/_pkgtools @unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true -@unexec rmdir %D/share/zsh 2>/dev/null || true +@dirrmtry share/zsh %%PORTDOCS%%share/examples/pkgtools/bash/complete.sample %%PORTDOCS%%@dirrm share/examples/pkgtools/bash %%PORTDOCS%%share/examples/pkgtools/tcsh/complete.sample diff --git a/print/a2ps-letter/pkg-plist b/print/a2ps-letter/pkg-plist index 7ed8f4b22176..a9aed2df7274 100644 --- a/print/a2ps-letter/pkg-plist +++ b/print/a2ps-letter/pkg-plist @@ -272,17 +272,17 @@ share/locale/tr/LC_MESSAGES/a2ps.mo @dirrm %%DATADIR%% %%WITHEMACS%%@dirrm lib/xemacs/site-lisp %%WITHEMACS%%@dirrm lib/xemacs -@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ca 2> /dev/null || true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/cs 2> /dev/null || true -@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ko 2> /dev/null || true -@unexec rmdir %D/share/locale/no/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/no 2> /dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/pl 2> /dev/null || true -@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/pt 2> /dev/null || true -@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/sl 2> /dev/null || true +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko +@dirrmtry share/locale/no/LC_MESSAGES +@dirrmtry share/locale/no +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl diff --git a/print/adobe-cmaps/pkg-plist b/print/adobe-cmaps/pkg-plist index bd9a6791ff4b..fe9e0c85440d 100644 --- a/print/adobe-cmaps/pkg-plist +++ b/print/adobe-cmaps/pkg-plist @@ -453,7 +453,7 @@ share/ghostscript/Resource/rksj-cmaps/TCVN-RKSJ-H @dirrm share/ghostscript/Resource/CMap @exec mkdir -p %D/share/ghostscript/Resource/CIDFont @exec mkdir -p %D/share/ghostscript/Resource/Font -@unexec rmdir %D/share/ghostscript/Resource/Font 2>/dev/null || true -@unexec rmdir %D/share/ghostscript/Resource/CIDFont 2>/dev/null || true -@unexec rmdir %D/share/ghostscript/Resource 2>/dev/null || true -@unexec rmdir %D/share/ghostscript 2>/dev/null || true +@dirrmtry share/ghostscript/Resource/Font +@dirrmtry share/ghostscript/Resource/CIDFont +@dirrmtry share/ghostscript/Resource +@dirrmtry share/ghostscript diff --git a/print/axpoint/pkg-plist b/print/axpoint/pkg-plist index 7e25c924d3c1..a9149d7d0d40 100644 --- a/print/axpoint/pkg-plist +++ b/print/axpoint/pkg-plist @@ -1,8 +1,8 @@ bin/axpoint %%SITE_PERL%%/XML/Handler/AxPoint.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/AxPoint/.packlist -@unexec rmdir %D/%%SITE_PERL%%/XML/Handler 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/Handler +@dirrmtry %%SITE_PERL%%/XML @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/AxPoint -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/print/bjfilter360/pkg-plist b/print/bjfilter360/pkg-plist index 7bad862b525a..1048c4db8adf 100644 --- a/print/bjfilter360/pkg-plist +++ b/print/bjfilter360/pkg-plist @@ -11,6 +11,6 @@ libexec/bjfilter360/scripts/ja.lc usr/lib/bjlib/cnb_0980.tbl usr/lib/libcnbpo098.so usr/lib/libcnbpo098.so.1.0.0 -@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true +@dirrmtry usr/lib/bjlib @exec /compat/linux/sbin/ldconfig ; true @unexec /compat/linux/sbin/ldconfig ; true diff --git a/print/bjfilter850/pkg-plist b/print/bjfilter850/pkg-plist index a9badf98259d..ad555de6508c 100644 --- a/print/bjfilter850/pkg-plist +++ b/print/bjfilter850/pkg-plist @@ -11,6 +11,6 @@ libexec/bjfilter850/scripts/ja.lc usr/lib/bjlib/cnb_0740.tbl usr/lib/libcnbpo074.so usr/lib/libcnbpo074.so.1.0.0 -@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true +@dirrmtry usr/lib/bjlib @exec /compat/linux/sbin/ldconfig ; true @unexec /compat/linux/sbin/ldconfig ; true diff --git a/print/bjfilter850ug/pkg-plist b/print/bjfilter850ug/pkg-plist index 947153626b3f..53743f0771bc 100644 --- a/print/bjfilter850ug/pkg-plist +++ b/print/bjfilter850ug/pkg-plist @@ -11,6 +11,6 @@ libexec/bjfilter850ug/scripts/ja.lc usr/lib/bjlib/cnb_0740.tbl usr/lib/libcnbpo074.so usr/lib/libcnbpo074.so.1.0.0 -@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true +@dirrmtry usr/lib/bjlib @exec /compat/linux/sbin/ldconfig ; true @unexec /compat/linux/sbin/ldconfig ; true diff --git a/print/bjfilter860/pkg-plist b/print/bjfilter860/pkg-plist index 1d5c5d90c8f8..17096fc1d344 100644 --- a/print/bjfilter860/pkg-plist +++ b/print/bjfilter860/pkg-plist @@ -11,6 +11,6 @@ libexec/bjfilter860/scripts/ja.lc usr/lib/bjlib/cnb_1050.tbl usr/lib/libcnbpo105.so usr/lib/libcnbpo105.so.1.0.0 -@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true +@dirrmtry usr/lib/bjlib @exec /compat/linux/sbin/ldconfig ; true @unexec /compat/linux/sbin/ldconfig ; true diff --git a/print/bjfilter870/pkg-plist b/print/bjfilter870/pkg-plist index 60893b60d1fc..2f50e0c4f75b 100644 --- a/print/bjfilter870/pkg-plist +++ b/print/bjfilter870/pkg-plist @@ -11,6 +11,6 @@ libexec/bjfilter870/scripts/ja.lc usr/lib/bjlib/cnb_1020.tbl usr/lib/libcnbpo102.so usr/lib/libcnbpo102.so.1.0.0 -@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true +@dirrmtry usr/lib/bjlib @exec /compat/linux/sbin/ldconfig ; true @unexec /compat/linux/sbin/ldconfig ; true diff --git a/print/bjfiltercom/pkg-plist b/print/bjfiltercom/pkg-plist index c143e365de52..aa7127bee842 100644 --- a/print/bjfiltercom/pkg-plist +++ b/print/bjfiltercom/pkg-plist @@ -85,14 +85,14 @@ usr/local/share/stsmon/pixmaps/Inkg_sp.xpm usr/local/share/stsmon/pixmaps/Inkg_ye.xpm @dirrm usr/local/share/stsmon/pixmaps @dirrm usr/local/share/stsmon -@unexec rmdir %D/usr/local/share/printui 2>/dev/null || true -@unexec rmdir %D/usr/local/share/locale/ja/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/usr/local/share/locale/ja 2>/dev/null || true -@unexec rmdir %D/usr/local/share/locale 2>/dev/null || true -@unexec rmdir %D/usr/local/share 2>/dev/null || true -@unexec rmdir %D/usr/local 2>/dev/null || true -@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true -@unexec rmdir %D/usr/lib 2>/dev/null || true -@unexec rmdir %D/usr 2>/dev/null || true +@dirrmtry usr/local/share/printui +@dirrmtry usr/local/share/locale/ja/LC_MESSAGES +@dirrmtry usr/local/share/locale/ja +@dirrmtry usr/local/share/locale +@dirrmtry usr/local/share +@dirrmtry usr/local +@dirrmtry usr/lib/bjlib +@dirrmtry usr/lib +@dirrmtry usr @exec /compat/linux/sbin/ldconfig ; true @unexec /compat/linux/sbin/ldconfig ; true diff --git a/print/bjfilters600/pkg-plist b/print/bjfilters600/pkg-plist index e683fd9a279c..56ddeda1f6be 100644 --- a/print/bjfilters600/pkg-plist +++ b/print/bjfilters600/pkg-plist @@ -11,6 +11,6 @@ libexec/bjfilters600/scripts/ja.lc usr/lib/bjlib/cnb_1040.tbl usr/lib/libcnbpo104.so usr/lib/libcnbpo104.so.1.0.0 -@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true +@dirrmtry usr/lib/bjlib @exec /compat/linux/sbin/ldconfig ; true @unexec /compat/linux/sbin/ldconfig ; true diff --git a/print/bjfilters630/pkg-plist b/print/bjfilters630/pkg-plist index c1cbcffc7a29..cb37cdf6a5c2 100644 --- a/print/bjfilters630/pkg-plist +++ b/print/bjfilters630/pkg-plist @@ -11,6 +11,6 @@ libexec/bjfilters630/scripts/ja.lc usr/lib/bjlib/cnb_1230.tbl usr/lib/libcnbpo123.so usr/lib/libcnbpo123.so.1.0.0 -@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true +@dirrmtry usr/lib/bjlib @exec /compat/linux/sbin/ldconfig ; true @unexec /compat/linux/sbin/ldconfig ; true diff --git a/print/bjfilters6300/pkg-plist b/print/bjfilters6300/pkg-plist index 0bd484554e50..e3e672d47809 100644 --- a/print/bjfilters6300/pkg-plist +++ b/print/bjfilters6300/pkg-plist @@ -11,6 +11,6 @@ libexec/bjfilters6300/scripts/ja.lc usr/lib/bjlib/cnb_1130.tbl usr/lib/libcnbpo113.so usr/lib/libcnbpo113.so.1.0.0 -@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true +@dirrmtry usr/lib/bjlib @exec /compat/linux/sbin/ldconfig ; true @unexec /compat/linux/sbin/ldconfig ; true diff --git a/print/cjk-lyx/pkg-plist b/print/cjk-lyx/pkg-plist index 93d60c051b0c..e127caa69d65 100644 --- a/print/cjk-lyx/pkg-plist +++ b/print/cjk-lyx/pkg-plist @@ -938,22 +938,22 @@ share/locale/ko/LC_MESSAGES/lyx.mo %%DATADIR%%/encodings %%DATADIR%%/languages %%DATADIR%%/symbols -@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/fi 2>/dev/null || true -@unexec rmdir %D/share/locale/nn/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/nn 2>/dev/null || true -@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/no 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pl 2>/dev/null || true -@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ro 2>/dev/null || true -@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sk 2>/dev/null || true -@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sl 2>/dev/null || true -@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ko 2>/dev/null || true +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/nn/LC_MESSAGES +@dirrmtry share/locale/nn +@dirrmtry share/locale/no/LC_MESSAGES +@dirrmtry share/locale/no +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/ko/LC_MESSAGES +@dirrmtry share/locale/ko @dirrm %%DATADIR%%/reLyX/Text @dirrm %%DATADIR%%/reLyX @dirrm %%DATADIR%%/bind diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist index 334295f09d91..cce1325d55c7 100644 --- a/print/cups-base/pkg-plist +++ b/print/cups-base/pkg-plist @@ -544,30 +544,30 @@ share/locale/sv/cups_sv share/locale/uk/cups_uk share/locale/uk_UA/cups_uk_UA share/locale/zh_CN/cups_zh_CN -@unexec rmdir %D/man/fr/man8 2>/dev/null || true -@unexec rmdir %D/man/fr/man5 2>/dev/null || true -@unexec rmdir %D/man/fr/man1 2>/dev/null || true -@unexec rmdir %D/man/fr 2>/dev/null || true -@unexec rmdir %D/man/es/man8 2>/dev/null || true -@unexec rmdir %D/man/es/man5 2>/dev/null || true -@unexec rmdir %D/man/es/man1 2>/dev/null || true -@unexec rmdir %D/man/es 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true -@unexec rmdir %D/share/locale/uk_UA 2>/dev/null || true -@unexec rmdir %D/share/locale/uk 2>/dev/null || true -@unexec rmdir %D/share/locale/sv 2>/dev/null || true -@unexec rmdir %D/share/locale/ru_RU 2>/dev/null || true -@unexec rmdir %D/share/locale/it 2>/dev/null || true -@unexec rmdir %D/share/locale/he 2>/dev/null || true -@unexec rmdir %D/share/locale/fr 2>/dev/null || true -@unexec rmdir %D/share/locale/es 2>/dev/null || true -@unexec rmdir %D/share/locale/en 2>/dev/null || true -@unexec rmdir %D/share/locale/en_US 2>/dev/null || true -@unexec rmdir %D/share/locale/de 2>/dev/null || true -@unexec rmdir %D/share/locale/cs 2>/dev/null || true -@unexec rmdir %D/share/locale/be 2>/dev/null || true -@unexec rmdir %D/share/locale/C 2>/dev/null || true -@unexec rmdir %D/share/locale 2>/dev/null || true +@dirrmtry man/fr/man8 +@dirrmtry man/fr/man5 +@dirrmtry man/fr/man1 +@dirrmtry man/fr +@dirrmtry man/es/man8 +@dirrmtry man/es/man5 +@dirrmtry man/es/man1 +@dirrmtry man/es +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/uk_UA +@dirrmtry share/locale/uk +@dirrmtry share/locale/sv +@dirrmtry share/locale/ru_RU +@dirrmtry share/locale/it +@dirrmtry share/locale/he +@dirrmtry share/locale/fr +@dirrmtry share/locale/es +@dirrmtry share/locale/en +@dirrmtry share/locale/en_US +@dirrmtry share/locale/de +@dirrmtry share/locale/cs +@dirrmtry share/locale/be +@dirrmtry share/locale/C +@dirrmtry share/locale @dirrm share/doc/cups/images @dirrm share/doc/cups/be/images @dirrm share/doc/cups/be @@ -604,4 +604,4 @@ share/locale/zh_CN/cups_zh_CN @exec mkdir %D/etc/cups/ppd || true @exec mkdir %D/etc/cups/interfaces || true @unexec rm -rf /var/spool/cups -@unexec rmdir %D/etc/cups 2>/dev/null || true +@dirrmtry etc/cups diff --git a/print/ec-fonts-mftraced/pkg-plist b/print/ec-fonts-mftraced/pkg-plist index dc9fc59a2c29..a4f097bd60e4 100644 --- a/print/ec-fonts-mftraced/pkg-plist +++ b/print/ec-fonts-mftraced/pkg-plist @@ -113,14 +113,14 @@ %%TEXMFLOCALDIR%%/fonts/type1/public/ec-fonts-mftraced/ectt8.pfa %%TEXMFLOCALDIR%%/fonts/type1/public/ec-fonts-mftraced/ectt9.pfa @dirrm %%TEXMFLOCALDIR%%/fonts/type1/public/ec-fonts-mftraced -@unexec rmdir %D/%%TEXMFLOCALDIR%%/fonts/type1/public 2>/dev/null || true -@unexec rmdir %D/%%TEXMFLOCALDIR%%/fonts/type1 2>/dev/null || true +@dirrmtry %%TEXMFLOCALDIR%%/fonts/type1/public +@dirrmtry %%TEXMFLOCALDIR%%/fonts/type1 @dirrm %%TEXMFLOCALDIR%%/fonts/tfm/public/ec-fonts-mftraced -@unexec rmdir %D/%%TEXMFLOCALDIR%%/fonts/tfm/public 2>/dev/null || true -@unexec rmdir %D/%%TEXMFLOCALDIR%%/fonts/tfm 2>/dev/null || true +@dirrmtry %%TEXMFLOCALDIR%%/fonts/tfm/public +@dirrmtry %%TEXMFLOCALDIR%%/fonts/tfm @dirrm %%TEXMFLOCALDIR%%/fonts/map/dvips/ec-fonts-mftraced -@unexec rmdir %D/%%TEXMFLOCALDIR%%/fonts/map/dvips 2>/dev/null || true -@unexec rmdir %D/%%TEXMFLOCALDIR%%/fonts/map 2>/dev/null || true -@unexec rmdir %D/%%TEXMFLOCALDIR%%/fonts 2>/dev/null || true -@unexec rmdir %D/%%TEXMFLOCALDIR%%/dvips 2>/dev/null || true -@unexec rmdir %D/%%TEXMFLOCALDIR%% 2>/dev/null || true +@dirrmtry %%TEXMFLOCALDIR%%/fonts/map/dvips +@dirrmtry %%TEXMFLOCALDIR%%/fonts/map +@dirrmtry %%TEXMFLOCALDIR%%/fonts +@dirrmtry %%TEXMFLOCALDIR%%/dvips +@dirrmtry %%TEXMFLOCALDIR%% diff --git a/print/foomatic-db-engine/pkg-plist b/print/foomatic-db-engine/pkg-plist index 944f9b22b283..4b590a10bc65 100644 --- a/print/foomatic-db-engine/pkg-plist +++ b/print/foomatic-db-engine/pkg-plist @@ -25,6 +25,6 @@ share/foomatic/templates/pjl_num_option.xml @dirrm %%SITE_PERL%%/Foomatic @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Foomatic @dirrm share/foomatic/templates -@unexec rmdir %D/share/foomatic 2>/dev/null || true +@dirrmtry share/foomatic @unexec rmdir %D/etc/foomatic @exec mkdir -p %D/etc/foomatic diff --git a/print/ghostscript-afpl/pkg-plist b/print/ghostscript-afpl/pkg-plist index 64051a47c178..5874df19174e 100644 --- a/print/ghostscript-afpl/pkg-plist +++ b/print/ghostscript-afpl/pkg-plist @@ -510,8 +510,8 @@ bin/wftopfa @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/CMap @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource -@unexec rmdir %D/%%DATADIR%%/%%GS_VERSION%% 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true +@dirrmtry %%DATADIR%%/%%GS_VERSION%% +@dirrmtry %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/mjc %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/md2k %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/lxm3200 diff --git a/print/ghostscript-gnu/pkg-plist b/print/ghostscript-gnu/pkg-plist index 4f496a9e2637..0f4f7afd190f 100644 --- a/print/ghostscript-gnu/pkg-plist +++ b/print/ghostscript-gnu/pkg-plist @@ -365,7 +365,7 @@ share/ghostscript/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps @dirrm share/ghostscript/%%GS_VERSION%%/examples @dirrm share/ghostscript/%%GS_VERSION%%/doc @dirrm share/ghostscript/%%GS_VERSION%% -@unexec rmdir %D/share/ghostscript 2>/dev/null || true +@dirrmtry share/ghostscript %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/pcl3 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/mjc %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/md2k diff --git a/print/ghostscript-gpl/pkg-plist b/print/ghostscript-gpl/pkg-plist index 62279dab99f8..8ec960682bc1 100644 --- a/print/ghostscript-gpl/pkg-plist +++ b/print/ghostscript-gpl/pkg-plist @@ -514,8 +514,8 @@ bin/wftopfa @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/CMap @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource -@unexec rmdir %D/%%DATADIR%%/%%GS_VERSION%% 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true +@dirrmtry %%DATADIR%%/%%GS_VERSION%% +@dirrmtry %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/pcl3 %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/mjc %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/md2k diff --git a/print/ghostscript7/pkg-plist b/print/ghostscript7/pkg-plist index 4f496a9e2637..0f4f7afd190f 100644 --- a/print/ghostscript7/pkg-plist +++ b/print/ghostscript7/pkg-plist @@ -365,7 +365,7 @@ share/ghostscript/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps @dirrm share/ghostscript/%%GS_VERSION%%/examples @dirrm share/ghostscript/%%GS_VERSION%%/doc @dirrm share/ghostscript/%%GS_VERSION%% -@unexec rmdir %D/share/ghostscript 2>/dev/null || true +@dirrmtry share/ghostscript %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/pcl3 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/mjc %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/md2k diff --git a/print/ghostscript8/pkg-plist b/print/ghostscript8/pkg-plist index 62279dab99f8..8ec960682bc1 100644 --- a/print/ghostscript8/pkg-plist +++ b/print/ghostscript8/pkg-plist @@ -514,8 +514,8 @@ bin/wftopfa @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/CMap @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource -@unexec rmdir %D/%%DATADIR%%/%%GS_VERSION%% 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true +@dirrmtry %%DATADIR%%/%%GS_VERSION%% +@dirrmtry %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/pcl3 %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/mjc %%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/md2k diff --git a/print/gsfonts/pkg-plist b/print/gsfonts/pkg-plist index 55286a549b7c..b2cd1846f227 100644 --- a/print/gsfonts/pkg-plist +++ b/print/gsfonts/pkg-plist @@ -158,4 +158,4 @@ %%PORTDOCS%%share/doc/gsfonts/TODO @dirrm %%FONTSDIR%% %%PORTDOCS%%@dirrm share/doc/gsfonts -@unexec rmdir %D/share/ghostscript 2>/dev/null || true +@dirrmtry share/ghostscript diff --git a/print/gtklp/pkg-plist b/print/gtklp/pkg-plist index 4640524b2a97..de8831d8ccfc 100644 --- a/print/gtklp/pkg-plist +++ b/print/gtklp/pkg-plist @@ -17,9 +17,9 @@ share/locale/pt_BR/LC_MESSAGES/gtklp.mo share/locale/ru/LC_MESSAGES/gtklp.mo share/locale/zh_CN/LC_MESSAGES/gtklp.mo share/locale/zh_TW/LC_MESSAGES/gtklp.mo -@unexec rmdir %D/share/locale/cz/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/cz 2> /dev/null || true -@unexec rmdir %D/share/locale/cht/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/cht 2> /dev/null || true -@unexec rmdir %D/share/locale/chs/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/chs 2> /dev/null || true +@dirrmtry share/locale/cz/LC_MESSAGES +@dirrmtry share/locale/cz +@dirrmtry share/locale/cht/LC_MESSAGES +@dirrmtry share/locale/cht +@dirrmtry share/locale/chs/LC_MESSAGES +@dirrmtry share/locale/chs diff --git a/print/jadetex/pkg-plist b/print/jadetex/pkg-plist index 8758f3254724..243e8a993803 100644 --- a/print/jadetex/pkg-plist +++ b/print/jadetex/pkg-plist @@ -7,6 +7,6 @@ share/texmf/tex/jadetex/dsssl.def share/texmf/tex/jadetex/jadetex.ltx share/texmf/web2c/jadetex.fmt share/texmf/web2c/pdfjadetex.fmt -@unexec rmdir %D/share/texmf/tex/jadetex 2> /dev/null || true +@dirrmtry share/texmf/tex/jadetex @exec %D/bin/mktexlsr @unexec %D/bin/mktexlsr diff --git a/print/kcdlabel/pkg-plist b/print/kcdlabel/pkg-plist index a4b64a3c1726..af5fac156753 100644 --- a/print/kcdlabel/pkg-plist +++ b/print/kcdlabel/pkg-plist @@ -15,17 +15,17 @@ share/locale/de/LC_MESSAGES/kcdlabel.mo share/locale/fr/LC_MESSAGES/kcdlabel.mo share/locale/hu/LC_MESSAGES/kcdlabel.mo share/locale/it/LC_MESSAGES/kcdlabel.mo -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cs 2>/dev/null || true -@unexec rmdir %D/share/icons/small/locolor/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/small/locolor 2>/dev/null || true -@unexec rmdir %D/share/icons/small 2>/dev/null || true -@unexec rmdir %D/share/icons/medium/locolor/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/medium/locolor 2>/dev/null || true -@unexec rmdir %D/share/icons/medium 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/icons/small/locolor/apps +@dirrmtry share/icons/small/locolor +@dirrmtry share/icons/small +@dirrmtry share/icons/medium/locolor/apps +@dirrmtry share/icons/medium/locolor +@dirrmtry share/icons/medium +@dirrmtry share/icons @dirrm share/doc/HTML/en/kcdlabel -@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML 2>/dev/null || true -@unexec rmdir %D/share/applnk/Multimedia 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/doc/HTML/en +@dirrmtry share/doc/HTML +@dirrmtry share/applnk/Multimedia +@dirrmtry share/applnk diff --git a/print/kover/pkg-plist b/print/kover/pkg-plist index 88e51e9f8a41..a4e732029ab4 100644 --- a/print/kover/pkg-plist +++ b/print/kover/pkg-plist @@ -21,23 +21,23 @@ share/locale/nb/LC_MESSAGES/kover.mo share/locale/no/LC_MESSAGES/kover.mo share/locale/pl/LC_MESSAGES/kover.mo share/mimelnk/application/x-kover.desktop -@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true -@unexec rmdir %D/share/mimelnk 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true +@dirrmtry share/mimelnk/application +@dirrmtry share/mimelnk +@dirrmtry share/icons/locolor/32x32/apps +@dirrmtry share/icons/locolor/32x32 +@dirrmtry share/icons/locolor/16x16/apps +@dirrmtry share/icons/locolor/16x16 +@dirrmtry share/icons/locolor +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons @dirrm share/apps/kover/pics @dirrm share/apps/kover -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Multimedia 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/apps +@dirrmtry share/applnk/Multimedia +@dirrmtry share/applnk diff --git a/print/latex/pkg-plist b/print/latex/pkg-plist index 626320b3ab6c..ebdb6b98bf06 100644 --- a/print/latex/pkg-plist +++ b/print/latex/pkg-plist @@ -1035,6 +1035,6 @@ share/texmf/web2c/latex.fmt @dirrm share/texmf/fonts/vf/adobe @dirrm share/texmf/tex/latex/psnfss @dirrm share/texmf/tex/latex -@unexec rmdir %D/share/texmf/makeindx 2>/dev/null || true -@unexec rmdir %D/share/texmf/documentation 2>/dev/null || true -@unexec rmdir %D/share/texmf/fonts/vf 2>/dev/null || true +@dirrmtry share/texmf/makeindx +@dirrmtry share/texmf/documentation +@dirrmtry share/texmf/fonts/vf diff --git a/print/lgrind/pkg-plist b/print/lgrind/pkg-plist index fa1a105e0b6f..2c075ed50dbd 100644 --- a/print/lgrind/pkg-plist +++ b/print/lgrind/pkg-plist @@ -3,9 +3,9 @@ share/texmf/doc/latex/lgrind/lgrind.dvi share/texmf/tex/latex/lgrind/lgrind.sty share/texmf/tex/latex/lgrind/lgrindef @dirrm share/texmf/tex/latex/lgrind -@unexec rmdir %D/share/texmf/tex/latex 2>/dev/null || true -@unexec rmdir %D/share/texmf/tex 2>/dev/null || true +@dirrmtry share/texmf/tex/latex +@dirrmtry share/texmf/tex @dirrm share/texmf/doc/latex/lgrind -@unexec rmdir %D/share/texmf/doc/latex 2>/dev/null || true -@unexec rmdir %D/share/texmf/doc 2>/dev/null || true -@unexec rmdir %D/share/texmf 2>/dev/null || true +@dirrmtry share/texmf/doc/latex +@dirrmtry share/texmf/doc +@dirrmtry share/texmf diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist index 783bea79666b..c5d1cadeb8e6 100644 --- a/print/libgnomeprint/pkg-plist +++ b/print/libgnomeprint/pkg-plist @@ -152,14 +152,14 @@ share/locale/wa/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/xh/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/zh_CN/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/zh_TW/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/xh 2>/dev/null || true -@unexec rmdir %D/share/locale/te/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/te 2>/dev/null || true -@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/rw 2>/dev/null || true -@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/mr 2>/dev/null || true +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr @dirrm share/gnome/libgnomeprint/%%VERSION%%/printers/uninstalled @dirrm share/gnome/libgnomeprint/%%VERSION%%/printers @dirrm share/gnome/libgnomeprint/%%VERSION%%/models/uninstalled diff --git a/print/makeindex/pkg-plist b/print/makeindex/pkg-plist index 72db3a965674..4da192b0b64f 100644 --- a/print/makeindex/pkg-plist +++ b/print/makeindex/pkg-plist @@ -16,4 +16,4 @@ share/texmf/makeindx/german/wb.ist @dirrm share/texmf/makeindx/english @dirrm share/texmf/makeindx/german @dirrm share/texmf/makeindx -@unexec rmdir %D/share/texmf 2>/dev/null || true +@dirrmtry share/texmf diff --git a/print/musixtex/pkg-plist b/print/musixtex/pkg-plist index f4b0e150b27a..449c3aa27c82 100644 --- a/print/musixtex/pkg-plist +++ b/print/musixtex/pkg-plist @@ -273,5 +273,5 @@ share/texmf/tex/musixtex.tex share/texmf/tex/musixtri.tex @exec %D/bin/texhash || true @dirrm share/texmf/documentation/musixtex.examples -@unexec rmdir %D/share/texmf/documentation 2>/dev/null || true +@dirrmtry share/texmf/documentation @unexec %D/bin/texhash || true diff --git a/print/p5-Net-Printer/pkg-plist b/print/p5-Net-Printer/pkg-plist index e19a26568bba..1bbb9368b381 100644 --- a/print/p5-Net-Printer/pkg-plist +++ b/print/p5-Net-Printer/pkg-plist @@ -2,7 +2,7 @@ %%SITE_PERL%%/auto/Net/Printer/autosplit.ix %%SITE_PERL%%/mach/auto/Net/Printer/.packlist @dirrm %%SITE_PERL%%/mach/auto/Net/Printer -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/mach/auto/Net @dirrm %%SITE_PERL%%/auto/Net/Printer -@unexec rmdir %D/%%SITE_PERL%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net diff --git a/print/p5-PostScript-Simple/pkg-plist b/print/p5-PostScript-Simple/pkg-plist index 964b3137da06..15051c4afcba 100644 --- a/print/p5-PostScript-Simple/pkg-plist +++ b/print/p5-PostScript-Simple/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/PostScript/Simple/EPS.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript/Simple @dirrm %%SITE_PERL%%/PostScript/Simple -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PostScript 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PostScript +@dirrmtry %%SITE_PERL%%/PostScript diff --git a/print/p5-Text-PDF/pkg-plist b/print/p5-Text-PDF/pkg-plist index 90a4fe7407fb..fc02546a1fa3 100644 --- a/print/p5-Text-PDF/pkg-plist +++ b/print/p5-Text-PDF/pkg-plist @@ -31,7 +31,7 @@ bin/pdfstamp.plx %%SITE_PERL%%/Text/PDF/examples/test.pdf %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/PDF/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/PDF -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text @dirrm %%SITE_PERL%%/Text/PDF/examples @dirrm %%SITE_PERL%%/Text/PDF -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Text diff --git a/print/texinfo/pkg-plist b/print/texinfo/pkg-plist index 7fcdc1a6a4ad..741f7a76e03e 100644 --- a/print/texinfo/pkg-plist +++ b/print/texinfo/pkg-plist @@ -42,25 +42,25 @@ share/locale/zh_TW/LC_MESSAGES/texinfo.mo %%TEXMFLOCAL%%/tex/texinfo/txi-pt.tex %%TEXMFLOCAL%%/tex/texinfo/txi-tr.tex @dirrm %%TEXMFLOCAL%%/tex/texinfo -@unexec rmdir %D/%%TEXMFLOCAL%%/tex/generic/dvips 2> /dev/null || true -@unexec rmdir %D/%%TEXMFLOCAL%%/tex/generic 2> /dev/null || true -@unexec rmdir %D/%%TEXMFLOCAL%%/tex 2> /dev/null || true -@unexec rmdir %D/%%TEXMFLOCAL%%/pdftex/plain/misc 2> /dev/null || true -@unexec rmdir %D/%%TEXMFLOCAL%%/pdftex/plain 2> /dev/null || true -@unexec rmdir %D/%%TEXMFLOCAL%%/pdftex 2> /dev/null || true -@unexec rmdir %D/%%TEXMFLOCAL%% 2> /dev/null || true +@dirrmtry %%TEXMFLOCAL%%/tex/generic/dvips +@dirrmtry %%TEXMFLOCAL%%/tex/generic +@dirrmtry %%TEXMFLOCAL%%/tex +@dirrmtry %%TEXMFLOCAL%%/pdftex/plain/misc +@dirrmtry %%TEXMFLOCAL%%/pdftex/plain +@dirrmtry %%TEXMFLOCAL%%/pdftex +@dirrmtry %%TEXMFLOCAL%% @dirrm %%DATADIR%% -@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zh_TW 2> /dev/null || true -@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zh_CN 2> /dev/null || true -@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ro 2> /dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/pl 2> /dev/null || true -@unexec rmdir %D/share/locale/no/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/no 2> /dev/null || true -@unexec rmdir %D/share/locale/de_AT/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/de_AT 2> /dev/null || true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/cs 2> /dev/null || true +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/no/LC_MESSAGES +@dirrmtry share/locale/no +@dirrmtry share/locale/de_AT/LC_MESSAGES +@dirrmtry share/locale/de_AT +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs diff --git a/print/tr2latex/pkg-plist b/print/tr2latex/pkg-plist index b156f1193e1c..6592121875ab 100644 --- a/print/tr2latex/pkg-plist +++ b/print/tr2latex/pkg-plist @@ -1,7 +1,7 @@ bin/tr2latex share/texmf/tex/latex/misc/troffman.sty share/texmf/tex/latex/misc/troffms.sty -@unexec rmdir %D/share/texmf/tex/latex/misc 2> /dev/null || true -@unexec rmdir %D/share/texmf/tex/latex 2> /dev/null || true -@unexec rmdir %D/share/texmf/tex 2> /dev/null || true -@unexec rmdir %D/share/texmf 2> /dev/null || true +@dirrmtry share/texmf/tex/latex/misc +@dirrmtry share/texmf/tex/latex +@dirrmtry share/texmf/tex +@dirrmtry share/texmf diff --git a/print/transfig/pkg-plist b/print/transfig/pkg-plist index 6d0fcdf73b43..815dc51100dd 100644 --- a/print/transfig/pkg-plist +++ b/print/transfig/pkg-plist @@ -88,5 +88,5 @@ lib/X11/xfig/bitmaps/vert_rightshingle.bmp lib/X11/xfig/bitmaps/vert_saw.bmp lib/X11/xfig/bitmaps/vertical.bmp @dirrm lib/X11/xfig/bitmaps -@unexec rmdir %D/lib/X11/xfig 2> /dev/null || true +@dirrmtry lib/X11/xfig @dirrm lib/X11/fig2dev diff --git a/print/xfce4-print/pkg-plist b/print/xfce4-print/pkg-plist index 4150d2fbef21..0cfb49813ab4 100644 --- a/print/xfce4-print/pkg-plist +++ b/print/xfce4-print/pkg-plist @@ -80,19 +80,19 @@ share/xfce4/doc/he/images/xfprint_prettyprinting.png share/xfce4/doc/he/images/xfprint_sheets.png share/xfce4/doc/he/images/xfprint_virtualpages.png share/xfce4/doc/he/xfprint.html -@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true -@unexec rmdir %D/lib/xfce4/xfprint-plugins 2>/dev/null || true -@unexec rmdir %D/lib/xfce4 2>/dev/null || true -@unexec rmdir %D/share/applications 2>/dev/null || true -@unexec rmdir %D/share/locale/bn_IN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/bn_IN 2>/dev/null || true -@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/mr 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true -@unexec rmdir %D/share/xfce4 2>/dev/null || true +@dirrmtry lib/xfce4/mcs-plugins +@dirrmtry lib/xfce4/xfprint-plugins +@dirrmtry lib/xfce4 +@dirrmtry share/applications +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/xfce4/doc/C/images +@dirrmtry share/xfce4/doc/C +@dirrmtry share/xfce4/doc/fr/images +@dirrmtry share/xfce4/doc/fr +@dirrmtry share/xfce4/doc/he/images +@dirrmtry share/xfce4/doc/he +@dirrmtry share/xfce4/doc +@dirrmtry share/xfce4 diff --git a/russian/cyrproxy/pkg-plist b/russian/cyrproxy/pkg-plist index 7f147b20d9e1..d81ceaef9225 100644 --- a/russian/cyrproxy/pkg-plist +++ b/russian/cyrproxy/pkg-plist @@ -23,4 +23,4 @@ libexec/tcpspy www/cgi-bin/cyrwww @dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/www/cgi-bin 2> /dev/null || true +@dirrmtry www/cgi-bin diff --git a/russian/fortuneru/pkg-plist b/russian/fortuneru/pkg-plist index dc988e50c80f..f7ea5ba843bc 100644 --- a/russian/fortuneru/pkg-plist +++ b/russian/fortuneru/pkg-plist @@ -32,5 +32,5 @@ share/games/fortune/rus/windows_errors.dat share/games/fortune/rus/pavlenka share/games/fortune/rus/pavlenka.dat @dirrm share/games/fortune/rus -@unexec rmdir %D/share/games/fortune 2>/dev/null || true -@unexec rmdir %D/share/games 2>/dev/null || true +@dirrmtry share/games/fortune +@dirrmtry share/games diff --git a/russian/ksocrat/pkg-plist b/russian/ksocrat/pkg-plist index d83d402c6383..b1f163787424 100644 --- a/russian/ksocrat/pkg-plist +++ b/russian/ksocrat/pkg-plist @@ -10,18 +10,18 @@ share/apps/ksocrat/Arsenal_Commware_License_ENG.txt share/apps/ksocrat/Arsenal_Commware_License_RUS.txt share/apps/ksocrat/enru.dic share/apps/ksocrat/ruen.dic -@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/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/locolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons/locolor/16x16/apps +@dirrmtry share/icons/locolor/16x16 +@dirrmtry share/icons/locolor/32x32/apps +@dirrmtry share/icons/locolor/32x32 +@dirrmtry share/icons/locolor +@dirrmtry share/icons @dirrm share/apps/ksocrat -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/apps +@dirrmtry share/applnk/Applications +@dirrmtry share/applnk diff --git a/russian/messarge/pkg-plist b/russian/messarge/pkg-plist index f1bc09dfe9e3..6274ae03e123 100644 --- a/russian/messarge/pkg-plist +++ b/russian/messarge/pkg-plist @@ -15,5 +15,5 @@ share/examples/messarge/s.shtml share/examples/messarge/t.shtml share/examples/messarge/write.shtml @dirrm share/examples/messarge -@unexec rmdir %D/man/ru_RU.KOI8-R/man1 2> /dev/null || true -@unexec rmdir %D/man/ru_RU.KOI8-R 2> /dev/null || true +@dirrmtry man/ru_RU.KOI8-R/man1 +@dirrmtry man/ru_RU.KOI8-R diff --git a/russian/p5-Lingua-RU-Charset/pkg-plist b/russian/p5-Lingua-RU-Charset/pkg-plist index f91b2535e624..2c8d16043d2c 100644 --- a/russian/p5-Lingua-RU-Charset/pkg-plist +++ b/russian/p5-Lingua-RU-Charset/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Lingua/RU/Charset.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/RU/Charset/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/RU/Charset -@unexec rmdir %D/%%SITE_PERL%%/Lingua/RU 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/RU 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Lingua/RU +@dirrmtry %%SITE_PERL%%/Lingua +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/RU +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua diff --git a/russian/p5-XML-Parser-encodings/pkg-plist b/russian/p5-XML-Parser-encodings/pkg-plist index 53fa70993e8e..2b5d3bfc40b7 100644 --- a/russian/p5-XML-Parser-encodings/pkg-plist +++ b/russian/p5-XML-Parser-encodings/pkg-plist @@ -3,6 +3,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/mac-cyrillic.enc %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/koi8-r.enc %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings/windows-1251.enc -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML diff --git a/russian/tac+ia/pkg-plist b/russian/tac+ia/pkg-plist index fe0ce2c0f99b..e4252bbdf7bd 100644 --- a/russian/tac+ia/pkg-plist +++ b/russian/tac+ia/pkg-plist @@ -24,4 +24,4 @@ share/doc/tac_plus/users_guide @dirrm tac_plus/parrot @dirrm tac_plus @cwd /var/log -@unexec rmdir %D/tac_plus 2>/dev/null || true +@dirrmtry tac_plus diff --git a/science/gchemutils/pkg-plist b/science/gchemutils/pkg-plist index 1d6bfa19b2be..ae731ce9c290 100644 --- a/science/gchemutils/pkg-plist +++ b/science/gchemutils/pkg-plist @@ -134,6 +134,6 @@ share/mime/packages/gchemutils.xml @dirrm share/gnome/doc/gchemutils/reference @dirrm share/gnome/doc/gchemutils @dirrm share/gnome/doc -@unexec rmdir %D/share/mime/chemical 2>/dev/null || true +@dirrmtry share/mime/chemical @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime diff --git a/science/kst/pkg-plist b/science/kst/pkg-plist index 63e4702918bb..fed9070dcc2f 100644 --- a/science/kst/pkg-plist +++ b/science/kst/pkg-plist @@ -353,48 +353,48 @@ share/servicetypes/kst/kstextension.desktop share/servicetypes/kst/kstfilter.desktop share/servicetypes/kst/kstplugin.desktop @dirrm share/servicetypes/kst -@unexec rmdir %D/share/servicetypes 2>/dev/null || true +@dirrmtry share/servicetypes @dirrm share/services/kst -@unexec rmdir %D/share/services 2>/dev/null || true -@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true -@unexec rmdir %D/share/mimelnk 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32/mimetypes 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16/mimetypes 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32/mimetypes 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/22x22/actions 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16/mimetypes 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/services +@dirrmtry share/mimelnk/application +@dirrmtry share/mimelnk +@dirrmtry share/icons/locolor/32x32/mimetypes +@dirrmtry share/icons/locolor/32x32/apps +@dirrmtry share/icons/locolor/32x32 +@dirrmtry share/icons/locolor/16x16/mimetypes +@dirrmtry share/icons/locolor/16x16/apps +@dirrmtry share/icons/locolor/16x16 +@dirrmtry share/icons/locolor +@dirrmtry share/icons/hicolor/32x32/mimetypes +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor/22x22/actions +@dirrmtry share/icons/hicolor/22x22 +@dirrmtry share/icons/hicolor/16x16/mimetypes +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons @dirrm share/doc/HTML/sv/kst -@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true +@dirrmtry share/doc/HTML/sv @dirrm share/doc/HTML/pt/kst -@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true +@dirrmtry share/doc/HTML/pt @dirrm share/doc/HTML/it/kst -@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true +@dirrmtry share/doc/HTML/it @dirrm share/doc/HTML/fr/kst -@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true +@dirrmtry share/doc/HTML/fr @dirrm share/doc/HTML/et/kst -@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true +@dirrmtry share/doc/HTML/et @dirrm share/doc/HTML/es/kst -@unexec rmdir %D/share/doc/HTML/es 2>/dev/null || true +@dirrmtry share/doc/HTML/es @dirrm share/doc/HTML/en/kst -@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true +@dirrmtry share/doc/HTML/en @dirrm share/doc/HTML/da/kst -@unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML 2>/dev/null || true -@unexec rmdir %D/share/config/colors 2>/dev/null || true -@unexec rmdir %D/share/config 2>/dev/null || true +@dirrmtry share/doc/HTML/da +@dirrmtry share/doc/HTML +@dirrmtry share/config/colors +@dirrmtry share/config @dirrm share/apps/kst -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Applications/Sciences 2>/dev/null || true -@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/apps +@dirrmtry share/applnk/Applications/Sciences +@dirrmtry share/applnk/Applications +@dirrmtry share/applnk @dirrm lib/kde3/kstplugins diff --git a/science/kst2/pkg-plist b/science/kst2/pkg-plist index 63e4702918bb..fed9070dcc2f 100644 --- a/science/kst2/pkg-plist +++ b/science/kst2/pkg-plist @@ -353,48 +353,48 @@ share/servicetypes/kst/kstextension.desktop share/servicetypes/kst/kstfilter.desktop share/servicetypes/kst/kstplugin.desktop @dirrm share/servicetypes/kst -@unexec rmdir %D/share/servicetypes 2>/dev/null || true +@dirrmtry share/servicetypes @dirrm share/services/kst -@unexec rmdir %D/share/services 2>/dev/null || true -@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true -@unexec rmdir %D/share/mimelnk 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32/mimetypes 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16/mimetypes 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32/mimetypes 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/22x22/actions 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16/mimetypes 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/services +@dirrmtry share/mimelnk/application +@dirrmtry share/mimelnk +@dirrmtry share/icons/locolor/32x32/mimetypes +@dirrmtry share/icons/locolor/32x32/apps +@dirrmtry share/icons/locolor/32x32 +@dirrmtry share/icons/locolor/16x16/mimetypes +@dirrmtry share/icons/locolor/16x16/apps +@dirrmtry share/icons/locolor/16x16 +@dirrmtry share/icons/locolor +@dirrmtry share/icons/hicolor/32x32/mimetypes +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor/22x22/actions +@dirrmtry share/icons/hicolor/22x22 +@dirrmtry share/icons/hicolor/16x16/mimetypes +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons @dirrm share/doc/HTML/sv/kst -@unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true +@dirrmtry share/doc/HTML/sv @dirrm share/doc/HTML/pt/kst -@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true +@dirrmtry share/doc/HTML/pt @dirrm share/doc/HTML/it/kst -@unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true +@dirrmtry share/doc/HTML/it @dirrm share/doc/HTML/fr/kst -@unexec rmdir %D/share/doc/HTML/fr 2>/dev/null || true +@dirrmtry share/doc/HTML/fr @dirrm share/doc/HTML/et/kst -@unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true +@dirrmtry share/doc/HTML/et @dirrm share/doc/HTML/es/kst -@unexec rmdir %D/share/doc/HTML/es 2>/dev/null || true +@dirrmtry share/doc/HTML/es @dirrm share/doc/HTML/en/kst -@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true +@dirrmtry share/doc/HTML/en @dirrm share/doc/HTML/da/kst -@unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML 2>/dev/null || true -@unexec rmdir %D/share/config/colors 2>/dev/null || true -@unexec rmdir %D/share/config 2>/dev/null || true +@dirrmtry share/doc/HTML/da +@dirrmtry share/doc/HTML +@dirrmtry share/config/colors +@dirrmtry share/config @dirrm share/apps/kst -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Applications/Sciences 2>/dev/null || true -@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/apps +@dirrmtry share/applnk/Applications/Sciences +@dirrmtry share/applnk/Applications +@dirrmtry share/applnk @dirrm lib/kde3/kstplugins diff --git a/science/mpb/pkg-plist b/science/mpb/pkg-plist index f8d2245f5294..6bb62c7e2c94 100644 --- a/science/mpb/pkg-plist +++ b/science/mpb/pkg-plist @@ -2,4 +2,4 @@ bin/mpb bin/mpb-split bin/mpb-data share/libctl/specs/mpb.scm -@unexec rmdir %D/share/libctl/specs 2>/dev/null || true +@dirrmtry share/libctl/specs diff --git a/science/p5-Chemistry-Elements/pkg-plist b/science/p5-Chemistry-Elements/pkg-plist index be8be406a681..193d99b3c4ff 100644 --- a/science/p5-Chemistry-Elements/pkg-plist +++ b/science/p5-Chemistry-Elements/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Chemistry/Elements.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Elements/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry/Elements -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Chemistry 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chemistry +@dirrmtry %%SITE_PERL%%/Chemistry diff --git a/science/ruby-gphys/pkg-plist b/science/ruby-gphys/pkg-plist index 9160b505bcb5..6bf8a2fa37cf 100644 --- a/science/ruby-gphys/pkg-plist +++ b/science/ruby-gphys/pkg-plist @@ -44,7 +44,7 @@ bin/grads2nc_with_gphys %%RUBY_SITELIBDIR%%/numru/gphys/varraygrib.rb %%RUBY_SITELIBDIR%%/numru/gphys/varraynetcdf.rb @dirrm %%RUBY_SITELIBDIR%%/numru/gphys -@unexec rmdir %D/%%RUBY_SITELIBDIR%%/numru 2>/dev/null || true +@dirrmtry %%RUBY_SITELIBDIR%%/numru %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/cira86_to_nc.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/druby_cli1.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample/druby_cli2.rb diff --git a/science/v_sim/pkg-plist b/science/v_sim/pkg-plist index 174226bf8a98..9845b9df65e8 100644 --- a/science/v_sim/pkg-plist +++ b/science/v_sim/pkg-plist @@ -122,7 +122,7 @@ share/pixmaps/v_sim.xpm %%DATADIR%%/v_sim.res @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%% -@unexec rmdir %D/share/pixmaps 2>/dev/null || true +@dirrmtry share/pixmaps %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% %%REFDOC%%@dirrm %%DOCSDIR%%/APIreference %%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/security/amap/pkg-plist b/security/amap/pkg-plist index 4aac38bdf575..99d2fcb82803 100644 --- a/security/amap/pkg-plist +++ b/security/amap/pkg-plist @@ -11,4 +11,4 @@ etc/amap/appdefs.trig.default %%AMAPINCDIR%%/amap-lib.h @dirrm %%AMAPLIBDIR%% @dirrm %%AMAPINCDIR%% -@unexec rmdir %D/etc/amap 2>/dev/null || true +@dirrmtry etc/amap diff --git a/security/antivir-milter/pkg-plist b/security/antivir-milter/pkg-plist index e373ba7b628b..aa03e827f27e 100644 --- a/security/antivir-milter/pkg-plist +++ b/security/antivir-milter/pkg-plist @@ -13,7 +13,7 @@ AntiVir/antivir2.vdf-dist_avmilter @unexec if cmp -s %D/AntiVir/antivir3.vdf-dist_avmilter %D/AntiVir/antivir3.vdf; then rm -f %D/AntiVir/antivir3.vdf; fi AntiVir/antivir3.vdf-dist_avmilter @exec [ -f %B/antivir3.vdf ] || cp -p %B/%f %B/antivir3.vdf -@unexec rmdir %D/AntiVir/updcomp 2> /dev/null || true +@dirrmtry AntiVir/updcomp @unexec rmdir %D/AntiVir 2> /dev/null || echo "If permanently deleting this package, %D/AntiVir and its contents must be removed manually." bin/avq bin/avqrm diff --git a/security/audit/pkg-plist b/security/audit/pkg-plist index 29c6a08aeb1f..0b74e0fa0be4 100644 --- a/security/audit/pkg-plist +++ b/security/audit/pkg-plist @@ -10,4 +10,4 @@ lib/alat/libauth_raw.so.1 lib/alat/libia_syslog.so.1 lib/alat/libres_local.so.1 sbin/auditd -@unexec rmdir %D/lib/alat 2>/dev/null || true +@dirrmtry lib/alat diff --git a/security/base/pkg-plist b/security/base/pkg-plist index 60c32b328bc4..05247dadd53a 100644 --- a/security/base/pkg-plist +++ b/security/base/pkg-plist @@ -123,4 +123,4 @@ www/base/styles/acid_style.css @dirrm www/base/images @dirrm www/base/help @dirrm www/base/admin -@unexec rmdir %D/www/base 2>/dev/null || true +@dirrmtry www/base diff --git a/security/dazuko/pkg-plist b/security/dazuko/pkg-plist index bf2e1df9fb2b..65115540657c 100644 --- a/security/dazuko/pkg-plist +++ b/security/dazuko/pkg-plist @@ -1,2 +1,2 @@ modules/dazuko.ko -@unexec rmdir %D/modules 2>/dev/null || true +@dirrmtry modules diff --git a/security/doorman/pkg-plist b/security/doorman/pkg-plist index b786195a8f02..65bc32edc5f3 100644 --- a/security/doorman/pkg-plist +++ b/security/doorman/pkg-plist @@ -13,4 +13,4 @@ etc/doormand/iptables_delete etc/doormand/pfctl_add etc/doormand/pfctl_delete sbin/doormand -@unexec rmdir %D/etc/doormand 2>/dev/null || true +@dirrmtry etc/doormand diff --git a/security/f-prot-sig/pkg-plist b/security/f-prot-sig/pkg-plist index 10ba24cdb2d2..201228d524c7 100644 --- a/security/f-prot-sig/pkg-plist +++ b/security/f-prot-sig/pkg-plist @@ -4,4 +4,4 @@ f-prot/SIGN2.ASC f-prot/SIGN2.DEF f-prot/MACRO.DEF f-prot/MACRO.ASC -@unexec rmdir %D/f-prot 2>/dev/null || true +@dirrmtry f-prot diff --git a/security/f-prot/pkg-plist b/security/f-prot/pkg-plist index dabef511edcf..684cac875fc8 100644 --- a/security/f-prot/pkg-plist +++ b/security/f-prot/pkg-plist @@ -34,4 +34,4 @@ f-prot/tools/check-updates.pl %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm f-prot/tools @dirrm f-prot/etc -@unexec rmdir %D/f-prot 2>/dev/null || true +@dirrmtry f-prot diff --git a/security/fakeroot/pkg-plist b/security/fakeroot/pkg-plist index 66e0e9153a7d..6c22406f13aa 100644 --- a/security/fakeroot/pkg-plist +++ b/security/fakeroot/pkg-plist @@ -4,9 +4,9 @@ lib/libfakeroot.a lib/libfakeroot.so lib/libfakeroot.so.0 man/fr/man1/fakeroot.1.gz -@unexec rmdir %D/man/sv/man1 2>/dev/null || true -@unexec rmdir %D/man/sv 2>/dev/null || true -@unexec rmdir %D/man/fr/man1 2>/dev/null || true -@unexec rmdir %D/man/fr 2>/dev/null || true -@unexec rmdir %D/man/es/man1 2>/dev/null || true -@unexec rmdir %D/man/es 2>/dev/null || true +@dirrmtry man/sv/man1 +@dirrmtry man/sv +@dirrmtry man/fr/man1 +@dirrmtry man/fr +@dirrmtry man/es/man1 +@dirrmtry man/es diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist index c3d185c8136b..8f80c4a594cf 100644 --- a/security/gnupg/pkg-plist +++ b/security/gnupg/pkg-plist @@ -53,26 +53,26 @@ libexec/gnupg/gpgkeys_http %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg.mo @dirrm %%DATADIR%% -@unexec rmdir %D/share/locale/be/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/be 2>/dev/null || true -@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ca 2>/dev/null || true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cs 2>/dev/null || true -@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/el 2>/dev/null || true -@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/fi 2>/dev/null || true -@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/gl 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pl 2>/dev/null || true -@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pt 2>/dev/null || true -@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ro 2>/dev/null || true -@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sk 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW @dirrm %%DOCSDIR%% diff --git a/security/gnupg1/pkg-plist b/security/gnupg1/pkg-plist index c3d185c8136b..8f80c4a594cf 100644 --- a/security/gnupg1/pkg-plist +++ b/security/gnupg1/pkg-plist @@ -53,26 +53,26 @@ libexec/gnupg/gpgkeys_http %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg.mo @dirrm %%DATADIR%% -@unexec rmdir %D/share/locale/be/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/be 2>/dev/null || true -@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ca 2>/dev/null || true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cs 2>/dev/null || true -@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/el 2>/dev/null || true -@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/fi 2>/dev/null || true -@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/gl 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pl 2>/dev/null || true -@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pt 2>/dev/null || true -@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ro 2>/dev/null || true -@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sk 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true +@dirrmtry share/locale/be/LC_MESSAGES +@dirrmtry share/locale/be +@dirrmtry share/locale/ca/LC_MESSAGES +@dirrmtry share/locale/ca +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale/el/LC_MESSAGES +@dirrmtry share/locale/el +@dirrmtry share/locale/fi/LC_MESSAGES +@dirrmtry share/locale/fi +@dirrmtry share/locale/gl/LC_MESSAGES +@dirrmtry share/locale/gl +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/pt/LC_MESSAGES +@dirrmtry share/locale/pt +@dirrmtry share/locale/ro/LC_MESSAGES +@dirrmtry share/locale/ro +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/zh_TW/LC_MESSAGES +@dirrmtry share/locale/zh_TW @dirrm %%DOCSDIR%% diff --git a/security/gringotts/pkg-plist b/security/gringotts/pkg-plist index 21187fcc3df2..4cfe3580d89f 100644 --- a/security/gringotts/pkg-plist +++ b/security/gringotts/pkg-plist @@ -5,8 +5,8 @@ share/locale/fr/LC_MESSAGES/gringotts.mo share/locale/it/LC_MESSAGES/gringotts.mo %%GNOMEHIER%%share/gnome/apps/Utilities/gringotts.desktop %%GNOMEHIER%%@unexec rmdir -p %D/share/gnome/apps/Utilities 2>/dev/null || true -@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true -@unexec rmdir %D/share/gnome 2>/dev/null || true +@dirrmtry share/gnome/pixmaps +@dirrmtry share/gnome %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/COPYING diff --git a/security/ipsec-tools/pkg-plist b/security/ipsec-tools/pkg-plist index 27f2cfbc6542..1d4617e6083c 100644 --- a/security/ipsec-tools/pkg-plist +++ b/security/ipsec-tools/pkg-plist @@ -38,11 +38,11 @@ sbin/racoonctl %%EXAMPLESDIR%%/roadwarrior/client/racoon.conf %%EXAMPLESDIR%%/roadwarrior/server/racoon.conf %%EXAMPLESDIR%%/roadwarrior/server/racoon.conf-radius -@unexec rmdir %D/etc/racoon 2>/dev/null || true +@dirrmtry etc/racoon @dirrm include/racoon @dirrm include/libipsec @dirrm %%EXAMPLESDIR%%/roadwarrior/server @dirrm %%EXAMPLESDIR%%/roadwarrior/client @dirrm %%EXAMPLESDIR%%/roadwarrior @dirrm %%EXAMPLESDIR%% -@unexec rmdir %D/var/racoon 2>/dev/null || true +@dirrmtry var/racoon diff --git a/security/jailaudit/pkg-plist b/security/jailaudit/pkg-plist index 447a2b0a3746..43a7a083dd0d 100644 --- a/security/jailaudit/pkg-plist +++ b/security/jailaudit/pkg-plist @@ -1,11 +1,11 @@ bin/jailaudit etc/jailaudit.conf.sample %%PERIODICDIR%%/security/410.jailaudit -@unexec rmdir %D/%%PERIODICDIR%%/security 2>/dev/null || true -@unexec rmdir %D/%%PERIODICDIR%% 2>/dev/null || true +@dirrmtry %%PERIODICDIR%%/security +@dirrmtry %%PERIODICDIR%% @exec mkdir -p %D/%%REPORTDIR%% -@unexec rmdir %D/%%REPORTDIR%% 2>/dev/null || true +@dirrmtry %%REPORTDIR%% @exec mkdir -p %D/%%TMPDIR%% -@unexec rmdir %D/%%TMPDIR%% 2>/dev/null || true +@dirrmtry %%TMPDIR%% @unexec rmdir %DPDIR%% 2>/dev/null || true -@unexec rmdir %D/jailaudit 2>/dev/null || true +@dirrmtry jailaudit diff --git a/security/klamav/pkg-plist b/security/klamav/pkg-plist index 2927ca6b49c4..000107f7f07c 100644 --- a/security/klamav/pkg-plist +++ b/security/klamav/pkg-plist @@ -47,32 +47,32 @@ share/apps/klamav/about/wait.html share/apps/klamav/about/aboutklamav.html share/apps/klamav/about/klam.png share/apps/klamav/about/tshirt.png -@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML/en/klamav02 2>/dev/null || true -@unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32/actions 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/22x22/actions 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32/actions 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16/actions 2>/dev/null || true -@unexec rmdir %D/share/apps/klamav/icons/locolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/apps/klamav/icons/hicolor/32x32/actions 2>/dev/null || true -@unexec rmdir %D/share/apps/klamav/icons/hicolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/apps/klamav/icons/hicolor/22x22/actions 2>/dev/null || true -@unexec rmdir %D/share/apps/klamav/icons/locolor/32x32/actions 2>/dev/null || true -@unexec rmdir %D/share/apps/klamav/icons/locolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/apps/klamav/icons/hicolor/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/apps/klamav/icons/locolor/16x16/actions 2>/dev/null || true -@unexec rmdir %D/share/apps/klamav/icons/locolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/apps/klamav/icons/locolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/apps/klamav/icons/locolor 2>/dev/null || true -@unexec rmdir %D/share/apps/klamav/icons/hicolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/apps/klamav/icons/hicolor/22x22 2>/dev/null || true -@unexec rmdir %D/share/apps/klamav/icons/hicolor/48x48 2>/dev/null || true -@unexec rmdir %D/share/apps/klamav/icons/hicolor 2>/dev/null || true -@unexec rmdir %D/share/apps/klamav/icons 2>/dev/null || true -@unexec rmdir %D/share/apps/klamav/about 2>/dev/null || true -@unexec rmdir %D/share/apps/klamav 2>/dev/null || true +@dirrmtry share/applnk/Utilities +@dirrmtry share/doc/HTML/en/klamav02 +@dirrmtry share/apps/konqueror/servicemenus +@dirrmtry share/icons/locolor/32x32/apps +@dirrmtry share/icons/locolor/32x32/actions +@dirrmtry share/icons/locolor/16x16/apps +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/22x22/actions +@dirrmtry share/icons/hicolor/32x32/actions +@dirrmtry share/icons/locolor/16x16/actions +@dirrmtry share/apps/klamav/icons/locolor/32x32/apps +@dirrmtry share/apps/klamav/icons/hicolor/32x32/actions +@dirrmtry share/apps/klamav/icons/hicolor/32x32/apps +@dirrmtry share/apps/klamav/icons/hicolor/22x22/actions +@dirrmtry share/apps/klamav/icons/locolor/32x32/actions +@dirrmtry share/apps/klamav/icons/locolor/16x16/apps +@dirrmtry share/apps/klamav/icons/hicolor/48x48/apps +@dirrmtry share/apps/klamav/icons/locolor/16x16/actions +@dirrmtry share/apps/klamav/icons/locolor/32x32 +@dirrmtry share/apps/klamav/icons/locolor/16x16 +@dirrmtry share/apps/klamav/icons/locolor +@dirrmtry share/apps/klamav/icons/hicolor/32x32 +@dirrmtry share/apps/klamav/icons/hicolor/22x22 +@dirrmtry share/apps/klamav/icons/hicolor/48x48 +@dirrmtry share/apps/klamav/icons/hicolor +@dirrmtry share/apps/klamav/icons +@dirrmtry share/apps/klamav/about +@dirrmtry share/apps/klamav diff --git a/security/nessus-devel/pkg-plist b/security/nessus-devel/pkg-plist index 888c58c17474..f1263b9acaa5 100644 --- a/security/nessus-devel/pkg-plist +++ b/security/nessus-devel/pkg-plist @@ -27,12 +27,12 @@ sbin/nessusd @exec mkdir -p %D/var/nessus/logs @exec mkdir -p %D/var/nessus/users @unexec if [ ! -s %D/var/nessus/logs/nessusd.messages ]; then rm %D/var/nessus/logs/nessusd.messages 2> /dev/null; fi || true -@unexec rmdir %D/var/nessus/jobs 2>/dev/null || true -@unexec rmdir %D/var/nessus/logs 2>/dev/null || true -@unexec rmdir %D/var/nessus/users 2>/dev/null || true -@unexec rmdir %D/var/nessus 2>/dev/null || true -@unexec rmdir %D/etc/nessus 2>/dev/null || true +@dirrmtry var/nessus/jobs +@dirrmtry var/nessus/logs +@dirrmtry var/nessus/users +@dirrmtry var/nessus +@dirrmtry etc/nessus @exec mkdir -p %D/lib/nessus/plugins -@unexec rmdir %D/lib/nessus/plugins 2>/dev/null || true -@unexec rmdir %D/lib/nessus 2>/dev/null || true +@dirrmtry lib/nessus/plugins +@dirrmtry lib/nessus @exec if [ ! -f %D/var/CA/serverkey.pem ]; then %D/sbin/nessus-mkcert; fi diff --git a/security/nessus-libnasl/pkg-plist b/security/nessus-libnasl/pkg-plist index 72a6abb1878f..10ccab19c3c0 100644 --- a/security/nessus-libnasl/pkg-plist +++ b/security/nessus-libnasl/pkg-plist @@ -6,5 +6,5 @@ lib/libnasl.la lib/libnasl.so lib/libnasl.so.4 var/nessus/nessus_org.pem -@unexec rmdir %D/var/nessus 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true +@dirrmtry var/nessus +@dirrmtry var diff --git a/security/nessus/pkg-plist b/security/nessus/pkg-plist index 888c58c17474..f1263b9acaa5 100644 --- a/security/nessus/pkg-plist +++ b/security/nessus/pkg-plist @@ -27,12 +27,12 @@ sbin/nessusd @exec mkdir -p %D/var/nessus/logs @exec mkdir -p %D/var/nessus/users @unexec if [ ! -s %D/var/nessus/logs/nessusd.messages ]; then rm %D/var/nessus/logs/nessusd.messages 2> /dev/null; fi || true -@unexec rmdir %D/var/nessus/jobs 2>/dev/null || true -@unexec rmdir %D/var/nessus/logs 2>/dev/null || true -@unexec rmdir %D/var/nessus/users 2>/dev/null || true -@unexec rmdir %D/var/nessus 2>/dev/null || true -@unexec rmdir %D/etc/nessus 2>/dev/null || true +@dirrmtry var/nessus/jobs +@dirrmtry var/nessus/logs +@dirrmtry var/nessus/users +@dirrmtry var/nessus +@dirrmtry etc/nessus @exec mkdir -p %D/lib/nessus/plugins -@unexec rmdir %D/lib/nessus/plugins 2>/dev/null || true -@unexec rmdir %D/lib/nessus 2>/dev/null || true +@dirrmtry lib/nessus/plugins +@dirrmtry lib/nessus @exec if [ ! -f %D/var/CA/serverkey.pem ]; then %D/sbin/nessus-mkcert; fi diff --git a/security/nmap/pkg-plist b/security/nmap/pkg-plist index 1fa09e07e2a2..1da8797a351f 100644 --- a/security/nmap/pkg-plist +++ b/security/nmap/pkg-plist @@ -12,7 +12,7 @@ bin/nmap %%PORTDOCS%%%%DOCSDIR%%/HACKING %%PORTDOCS%%%%DOCSDIR%%/nmap.dtd %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/man/pt.ISO8859-1/man1 2>/dev/null || true -@unexec rmdir %D/man/pt_BR.ISO8859-1/man1 2>/dev/null || true -@unexec rmdir %D/man/pt.ISO8859-1 2>/dev/null || true -@unexec rmdir %D/man/pt_BR.ISO8859-1 2>/dev/null || true +@dirrmtry man/pt.ISO8859-1/man1 +@dirrmtry man/pt_BR.ISO8859-1/man1 +@dirrmtry man/pt.ISO8859-1 +@dirrmtry man/pt_BR.ISO8859-1 diff --git a/security/ocaml-cryptokit/pkg-plist b/security/ocaml-cryptokit/pkg-plist index 3b2ae4f7cbaa..340e5b406d84 100644 --- a/security/ocaml-cryptokit/pkg-plist +++ b/security/ocaml-cryptokit/pkg-plist @@ -6,5 +6,5 @@ lib/ocaml/cryptokit.cmxa lib/ocaml/cryptokit.mli lib/ocaml/libcryptokit.a lib/ocaml/stublibs/dllcryptokit.so -@unexec rmdir %D/lib/ocaml/stublibs 2>/dev/null || true -@unexec rmdir %D/lib/ocaml 2>/dev/null || true +@dirrmtry lib/ocaml/stublibs +@dirrmtry lib/ocaml diff --git a/security/opensc/pkg-plist b/security/opensc/pkg-plist index 0792d7f01581..49e68ed122b7 100644 --- a/security/opensc/pkg-plist +++ b/security/opensc/pkg-plist @@ -14,7 +14,7 @@ libdata/pkgconfig/libscam.pc libdata/pkgconfig/libscconf.pc libdata/pkgconfig/libscldap.pc lib/security/pam_opensc.so -@unexec rmdir %D/lib/security 2>/dev/null || true +@dirrmtry lib/security lib/pkcs11/pkcs11-spy.so lib/pkcs11/opensc-pkcs11.so lib/pkcs11/libpkcs11.so.1 diff --git a/security/openscep/pkg-plist b/security/openscep/pkg-plist index 900f117f0874..cced5b4c6984 100644 --- a/security/openscep/pkg-plist +++ b/security/openscep/pkg-plist @@ -70,4 +70,4 @@ www/openscep/updatecrl.8.html www/openscep/welcome.html @dirrm www/cgi-bin/openscep @dirrm www/openscep -@unexec rmdir %D/etc/openscep 2>/dev/null || true +@dirrmtry etc/openscep diff --git a/security/p5-Authen-Captcha/pkg-plist b/security/p5-Authen-Captcha/pkg-plist index 32588496fbad..d1bec9ddf23e 100644 --- a/security/p5-Authen-Captcha/pkg-plist +++ b/security/p5-Authen-Captcha/pkg-plist @@ -43,5 +43,5 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Captcha @dirrm %%SITE_PERL%%/Authen/Captcha/images @dirrm %%SITE_PERL%%/Authen/Captcha -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Authen 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen +@dirrmtry %%SITE_PERL%%/Authen diff --git a/security/p5-Authen-CyrusSASL/pkg-plist b/security/p5-Authen-CyrusSASL/pkg-plist index a6cdc1e368b7..ffed084228af 100644 --- a/security/p5-Authen-CyrusSASL/pkg-plist +++ b/security/p5-Authen-CyrusSASL/pkg-plist @@ -2,7 +2,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/CyrusSASL/.packlist %%SITE_PERL%%/auto/Authen/CyrusSASL/autosplit.ix @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/CyrusSASL -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen @dirrm %%SITE_PERL%%/auto/Authen/CyrusSASL -@unexec rmdir %D/%%SITE_PERL%%/auto/Authen 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Authen 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/Authen +@dirrmtry %%SITE_PERL%%/Authen diff --git a/security/p5-Authen-Htpasswd/pkg-plist b/security/p5-Authen-Htpasswd/pkg-plist index 776c1f77a4e1..b5f95b7322d9 100644 --- a/security/p5-Authen-Htpasswd/pkg-plist +++ b/security/p5-Authen-Htpasswd/pkg-plist @@ -2,7 +2,7 @@ %%SITE_PERL%%/Authen/Htpasswd/User.pm %%SITE_PERL%%/Authen/Htpasswd/Util.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Htpasswd/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Htpasswd 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Authen/Htpasswd 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Authen 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Htpasswd +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen +@dirrmtry %%SITE_PERL%%/Authen/Htpasswd +@dirrmtry %%SITE_PERL%%/Authen diff --git a/security/p5-Authen-PAM/pkg-plist b/security/p5-Authen-PAM/pkg-plist index 1d6535116b2f..6e7300c9a1cd 100644 --- a/security/p5-Authen-PAM/pkg-plist +++ b/security/p5-Authen-PAM/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/PAM/PAM.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/PAM/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/PAM -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Authen 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Authen diff --git a/security/p5-Authen-Radius/pkg-plist b/security/p5-Authen-Radius/pkg-plist index 8054a8530fd0..3b1b22f1a734 100644 --- a/security/p5-Authen-Radius/pkg-plist +++ b/security/p5-Authen-Radius/pkg-plist @@ -13,5 +13,5 @@ %%DATADIR%%/dictionary.xtradius @dirrm %%DATADIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Radius -@unexec rmdir %D/%%SITE_PERL%%/Authen 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Authen +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen diff --git a/security/p5-Authen-SASL-Cyrus/pkg-plist b/security/p5-Authen-SASL-Cyrus/pkg-plist index 7f10f5ad82ae..d033708bfe0c 100644 --- a/security/p5-Authen-SASL-Cyrus/pkg-plist +++ b/security/p5-Authen-SASL-Cyrus/pkg-plist @@ -6,8 +6,8 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL/Cyrus/Cyrus.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Authen/SASL/Cyrus @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL/Cyrus -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Authen/SASL 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Authen 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL/Cyrus 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Authen/SASL +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Authen +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL/Cyrus +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen diff --git a/security/p5-Authen-SASL/pkg-plist b/security/p5-Authen-SASL/pkg-plist index cd1710058c39..145e25f726c2 100644 --- a/security/p5-Authen-SASL/pkg-plist +++ b/security/p5-Authen-SASL/pkg-plist @@ -12,7 +12,7 @@ %%SITE_PERL%%/Authen/SASL/Perl/PLAIN.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/SASL -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen @dirrm %%SITE_PERL%%/Authen/SASL/Perl @dirrm %%SITE_PERL%%/Authen/SASL -@unexec rmdir %D/%%SITE_PERL%%/Authen 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Authen diff --git a/security/p5-Authen-Smb/pkg-plist b/security/p5-Authen-Smb/pkg-plist index 67b447cd7a27..9c6e93101b83 100644 --- a/security/p5-Authen-Smb/pkg-plist +++ b/security/p5-Authen-Smb/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Smb/Smb.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Smb/Smb.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Smb -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Authen 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Authen diff --git a/security/p5-Authen-TacacsPlus/pkg-plist b/security/p5-Authen-TacacsPlus/pkg-plist index 0140da6a61cf..be658388fe83 100644 --- a/security/p5-Authen-TacacsPlus/pkg-plist +++ b/security/p5-Authen-TacacsPlus/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus/TacacsPlus.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus/TacacsPlus.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/TacacsPlus -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Authen 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Authen diff --git a/security/p5-Authen-Ticket/pkg-plist b/security/p5-Authen-Ticket/pkg-plist index 87b02d1b9624..116e93cfb387 100644 --- a/security/p5-Authen-Ticket/pkg-plist +++ b/security/p5-Authen-Ticket/pkg-plist @@ -9,5 +9,5 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Authen::Ticket::Signature.3 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Ticket/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen/Ticket @dirrm %%SITE_PERL%%/Authen/Ticket -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Authen 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Authen +@dirrmtry %%SITE_PERL%%/Authen diff --git a/security/p5-Business-PayPal-EWP/pkg-plist b/security/p5-Business-PayPal-EWP/pkg-plist index b7067e3261b9..29127c5904bf 100644 --- a/security/p5-Business-PayPal-EWP/pkg-plist +++ b/security/p5-Business-PayPal-EWP/pkg-plist @@ -4,7 +4,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/Business/PayPal/EWP.pm.orig %%SITE_PERL%%/%%PERL_ARCH%%/Business/PayPal/EWP.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/PayPal/EWP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/PayPal 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Business 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Business/PayPal 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Business 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business/PayPal +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Business +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Business/PayPal +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Business diff --git a/security/p5-Crypt-Anubis/pkg-plist b/security/p5-Crypt-Anubis/pkg-plist index 41b426620bab..c32cf52fa481 100644 --- a/security/p5-Crypt-Anubis/pkg-plist +++ b/security/p5-Crypt-Anubis/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Anubis/Anubis.bs %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Anubis.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Anubis -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-AppleTwoFish/pkg-plist b/security/p5-Crypt-AppleTwoFish/pkg-plist index 9a1ac9209620..fa2365816a97 100644 --- a/security/p5-Crypt-AppleTwoFish/pkg-plist +++ b/security/p5-Crypt-AppleTwoFish/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/AppleTwoFish.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/AppleTwoFish/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/AppleTwoFish/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-Blowfish/pkg-plist b/security/p5-Crypt-Blowfish/pkg-plist index e7a7883aa25d..e3d712ed9b8d 100644 --- a/security/p5-Crypt-Blowfish/pkg-plist +++ b/security/p5-Crypt-Blowfish/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish/Blowfish.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish/Blowfish.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-Blowfish_PP/pkg-plist b/security/p5-Crypt-Blowfish_PP/pkg-plist index 59bb9f1990f9..fef394b9eb82 100644 --- a/security/p5-Crypt-Blowfish_PP/pkg-plist +++ b/security/p5-Crypt-Blowfish_PP/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/Crypt/Blowfish_PP.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish_PP/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Blowfish_PP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-CAST5_PP/pkg-plist b/security/p5-Crypt-CAST5_PP/pkg-plist index 104880503e66..00aef0893362 100644 --- a/security/p5-Crypt-CAST5_PP/pkg-plist +++ b/security/p5-Crypt-CAST5_PP/pkg-plist @@ -6,8 +6,8 @@ %%SITE_PERL%%/auto/Crypt/CAST5_PP/init.al %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CAST5_PP/.packlist @dirrm %%SITE_PERL%%/Crypt/CAST5_PP -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Crypt @dirrm %%SITE_PERL%%/auto/Crypt/CAST5_PP -@unexec rmdir %D/%%SITE_PERL%%/auto/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/Crypt @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CAST5_PP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt diff --git a/security/p5-Crypt-CBC/pkg-plist b/security/p5-Crypt-CBC/pkg-plist index fefc24052297..fafe8b3a8e32 100644 --- a/security/p5-Crypt-CBC/pkg-plist +++ b/security/p5-Crypt-CBC/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/CBC.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CBC/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CBC -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-CBCeasy/pkg-plist b/security/p5-Crypt-CBCeasy/pkg-plist index 70f50f6fd34e..f56a73f9dc44 100644 --- a/security/p5-Crypt-CBCeasy/pkg-plist +++ b/security/p5-Crypt-CBCeasy/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/CBCeasy.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CBCeasy/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CBCeasy -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-CFB/pkg-plist b/security/p5-Crypt-CFB/pkg-plist index 055080039c53..7393bb8dde69 100644 --- a/security/p5-Crypt-CFB/pkg-plist +++ b/security/p5-Crypt-CFB/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/CFB.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CFB/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CFB/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-Caesar/pkg-plist b/security/p5-Crypt-Caesar/pkg-plist index 47c3a559bd07..e8e6faabb213 100644 --- a/security/p5-Crypt-Caesar/pkg-plist +++ b/security/p5-Crypt-Caesar/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/Caesar.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Caesar/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Caesar/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-Chimera/pkg-plist b/security/p5-Crypt-Chimera/pkg-plist index 05dd2e73b4a3..ccaa706f2ee5 100644 --- a/security/p5-Crypt-Chimera/pkg-plist +++ b/security/p5-Crypt-Chimera/pkg-plist @@ -6,6 +6,6 @@ %%SITE_PERL%%/Crypt/Chimera/World.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Chimera/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Chimera/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt @dirrm %%SITE_PERL%%/Crypt/Chimera/ -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-CipherSaber/pkg-plist b/security/p5-Crypt-CipherSaber/pkg-plist index 45c0dc1c90ec..86b9145e063f 100644 --- a/security/p5-Crypt-CipherSaber/pkg-plist +++ b/security/p5-Crypt-CipherSaber/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/CipherSaber.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CipherSaber/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/CipherSaber -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-Cracklib/pkg-plist b/security/p5-Crypt-Cracklib/pkg-plist index 9f9abbdb3788..5065f7248931 100644 --- a/security/p5-Crypt-Cracklib/pkg-plist +++ b/security/p5-Crypt-Cracklib/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Cracklib/Cracklib.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Cracklib/Cracklib.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Cracklib -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-Ctr/pkg-plist b/security/p5-Crypt-Ctr/pkg-plist index 8695dbd029e2..5b91f7aaff1b 100644 --- a/security/p5-Crypt-Ctr/pkg-plist +++ b/security/p5-Crypt-Ctr/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/Ctr.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Ctr/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Ctr/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-DES/pkg-plist b/security/p5-Crypt-DES/pkg-plist index bf40e2183b1c..6f1d3d477d41 100644 --- a/security/p5-Crypt-DES/pkg-plist +++ b/security/p5-Crypt-DES/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES/DES.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES/DES.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2> /dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2> /dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-DES_EDE3/pkg-plist b/security/p5-Crypt-DES_EDE3/pkg-plist index f8b2f54428e5..d18a3a303e82 100644 --- a/security/p5-Crypt-DES_EDE3/pkg-plist +++ b/security/p5-Crypt-DES_EDE3/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/Crypt/DES_EDE3.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES_EDE3/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/DES_EDE3 -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-DES_PP/pkg-plist b/security/p5-Crypt-DES_PP/pkg-plist index b490ea7d7e32..775d6ea1d635 100644 --- a/security/p5-Crypt-DES_PP/pkg-plist +++ b/security/p5-Crypt-DES_PP/pkg-plist @@ -2,4 +2,4 @@ %%SITE_PERL%%/Crypt/.cvsignore %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt-DES_PP/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt-DES_PP/ -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-ECB/pkg-plist b/security/p5-Crypt-ECB/pkg-plist index 9de44d23c92e..f62db0771196 100644 --- a/security/p5-Crypt-ECB/pkg-plist +++ b/security/p5-Crypt-ECB/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/ECB.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/ECB/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/ECB -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-Enigma/pkg-plist b/security/p5-Crypt-Enigma/pkg-plist index 94d914953dfa..1bf9fdf36a45 100644 --- a/security/p5-Crypt-Enigma/pkg-plist +++ b/security/p5-Crypt-Enigma/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/Enigma.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Enigma/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Enigma/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-GOST/pkg-plist b/security/p5-Crypt-GOST/pkg-plist index 122d6e83bf4d..bc36cac4b460 100644 --- a/security/p5-Crypt-GOST/pkg-plist +++ b/security/p5-Crypt-GOST/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GOST/GOST.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GOST/GOST.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GOST/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-GOST_PP/pkg-plist b/security/p5-Crypt-GOST_PP/pkg-plist index 25361b58dad8..c138817a0dc6 100644 --- a/security/p5-Crypt-GOST_PP/pkg-plist +++ b/security/p5-Crypt-GOST_PP/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/GOST_PP.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GOST_PP/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GOST_PP/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-GPG/pkg-plist b/security/p5-Crypt-GPG/pkg-plist index ea482071b39c..e6654833f51e 100644 --- a/security/p5-Crypt-GPG/pkg-plist +++ b/security/p5-Crypt-GPG/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/GPG.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GPG/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GPG/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-GeneratePassword/pkg-plist b/security/p5-Crypt-GeneratePassword/pkg-plist index fcab373a647e..f60ff96e213e 100644 --- a/security/p5-Crypt-GeneratePassword/pkg-plist +++ b/security/p5-Crypt-GeneratePassword/pkg-plist @@ -3,6 +3,6 @@ %%SITE_PERL%%/Crypt/GeneratePassword/de.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GeneratePassword/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/GeneratePassword -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt @dirrm %%SITE_PERL%%/Crypt/GeneratePassword -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-HCE_MD5/pkg-plist b/security/p5-Crypt-HCE_MD5/pkg-plist index 5b28579e3573..8d14cda74803 100644 --- a/security/p5-Crypt-HCE_MD5/pkg-plist +++ b/security/p5-Crypt-HCE_MD5/pkg-plist @@ -3,6 +3,6 @@ %%SITE_PERL%%/auto/Crypt/HCE_MD5/autosplit.ix @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/HCE_MD5/ @dirrm %%SITE_PERL%%/auto/Crypt/HCE_MD5/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-HCE_SHA/pkg-plist b/security/p5-Crypt-HCE_SHA/pkg-plist index 6bff173d3f9c..1ba45019ee2f 100644 --- a/security/p5-Crypt-HCE_SHA/pkg-plist +++ b/security/p5-Crypt-HCE_SHA/pkg-plist @@ -3,7 +3,7 @@ %%SITE_PERL%%/auto/Crypt/HCE_SHA/autosplit.ix @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/HCE_SHA @dirrm %%SITE_PERL%%/auto/Crypt/HCE_SHA -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2> /dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2> /dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt +@dirrmtry %%SITE_PERL%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-IDEA/pkg-plist b/security/p5-Crypt-IDEA/pkg-plist index 88167ababefe..c6daaa21b2cb 100644 --- a/security/p5-Crypt-IDEA/pkg-plist +++ b/security/p5-Crypt-IDEA/pkg-plist @@ -5,5 +5,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/IDEA/IDEA.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/IDEA/IDEA.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/IDEA -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2> /dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2> /dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-Imail/pkg-plist b/security/p5-Crypt-Imail/pkg-plist index 65416fb3b748..2fa6fafff715 100644 --- a/security/p5-Crypt-Imail/pkg-plist +++ b/security/p5-Crypt-Imail/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/Imail.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Imail/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Imail/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-Khazad/pkg-plist b/security/p5-Crypt-Khazad/pkg-plist index bb55ea021139..597548d79be3 100644 --- a/security/p5-Crypt-Khazad/pkg-plist +++ b/security/p5-Crypt-Khazad/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Khazad/Khazad.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Khazad/Khazad.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Khazad/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-License/pkg-plist b/security/p5-Crypt-License/pkg-plist index c3d578e81d7d..57a3d145fcdf 100644 --- a/security/p5-Crypt-License/pkg-plist +++ b/security/p5-Crypt-License/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/License/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/License/ @dirrm %%SITE_PERL%%/Crypt/License/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-Lite/pkg-plist b/security/p5-Crypt-Lite/pkg-plist index 6a9d69d2d300..81be2bb0843b 100644 --- a/security/p5-Crypt-Lite/pkg-plist +++ b/security/p5-Crypt-Lite/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Lite/Lite.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Lite/Lite.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Lite/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-Loki97/pkg-plist b/security/p5-Crypt-Loki97/pkg-plist index 088f57911af8..31134f6319b8 100644 --- a/security/p5-Crypt-Loki97/pkg-plist +++ b/security/p5-Crypt-Loki97/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Loki97/Loki97.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Loki97/Loki97.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Loki97/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-MySQL/pkg-plist b/security/p5-Crypt-MySQL/pkg-plist index 50cbc65e6a38..a0f2e73afcaf 100644 --- a/security/p5-Crypt-MySQL/pkg-plist +++ b/security/p5-Crypt-MySQL/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/MySQL/MySQL.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/MySQL/MySQL.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/MySQL -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-NULL/pkg-plist b/security/p5-Crypt-NULL/pkg-plist index 3c4d937c0adb..c9efbab5416b 100644 --- a/security/p5-Crypt-NULL/pkg-plist +++ b/security/p5-Crypt-NULL/pkg-plist @@ -2,5 +2,5 @@ %%SITE_PERL%%/Crypt/NULL.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/NULL/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/NULL -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-OFB/pkg-plist b/security/p5-Crypt-OFB/pkg-plist index 6b4f77918070..7ff7041f2153 100644 --- a/security/p5-Crypt-OFB/pkg-plist +++ b/security/p5-Crypt-OFB/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/OFB.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OFB/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OFB -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-OTP/pkg-plist b/security/p5-Crypt-OTP/pkg-plist index 639fd6c5ce84..ea3fd561dc08 100644 --- a/security/p5-Crypt-OTP/pkg-plist +++ b/security/p5-Crypt-OTP/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/OTP.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OTP/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OTP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-OpenPGP/pkg-plist b/security/p5-Crypt-OpenPGP/pkg-plist index 58794e59172f..535cf543f4ff 100644 --- a/security/p5-Crypt-OpenPGP/pkg-plist +++ b/security/p5-Crypt-OpenPGP/pkg-plist @@ -44,4 +44,4 @@ @dirrm %%SITE_PERL%%/Crypt/OpenPGP/Key @dirrm %%SITE_PERL%%/Crypt/OpenPGP/Signature @dirrm %%SITE_PERL%%/Crypt/OpenPGP -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-OpenSSL-Bignum/pkg-plist b/security/p5-Crypt-OpenSSL-Bignum/pkg-plist index 300f2a888853..feef75e2b682 100644 --- a/security/p5-Crypt-OpenSSL-Bignum/pkg-plist +++ b/security/p5-Crypt-OpenSSL-Bignum/pkg-plist @@ -4,8 +4,8 @@ %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/Bignum/CTX.pm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/Bignum.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Bignum -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/Bignum -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-OpenSSL-DSA/pkg-plist b/security/p5-Crypt-OpenSSL-DSA/pkg-plist index 8832928f600e..b743390b07ed 100644 --- a/security/p5-Crypt-OpenSSL-DSA/pkg-plist +++ b/security/p5-Crypt-OpenSSL-DSA/pkg-plist @@ -5,8 +5,8 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/DSA/DSA.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/DSA/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/DSA -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL/DSA -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-OpenSSL-RSA/pkg-plist b/security/p5-Crypt-OpenSSL-RSA/pkg-plist index be80bc51a652..c49e360a476b 100644 --- a/security/p5-Crypt-OpenSSL-RSA/pkg-plist +++ b/security/p5-Crypt-OpenSSL-RSA/pkg-plist @@ -17,8 +17,8 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/new_public_key.al %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/set_padding_mode.al %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA/use_sslv23_padding.al -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/RSA +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-OpenSSL-Random/pkg-plist b/security/p5-Crypt-OpenSSL-Random/pkg-plist index 61d813d6a70d..a9f5564cec9a 100644 --- a/security/p5-Crypt-OpenSSL-Random/pkg-plist +++ b/security/p5-Crypt-OpenSSL-Random/pkg-plist @@ -3,8 +3,8 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random/Random.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random/Random.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random/autosplit.ix -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/OpenSSL +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL/Random +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/OpenSSL +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt diff --git a/security/p5-Crypt-PGPSimple/pkg-plist b/security/p5-Crypt-PGPSimple/pkg-plist index 94256c17c920..ad03aeb496f8 100644 --- a/security/p5-Crypt-PGPSimple/pkg-plist +++ b/security/p5-Crypt-PGPSimple/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PGPSimple/.packlist %%SITE_PERL%%/Crypt/PGPSimple.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PGPSimple -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-PassGen/pkg-plist b/security/p5-Crypt-PassGen/pkg-plist index 032d181adc56..1b6338f4d738 100644 --- a/security/p5-Crypt-PassGen/pkg-plist +++ b/security/p5-Crypt-PassGen/pkg-plist @@ -2,5 +2,5 @@ %%SITE_PERL%%/Crypt/PassGenWordFreq.dat %%SITE_PERL%%/Crypt/PassGen.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PassGen -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-PasswdMD5/pkg-plist b/security/p5-Crypt-PasswdMD5/pkg-plist index 2cd4efbede1f..c932cf5c3c4e 100644 --- a/security/p5-Crypt-PasswdMD5/pkg-plist +++ b/security/p5-Crypt-PasswdMD5/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/PasswdMD5.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PasswdMD5/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Crypt @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/PasswdMD5 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt diff --git a/security/p5-Crypt-RC4/pkg-plist b/security/p5-Crypt-RC4/pkg-plist index a70c3b1acec9..bc99edce44bd 100644 --- a/security/p5-Crypt-RC4/pkg-plist +++ b/security/p5-Crypt-RC4/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/RC4.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC4/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC4 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-RC5/pkg-plist b/security/p5-Crypt-RC5/pkg-plist index 5b5822b99979..cdce55091b8d 100644 --- a/security/p5-Crypt-RC5/pkg-plist +++ b/security/p5-Crypt-RC5/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/RC5.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC5/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC5 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-RC6/pkg-plist b/security/p5-Crypt-RC6/pkg-plist index c3441f96c83e..b1c0f904bb3f 100644 --- a/security/p5-Crypt-RC6/pkg-plist +++ b/security/p5-Crypt-RC6/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC6/RC6.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC6/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RC6 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-RIPEMD160/pkg-plist b/security/p5-Crypt-RIPEMD160/pkg-plist index 0560b276a2e4..fda973bf8aa8 100644 --- a/security/p5-Crypt-RIPEMD160/pkg-plist +++ b/security/p5-Crypt-RIPEMD160/pkg-plist @@ -6,5 +6,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/RIPEMD160/MAC.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RIPEMD160 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/RIPEMD160 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-RSA/pkg-plist b/security/p5-Crypt-RSA/pkg-plist index 9b949c687f52..d550f81e9f4f 100644 --- a/security/p5-Crypt-RSA/pkg-plist +++ b/security/p5-Crypt-RSA/pkg-plist @@ -14,11 +14,11 @@ %%SITE_PERL%%/Crypt/RSA/SS/PSS.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RSA/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/RSA -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt @dirrm %%SITE_PERL%%/Crypt/RSA/SS @dirrm %%SITE_PERL%%/Crypt/RSA/Key/Public @dirrm %%SITE_PERL%%/Crypt/RSA/Key/Private @dirrm %%SITE_PERL%%/Crypt/RSA/Key @dirrm %%SITE_PERL%%/Crypt/RSA/ES @dirrm %%SITE_PERL%%/Crypt/RSA -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-Rabbit/pkg-plist b/security/p5-Crypt-Rabbit/pkg-plist index 5c42cded897f..697a0be59e2a 100644 --- a/security/p5-Crypt-Rabbit/pkg-plist +++ b/security/p5-Crypt-Rabbit/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rabbit/Rabbit.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rabbit/Rabbit.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rabbit/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-Random/pkg-plist b/security/p5-Crypt-Random/pkg-plist index acf0ccebad69..6c36c24a9e03 100644 --- a/security/p5-Crypt-Random/pkg-plist +++ b/security/p5-Crypt-Random/pkg-plist @@ -10,5 +10,5 @@ bin/makerandom @dirrm %%SITE_PERL%%/Crypt/Random/Provider @dirrm %%SITE_PERL%%/Crypt/Random @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Random -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-Rijndael/pkg-plist b/security/p5-Crypt-Rijndael/pkg-plist index cc0dc16563d7..80edc6b86148 100644 --- a/security/p5-Crypt-Rijndael/pkg-plist +++ b/security/p5-Crypt-Rijndael/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rijndael/Rijndael.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rijndael/Rijndael.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rijndael -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-SKey/pkg-plist b/security/p5-Crypt-SKey/pkg-plist index 41cc5d7a985b..5ebb5bf73927 100644 --- a/security/p5-Crypt-SKey/pkg-plist +++ b/security/p5-Crypt-SKey/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/SKey.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SKey/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SKey/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-SSLeay/pkg-plist b/security/p5-Crypt-SSLeay/pkg-plist index 04e1619975df..9581cc4cb84d 100644 --- a/security/p5-Crypt-SSLeay/pkg-plist +++ b/security/p5-Crypt-SSLeay/pkg-plist @@ -10,6 +10,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SSLeay/SSLeay.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SSLeay @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Crypt/SSLeay -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-Salt/pkg-plist b/security/p5-Crypt-Salt/pkg-plist index 8ab5a43bf5cd..8d99606fb21f 100644 --- a/security/p5-Crypt-Salt/pkg-plist +++ b/security/p5-Crypt-Salt/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/Salt.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Salt/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Salt/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-SaltedHash/pkg-plist b/security/p5-Crypt-SaltedHash/pkg-plist index 5ad7b629c294..b5e777cb9710 100644 --- a/security/p5-Crypt-SaltedHash/pkg-plist +++ b/security/p5-Crypt-SaltedHash/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/SaltedHash.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SaltedHash/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SaltedHash/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-Serpent/pkg-plist b/security/p5-Crypt-Serpent/pkg-plist index 03e7e9c7379d..59b45f67568d 100644 --- a/security/p5-Crypt-Serpent/pkg-plist +++ b/security/p5-Crypt-Serpent/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Serpent/Serpent.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Serpent/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Serpent -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-Shark/pkg-plist b/security/p5-Crypt-Shark/pkg-plist index 67c5e23faff8..ff06c58df41a 100644 --- a/security/p5-Crypt-Shark/pkg-plist +++ b/security/p5-Crypt-Shark/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Shark/Shark.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Shark/Shark.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Shark/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-SmbHash/pkg-plist b/security/p5-Crypt-SmbHash/pkg-plist index 653b7f60b943..d58d97f2c361 100644 --- a/security/p5-Crypt-SmbHash/pkg-plist +++ b/security/p5-Crypt-SmbHash/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/SmbHash.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SmbHash/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/SmbHash -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-Solitaire/pkg-plist b/security/p5-Crypt-Solitaire/pkg-plist index 6cd45923cd41..f2c4370de768 100644 --- a/security/p5-Crypt-Solitaire/pkg-plist +++ b/security/p5-Crypt-Solitaire/pkg-plist @@ -2,7 +2,7 @@ %%SITE_PERL%%/auto/Crypt/Solitaire/autosplit.ix %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Solitaire/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Solitaire -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt @dirrm %%SITE_PERL%%/auto/Crypt/Solitaire -@unexec rmdir %D/%%SITE_PERL%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-TEA/pkg-plist b/security/p5-Crypt-TEA/pkg-plist index b6219d076d92..82cc42fd8f42 100644 --- a/security/p5-Crypt-TEA/pkg-plist +++ b/security/p5-Crypt-TEA/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/TEA/TEA.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/TEA/TEA.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/TEA/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-TripleDES/pkg-plist b/security/p5-Crypt-TripleDES/pkg-plist index 79a3db025a97..79bf235a81e5 100644 --- a/security/p5-Crypt-TripleDES/pkg-plist +++ b/security/p5-Crypt-TripleDES/pkg-plist @@ -2,5 +2,5 @@ %%SITE_PERL%%/Crypt/TripleDES.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/TripleDES/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/TripleDES -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-Twofish/pkg-plist b/security/p5-Crypt-Twofish/pkg-plist index 347fe0fd504c..d70c93e6c841 100644 --- a/security/p5-Crypt-Twofish/pkg-plist +++ b/security/p5-Crypt-Twofish/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish/Twofish.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish/Twofish.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-Twofish2/pkg-plist b/security/p5-Crypt-Twofish2/pkg-plist index 0091565543d6..86c9b7cc24e6 100644 --- a/security/p5-Crypt-Twofish2/pkg-plist +++ b/security/p5-Crypt-Twofish2/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish2/Twofish2.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish2/Twofish2.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Twofish2 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt diff --git a/security/p5-Crypt-UnixCrypt/pkg-plist b/security/p5-Crypt-UnixCrypt/pkg-plist index 302e0f58561d..465eaa9b521d 100644 --- a/security/p5-Crypt-UnixCrypt/pkg-plist +++ b/security/p5-Crypt-UnixCrypt/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/UnixCrypt.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/UnixCrypt/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/UnixCrypt -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-X509/pkg-plist b/security/p5-Crypt-X509/pkg-plist index bfc0e607931d..192d8e2a3930 100644 --- a/security/p5-Crypt-X509/pkg-plist +++ b/security/p5-Crypt-X509/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/X509.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/X509/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/X509/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Crypt-xDBM_File/pkg-plist b/security/p5-Crypt-xDBM_File/pkg-plist index 441165e81111..9cd0ab1aac02 100644 --- a/security/p5-Crypt-xDBM_File/pkg-plist +++ b/security/p5-Crypt-xDBM_File/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Crypt/xDBM_File.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/xDBM_File/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/xDBM_File -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Crypt 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt +@dirrmtry %%SITE_PERL%%/Crypt diff --git a/security/p5-Data-Password/pkg-plist b/security/p5-Data-Password/pkg-plist index dac7875ae2d1..4342ed05e70e 100644 --- a/security/p5-Data-Password/pkg-plist +++ b/security/p5-Data-Password/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Data/Password.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Password/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Data @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/Password -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data diff --git a/security/p5-Digest-Adler32/pkg-plist b/security/p5-Digest-Adler32/pkg-plist index 49359cc4645d..e0093be90b27 100644 --- a/security/p5-Digest-Adler32/pkg-plist +++ b/security/p5-Digest-Adler32/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Digest/Adler32.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Adler32/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Adler32 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ +@dirrmtry %%SITE_PERL%%/Digest/ diff --git a/security/p5-Digest-BubbleBabble/pkg-plist b/security/p5-Digest-BubbleBabble/pkg-plist index 12d902db7f74..9f28a654de48 100644 --- a/security/p5-Digest-BubbleBabble/pkg-plist +++ b/security/p5-Digest-BubbleBabble/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Digest/BubbleBabble.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/BubbleBabble/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/BubbleBabble -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Digest 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest +@dirrmtry %%SITE_PERL%%/Digest diff --git a/security/p5-Digest-CRC/pkg-plist b/security/p5-Digest-CRC/pkg-plist index 8d3a1a1d8ad3..de7929194fbd 100644 --- a/security/p5-Digest-CRC/pkg-plist +++ b/security/p5-Digest-CRC/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/CRC/CRC.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/CRC/CRC.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/CRC -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/ +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ diff --git a/security/p5-Digest-Crc32/pkg-plist b/security/p5-Digest-Crc32/pkg-plist index 1dd898786717..6ddc37113db5 100644 --- a/security/p5-Digest-Crc32/pkg-plist +++ b/security/p5-Digest-Crc32/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Digest/Crc32.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Crc32/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Crc32/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ +@dirrmtry %%SITE_PERL%%/Digest/ diff --git a/security/p5-Digest-DJB/pkg-plist b/security/p5-Digest-DJB/pkg-plist index e68f5dba2b09..1a5b57e9b0b8 100644 --- a/security/p5-Digest-DJB/pkg-plist +++ b/security/p5-Digest-DJB/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/DJB/DJB.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/DJB/DJB.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/DJB/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/ diff --git a/security/p5-Digest-DMAC/pkg-plist b/security/p5-Digest-DMAC/pkg-plist index 565537d144a2..ddf3a696ecb1 100644 --- a/security/p5-Digest-DMAC/pkg-plist +++ b/security/p5-Digest-DMAC/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Digest/DMAC.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/DMAC/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/DMAC/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ +@dirrmtry %%SITE_PERL%%/Digest/ diff --git a/security/p5-Digest-EMAC/pkg-plist b/security/p5-Digest-EMAC/pkg-plist index 0822434bdb9f..e520c6764845 100644 --- a/security/p5-Digest-EMAC/pkg-plist +++ b/security/p5-Digest-EMAC/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Digest/EMAC.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/EMAC/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/EMAC/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ +@dirrmtry %%SITE_PERL%%/Digest/ diff --git a/security/p5-Digest-Elf/pkg-plist b/security/p5-Digest-Elf/pkg-plist index ffc327260dba..730f04750298 100644 --- a/security/p5-Digest-Elf/pkg-plist +++ b/security/p5-Digest-Elf/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Elf/Elf.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Elf/Elf.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Elf/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/ diff --git a/security/p5-Digest-FNV/pkg-plist b/security/p5-Digest-FNV/pkg-plist index 0baab84c4da6..c8833e73ce49 100644 --- a/security/p5-Digest-FNV/pkg-plist +++ b/security/p5-Digest-FNV/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/FNV/FNV.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/FNV/FNV.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/FNV/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/ diff --git a/security/p5-Digest-HMAC/pkg-plist b/security/p5-Digest-HMAC/pkg-plist index 350bd43d71ce..76c6d448a06f 100644 --- a/security/p5-Digest-HMAC/pkg-plist +++ b/security/p5-Digest-HMAC/pkg-plist @@ -2,6 +2,6 @@ %%SITE_PERL%%/Digest/HMAC_MD5.pm %%SITE_PERL%%/Digest/HMAC_SHA1.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/HMAC/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/HMAC 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Digest 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/HMAC +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest +@dirrmtry %%SITE_PERL%%/Digest diff --git a/security/p5-Digest-Hashcash/pkg-plist b/security/p5-Digest-Hashcash/pkg-plist index 1e3d1e97a3ec..a2a8dbe1d963 100644 --- a/security/p5-Digest-Hashcash/pkg-plist +++ b/security/p5-Digest-Hashcash/pkg-plist @@ -3,6 +3,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Hashcash/Hashcash.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Hashcash/Hashcash.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Hashcash/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Hashcash/ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/ +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Hashcash/ +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ diff --git a/security/p5-Digest-Haval256/pkg-plist b/security/p5-Digest-Haval256/pkg-plist index d56296269cec..517a6ed9156b 100644 --- a/security/p5-Digest-Haval256/pkg-plist +++ b/security/p5-Digest-Haval256/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Haval256/Haval256.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Haval256/Haval256.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Haval256 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/ diff --git a/security/p5-Digest-JHash/pkg-plist b/security/p5-Digest-JHash/pkg-plist index 64d0505070c7..c3548f8c3811 100644 --- a/security/p5-Digest-JHash/pkg-plist +++ b/security/p5-Digest-JHash/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/JHash/JHash.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/JHash/JHash.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/JHash/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/ diff --git a/security/p5-Digest-MD2/pkg-plist b/security/p5-Digest-MD2/pkg-plist index 2f42d58fd055..7e340e22dc89 100644 --- a/security/p5-Digest-MD2/pkg-plist +++ b/security/p5-Digest-MD2/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD2/MD2.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD2/MD2.bs @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD2 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest diff --git a/security/p5-Digest-MD4/pkg-plist b/security/p5-Digest-MD4/pkg-plist index 4712c7dabee7..8c072000bcaa 100644 --- a/security/p5-Digest-MD4/pkg-plist +++ b/security/p5-Digest-MD4/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD4/MD4.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD4/MD4.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD4 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest diff --git a/security/p5-Digest-MD5-File/pkg-plist b/security/p5-Digest-MD5-File/pkg-plist index 9ed2e3fcfd74..e994828cd062 100644 --- a/security/p5-Digest-MD5-File/pkg-plist +++ b/security/p5-Digest-MD5-File/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Digest/MD5/File.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/File/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/File/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Digest/MD5 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5 +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ +@dirrmtry %%SITE_PERL%%/Digest/MD5 +@dirrmtry %%SITE_PERL%%/Digest/ diff --git a/security/p5-Digest-MD5-M4p/pkg-plist b/security/p5-Digest-MD5-M4p/pkg-plist index 47b991696b4f..8d7002ceef5b 100644 --- a/security/p5-Digest-MD5-M4p/pkg-plist +++ b/security/p5-Digest-MD5-M4p/pkg-plist @@ -3,7 +3,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/M4p/M4p.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/M4p/M4p.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/M4p -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/MD5 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5 +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/MD5 +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest diff --git a/security/p5-Digest-MD5-Reverse/pkg-plist b/security/p5-Digest-MD5-Reverse/pkg-plist index 09db6ffa52f4..cb26129d65d3 100644 --- a/security/p5-Digest-MD5-Reverse/pkg-plist +++ b/security/p5-Digest-MD5-Reverse/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Digest/MD5/Reverse.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/Reverse/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/Reverse/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Digest/MD5 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5 +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ +@dirrmtry %%SITE_PERL%%/Digest/MD5 +@dirrmtry %%SITE_PERL%%/Digest/ diff --git a/security/p5-Digest-MD5/pkg-plist b/security/p5-Digest-MD5/pkg-plist index cd8b45f104b2..6121c381507d 100644 --- a/security/p5-Digest-MD5/pkg-plist +++ b/security/p5-Digest-MD5/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/MD5.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5/MD5.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/MD5 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest diff --git a/security/p5-Digest-ManberHash/pkg-plist b/security/p5-Digest-ManberHash/pkg-plist index e85f4b56da81..2fb1a571cdaf 100644 --- a/security/p5-Digest-ManberHash/pkg-plist +++ b/security/p5-Digest-ManberHash/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ManberHash/ManberHash.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ManberHash/ManberHash.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ManberHash -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/ diff --git a/security/p5-Digest-Nilsimsa/pkg-plist b/security/p5-Digest-Nilsimsa/pkg-plist index 7e86c12d5910..dab4f5d233aa 100644 --- a/security/p5-Digest-Nilsimsa/pkg-plist +++ b/security/p5-Digest-Nilsimsa/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Nilsimsa/Nilsimsa.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Nilsimsa/Nilsimsa.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Nilsimsa -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest diff --git a/security/p5-Digest-Pearson-PurePerl/pkg-plist b/security/p5-Digest-Pearson-PurePerl/pkg-plist index 9e482faf0dcb..d5e2148d4a73 100644 --- a/security/p5-Digest-Pearson-PurePerl/pkg-plist +++ b/security/p5-Digest-Pearson-PurePerl/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Digest/Pearson/PurePerl.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Pearson/PurePerl/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Pearson/PurePerl/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Pearson/ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Pearson/ +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ @dirrm %%SITE_PERL%%/Digest/Pearson/ -@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Digest/ diff --git a/security/p5-Digest-Pearson/pkg-plist b/security/p5-Digest-Pearson/pkg-plist index 21df5b8ac42b..e23e76a0dad0 100644 --- a/security/p5-Digest-Pearson/pkg-plist +++ b/security/p5-Digest-Pearson/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Pearson/Pearson.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Pearson/Pearson.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Pearson -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/ diff --git a/security/p5-Digest-Perl-MD4/pkg-plist b/security/p5-Digest-Perl-MD4/pkg-plist index 6d18aae464b5..93dea3436bec 100644 --- a/security/p5-Digest-Perl-MD4/pkg-plist +++ b/security/p5-Digest-Perl-MD4/pkg-plist @@ -2,7 +2,7 @@ %%SITE_PERL%%/Digest/Perl/Digest-MD4.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/MD4/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/MD4/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/ +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ @dirrm %%SITE_PERL%%/Digest/Perl/ -@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Digest/ diff --git a/security/p5-Digest-Perl-MD5/pkg-plist b/security/p5-Digest-Perl-MD5/pkg-plist index 80bde8594b2b..4c1d5dd178d4 100644 --- a/security/p5-Digest-Perl-MD5/pkg-plist +++ b/security/p5-Digest-Perl-MD5/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Digest/Perl/MD5.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/MD5/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/MD5/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Perl/ +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ @dirrm %%SITE_PERL%%/Digest/Perl/ -@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Digest/ diff --git a/security/p5-Digest-SHA-PurePerl/pkg-plist b/security/p5-Digest-SHA-PurePerl/pkg-plist index 90be7d582275..81f8012613eb 100644 --- a/security/p5-Digest-SHA-PurePerl/pkg-plist +++ b/security/p5-Digest-SHA-PurePerl/pkg-plist @@ -2,7 +2,7 @@ bin/shasum %%SITE_PERL%%/Digest/SHA/PurePerl.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA/PurePerl/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA/PurePerl/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA/ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA/ +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/ @dirrm %%SITE_PERL%%/Digest/SHA/ -@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Digest/ diff --git a/security/p5-Digest-SHA/pkg-plist b/security/p5-Digest-SHA/pkg-plist index 2da93527a67b..9f82141b210c 100644 --- a/security/p5-Digest-SHA/pkg-plist +++ b/security/p5-Digest-SHA/pkg-plist @@ -3,6 +3,6 @@ bin/shasum %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA/SHA.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA/SHA.so -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/ diff --git a/security/p5-Digest-SHA1/pkg-plist b/security/p5-Digest-SHA1/pkg-plist index a552aec3c7b9..02760efd8321 100644 --- a/security/p5-Digest-SHA1/pkg-plist +++ b/security/p5-Digest-SHA1/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA1/SHA1.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA1/SHA1.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA1 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest diff --git a/security/p5-Digest-SHA2/pkg-plist b/security/p5-Digest-SHA2/pkg-plist index d239641a8c83..82442b8ceb79 100644 --- a/security/p5-Digest-SHA2/pkg-plist +++ b/security/p5-Digest-SHA2/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA2/SHA2.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA2/SHA2.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA2 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest diff --git a/security/p5-Digest-SHA256/pkg-plist b/security/p5-Digest-SHA256/pkg-plist index 6ad961e1cbc7..93bd95fb6eca 100644 --- a/security/p5-Digest-SHA256/pkg-plist +++ b/security/p5-Digest-SHA256/pkg-plist @@ -6,5 +6,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA256/SHA256.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA256/autosplit.ix @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/SHA256 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest diff --git a/security/p5-Digest-SV1/pkg-plist b/security/p5-Digest-SV1/pkg-plist index 5028d857d9bc..726386ad8c88 100644 --- a/security/p5-Digest-SV1/pkg-plist +++ b/security/p5-Digest-SV1/pkg-plist @@ -1,2 +1,2 @@ %%SITE_PERL%%/Digest/SV1.pm -@unexec rmdir %D/%%SITE_PERL%%/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Digest/ diff --git a/security/p5-Digest-Tiger/pkg-plist b/security/p5-Digest-Tiger/pkg-plist index c11e6a33c704..46506fa3f2ae 100644 --- a/security/p5-Digest-Tiger/pkg-plist +++ b/security/p5-Digest-Tiger/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Tiger/Tiger.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Tiger/Tiger.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Tiger -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/ diff --git a/security/p5-Digest-Whirlpool/pkg-plist b/security/p5-Digest-Whirlpool/pkg-plist index 3a0f7715e4d8..a2e002399a9b 100644 --- a/security/p5-Digest-Whirlpool/pkg-plist +++ b/security/p5-Digest-Whirlpool/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Whirlpool/Whirlpool.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Whirlpool/Whirlpool.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest/Whirlpool -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Digest/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Digest/ diff --git a/security/p5-Digest/pkg-plist b/security/p5-Digest/pkg-plist index 20d61770d45e..b592854aa7ba 100644 --- a/security/p5-Digest/pkg-plist +++ b/security/p5-Digest/pkg-plist @@ -2,5 +2,5 @@ %%SITE_PERL%%/Digest.pm %%SITE_PERL%%/Digest/base.pm %%SITE_PERL%%/Digest/file.pm -@unexec rmdir %D/%%SITE_PERL%%/Digest 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Digest +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Digest diff --git a/security/p5-Email-Obfuscate/pkg-plist b/security/p5-Email-Obfuscate/pkg-plist index 6abcf3f736f6..e0f640ec95d2 100644 --- a/security/p5-Email-Obfuscate/pkg-plist +++ b/security/p5-Email-Obfuscate/pkg-plist @@ -2,5 +2,5 @@ %%SITE_PERL%%/Email/Obfuscate.pod %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Obfuscate/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email/Obfuscate -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Email 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Email 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Email +@dirrmtry %%SITE_PERL%%/Email diff --git a/security/p5-File-Scan/pkg-plist b/security/p5-File-Scan/pkg-plist index d04feba0f8f3..11f4c15e6f85 100644 --- a/security/p5-File-Scan/pkg-plist +++ b/security/p5-File-Scan/pkg-plist @@ -16,5 +16,5 @@ %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Scan -@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/security/p5-Filter-CBC/pkg-plist b/security/p5-Filter-CBC/pkg-plist index 94989c6b4e2b..267f476adc30 100644 --- a/security/p5-Filter-CBC/pkg-plist +++ b/security/p5-Filter-CBC/pkg-plist @@ -15,5 +15,5 @@ %%PORTDOCS%%%%EXAMPLESDIR%%/twofish.pl %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/CBC -@unexec rmdir %D/%%SITE_PERL%%/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Filter +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter diff --git a/security/p5-Filter-Crypto/pkg-plist b/security/p5-Filter-Crypto/pkg-plist index 546c07ea04cf..4e4458ceaa07 100644 --- a/security/p5-Filter-Crypto/pkg-plist +++ b/security/p5-Filter-Crypto/pkg-plist @@ -9,10 +9,10 @@ bin/crypt_file %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Crypto/Decrypt/Decrypt.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Crypto/Decrypt/Decrypt.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Filter/Crypto -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Filter 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Filter @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/PAR/Filter -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/PAR 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/PAR @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Crypto/CryptFile @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Crypto/Decrypt @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Crypto -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter diff --git a/security/p5-GD-SecurityImage/pkg-plist b/security/p5-GD-SecurityImage/pkg-plist index b82d70fead35..560fd4dfa2ed 100644 --- a/security/p5-GD-SecurityImage/pkg-plist +++ b/security/p5-GD-SecurityImage/pkg-plist @@ -6,5 +6,5 @@ %%SITE_PERL%%/GD/SecurityImage/Styles.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD/SecurityImage @dirrm %%SITE_PERL%%/GD/SecurityImage -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/GD 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/GD 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GD +@dirrmtry %%SITE_PERL%%/GD diff --git a/security/p5-IO-Socket-SSL/pkg-plist b/security/p5-IO-Socket-SSL/pkg-plist index 96908b518b82..8344d611f70f 100644 --- a/security/p5-IO-Socket-SSL/pkg-plist +++ b/security/p5-IO-Socket-SSL/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/IO/Socket/SSL.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/SSL/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/SSL -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket @dirrm %%SITE_PERL%%/IO/Socket -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO +@dirrmtry %%SITE_PERL%%/IO diff --git a/security/p5-Module-Signature/pkg-plist b/security/p5-Module-Signature/pkg-plist index a756698dcf7c..6e09cc2ffb1d 100644 --- a/security/p5-Module-Signature/pkg-plist +++ b/security/p5-Module-Signature/pkg-plist @@ -2,5 +2,5 @@ bin/cpansign %%SITE_PERL%%/Module/Signature.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Signature/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module/Signature -@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Module 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Module +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Module diff --git a/security/p5-Net-OpenID-Server/pkg-plist b/security/p5-Net-OpenID-Server/pkg-plist index 56bcd9a6b804..5bba5d86432d 100644 --- a/security/p5-Net-OpenID-Server/pkg-plist +++ b/security/p5-Net-OpenID-Server/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Net/OpenID/Server.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenID/Server/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenID/Server -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenID 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net/OpenID 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/OpenID +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net +@dirrmtry %%SITE_PERL%%/Net/OpenID +@dirrmtry %%SITE_PERL%%/Net diff --git a/security/p5-Net-SSLeay/pkg-plist b/security/p5-Net-SSLeay/pkg-plist index a7b5dcdee3f4..2ad0c961784c 100644 --- a/security/p5-Net-SSLeay/pkg-plist +++ b/security/p5-Net-SSLeay/pkg-plist @@ -102,6 +102,6 @@ %%PORTDOCS%%%%EXAMPLESDIR%%/tcpecho.pl %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/SSLeay -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Net/SSLeay -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Net diff --git a/security/p5-Nmap-Scanner/pkg-plist b/security/p5-Nmap-Scanner/pkg-plist index e15e94f97fa4..28a62bd10d67 100644 --- a/security/p5-Nmap-Scanner/pkg-plist +++ b/security/p5-Nmap-Scanner/pkg-plist @@ -34,5 +34,5 @@ @dirrm %%SITE_PERL%%/Nmap/Scanner/Util @dirrm %%SITE_PERL%%/Nmap/Scanner @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nmap/Scanner -@unexec rmdir %D/%%SITE_PERL%%/Nmap 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Nmap 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Nmap +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Nmap diff --git a/security/p5-OpenCA-CRL/pkg-plist b/security/p5-OpenCA-CRL/pkg-plist index a767760715a7..cf68e8ec34fd 100644 --- a/security/p5-OpenCA-CRL/pkg-plist +++ b/security/p5-OpenCA-CRL/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/CRL/.packlist %%SITE_PERL%%/OpenCA/CRL.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/CRL -@unexec rmdir %D/%%SITE_PERL%%/OpenCA 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/OpenCA +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA diff --git a/security/p5-OpenCA-CRR/pkg-plist b/security/p5-OpenCA-CRR/pkg-plist index 633588f6b19c..c1d7dc7a3571 100644 --- a/security/p5-OpenCA-CRR/pkg-plist +++ b/security/p5-OpenCA-CRR/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/CRR/.packlist %%SITE_PERL%%/OpenCA/CRR.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/CRR -@unexec rmdir %D/%%SITE_PERL%%/OpenCA 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/OpenCA +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA diff --git a/security/p5-OpenCA-PKCS7/pkg-plist b/security/p5-OpenCA-PKCS7/pkg-plist index 9917283de371..df96bbafbfbe 100644 --- a/security/p5-OpenCA-PKCS7/pkg-plist +++ b/security/p5-OpenCA-PKCS7/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/PKCS7/.packlist %%SITE_PERL%%/OpenCA/PKCS7.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/PKCS7 -@unexec rmdir %D/%%SITE_PERL%%/OpenCA 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/OpenCA +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA diff --git a/security/p5-OpenCA-REQ/pkg-plist b/security/p5-OpenCA-REQ/pkg-plist index 002de9fc3097..1a869dab6bb3 100644 --- a/security/p5-OpenCA-REQ/pkg-plist +++ b/security/p5-OpenCA-REQ/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/REQ/.packlist %%SITE_PERL%%/OpenCA/REQ.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA/REQ -@unexec rmdir %D/%%SITE_PERL%%/OpenCA 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/OpenCA +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenCA diff --git a/security/p5-PGP-Sign/pkg-plist b/security/p5-PGP-Sign/pkg-plist index a5f790989576..fa88ee96559b 100644 --- a/security/p5-PGP-Sign/pkg-plist +++ b/security/p5-PGP-Sign/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/PGP/Sign.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PGP/Sign/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PGP/Sign -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PGP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PGP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PGP +@dirrmtry %%SITE_PERL%%/PGP diff --git a/security/p5-POE-Component-SSLify/pkg-plist b/security/p5-POE-Component-SSLify/pkg-plist index fd0fb1561d57..d18f03ddbb9c 100644 --- a/security/p5-POE-Component-SSLify/pkg-plist +++ b/security/p5-POE-Component-SSLify/pkg-plist @@ -3,8 +3,8 @@ %%SITE_PERL%%/POE/Component/SSLify/ClientHandle.pm %%SITE_PERL%%/POE/Component/SSLify/ServerHandle.pm @dirrm %%SITE_PERL%%/POE/Component/SSLify -@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/POE/Component +@dirrmtry %%SITE_PERL%%/POE @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/SSLify -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE diff --git a/security/p5-Safe-Hole/pkg-plist b/security/p5-Safe-Hole/pkg-plist index 40a37e51d91f..6993041f51be 100644 --- a/security/p5-Safe-Hole/pkg-plist +++ b/security/p5-Safe-Hole/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/Safe/Hole.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Safe/Hole/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Safe/Hole/ -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Safe 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Safe @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Safe diff --git a/security/p5-Tie-EncryptedHash/pkg-plist b/security/p5-Tie-EncryptedHash/pkg-plist index f77b5ed0cda2..b57215caaa56 100644 --- a/security/p5-Tie-EncryptedHash/pkg-plist +++ b/security/p5-Tie-EncryptedHash/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Tie/EncryptedHash.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/EncryptedHash/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/EncryptedHash -@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/security/portaudit/pkg-plist b/security/portaudit/pkg-plist index 84b4ccaaf52e..8edf7bb6dbc8 100644 --- a/security/portaudit/pkg-plist +++ b/security/portaudit/pkg-plist @@ -1,7 +1,7 @@ sbin/portaudit etc/portaudit.conf.sample %%PERIODICDIR%%/security/410.portaudit -@unexec rmdir %D/%%PERIODICDIR%%/security 2>/dev/null || true -@unexec rmdir %D/%%PERIODICDIR%% 2>/dev/null || true +@dirrmtry %%PERIODICDIR%%/security +@dirrmtry %%PERIODICDIR%% @exec mkdir -p %%DATABASEDIR%% @unexec rmdir %%DATABASEDIR%% 2>/dev/null || true diff --git a/security/prelude-lml/pkg-plist b/security/prelude-lml/pkg-plist index da1772a00347..70dd6b4712a0 100644 --- a/security/prelude-lml/pkg-plist +++ b/security/prelude-lml/pkg-plist @@ -51,7 +51,7 @@ etc/prelude-lml/plugins.rules-dist include/prelude-lml/prelude-lml.h lib/prelude-lml/debug.so lib/prelude-lml/pcre.so -@unexec rmdir %D/etc/prelude-lml/ruleset 2>/dev/null || true +@dirrmtry etc/prelude-lml/ruleset @unexec rmdir %D/etc/prelude-lml 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/etc/prelude-lml`` to remove any configuration files left." | fmt @dirrm include/prelude-lml @dirrm lib/prelude-lml diff --git a/security/revelation/pkg-plist b/security/revelation/pkg-plist index 26c50169ae10..2036325bb2f0 100644 --- a/security/revelation/pkg-plist +++ b/security/revelation/pkg-plist @@ -54,8 +54,8 @@ bin/revelation %%PYTHON_SITELIBDIR%%/revelation/crack.so %%PYTHON_SITELIBDIR%%/revelation/gnomemisc.so @dirrm %%PYTHON_SITELIBDIR%%/revelation -@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2> /dev/null || true -@unexec rmdir %D/%%PYTHON_LIBDIR%% 2> /dev/null || true +@dirrmtry %%PYTHON_SITELIBDIR%% +@dirrmtry %%PYTHON_LIBDIR%% libdata/bonobo/servers/GNOME_RevelationApplet.server libexec/revelation-applet share/gnome/applications/revelation.desktop diff --git a/security/samba-vscan/pkg-plist b/security/samba-vscan/pkg-plist index 4d4a10ae1693..cf6aba67437c 100644 --- a/security/samba-vscan/pkg-plist +++ b/security/samba-vscan/pkg-plist @@ -17,6 +17,6 @@ etc/samba-vscan/vscan-trend.conf %%VFSDIR%%/vscan-sophos.so %%VFSDIR%%/vscan-trend.so %%VFSDIR%%/vscan-antivir.so -@unexec rmdir %D/%%VFSDIR%% 2>/dev/null || true -@unexec rmdir %D/lib/samba 2>/dev/null || true +@dirrmtry %%VFSDIR%% +@dirrmtry lib/samba @dirrm etc/samba-vscan diff --git a/security/shishi/pkg-plist b/security/shishi/pkg-plist index 8384352bdd17..1949e678c80c 100644 --- a/security/shishi/pkg-plist +++ b/security/shishi/pkg-plist @@ -18,4 +18,4 @@ sbin/shishid %%NLS%%share/locale/en@quot/LC_MESSAGES/shishi.mo %%NLS%%share/locale/pl/LC_MESSAGES/shishi.mo %%NLS%%share/locale/sv/LC_MESSAGES/shishi.mo -@unexec rmdir %D/etc/shishi 2>/dev/null || true +@dirrmtry etc/shishi diff --git a/security/snort/pkg-plist b/security/snort/pkg-plist index c4568c4fb393..a9d2258c5f01 100644 --- a/security/snort/pkg-plist +++ b/security/snort/pkg-plist @@ -9,7 +9,7 @@ etc/snort/sid-msg.map-sample etc/snort/snort.conf-sample etc/snort/threshold.conf-sample etc/snort/unicode.map-sample -@unexec rmdir %D/etc/snort 2>/dev/null || true +@dirrmtry etc/snort %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/BUGS %%PORTDOCS%%%%DOCSDIR%%/CREDITS diff --git a/security/snortsms/pkg-plist b/security/snortsms/pkg-plist index 4d9639db542f..6e2297a8ae96 100644 --- a/security/snortsms/pkg-plist +++ b/security/snortsms/pkg-plist @@ -322,8 +322,8 @@ www/snortsms/variables/qry_variables.php @dirrm www/snortsms/css @dirrm www/snortsms/contrib @dirrm www/snortsms/configs -@unexec rmdir %D/www/snortsms/conf 2>/dev/null || true +@dirrmtry www/snortsms/conf @dirrm www/snortsms/classifications @dirrm www/snortsms/barnyard @dirrm www/snortsms/barnctrl -@unexec rmdir %D/www/snortsms 2>/dev/null || true +@dirrmtry www/snortsms diff --git a/security/ssh2/pkg-plist b/security/ssh2/pkg-plist index 4bb3ecf2d02f..523c27579984 100644 --- a/security/ssh2/pkg-plist +++ b/security/ssh2/pkg-plist @@ -53,7 +53,7 @@ sbin/sshd2 %%EXAMPLESDIR%%/ext_authorization_example.sh %%EXAMPLESDIR%%/kbdint_plugin_example.sh @dirrm %%EXAMPLESDIR%% -@unexec rmdir %D/etc/ssh2/hostkeys 2> /dev/null || true -@unexec rmdir %D/etc/ssh2/knownhosts 2> /dev/null || true -@unexec rmdir %D/etc/ssh2/subconfig 2> /dev/null || true +@dirrmtry etc/ssh2/hostkeys +@dirrmtry etc/ssh2/knownhosts +@dirrmtry etc/ssh2/subconfig @unexec rmdir %D/etc/ssh2 2> /dev/null || echo "If permanently deleting this package, %D/etc/ssh2 and its contents must be removed manually." diff --git a/security/tor/pkg-plist b/security/tor/pkg-plist index c3e22fbf8a72..abae4f580d85 100644 --- a/security/tor/pkg-plist +++ b/security/tor/pkg-plist @@ -5,4 +5,4 @@ bin/torify etc/rc.d/tor.sh.sample etc/tor/torrc.sample etc/tor/tor-tsocks.conf.sample -@unexec rmdir %D/etc/tor 2>/dev/null || true +@dirrmtry etc/tor diff --git a/security/unicornscan/pkg-plist b/security/unicornscan/pkg-plist index 08e471780c13..ea2ae3a9b5a8 100644 --- a/security/unicornscan/pkg-plist +++ b/security/unicornscan/pkg-plist @@ -21,9 +21,9 @@ share/unicornscan/p0fa.fp share/unicornscan/p0fr.fp share/unicornscan/port-numbers @exec %D/var/unicornscan/ -@unexec rmdir %D/var/unicornscan 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true -@unexec rmdir %D/share/unicornscan 2>/dev/null || true +@dirrmtry var/unicornscan +@dirrmtry var +@dirrmtry share/unicornscan @dirrm libexec/unicornscan/modules @dirrm libexec/unicornscan -@unexec rmdir %D/etc/unicornscan 2>/dev/null || true +@dirrmtry etc/unicornscan diff --git a/security/xca/pkg-plist b/security/xca/pkg-plist index 9571fc598ce9..963638407a46 100644 --- a/security/xca/pkg-plist +++ b/security/xca/pkg-plist @@ -37,4 +37,4 @@ share/xca/xca-9.html share/xca/xca.html @dirrm share/xca @unexec rmdir %D/share/pixmaps || true -@unexec rmdir %D/share/applications 2>/dev/null || true +@dirrmtry share/applications diff --git a/shells/zoidberg/pkg-plist b/shells/zoidberg/pkg-plist index 505d272ac60e..063d711a2d1e 100644 --- a/shells/zoidberg/pkg-plist +++ b/shells/zoidberg/pkg-plist @@ -69,7 +69,7 @@ etc/zoidrc @dirrm %%SITE_PERL%%/auto/Zoidberg/Fish/Log @dirrm %%SITE_PERL%%/auto/Zoidberg/Fish @dirrm %%SITE_PERL%%/auto/Zoidberg -@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Bundle %%DATADIR%%/AppInfo.xml %%DATADIR%%/pixmaps/zoid16.png %%DATADIR%%/pixmaps/zoid32.png diff --git a/sysutils/3dm/pkg-plist b/sysutils/3dm/pkg-plist index da1eec1f87fd..287e3f1517ef 100644 --- a/sysutils/3dm/pkg-plist +++ b/sysutils/3dm/pkg-plist @@ -139,4 +139,4 @@ share/3dm2/en/scripts/seealso.js @unexec unlink /etc/3dm2/3dm2.conf @unexec unlink /etc/3dm2/3dm2.pem @unexec unlink /etc/3dm2/msg -@unexec rmdir %D/share/3dm2/en/scripts %D/share/3dm2/en/images %D/share/3dm2/en %D/share/3dm2 /etc/3dm2 %D/etc/3dm2/msg %D/etc/3dm2 2>/dev/null || true +@dirrmtry share/3dm2/en/scripts %D/share/3dm2/en/images %D/share/3dm2/en %D/share/3dm2 /etc/3dm2 %D/etc/3dm2/msg %D/etc/3dm2 diff --git a/sysutils/LPRngTool/pkg-plist b/sysutils/LPRngTool/pkg-plist index a494e02f367f..30e26f5543d4 100644 --- a/sysutils/LPRngTool/pkg-plist +++ b/sysutils/LPRngTool/pkg-plist @@ -6,7 +6,7 @@ libexec/filters/printerdb libexec/filters/testpage.asc libexec/filters/testpage.ps libexec/filters/testpage-a4.ps -@unexec rmdir %D/libexec/filters 2> /dev/null || true +@dirrmtry libexec/filters %%CWD%%@cwd / @unexec if cmp -s %D/%%SYSCONFDIR%%/lprngtool.conf %D/%%SYSCONFDIR%%/lprngtool.conf.sample; then rm -f %D/%%SYSCONFDIR%%/lprngtool.conf; fi %%SYSCONFDIR%%/lprngtool.conf.sample diff --git a/sysutils/bbsmount/pkg-plist b/sysutils/bbsmount/pkg-plist index 42144aefae3d..359c45ac8959 100644 --- a/sysutils/bbsmount/pkg-plist +++ b/sysutils/bbsmount/pkg-plist @@ -15,7 +15,7 @@ share/bbtools/README.bbsmount %%DATADIR%%/images/unmounteddisk.xpm %%DATADIR%%/images/unmounted.xpm %%DATADIR%%/images/unmountedzip.xpm -@unexec rmdir %D/share/bbtools 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%%/examples 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%%/images 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true +@dirrmtry share/bbtools +@dirrmtry %%DATADIR%%/examples +@dirrmtry %%DATADIR%%/images +@dirrmtry %%DATADIR%% diff --git a/sysutils/bubblemon2/pkg-plist b/sysutils/bubblemon2/pkg-plist index 4c94b6a3643a..8f14b612d8ec 100644 --- a/sysutils/bubblemon2/pkg-plist +++ b/sysutils/bubblemon2/pkg-plist @@ -27,6 +27,6 @@ share/locale/ro/LC_MESSAGES/bubblemon.mo share/locale/ru/LC_MESSAGES/bubblemon.mo share/locale/sh/LC_MESSAGES/bubblemon.mo share/locale/sv/LC_MESSAGES/bubblemon.mo -@unexec rmdir %D/share/locale/sh/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/sh 2> /dev/null || true +@dirrmtry share/locale/sh/LC_MESSAGES +@dirrmtry share/locale/sh %%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/sysutils/ccze/pkg-plist b/sysutils/ccze/pkg-plist index 7d1fe308383a..5f51e7205f6c 100644 --- a/sysutils/ccze/pkg-plist +++ b/sysutils/ccze/pkg-plist @@ -21,6 +21,6 @@ lib/ccze/syslog.so lib/ccze/ulogd.so lib/ccze/vsftpd.so lib/ccze/xferlog.so -@unexec rmdir %D/lib/ccze 2>/dev/null || true +@dirrmtry lib/ccze %%PORTDOCS%%%%DOCSDIR%%/FAQ %%PORTDOCS%%@dirrm share/doc/ccze diff --git a/sysutils/cdbakeoven/pkg-plist b/sysutils/cdbakeoven/pkg-plist index 7c726684cdae..81bf6de0d402 100644 --- a/sysutils/cdbakeoven/pkg-plist +++ b/sysutils/cdbakeoven/pkg-plist @@ -60,26 +60,26 @@ share/icons/hicolor/48x48/apps/cdbakeoven.png share/icons/hicolor/48x48/mimetypes/cdimage.png share/mimelnk/application/cdbo-file-list.desktop share/mimelnk/inode/ISO-image.desktop -@unexec rmdir %D/share/mimelnk/inode 2>/dev/null || true -@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/48x48/mimetypes 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32/mimetypes 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/mimetypes 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 -@unexec rmdir %D/share/apps/cdbakeoven/toolbar 2>/dev/null || true +@dirrmtry share/mimelnk/inode +@dirrmtry share/mimelnk/application +@dirrmtry share/mimelnk +@dirrmtry share/icons/hicolor/48x48/mimetypes +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor/32x32/mimetypes +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor/16x16/mimetypes +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons +@dirrmtry share/apps/cdbakeoven/toolbar @dirrm share/apps/cdbakeoven/info @dirrm share/apps/cdbakeoven -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true +@dirrmtry share/apps +@dirrmtry share/applnk/Utilities @dirrm share/applnk/Settings/CDBakeOven -@unexec rmdir %D/share/applnk/Settings 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true -@unexec rmdir %D/lib/kde3 2>/dev/null || true +@dirrmtry share/applnk/Settings +@dirrmtry share/applnk +@dirrmtry lib/kde3 diff --git a/sysutils/di/pkg-plist b/sysutils/di/pkg-plist index c23bf6ebf0d2..accff98e7356 100644 --- a/sysutils/di/pkg-plist +++ b/sysutils/di/pkg-plist @@ -2,7 +2,7 @@ bin/di bin/mi share/locale/de_DE/LC_MESSAGES/di.mo share/locale/en_US/LC_MESSAGES/di.mo -@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true -@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/en_US 2> /dev/null || true +@dirrmtry share/locale/de_DE/LC_MESSAGES +@dirrmtry share/locale/de_DE +@dirrmtry share/locale/en_US/LC_MESSAGES +@dirrmtry share/locale/en_US diff --git a/sysutils/dirvish/pkg-plist b/sysutils/dirvish/pkg-plist index ba956e789a54..3a0d07fb776b 100644 --- a/sysutils/dirvish/pkg-plist +++ b/sysutils/dirvish/pkg-plist @@ -4,4 +4,4 @@ sbin/dirvish-locate sbin/dirvish-runall etc/dirvish/default.conf.dist etc/dirvish/master.conf.dist -@unexec rmdir %D/etc/dirvish 2>/dev/null || true +@dirrmtry etc/dirvish diff --git a/sysutils/epylog/pkg-plist b/sysutils/epylog/pkg-plist index cb95229fdc89..b7dcb5260e02 100644 --- a/sysutils/epylog/pkg-plist +++ b/sysutils/epylog/pkg-plist @@ -62,5 +62,5 @@ share/epylog/modules/weeder_mod.pyc @dirrm share/doc/epylog-1.0.3/doc @dirrm share/doc/epylog-1.0.3 @dirrm %%PYTHON_SITELIBDIR%%/epylog -@unexec rmdir %D/etc/epylog/modules.d 2>/dev/null || true -@unexec rmdir %D/etc/epylog 2>/dev/null || true +@dirrmtry etc/epylog/modules.d +@dirrmtry etc/epylog diff --git a/sysutils/filelight-kde4/pkg-plist b/sysutils/filelight-kde4/pkg-plist index 7790585fffca..64f3c5e8f986 100644 --- a/sysutils/filelight-kde4/pkg-plist +++ b/sysutils/filelight-kde4/pkg-plist @@ -12,28 +12,28 @@ share/locale/cy/LC_MESSAGES/filelight.mo share/locale/de/LC_MESSAGES/filelight.mo share/locale/nl/LC_MESSAGES/filelight.mo share/locale/ru/LC_MESSAGES/filelight.mo -@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ru 2>/dev/null || true -@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/nl 2>/dev/null || true -@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/de 2>/dev/null || true -@unexec rmdir %D/share/locale/cy/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cy 2>/dev/null || true -@unexec rmdir %D/share/locale 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/64x64/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/64x64 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/22x22/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true +@dirrmtry share/locale/ru/LC_MESSAGES +@dirrmtry share/locale/ru +@dirrmtry share/locale/nl/LC_MESSAGES +@dirrmtry share/locale/nl +@dirrmtry share/locale/de/LC_MESSAGES +@dirrmtry share/locale/de +@dirrmtry share/locale/cy/LC_MESSAGES +@dirrmtry share/locale/cy +@dirrmtry share/locale +@dirrmtry share/icons/crystalsvg/64x64/apps +@dirrmtry share/icons/crystalsvg/64x64 +@dirrmtry share/icons/crystalsvg/48x48/apps +@dirrmtry share/icons/crystalsvg/48x48 +@dirrmtry share/icons/crystalsvg/22x22/apps +@dirrmtry share/icons/crystalsvg/22x22 +@dirrmtry share/icons/crystalsvg +@dirrmtry share/icons @dirrm share/doc/HTML/en/filelight -@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML 2>/dev/null || true -@unexec rmdir %D/share/config 2>/dev/null || true +@dirrmtry share/doc/HTML/en +@dirrmtry share/doc/HTML +@dirrmtry share/config @dirrm share/apps/filelight -@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/sysutils/filelight/pkg-plist b/sysutils/filelight/pkg-plist index 7790585fffca..64f3c5e8f986 100644 --- a/sysutils/filelight/pkg-plist +++ b/sysutils/filelight/pkg-plist @@ -12,28 +12,28 @@ share/locale/cy/LC_MESSAGES/filelight.mo share/locale/de/LC_MESSAGES/filelight.mo share/locale/nl/LC_MESSAGES/filelight.mo share/locale/ru/LC_MESSAGES/filelight.mo -@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ru 2>/dev/null || true -@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/nl 2>/dev/null || true -@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/de 2>/dev/null || true -@unexec rmdir %D/share/locale/cy/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cy 2>/dev/null || true -@unexec rmdir %D/share/locale 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/64x64/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/64x64 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/22x22/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true +@dirrmtry share/locale/ru/LC_MESSAGES +@dirrmtry share/locale/ru +@dirrmtry share/locale/nl/LC_MESSAGES +@dirrmtry share/locale/nl +@dirrmtry share/locale/de/LC_MESSAGES +@dirrmtry share/locale/de +@dirrmtry share/locale/cy/LC_MESSAGES +@dirrmtry share/locale/cy +@dirrmtry share/locale +@dirrmtry share/icons/crystalsvg/64x64/apps +@dirrmtry share/icons/crystalsvg/64x64 +@dirrmtry share/icons/crystalsvg/48x48/apps +@dirrmtry share/icons/crystalsvg/48x48 +@dirrmtry share/icons/crystalsvg/22x22/apps +@dirrmtry share/icons/crystalsvg/22x22 +@dirrmtry share/icons/crystalsvg +@dirrmtry share/icons @dirrm share/doc/HTML/en/filelight -@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML 2>/dev/null || true -@unexec rmdir %D/share/config 2>/dev/null || true +@dirrmtry share/doc/HTML/en +@dirrmtry share/doc/HTML +@dirrmtry share/config @dirrm share/apps/filelight -@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/sysutils/fusefs-kmod/pkg-plist b/sysutils/fusefs-kmod/pkg-plist index dfdf9aaf7b16..305e6c5b8ac3 100644 --- a/sysutils/fusefs-kmod/pkg-plist +++ b/sysutils/fusefs-kmod/pkg-plist @@ -2,7 +2,7 @@ etc/rc.d/fuse.sh modules/fuse.ko sbin/mount_fusefs @unexec kldxref %D/modules -@unexec rmdir %D/modules 2>/dev/null || true +@dirrmtry modules %%PORTDOCS%%%%DOCSDIR%%/kmod/doc.txt %%PORTDOCS%%%%DOCSDIR%%/kmod/html/Faq.html %%PORTDOCS%%%%DOCSDIR%%/kmod/html/Implementation.html @@ -21,4 +21,4 @@ sbin/mount_fusefs %%PORTDOCS%%%%DOCSDIR%%/kmod/html/tabbar-right.css %%PORTDOCS%%@dirrm %%DOCSDIR%%/kmod/html %%PORTDOCS%%@dirrm %%DOCSDIR%%/kmod -@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true +@dirrmtry %%DOCSDIR%% diff --git a/sysutils/fusefs-libs/pkg-plist b/sysutils/fusefs-libs/pkg-plist index e8b632a1264e..dbaaae9a7bf6 100644 --- a/sysutils/fusefs-libs/pkg-plist +++ b/sysutils/fusefs-libs/pkg-plist @@ -14,4 +14,4 @@ libdata/pkgconfig/fuse.pc %%PORTDOCS%%%%DOCSDIR%%/libs/how-fuse-works %%PORTDOCS%%%%DOCSDIR%%/libs/kernel.txt %%PORTDOCS%%@dirrm %%DOCSDIR%%/libs -@unexec rmdir %D/%%DOCSDIR%% 2>/dev/null || true +@dirrmtry %%DOCSDIR%% diff --git a/sysutils/ganglia-monitor-core/pkg-plist b/sysutils/ganglia-monitor-core/pkg-plist index 64836c856217..e7bf683f2f34 100644 --- a/sysutils/ganglia-monitor-core/pkg-plist +++ b/sysutils/ganglia-monitor-core/pkg-plist @@ -15,5 +15,5 @@ etc/gmond.conf.sample %%GMETAD%%sbin/gmetad %%GMETAD%%sbin/gmetasnap sbin/gmond -@unexec rmdir %D/var/db/ganglia/rrds 2>/dev/null || true -@unexec rmdir %D/var/db/ganglia 2>/dev/null || true +@dirrmtry var/db/ganglia/rrds +@dirrmtry var/db/ganglia diff --git a/sysutils/gcombust/pkg-plist b/sysutils/gcombust/pkg-plist index de2a30354896..4d673562a89c 100644 --- a/sysutils/gcombust/pkg-plist +++ b/sysutils/gcombust/pkg-plist @@ -19,5 +19,5 @@ share/locale/ru/LC_MESSAGES/gcombust.mo share/locale/sk/LC_MESSAGES/gcombust.mo share/locale/sv/LC_MESSAGES/gcombust.mo share/pixmaps/gcombust.xpm -@unexec rmdir %D/share/applications 2>/dev/null || true +@dirrmtry share/applications @dirrm share/doc/gcombust diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist index 6c197f89bf05..de48244c72be 100644 --- a/sysutils/gconf-editor/pkg-plist +++ b/sysutils/gconf-editor/pkg-plist @@ -99,12 +99,12 @@ share/locale/vi/LC_MESSAGES/gconf-editor.mo share/locale/xh/LC_MESSAGES/gconf-editor.mo share/locale/zh_CN/LC_MESSAGES/gconf-editor.mo share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo -@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ku 2> /dev/null || true -@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ug 2> /dev/null || true -@unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/te 2> /dev/null || true +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te @dirrm share/gnome/pixmaps/gconf-editor @dirrm share/gnome/omf/gconf-editor @dirrm share/gnome/help/gconf-editor/uk/figures diff --git a/sysutils/gkrellm/pkg-plist b/sysutils/gkrellm/pkg-plist index 268eb63fd978..8636b7a4b045 100644 --- a/sysutils/gkrellm/pkg-plist +++ b/sysutils/gkrellm/pkg-plist @@ -11,7 +11,7 @@ share/locale/sv/LC_MESSAGES/gkrellm.mo @dirrm include/gkrellm @exec mkdir -p %D/libexec/gkrellm/plugins @exec mkdir -p %D/share/gkrellm/themes -@unexec rmdir %D/libexec/gkrellm/plugins 2>/dev/null || true -@unexec rmdir %D/libexec/gkrellm 2>/dev/null || true -@unexec rmdir %D/share/gkrellm/themes 2>/dev/null || true -@unexec rmdir %D/share/gkrellm 2>/dev/null || true +@dirrmtry libexec/gkrellm/plugins +@dirrmtry libexec/gkrellm +@dirrmtry share/gkrellm/themes +@dirrmtry share/gkrellm diff --git a/sysutils/gkrellm2/pkg-plist b/sysutils/gkrellm2/pkg-plist index 2960740ab608..76eb7e40a054 100644 --- a/sysutils/gkrellm2/pkg-plist +++ b/sysutils/gkrellm2/pkg-plist @@ -3,8 +3,8 @@ include/gkrellm2/gkrellmd.h libdata/pkgconfig/gkrellmd.pc sbin/gkrellmd @exec mkdir -p %D/libexec/gkrellm2/plugins-gkrellmd -@unexec rmdir %D/libexec/gkrellm2/plugins-gkrellmd 2>/dev/null || true -@unexec rmdir %D/libexec/gkrellm2 2>/dev/null || true +@dirrmtry libexec/gkrellm2/plugins-gkrellmd +@dirrmtry libexec/gkrellm2 @unexec if cmp -s %D/etc/gkrellmd.conf %D/%%EXAMPLESDIR%%/gkrellmd.conf; then rm -f %D/etc/gkrellmd.conf; fi %%EXAMPLESDIR%%/gkrellmd.conf @exec [ -f %D/etc/gkrellmd.conf ] || cp %B/%f %D/etc/gkrellmd.conf diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index b43391f76cfb..a8b3cb1f22ee 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -212,14 +212,14 @@ share/locale/xh/LC_MESSAGES/control-center-2.0.mo share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo share/locale/zu/LC_MESSAGES/control-center-2.0.mo -@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zu 2> /dev/null || true -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/xh 2> /dev/null || true -@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/rw 2> /dev/null || true -@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/nso 2> /dev/null || true +@dirrmtry share/locale/zu/LC_MESSAGES +@dirrmtry share/locale/zu +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/nso/LC_MESSAGES +@dirrmtry share/locale/nso @dirrm share/gnome/omf/control-center @dirrm share/gnome/help/control-center/C @dirrm share/gnome/help/control-center @@ -228,7 +228,7 @@ share/locale/zu/LC_MESSAGES/control-center-2.0.mo @dirrm share/gnome/control-center-2.0/xrdb @dirrm share/gnome/control-center-2.0/pixmaps @dirrm share/gnome/control-center-2.0/interfaces -@unexec rmdir %D/share/gnome/control-center-2.0/icons 2> /dev/null || true +@dirrmtry share/gnome/control-center-2.0/icons @dirrm lib/window-manager-settings @dirrm include/gnome-window-settings-2.0 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist index e7455e4cedcb..419ddc095099 100644 --- a/sysutils/gnome-system-monitor/pkg-plist +++ b/sysutils/gnome-system-monitor/pkg-plist @@ -80,8 +80,8 @@ share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo -@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ug 2> /dev/null || true +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug @dirrm share/gnome/omf/gnome-system-monitor @dirrm share/gnome/help/gnome-system-monitor/C/figures @dirrm share/gnome/help/gnome-system-monitor/C diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist index ab659acf1b79..131f4edef34e 100644 --- a/sysutils/gnome-system-tools/pkg-plist +++ b/sysutils/gnome-system-tools/pkg-plist @@ -163,8 +163,8 @@ share/locale/wa/LC_MESSAGES/gnome-system-tools.mo share/locale/xh/LC_MESSAGES/gnome-system-tools.mo share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo -@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ku 2> /dev/null || true +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku @dirrm share/gnome/omf/gnome-system-tools @dirrm share/gnome/help/users-admin/C/figures @dirrm share/gnome/help/users-admin/C diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist index b43391f76cfb..a8b3cb1f22ee 100644 --- a/sysutils/gnomecontrolcenter2/pkg-plist +++ b/sysutils/gnomecontrolcenter2/pkg-plist @@ -212,14 +212,14 @@ share/locale/xh/LC_MESSAGES/control-center-2.0.mo share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo share/locale/zu/LC_MESSAGES/control-center-2.0.mo -@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zu 2> /dev/null || true -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/xh 2> /dev/null || true -@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/rw 2> /dev/null || true -@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/nso 2> /dev/null || true +@dirrmtry share/locale/zu/LC_MESSAGES +@dirrmtry share/locale/zu +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/nso/LC_MESSAGES +@dirrmtry share/locale/nso @dirrm share/gnome/omf/control-center @dirrm share/gnome/help/control-center/C @dirrm share/gnome/help/control-center @@ -228,7 +228,7 @@ share/locale/zu/LC_MESSAGES/control-center-2.0.mo @dirrm share/gnome/control-center-2.0/xrdb @dirrm share/gnome/control-center-2.0/pixmaps @dirrm share/gnome/control-center-2.0/interfaces -@unexec rmdir %D/share/gnome/control-center-2.0/icons 2> /dev/null || true +@dirrmtry share/gnome/control-center-2.0/icons @dirrm lib/window-manager-settings @dirrm include/gnome-window-settings-2.0 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist index e7455e4cedcb..419ddc095099 100644 --- a/sysutils/gnomesystemmonitor/pkg-plist +++ b/sysutils/gnomesystemmonitor/pkg-plist @@ -80,8 +80,8 @@ share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo -@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ug 2> /dev/null || true +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug @dirrm share/gnome/omf/gnome-system-monitor @dirrm share/gnome/help/gnome-system-monitor/C/figures @dirrm share/gnome/help/gnome-system-monitor/C diff --git a/sysutils/gnomesystemtools/pkg-plist b/sysutils/gnomesystemtools/pkg-plist index ab659acf1b79..131f4edef34e 100644 --- a/sysutils/gnomesystemtools/pkg-plist +++ b/sysutils/gnomesystemtools/pkg-plist @@ -163,8 +163,8 @@ share/locale/wa/LC_MESSAGES/gnome-system-tools.mo share/locale/xh/LC_MESSAGES/gnome-system-tools.mo share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo -@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ku 2> /dev/null || true +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku @dirrm share/gnome/omf/gnome-system-tools @dirrm share/gnome/help/users-admin/C/figures @dirrm share/gnome/help/users-admin/C diff --git a/sysutils/hdup/pkg-plist b/sysutils/hdup/pkg-plist index 76d52c19c6b4..4def8e8664e1 100644 --- a/sysutils/hdup/pkg-plist +++ b/sysutils/hdup/pkg-plist @@ -5,6 +5,6 @@ sbin/hdup %%DOCSDIR%%/FAQ.html %%EXAMPLESDIR%%/hdup.cron %%EXAMPLESDIR%%/no-history-post-run.sh -@unexec rmdir %D/etc/hdup 2> /dev/null || true +@dirrmtry etc/hdup @dirrm %%DOCSDIR%% @dirrm %%EXAMPLESDIR%% diff --git a/sysutils/heartbeat/pkg-plist b/sysutils/heartbeat/pkg-plist index 4b582ecf3b30..943185cb92a9 100644 --- a/sysutils/heartbeat/pkg-plist +++ b/sysutils/heartbeat/pkg-plist @@ -261,9 +261,9 @@ share/doc/heartbeat-1.2.3/startstop @dirrm include/clplumbing @dirrm etc/ha.d/resource.d @dirrm etc/ha.d/rc.d -@unexec rmdir %D/etc/ha.d/conf 2>/dev/null || true -@unexec rmdir %D/etc/ha.d 2>/dev/null || true +@dirrmtry etc/ha.d/conf +@dirrmtry etc/ha.d @cwd / -@unexec rmdir %D/var/lib/heartbeat/ckpt 2>/dev/null || true -@unexec rmdir %D/var/lib/heartbeat/ccm 2>/dev/null || true -@unexec rmdir %D/var/lib/heartbeat 2>/dev/null || true +@dirrmtry var/lib/heartbeat/ckpt +@dirrmtry var/lib/heartbeat/ccm +@dirrmtry var/lib/heartbeat diff --git a/sysutils/heartbeat2/pkg-plist b/sysutils/heartbeat2/pkg-plist index 4b582ecf3b30..943185cb92a9 100644 --- a/sysutils/heartbeat2/pkg-plist +++ b/sysutils/heartbeat2/pkg-plist @@ -261,9 +261,9 @@ share/doc/heartbeat-1.2.3/startstop @dirrm include/clplumbing @dirrm etc/ha.d/resource.d @dirrm etc/ha.d/rc.d -@unexec rmdir %D/etc/ha.d/conf 2>/dev/null || true -@unexec rmdir %D/etc/ha.d 2>/dev/null || true +@dirrmtry etc/ha.d/conf +@dirrmtry etc/ha.d @cwd / -@unexec rmdir %D/var/lib/heartbeat/ckpt 2>/dev/null || true -@unexec rmdir %D/var/lib/heartbeat/ccm 2>/dev/null || true -@unexec rmdir %D/var/lib/heartbeat 2>/dev/null || true +@dirrmtry var/lib/heartbeat/ckpt +@dirrmtry var/lib/heartbeat/ccm +@dirrmtry var/lib/heartbeat diff --git a/sysutils/heirloom/pkg-plist b/sysutils/heirloom/pkg-plist index eaada1734617..f6f6daaed1d7 100644 --- a/sysutils/heirloom/pkg-plist +++ b/sysutils/heirloom/pkg-plist @@ -270,11 +270,11 @@ @dirrm %%DATADIR%%/usr/ucb @dirrm %%DATADIR%%/usr/share/man/5man/man8 @dirrm %%DATADIR%%/usr/share/man/5man/man7 -@unexec rmdir %D/%%DATADIR%%/usr/share/man/5man/man6 2>/dev/null || true +@dirrmtry %%DATADIR%%/usr/share/man/5man/man6 @dirrm %%DATADIR%%/usr/share/man/5man/man5 -@unexec rmdir %D/%%DATADIR%%/usr/share/man/5man/man4 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%%/usr/share/man/5man/man3 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%%/usr/share/man/5man/man2 2>/dev/null || true +@dirrmtry %%DATADIR%%/usr/share/man/5man/man4 +@dirrmtry %%DATADIR%%/usr/share/man/5man/man3 +@dirrmtry %%DATADIR%%/usr/share/man/5man/man2 @dirrm %%DATADIR%%/usr/share/man/5man/man1m @dirrm %%DATADIR%%/usr/share/man/5man/man1b @dirrm %%DATADIR%%/usr/share/man/5man/man1 diff --git a/sysutils/kcpuload/pkg-plist b/sysutils/kcpuload/pkg-plist index 4e2e9dcce7c8..e49fcab45bd2 100644 --- a/sysutils/kcpuload/pkg-plist +++ b/sysutils/kcpuload/pkg-plist @@ -34,17 +34,17 @@ share/icons/locolor/32x32/apps/kcpuload.png @dirrm share/apps/kcpuload @dirrm share/doc/HTML/en/kcpuload/common @dirrm share/doc/HTML/en/kcpuload -@unexec rmdir %D/share/icons/crystalsvg/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true -@unexec rmdir %D/share/applnk/System 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor 2>/dev/null || true +@dirrmtry share/icons/crystalsvg/16x16/apps +@dirrmtry share/icons/crystalsvg/16x16 +@dirrmtry share/icons/crystalsvg/32x32/apps +@dirrmtry share/icons/crystalsvg/32x32 +@dirrmtry share/icons/crystalsvg/48x48/apps +@dirrmtry share/icons/crystalsvg/48x48 +@dirrmtry share/icons/crystalsvg +@dirrmtry share/applnk/System +@dirrmtry share/applnk +@dirrmtry share/icons/locolor/16x16/apps +@dirrmtry share/icons/locolor/16x16 +@dirrmtry share/icons/locolor/32x32/apps +@dirrmtry share/icons/locolor/32x32 +@dirrmtry share/icons/locolor diff --git a/sysutils/kcube/pkg-plist b/sysutils/kcube/pkg-plist index 773231ec5c34..6e95ed323447 100644 --- a/sysutils/kcube/pkg-plist +++ b/sysutils/kcube/pkg-plist @@ -2,4 +2,4 @@ lib/libkcube.la lib/libkcube.so lib/libkcube.so.1 share/apps/kicker/applets/kcube.desktop -@unexec rmdir %D/share/apps/kicker/applets 2>/dev/null || true +@dirrmtry share/apps/kicker/applets diff --git a/sysutils/kdirstat/pkg-plist b/sysutils/kdirstat/pkg-plist index 144529215c51..ab336eb3cc6d 100644 --- a/sysutils/kdirstat/pkg-plist +++ b/sysutils/kdirstat/pkg-plist @@ -36,4 +36,4 @@ share/locale/ja/LC_MESSAGES/kdirstat.mo @dirrm share/apps/kdirstat/icons/hicolor @dirrm share/apps/kdirstat/icons @dirrm share/apps/kdirstat -@unexec rmdir %D/share/apps/kconf_update 2>/dev/null || true +@dirrmtry share/apps/kconf_update diff --git a/sysutils/kkbswitch/pkg-plist b/sysutils/kkbswitch/pkg-plist index bccbe71c8ebd..1c9bca5337ca 100644 --- a/sysutils/kkbswitch/pkg-plist +++ b/sysutils/kkbswitch/pkg-plist @@ -23,5 +23,5 @@ share/locale/bg/LC_MESSAGES/kkbswitch.mo @dirrm share/apps/kkbswitch @dirrm %%DOCSDIR%%/common @dirrm %%DOCSDIR%% -@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/applnk/Utilities +@dirrmtry share/applnk diff --git a/sysutils/kkeyled/pkg-plist b/sysutils/kkeyled/pkg-plist index 46181ce53050..9ce863e870eb 100644 --- a/sysutils/kkeyled/pkg-plist +++ b/sysutils/kkeyled/pkg-plist @@ -96,34 +96,34 @@ share/icons/locolor/22x22/apps/kkeyled.png share/icons/locolor/32x32/apps/kkeyled.png share/icons/locolor/48x48/apps/kkeyled.png share/locale/de/LC_MESSAGES/kkeyled.mo -@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/de 2>/dev/null || true -@unexec rmdir %D/share/locale 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/22x22/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/22x22 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/22x22 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/locale/de/LC_MESSAGES +@dirrmtry share/locale/de +@dirrmtry share/locale +@dirrmtry share/icons/locolor/48x48/apps +@dirrmtry share/icons/locolor/48x48 +@dirrmtry share/icons/locolor/32x32/apps +@dirrmtry share/icons/locolor/32x32 +@dirrmtry share/icons/locolor/22x22/apps +@dirrmtry share/icons/locolor/22x22 +@dirrmtry share/icons/locolor/16x16/apps +@dirrmtry share/icons/locolor/16x16 +@dirrmtry share/icons/locolor +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor/22x22/apps +@dirrmtry share/icons/hicolor/22x22 +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons @dirrm share/doc/HTML/en/kkeyled -@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true +@dirrmtry share/doc/HTML/en @dirrm share/doc/HTML/de/kkeyled -@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML 2>/dev/null || true -@unexec rmdir %D/share/config 2>/dev/null || true +@dirrmtry share/doc/HTML/de +@dirrmtry share/doc/HTML +@dirrmtry share/config @dirrm share/apps/kkeyled/pics/theme/round @dirrm share/apps/kkeyled/pics/theme/red @dirrm share/apps/kkeyled/pics/theme/lock @@ -134,6 +134,6 @@ share/locale/de/LC_MESSAGES/kkeyled.mo @dirrm share/apps/kkeyled/pics/theme @dirrm share/apps/kkeyled/pics @dirrm share/apps/kkeyled -@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/sysutils/knutclient-kde4/pkg-plist b/sysutils/knutclient-kde4/pkg-plist index 0fe2be5c883c..ca32ff142af4 100644 --- a/sysutils/knutclient-kde4/pkg-plist +++ b/sysutils/knutclient-kde4/pkg-plist @@ -30,34 +30,34 @@ share/locale/cs/LC_MESSAGES/knutclient.mo share/locale/de/LC_MESSAGES/knutclient.mo share/locale/fr/LC_MESSAGES/knutclient.mo share/locale/it/LC_MESSAGES/knutclient.mo -@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/it 2>/dev/null || true -@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/fr 2>/dev/null || true -@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/de 2>/dev/null || true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cs 2>/dev/null || true -@unexec rmdir %D/share/locale 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true +@dirrmtry share/locale/it/LC_MESSAGES +@dirrmtry share/locale/it +@dirrmtry share/locale/fr/LC_MESSAGES +@dirrmtry share/locale/fr +@dirrmtry share/locale/de/LC_MESSAGES +@dirrmtry share/locale/de +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale +@dirrmtry share/icons/locolor/32x32/apps +@dirrmtry share/icons/locolor/32x32 +@dirrmtry share/icons/locolor/16x16/apps +@dirrmtry share/icons/locolor/16x16 +@dirrmtry share/icons/locolor +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons @dirrm share/doc/HTML/en/knutclient -@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true +@dirrmtry share/doc/HTML/en @dirrm share/doc/HTML/cs/knutclient -@unexec rmdir %D/share/doc/HTML/cs 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML 2>/dev/null || true +@dirrmtry share/doc/HTML/cs +@dirrmtry share/doc/HTML @dirrm share/apps/knutclient -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/apps +@dirrmtry share/applnk/Applications +@dirrmtry share/applnk diff --git a/sysutils/knutclient/pkg-plist b/sysutils/knutclient/pkg-plist index 0fe2be5c883c..ca32ff142af4 100644 --- a/sysutils/knutclient/pkg-plist +++ b/sysutils/knutclient/pkg-plist @@ -30,34 +30,34 @@ share/locale/cs/LC_MESSAGES/knutclient.mo share/locale/de/LC_MESSAGES/knutclient.mo share/locale/fr/LC_MESSAGES/knutclient.mo share/locale/it/LC_MESSAGES/knutclient.mo -@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/it 2>/dev/null || true -@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/fr 2>/dev/null || true -@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/de 2>/dev/null || true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cs 2>/dev/null || true -@unexec rmdir %D/share/locale 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true -@unexec rmdir %D/share/icons 2>/dev/null || true +@dirrmtry share/locale/it/LC_MESSAGES +@dirrmtry share/locale/it +@dirrmtry share/locale/fr/LC_MESSAGES +@dirrmtry share/locale/fr +@dirrmtry share/locale/de/LC_MESSAGES +@dirrmtry share/locale/de +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs +@dirrmtry share/locale +@dirrmtry share/icons/locolor/32x32/apps +@dirrmtry share/icons/locolor/32x32 +@dirrmtry share/icons/locolor/16x16/apps +@dirrmtry share/icons/locolor/16x16 +@dirrmtry share/icons/locolor +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons @dirrm share/doc/HTML/en/knutclient -@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true +@dirrmtry share/doc/HTML/en @dirrm share/doc/HTML/cs/knutclient -@unexec rmdir %D/share/doc/HTML/cs 2>/dev/null || true -@unexec rmdir %D/share/doc/HTML 2>/dev/null || true +@dirrmtry share/doc/HTML/cs +@dirrmtry share/doc/HTML @dirrm share/apps/knutclient -@unexec rmdir %D/share/apps 2>/dev/null || true -@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/apps +@dirrmtry share/applnk/Applications +@dirrmtry share/applnk diff --git a/sysutils/krename-kde4/pkg-plist b/sysutils/krename-kde4/pkg-plist index 6d8e8183b17f..fd8bbd1422c2 100644 --- a/sysutils/krename-kde4/pkg-plist +++ b/sysutils/krename-kde4/pkg-plist @@ -25,9 +25,9 @@ share/locale/sl/LC_MESSAGES/krename.mo share/locale/sv/LC_MESSAGES/krename.mo share/locale/zh_CN.GB2312/LC_MESSAGES/krename.mo share/locale/zh_TW.Big5/LC_MESSAGES/krename.mo -@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sl 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pl 2>/dev/null || true +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl @dirrm share/doc/HTML/en/krename @dirrm share/apps/krename diff --git a/sysutils/krename/pkg-plist b/sysutils/krename/pkg-plist index 6d8e8183b17f..fd8bbd1422c2 100644 --- a/sysutils/krename/pkg-plist +++ b/sysutils/krename/pkg-plist @@ -25,9 +25,9 @@ share/locale/sl/LC_MESSAGES/krename.mo share/locale/sv/LC_MESSAGES/krename.mo share/locale/zh_CN.GB2312/LC_MESSAGES/krename.mo share/locale/zh_TW.Big5/LC_MESSAGES/krename.mo -@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sl 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pl 2>/dev/null || true +@dirrmtry share/locale/sl/LC_MESSAGES +@dirrmtry share/locale/sl +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl @dirrm share/doc/HTML/en/krename @dirrm share/apps/krename diff --git a/sysutils/kshutdown-kde4/pkg-plist b/sysutils/kshutdown-kde4/pkg-plist index b3f68034ba36..6a4b2257631f 100644 --- a/sysutils/kshutdown-kde4/pkg-plist +++ b/sysutils/kshutdown-kde4/pkg-plist @@ -50,14 +50,14 @@ share/locale/ru/LC_MESSAGES/kshutdown.mo share/locale/sk/LC_MESSAGES/kshutdown.mo share/locale/sv/LC_MESSAGES/kshutdown.mo share/locale/zh_CN/LC_MESSAGES/kshutdown.mo -@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true -@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sk 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pl 2>/dev/null || true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cs 2>/dev/null || true +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs @dirrm share/doc/HTML/en/kshutdown @dirrm share/doc/HTML/de/kshutdown @dirrm share/apps/kshutdown/sounds @@ -67,4 +67,4 @@ share/locale/zh_CN/LC_MESSAGES/kshutdown.mo @dirrm share/apps/kshutdown/extras/multimedia @dirrm share/apps/kshutdown/extras @dirrm share/apps/kshutdown -@unexec rmdir %D/share/apps/kconf_update 2>/dev/null || true +@dirrmtry share/apps/kconf_update diff --git a/sysutils/kshutdown/pkg-plist b/sysutils/kshutdown/pkg-plist index b3f68034ba36..6a4b2257631f 100644 --- a/sysutils/kshutdown/pkg-plist +++ b/sysutils/kshutdown/pkg-plist @@ -50,14 +50,14 @@ share/locale/ru/LC_MESSAGES/kshutdown.mo share/locale/sk/LC_MESSAGES/kshutdown.mo share/locale/sv/LC_MESSAGES/kshutdown.mo share/locale/zh_CN/LC_MESSAGES/kshutdown.mo -@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true -@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sk 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pl 2>/dev/null || true -@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/cs 2>/dev/null || true +@dirrmtry share/locale/zh_CN/LC_MESSAGES +@dirrmtry share/locale/zh_CN +@dirrmtry share/locale/sk/LC_MESSAGES +@dirrmtry share/locale/sk +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/cs/LC_MESSAGES +@dirrmtry share/locale/cs @dirrm share/doc/HTML/en/kshutdown @dirrm share/doc/HTML/de/kshutdown @dirrm share/apps/kshutdown/sounds @@ -67,4 +67,4 @@ share/locale/zh_CN/LC_MESSAGES/kshutdown.mo @dirrm share/apps/kshutdown/extras/multimedia @dirrm share/apps/kshutdown/extras @dirrm share/apps/kshutdown -@unexec rmdir %D/share/apps/kconf_update 2>/dev/null || true +@dirrmtry share/apps/kconf_update diff --git a/sysutils/lire/pkg-plist b/sysutils/lire/pkg-plist index d21b724faaf5..1a543d488bd7 100644 --- a/sysutils/lire/pkg-plist +++ b/sysutils/lire/pkg-plist @@ -818,4 +818,4 @@ share/perl5/LocaleData/nl/LC_MESSAGES/lire.mo @dirrm etc/lire/config @dirrm etc/lire -@unexec rmdir %D/share/perl5 2>/dev/null || true +@dirrmtry share/perl5 diff --git a/sysutils/lmon/pkg-plist b/sysutils/lmon/pkg-plist index 6892ed5494b6..72f76698adfc 100644 --- a/sysutils/lmon/pkg-plist +++ b/sysutils/lmon/pkg-plist @@ -7,7 +7,7 @@ lmon/lmon.pl %%EXAMPLESDIR%%/jboss.rules %%EXAMPLESDIR%%/messages.rules @dirrm %%EXAMPLESDIR%% -@unexec rmdir %D/lmon 2>/dev/null || true +@dirrmtry lmon %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO diff --git a/sysutils/mapchan/pkg-plist b/sysutils/mapchan/pkg-plist index eff61dc4cace..15a7efc602f8 100644 --- a/sysutils/mapchan/pkg-plist +++ b/sysutils/mapchan/pkg-plist @@ -12,4 +12,4 @@ etc/mapchan/msm.map etc/mapchan/trivial.map etc/mapchan/sm7238.map etc/mapchan/win2koi.map -@unexec rmdir %D/etc/mapchan 2>/dev/null || true +@dirrmtry etc/mapchan diff --git a/sysutils/mcron/pkg-plist b/sysutils/mcron/pkg-plist index 770004a48cf3..102f0486a814 100644 --- a/sysutils/mcron/pkg-plist +++ b/sysutils/mcron/pkg-plist @@ -9,4 +9,4 @@ share/guile/site/mcron/redirect.scm share/guile/site/mcron/vixie-specification.scm share/guile/site/mcron/vixie-time.scm @dirrm share/guile/site/mcron -@unexec rmdir %D/share/guile/site 2>/dev/null || true +@dirrmtry share/guile/site diff --git a/sysutils/munin-main/pkg-plist b/sysutils/munin-main/pkg-plist index 243f13168ab5..91507cadc4bc 100644 --- a/sysutils/munin-main/pkg-plist +++ b/sysutils/munin-main/pkg-plist @@ -27,13 +27,13 @@ www/cgi-bin/munin-cgi-graph @unexec rm -f /var/run/munin/munin-*.lock @unexec rmdir /var/run/munin 2>/dev/null || true @unexec rmdir /var/log/munin-main 2>/dev/null || true -@unexec rmdir %D/www/data/munin 2>/dev/null || true -@unexec rmdir %D/www/data 2>/dev/null || true -@unexec rmdir %D/www/cgi-bin 2>/dev/null || true -@unexec rmdir %D/var/munin 2>/dev/null || true -@unexec rmdir %D/share/munin 2>/dev/null || true -@unexec rmdir %D/etc/munin/templates 2>/dev/null || true -@unexec rmdir %D/etc/munin 2>/dev/null || true +@dirrmtry www/data/munin +@dirrmtry www/data +@dirrmtry www/cgi-bin +@dirrmtry var/munin +@dirrmtry share/munin +@dirrmtry etc/munin/templates +@dirrmtry etc/munin @unexec echo @unexec echo '********************************************************************' @unexec echo "If you want to *completely* remove munin-main, you have to" diff --git a/sysutils/munin-master/pkg-plist b/sysutils/munin-master/pkg-plist index 243f13168ab5..91507cadc4bc 100644 --- a/sysutils/munin-master/pkg-plist +++ b/sysutils/munin-master/pkg-plist @@ -27,13 +27,13 @@ www/cgi-bin/munin-cgi-graph @unexec rm -f /var/run/munin/munin-*.lock @unexec rmdir /var/run/munin 2>/dev/null || true @unexec rmdir /var/log/munin-main 2>/dev/null || true -@unexec rmdir %D/www/data/munin 2>/dev/null || true -@unexec rmdir %D/www/data 2>/dev/null || true -@unexec rmdir %D/www/cgi-bin 2>/dev/null || true -@unexec rmdir %D/var/munin 2>/dev/null || true -@unexec rmdir %D/share/munin 2>/dev/null || true -@unexec rmdir %D/etc/munin/templates 2>/dev/null || true -@unexec rmdir %D/etc/munin 2>/dev/null || true +@dirrmtry www/data/munin +@dirrmtry www/data +@dirrmtry www/cgi-bin +@dirrmtry var/munin +@dirrmtry share/munin +@dirrmtry etc/munin/templates +@dirrmtry etc/munin @unexec echo @unexec echo '********************************************************************' @unexec echo "If you want to *completely* remove munin-main, you have to" diff --git a/sysutils/munin-node/pkg-plist b/sysutils/munin-node/pkg-plist index b02ef7a2437d..62a14c300c96 100644 --- a/sysutils/munin-node/pkg-plist +++ b/sysutils/munin-node/pkg-plist @@ -108,12 +108,12 @@ sbin/munin-run %%DATADIR%%/plugins/vmstat @unexec rm -f /var/run/munin/munin-node.pid @unexec rmdir /var/run/munin 2>/dev/null || true -@unexec rmdir %D/var/munin/plugin-state 2>/dev/null || true -@unexec rmdir %D/var/munin 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%%/plugins 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true -@unexec rmdir %D/etc/munin/plugin-conf.d 2>/dev/null || true -@unexec rmdir %D/etc/munin 2>/dev/null || true +@dirrmtry var/munin/plugin-state +@dirrmtry var/munin +@dirrmtry %%DATADIR%%/plugins +@dirrmtry %%DATADIR%% +@dirrmtry etc/munin/plugin-conf.d +@dirrmtry etc/munin @unexec rmdir %%LOCALBASE%%/%%SITE_PERL%%/Munin/Plugin 2>/dev/null || true @unexec rmdir %%LOCALBASE%%/%%SITE_PERL%%/Munin 2>/dev/null || true @unexec echo diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist index f58bdd6772fe..d899785780a9 100644 --- a/sysutils/nautilus-cd-burner/pkg-plist +++ b/sysutils/nautilus-cd-burner/pkg-plist @@ -85,7 +85,7 @@ share/locale/vi/LC_MESSAGES/nautilus-cd-burner.mo share/locale/xh/LC_MESSAGES/nautilus-cd-burner.mo share/locale/zh_CN/LC_MESSAGES/nautilus-cd-burner.mo share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo -@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ug 2> /dev/null || true +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug @dirrm share/gnome/nautilus-cd-burner @dirrm include/libnautilus-burn diff --git a/sysutils/nut/pkg-plist b/sysutils/nut/pkg-plist index e98706c5c707..9a13cce0a3c8 100644 --- a/sysutils/nut/pkg-plist +++ b/sysutils/nut/pkg-plist @@ -10,7 +10,7 @@ etc/nut/upsd.conf.sample etc/nut/upsd.users.sample etc/nut/upsmon.conf.sample etc/nut/upssched.conf.sample -@unexec rmdir %D/etc/nut 2>/dev/null || true +@dirrmtry etc/nut etc/rc.d/nut.sh libexec/nut/apcsmart libexec/nut/bcmxcp @@ -98,6 +98,6 @@ sbin/upssched %%PORTDOCS%%@dirrm %%DOCSDIR%%/cables %%PORTDOCS%%@dirrm %%DOCSDIR%%/drivers %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/libexec/nut 2>/dev/null || true +@dirrmtry libexec/nut @unexec rmdir /var/db/nut 2>/dev/null || true %%CGIDIRRM%% diff --git a/sysutils/nut22/pkg-plist b/sysutils/nut22/pkg-plist index e98706c5c707..9a13cce0a3c8 100644 --- a/sysutils/nut22/pkg-plist +++ b/sysutils/nut22/pkg-plist @@ -10,7 +10,7 @@ etc/nut/upsd.conf.sample etc/nut/upsd.users.sample etc/nut/upsmon.conf.sample etc/nut/upssched.conf.sample -@unexec rmdir %D/etc/nut 2>/dev/null || true +@dirrmtry etc/nut etc/rc.d/nut.sh libexec/nut/apcsmart libexec/nut/bcmxcp @@ -98,6 +98,6 @@ sbin/upssched %%PORTDOCS%%@dirrm %%DOCSDIR%%/cables %%PORTDOCS%%@dirrm %%DOCSDIR%%/drivers %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/libexec/nut 2>/dev/null || true +@dirrmtry libexec/nut @unexec rmdir /var/db/nut 2>/dev/null || true %%CGIDIRRM%% diff --git a/sysutils/p5-File-Stat-Bits/pkg-plist b/sysutils/p5-File-Stat-Bits/pkg-plist index e67176d0f800..593d8b0322df 100644 --- a/sysutils/p5-File-Stat-Bits/pkg-plist +++ b/sysutils/p5-File-Stat-Bits/pkg-plist @@ -3,7 +3,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Stat/Bits/.packlist @dirrm %%SITE_PERL%%/File/Stat/Bits @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Stat/Bits -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Stat 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/File 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/File/Stat 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File/Stat +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/File +@dirrmtry %%SITE_PERL%%/File/Stat +@dirrmtry %%SITE_PERL%%/File diff --git a/sysutils/p5-FreeBSD-Portindex/pkg-plist b/sysutils/p5-FreeBSD-Portindex/pkg-plist index 3e2d25069968..49c2158a11ab 100644 --- a/sysutils/p5-FreeBSD-Portindex/pkg-plist +++ b/sysutils/p5-FreeBSD-Portindex/pkg-plist @@ -11,5 +11,5 @@ etc/portindex.cfg.sample %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Portindex/.packlist @dirrm %%SITE_PERL%%/FreeBSD/Portindex @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD/Portindex -@unexec rmdir %D/%%SITE_PERL%%/FreeBSD 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/FreeBSD +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FreeBSD diff --git a/sysutils/p5-LJ-Cache/pkg-plist b/sysutils/p5-LJ-Cache/pkg-plist index b3f6973cd97f..2ab9932d8701 100644 --- a/sysutils/p5-LJ-Cache/pkg-plist +++ b/sysutils/p5-LJ-Cache/pkg-plist @@ -3,6 +3,6 @@ %%SITE_PERL%%/LJ/Cache.pm @dirrm %%SITE_PERL%%/auto/LJ/Cache @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ/Cache -@unexec rmdir %D/%%SITE_PERL%%/auto/LJ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/LJ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/LJ +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ +@dirrmtry %%SITE_PERL%%/LJ diff --git a/sysutils/p5-LJ-TextMessage/pkg-plist b/sysutils/p5-LJ-TextMessage/pkg-plist index c28736151691..9e1e8fedfe22 100644 --- a/sysutils/p5-LJ-TextMessage/pkg-plist +++ b/sysutils/p5-LJ-TextMessage/pkg-plist @@ -2,5 +2,5 @@ %%SITE_PERL%%/LJ/send-test.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ/TextMessage/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ/TextMessage -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/LJ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ +@dirrmtry %%SITE_PERL%%/LJ diff --git a/sysutils/p5-Schedule-At/pkg-plist b/sysutils/p5-Schedule-At/pkg-plist index ff379856ab8c..848ee1900afb 100644 --- a/sysutils/p5-Schedule-At/pkg-plist +++ b/sysutils/p5-Schedule-At/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Schedule/At.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/At/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/At -@unexec rmdir %D/%%SITE_PERL%%/Schedule 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Schedule +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule diff --git a/sysutils/p5-Schedule-Cron/pkg-plist b/sysutils/p5-Schedule-Cron/pkg-plist index 529d5ca38929..55921f411ab3 100644 --- a/sysutils/p5-Schedule-Cron/pkg-plist +++ b/sysutils/p5-Schedule-Cron/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Cron/.packlist %%SITE_PERL%%/Schedule/Cron.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Cron -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Schedule 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule +@dirrmtry %%SITE_PERL%%/Schedule diff --git a/sysutils/p5-Schedule-Load/pkg-plist b/sysutils/p5-Schedule-Load/pkg-plist index 29f701f27cb0..6d64685a554d 100644 --- a/sysutils/p5-Schedule-Load/pkg-plist +++ b/sysutils/p5-Schedule-Load/pkg-plist @@ -20,13 +20,13 @@ bin/slrsh @dirrm %%SITE_PERL%%/Schedule/Load @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Load @dirrm lib/rschedule -@unexec rmdir %D/%%SITE_PERL%%/Schedule 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Schedule +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule @dirrm %%SITE_PERL%%/auto/Schedule/Load/Hosts/Host @dirrm %%SITE_PERL%%/auto/Schedule/Load/Hosts/Proc @dirrm %%SITE_PERL%%/auto/Schedule/Load/Hosts @dirrm %%SITE_PERL%%/auto/Schedule/Load -@unexec rmdir %D/%%SITE_PERL%%/auto/Schedule 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/Schedule %%PORTDOCS%%%%EXAMPLESDIR%%/init.d/slchoosed %%PORTDOCS%%%%EXAMPLESDIR%%/init.d/slreportd %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/init.d diff --git a/sysutils/p5-Schedule-Match/pkg-plist b/sysutils/p5-Schedule-Match/pkg-plist index c04b1dda5ad2..5425d693b355 100644 --- a/sysutils/p5-Schedule-Match/pkg-plist +++ b/sysutils/p5-Schedule-Match/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Match/.packlist %%SITE_PERL%%/Schedule/Match.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule/Match -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Schedule 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Schedule +@dirrmtry %%SITE_PERL%%/Schedule diff --git a/sysutils/p5-Stat-lsMode/pkg-plist b/sysutils/p5-Stat-lsMode/pkg-plist index 81786c09e006..8753bc4aa102 100644 --- a/sysutils/p5-Stat-lsMode/pkg-plist +++ b/sysutils/p5-Stat-lsMode/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Stat/lsMode/.packlist %%SITE_PERL%%/Stat/lsMode.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Stat/lsMode -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Stat 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Stat 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Stat +@dirrmtry %%SITE_PERL%%/Stat diff --git a/sysutils/p5-Sys-CpuLoad/pkg-plist b/sysutils/p5-Sys-CpuLoad/pkg-plist index 52863016c303..f8b46eeaf715 100644 --- a/sysutils/p5-Sys-CpuLoad/pkg-plist +++ b/sysutils/p5-Sys-CpuLoad/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/CpuLoad/CpuLoad.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/CpuLoad/autosplit.ix @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/CpuLoad -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Sys 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sys diff --git a/sysutils/p5-Sys-Hostname-Long/pkg-plist b/sysutils/p5-Sys-Hostname-Long/pkg-plist index c4a4b75b68f2..38e39b156387 100644 --- a/sysutils/p5-Sys-Hostname-Long/pkg-plist +++ b/sysutils/p5-Sys-Hostname-Long/pkg-plist @@ -2,7 +2,7 @@ %%SITE_PERL%%/Sys/Hostname/testall.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Hostname/Long/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Hostname/Long -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Hostname 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Sys/Hostname 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Sys 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Hostname +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys +@dirrmtry %%SITE_PERL%%/Sys/Hostname +@dirrmtry %%SITE_PERL%%/Sys diff --git a/sysutils/p5-Sys-Utmp/pkg-plist b/sysutils/p5-Sys-Utmp/pkg-plist index ef61108e3208..bee93d47d033 100644 --- a/sysutils/p5-Sys-Utmp/pkg-plist +++ b/sysutils/p5-Sys-Utmp/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Utmp/Utmp.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Utmp/Utmp.bs @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys/Utmp -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Sys 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sys +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Sys diff --git a/sysutils/p5-Tie-Syslog/pkg-plist b/sysutils/p5-Tie-Syslog/pkg-plist index 04c6e4f437d0..f7d15ae6db59 100644 --- a/sysutils/p5-Tie-Syslog/pkg-plist +++ b/sysutils/p5-Tie-Syslog/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Syslog/.packlist %%SITE_PERL%%/Tie/Syslog.pm -@unexec rmdir %D/%%SITE_PERL%%/Tie 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie/Syslog 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/Syslog +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tie diff --git a/sysutils/p5-UPS-Nut/pkg-plist b/sysutils/p5-UPS-Nut/pkg-plist index 09b299f80594..a9528c8806a7 100644 --- a/sysutils/p5-UPS-Nut/pkg-plist +++ b/sysutils/p5-UPS-Nut/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/UPS/Nut/.packlist %%SITE_PERL%%/UPS/Nut.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/UPS/Nut -@unexec rmdir %D/%%SITE_PERL%%/UPS 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/UPS 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/UPS +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/UPS diff --git a/sysutils/p5-Unix-ConfigFile/pkg-plist b/sysutils/p5-Unix-ConfigFile/pkg-plist index 185dd77b86b8..e0a9ed608dae 100644 --- a/sysutils/p5-Unix-ConfigFile/pkg-plist +++ b/sysutils/p5-Unix-ConfigFile/pkg-plist @@ -5,5 +5,5 @@ %%SITE_PERL%%/Unix/PasswdFile.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/ConfigFile/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/ConfigFile -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Unix 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix +@dirrmtry %%SITE_PERL%%/Unix diff --git a/sysutils/p5-Unix-Mknod/pkg-plist b/sysutils/p5-Unix-Mknod/pkg-plist index 916d32bc8f0e..87c4c715d60b 100644 --- a/sysutils/p5-Unix-Mknod/pkg-plist +++ b/sysutils/p5-Unix-Mknod/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Mknod/Mknod.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Mknod/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Mknod -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Unix 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unix diff --git a/sysutils/p5-Unix-Processors/pkg-plist b/sysutils/p5-Unix-Processors/pkg-plist index df2794d71476..76f757a4df8b 100644 --- a/sysutils/p5-Unix-Processors/pkg-plist +++ b/sysutils/p5-Unix-Processors/pkg-plist @@ -5,5 +5,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Processors/Processors.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Unix/Processors @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Processors -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Unix 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unix +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix diff --git a/sysutils/p5-Unix-Syslog/pkg-plist b/sysutils/p5-Unix-Syslog/pkg-plist index 161d9d310ad9..23fa21a5b549 100644 --- a/sysutils/p5-Unix-Syslog/pkg-plist +++ b/sysutils/p5-Unix-Syslog/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Syslog/Syslog.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Syslog/autosplit.ix @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix/Syslog -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Unix 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unix +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unix diff --git a/sysutils/portmanager/pkg-plist b/sysutils/portmanager/pkg-plist index a59e63569925..dac7ae1fd888 100644 --- a/sysutils/portmanager/pkg-plist +++ b/sysutils/portmanager/pkg-plist @@ -24,5 +24,5 @@ lib/libMG.so lib/libMG.so.2 lib/libMGPM.so lib/libMGPM.so.1 -@unexec rmdir %D/etc/portmanager 2>/dev/null || true -@unexec rmdir %D/share/portmanager 2>/dev/null || true +@dirrmtry etc/portmanager +@dirrmtry share/portmanager diff --git a/sysutils/portupgrade-devel/pkg-plist b/sysutils/portupgrade-devel/pkg-plist index 03dffce2b2fa..3892dddc2c3d 100644 --- a/sysutils/portupgrade-devel/pkg-plist +++ b/sysutils/portupgrade-devel/pkg-plist @@ -30,7 +30,7 @@ etc/pkgtools.conf.sample etc/pkgtools.status-pkg.sh share/zsh/site-functions/_pkgtools @unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true -@unexec rmdir %D/share/zsh 2>/dev/null || true +@dirrmtry share/zsh %%PORTDOCS%%share/examples/pkgtools/bash/complete.sample %%PORTDOCS%%@dirrm share/examples/pkgtools/bash %%PORTDOCS%%share/examples/pkgtools/tcsh/complete.sample diff --git a/sysutils/portupgrade/pkg-plist b/sysutils/portupgrade/pkg-plist index 03dffce2b2fa..3892dddc2c3d 100644 --- a/sysutils/portupgrade/pkg-plist +++ b/sysutils/portupgrade/pkg-plist @@ -30,7 +30,7 @@ etc/pkgtools.conf.sample etc/pkgtools.status-pkg.sh share/zsh/site-functions/_pkgtools @unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true -@unexec rmdir %D/share/zsh 2>/dev/null || true +@dirrmtry share/zsh %%PORTDOCS%%share/examples/pkgtools/bash/complete.sample %%PORTDOCS%%@dirrm share/examples/pkgtools/bash %%PORTDOCS%%share/examples/pkgtools/tcsh/complete.sample diff --git a/sysutils/psgconf/pkg-plist b/sysutils/psgconf/pkg-plist index 10d7dcb245b5..ffd4cc915290 100644 --- a/sysutils/psgconf/pkg-plist +++ b/sysutils/psgconf/pkg-plist @@ -158,18 +158,18 @@ share/psgconf/files/rc.shutdown %%SITE_PERL%%/PSGConf/DataStore/ConfigFile.pm %%SITE_PERL%%/PSGConf/Util.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PSGConf -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/Action/PackageManager/RedHat 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/Action/PackageManager/FreeBSD 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/Action/PackageManager 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/Action/GenerateFile 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/Action/svcs 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/Action 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/Control/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/Control/Library 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/Control 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/Data 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf/DataStore 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PSGConf 2>/dev/null || true -@unexec rmdir %D/share/psgconf/config 2>/dev/null || true -@unexec rmdir %D/share/psgconf/files 2>/dev/null || true -@unexec rmdir %D/share/psgconf 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/PSGConf/Action/PackageManager/RedHat +@dirrmtry %%SITE_PERL%%/PSGConf/Action/PackageManager/FreeBSD +@dirrmtry %%SITE_PERL%%/PSGConf/Action/PackageManager +@dirrmtry %%SITE_PERL%%/PSGConf/Action/GenerateFile +@dirrmtry %%SITE_PERL%%/PSGConf/Action/svcs +@dirrmtry %%SITE_PERL%%/PSGConf/Action +@dirrmtry %%SITE_PERL%%/PSGConf/Control/Apache +@dirrmtry %%SITE_PERL%%/PSGConf/Control/Library +@dirrmtry %%SITE_PERL%%/PSGConf/Control +@dirrmtry %%SITE_PERL%%/PSGConf/Data +@dirrmtry %%SITE_PERL%%/PSGConf/DataStore +@dirrmtry %%SITE_PERL%%/PSGConf +@dirrmtry share/psgconf/config +@dirrmtry share/psgconf/files +@dirrmtry share/psgconf diff --git a/sysutils/pwg/pkg-plist b/sysutils/pwg/pkg-plist index 0dbdae976dca..b27ffe64c437 100644 --- a/sysutils/pwg/pkg-plist +++ b/sysutils/pwg/pkg-plist @@ -12,13 +12,13 @@ share/icons/locolor/16x16/apps/pwg.png share/icons/locolor/32x32/apps/pwg.png @dirrm share/apps/pwg/pics @dirrm share/apps/pwg -@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/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true -@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/applnk/Applications 2>/dev/null || true -@unexec rmdir %D/share/applnk 2>/dev/null || true +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/locolor/16x16/apps +@dirrmtry share/icons/locolor/16x16 +@dirrmtry share/icons/locolor/32x32/apps +@dirrmtry share/icons/locolor/32x32 +@dirrmtry share/applnk/Applications +@dirrmtry share/applnk diff --git a/sysutils/radeontool/pkg-plist b/sysutils/radeontool/pkg-plist index 57f8a9fe81ce..9c4ac903b8ca 100644 --- a/sysutils/radeontool/pkg-plist +++ b/sysutils/radeontool/pkg-plist @@ -1 +1 @@ -bin/radeontool
\ No newline at end of file +bin/radeontool diff --git a/sysutils/rtty/pkg-plist b/sysutils/rtty/pkg-plist index 4a6dbb4fc634..9b30766703fd 100644 --- a/sysutils/rtty/pkg-plist +++ b/sysutils/rtty/pkg-plist @@ -12,11 +12,11 @@ rtty/bin/ttysrv @exec mkdir -p %D/rtty/out @exec mkdir -p %D/rtty/pid @exec mkdir -p %D/rtty/sock -@unexec rmdir %D/rtty/sock 2>/dev/null || true -@unexec rmdir %D/rtty/pid 2>/dev/null || true -@unexec rmdir %D/rtty/out 2>/dev/null || true -@unexec rmdir %D/rtty/opt 2>/dev/null || true -@unexec rmdir %D/rtty/log 2>/dev/null || true -@unexec rmdir %D/rtty/dev 2>/dev/null || true +@dirrmtry rtty/sock +@dirrmtry rtty/pid +@dirrmtry rtty/out +@dirrmtry rtty/opt +@dirrmtry rtty/log +@dirrmtry rtty/dev @dirrm rtty/bin @dirrm rtty diff --git a/sysutils/serpentine/pkg-plist b/sysutils/serpentine/pkg-plist index 7c6b4d70b780..1a7d46465988 100644 --- a/sysutils/serpentine/pkg-plist +++ b/sysutils/serpentine/pkg-plist @@ -81,9 +81,9 @@ bin/serpentine share/applications/serpentine.desktop %%DATADIR%%/serpentine.glade @dirrm %%DATADIR%% -@unexec rmdir %D/share/applications 2> /dev/null || true +@dirrmtry share/applications @dirrm %%PYTHON_SITELIBDIR%%/serpentine/plugins @dirrm %%PYTHON_SITELIBDIR%%/serpentine %%MUINE%%@unexec rmdir %D/lib/muine/plugins 2> /dev/null || true -@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2> /dev/null || true -@unexec rmdir %D/%%PYTHON_LIBDIR%% 2> /dev/null || true +@dirrmtry %%PYTHON_SITELIBDIR%% +@dirrmtry %%PYTHON_LIBDIR%% diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist index 02ed2d8a7879..92fa9e5ef655 100644 --- a/sysutils/system-tools-backends/pkg-plist +++ b/sysutils/system-tools-backends/pkg-plist @@ -97,7 +97,7 @@ share/setup-tool-backends/scripts/xml.pl @dirrm share/setup-tool-backends/scripts @dirrm share/setup-tool-backends/files @dirrm share/setup-tool-backends -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/xh 2> /dev/null || true -@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/rw 2> /dev/null || true +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw diff --git a/sysutils/uptimed/pkg-plist b/sysutils/uptimed/pkg-plist index 6d1d68831c1e..8eb01412d8c2 100644 --- a/sysutils/uptimed/pkg-plist +++ b/sysutils/uptimed/pkg-plist @@ -9,4 +9,4 @@ www/cgi-bin/uprecords.cgi www/cgi-bin/uprecords.conf www/cgi-bin/uprecords.footer www/cgi-bin/uprecords.header -@unexec rmdir %D/www/cgi-bin 2>/dev/null || true +@dirrmtry www/cgi-bin diff --git a/sysutils/virtualmin/pkg-plist b/sysutils/virtualmin/pkg-plist index 9a94502f60d9..52233d117923 100644 --- a/sysutils/virtualmin/pkg-plist +++ b/sysutils/virtualmin/pkg-plist @@ -218,5 +218,5 @@ lib/webmin/virtual-server/warnbw-template @dirrm lib/webmin/virtual-server/help @dirrm lib/webmin/virtual-server @exec [ -e %D/etc/webmin/virtual-server ] || mkdir %D/etc/webmin/virtual-server -@unexec rmdir %D/etc/webmin/virtual-server 2>/dev/null || true -@unexec rmdir %D/etc/webmin 2>/dev/null || true +@dirrmtry etc/webmin/virtual-server +@dirrmtry etc/webmin diff --git a/sysutils/webmin/pkg-plist b/sysutils/webmin/pkg-plist index 3315792f42fb..065a38bb619d 100644 --- a/sysutils/webmin/pkg-plist +++ b/sysutils/webmin/pkg-plist @@ -1,4 +1,4 @@ @comment Insert PLIST.lib-webmin here @comment -=[ begin PLIST.lib-webmin ]=- @comment -=[ end PLIST.lib-webmin ]=- -@unexec rmdir %D/lib/webmin 2>/dev/null || true +@dirrmtry lib/webmin diff --git a/sysutils/xfce4-battery-plugin/pkg-plist b/sysutils/xfce4-battery-plugin/pkg-plist index d9f565c24181..83a053c2a982 100644 --- a/sysutils/xfce4-battery-plugin/pkg-plist +++ b/sysutils/xfce4-battery-plugin/pkg-plist @@ -1,3 +1,3 @@ lib/xfce4/panel-plugins/libbattmon.so -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true -@unexec rmdir %D/lib/xfce4 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins +@dirrmtry lib/xfce4 diff --git a/sysutils/xfce4-cpugraph-plugin/pkg-plist b/sysutils/xfce4-cpugraph-plugin/pkg-plist index 8040bee1e23e..29101aaeca09 100644 --- a/sysutils/xfce4-cpugraph-plugin/pkg-plist +++ b/sysutils/xfce4-cpugraph-plugin/pkg-plist @@ -1,4 +1,4 @@ lib/xfce4/panel-plugins/libcpugraph.so lib/xfce4/panel-plugins/libcpugraph.la lib/xfce4/panel-plugins/libcpugraph.a -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins diff --git a/sysutils/xfce4-fsguard-plugin/pkg-plist b/sysutils/xfce4-fsguard-plugin/pkg-plist index 197be7ddfc55..f2d4c6d0a6b7 100644 --- a/sysutils/xfce4-fsguard-plugin/pkg-plist +++ b/sysutils/xfce4-fsguard-plugin/pkg-plist @@ -2,4 +2,4 @@ lib/xfce4/panel-plugins/libfsguard.so lib/xfce4/panel-plugins/libfsguard.la lib/xfce4/panel-plugins/libfsguard.a -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins diff --git a/sysutils/xfce4-genmon-plugin/pkg-plist b/sysutils/xfce4-genmon-plugin/pkg-plist index 25673a9b2fde..2a1e9bc6df49 100644 --- a/sysutils/xfce4-genmon-plugin/pkg-plist +++ b/sysutils/xfce4-genmon-plugin/pkg-plist @@ -1,2 +1,2 @@ lib/xfce4/panel-plugins/libgenmon.so -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins diff --git a/sysutils/xfce4-mcs-manager/pkg-plist b/sysutils/xfce4-mcs-manager/pkg-plist index 8c90028ae4c1..cd1e82880aa6 100644 --- a/sysutils/xfce4-mcs-manager/pkg-plist +++ b/sysutils/xfce4-mcs-manager/pkg-plist @@ -66,20 +66,20 @@ share/xfce4/doc/he/images/smgr_from_root_menu.png share/xfce4/doc/he/images/smgr_from_setup_button.png share/xfce4/doc/he/xfce-mcs-manager.html @dirrm include/xfce4/xfce-mcs-manager -@unexec rmdir %D/include/xfce4 2>/dev/null || true -@unexec rmdir %D/share/applications 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor 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 -@unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true -@unexec rmdir %D/share/xfce4 2>/dev/null || true +@dirrmtry include/xfce4 +@dirrmtry share/applications +@dirrmtry share/icons/hicolor +@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 +@dirrmtry share/xfce4/doc/C/images +@dirrmtry share/xfce4/doc/C +@dirrmtry share/xfce4/doc/fr/images +@dirrmtry share/xfce4/doc/fr +@dirrmtry share/xfce4/doc/he/images +@dirrmtry share/xfce4/doc/he +@dirrmtry share/xfce4/doc +@dirrmtry share/xfce4 diff --git a/sysutils/xfce4-mcs-plugins/pkg-plist b/sysutils/xfce4-mcs-plugins/pkg-plist index ada2a194b4e8..f1786b3bd9c5 100644 --- a/sysutils/xfce4-mcs-plugins/pkg-plist +++ b/sysutils/xfce4-mcs-plugins/pkg-plist @@ -81,17 +81,17 @@ share/xfce4/doc/he/images/keyboard_settings.png share/xfce4/doc/he/images/mouse_settings.png share/xfce4/doc/he/images/user_interface_settings.png share/xfce4/doc/he/xfce-mcs-plugins.html -@unexec rmdir %D/lib/xfce4/mcs-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/xfce4/doc/C/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true -@unexec rmdir %D/share/xfce4 2>/dev/null || true +@dirrmtry lib/xfce4/mcs-plugins +@dirrmtry lib/xfce4 +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/xfce4/doc/C/images +@dirrmtry share/xfce4/doc/C +@dirrmtry share/xfce4/doc/fr/images +@dirrmtry share/xfce4/doc/fr +@dirrmtry share/xfce4/doc/he/images +@dirrmtry share/xfce4/doc/he +@dirrmtry share/xfce4/doc +@dirrmtry share/xfce4 diff --git a/sysutils/xfce4-netload-plugin/pkg-plist b/sysutils/xfce4-netload-plugin/pkg-plist index 6999985c500e..a8ecf2867b71 100644 --- a/sysutils/xfce4-netload-plugin/pkg-plist +++ b/sysutils/xfce4-netload-plugin/pkg-plist @@ -1,4 +1,4 @@ lib/xfce4/panel-plugins/libnetload.a lib/xfce4/panel-plugins/libnetload.la lib/xfce4/panel-plugins/libnetload.so -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins diff --git a/sysutils/xfce4-showdesktop-plugin/pkg-plist b/sysutils/xfce4-showdesktop-plugin/pkg-plist index 93c4b49fbe14..7d7e239bc815 100644 --- a/sysutils/xfce4-showdesktop-plugin/pkg-plist +++ b/sysutils/xfce4-showdesktop-plugin/pkg-plist @@ -1,3 +1,3 @@ lib/xfce4/panel-plugins/libshowdesktop.so -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true -@unexec rmdir %D/lib/xfce4 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins +@dirrmtry lib/xfce4 diff --git a/sysutils/xfce4-systemload-plugin/pkg-plist b/sysutils/xfce4-systemload-plugin/pkg-plist index 0a208fc70653..bb54a79ca642 100644 --- a/sysutils/xfce4-systemload-plugin/pkg-plist +++ b/sysutils/xfce4-systemload-plugin/pkg-plist @@ -1,4 +1,4 @@ lib/xfce4/panel-plugins/libsystemload.a lib/xfce4/panel-plugins/libsystemload.la lib/xfce4/panel-plugins/libsystemload.so -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins diff --git a/sysutils/xfce4-utils/pkg-plist b/sysutils/xfce4-utils/pkg-plist index 3e06d532150e..1fefd82c7642 100644 --- a/sysutils/xfce4-utils/pkg-plist +++ b/sysutils/xfce4-utils/pkg-plist @@ -177,21 +177,21 @@ share/xfce4/doc/he/xfce-utils.html share/xfce4/doc/xfce.css share/xfce4/doc/xfce-mouse.png share/xfce4/doc/xfce-rtl.css -@unexec rmdir %D/etc/xdg/xfce4 2>/dev/null || true -@unexec rmdir %D/etc/xdg 2>/dev/null || true -@unexec rmdir %D/etc/xfce4 2>/dev/null || true -@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true -@unexec rmdir %D/lib/xfce4 2>/dev/null || true -@unexec rmdir %D/share/applications 2>/dev/null || true -@unexec rmdir %D/share/locale/bn_IN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/bn_IN 2>/dev/null || true -@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/mr 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true -@unexec rmdir %D/share/xfce4 2>/dev/null || true +@dirrmtry etc/xdg/xfce4 +@dirrmtry etc/xdg +@dirrmtry etc/xfce4 +@dirrmtry lib/xfce4/mcs-plugins +@dirrmtry lib/xfce4 +@dirrmtry share/applications +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/xfce4/doc/C/images +@dirrmtry share/xfce4/doc/C +@dirrmtry share/xfce4/doc/fr/images +@dirrmtry share/xfce4/doc/fr +@dirrmtry share/xfce4/doc/he/images +@dirrmtry share/xfce4/doc/he +@dirrmtry share/xfce4/doc +@dirrmtry share/xfce4 diff --git a/sysutils/xfce4-wavelan-plugin/pkg-plist b/sysutils/xfce4-wavelan-plugin/pkg-plist index fcca7e5e925f..9ac1c58e71a7 100644 --- a/sysutils/xfce4-wavelan-plugin/pkg-plist +++ b/sysutils/xfce4-wavelan-plugin/pkg-plist @@ -1,2 +1,2 @@ lib/xfce4/panel-plugins/libwavelan.so -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins diff --git a/textproc/add-css-links/pkg-plist b/textproc/add-css-links/pkg-plist index b514713228bc..36d0daba8cb0 100644 --- a/textproc/add-css-links/pkg-plist +++ b/textproc/add-css-links/pkg-plist @@ -1,3 +1,3 @@ share/xsl/xhtml/add-css-links.xsl -@unexec rmdir %D/share/xsl/xhtml 2>/dev/null || true -@unexec rmdir %D/share/xsl 2>/dev/null || true +@dirrmtry share/xsl/xhtml +@dirrmtry share/xsl diff --git a/textproc/docbook-241/pkg-plist b/textproc/docbook-241/pkg-plist index dd4a0158fde2..d9ad42e50973 100644 --- a/textproc/docbook-241/pkg-plist +++ b/textproc/docbook-241/pkg-plist @@ -10,4 +10,4 @@ share/sgml/docbook/2.4.1/docbook.dtd share/sgml/docbook/2.4.1/catalog @exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTD_NAME%%/%%DTD_VERSION%%/catalog @dirrm share/sgml/docbook/2.4.1 -@unexec rmdir %D/share/sgml/docbook 2>/dev/null || true +@dirrmtry share/sgml/docbook diff --git a/textproc/docbook-300/pkg-plist b/textproc/docbook-300/pkg-plist index b51362d3e479..9366da32f19f 100644 --- a/textproc/docbook-300/pkg-plist +++ b/textproc/docbook-300/pkg-plist @@ -12,4 +12,4 @@ share/sgml/docbook/3.0/docbook.dtd share/sgml/docbook/3.0/catalog @exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTD_NAME%%/%%DTD_VERSION%%/catalog @dirrm share/sgml/docbook/3.0 -@unexec rmdir %D/share/sgml/docbook 2>/dev/null || true +@dirrmtry share/sgml/docbook diff --git a/textproc/docbook-310/pkg-plist b/textproc/docbook-310/pkg-plist index bdb82867f3b5..55bb9619ef16 100644 --- a/textproc/docbook-310/pkg-plist +++ b/textproc/docbook-310/pkg-plist @@ -16,4 +16,4 @@ share/sgml/docbook/3.1/catalog @exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTD_NAME%%/%%DTD_VERSION%%/catalog share/sgml/docbook/3.1/readme.txt @dirrm share/sgml/docbook/3.1 -@unexec rmdir %D/share/sgml/docbook 2>/dev/null || true +@dirrmtry share/sgml/docbook diff --git a/textproc/docbook-400/pkg-plist b/textproc/docbook-400/pkg-plist index 1db539cf7548..bb7676ec9986 100644 --- a/textproc/docbook-400/pkg-plist +++ b/textproc/docbook-400/pkg-plist @@ -14,4 +14,4 @@ share/sgml/docbook/4.0/catalog @exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTD_NAME%%/%%DTD_VERSION%%/catalog share/sgml/docbook/4.0/readme.txt @dirrm share/sgml/docbook/4.0 -@unexec rmdir %D/share/sgml/docbook 2>/dev/null || true +@dirrmtry share/sgml/docbook diff --git a/textproc/docbook-410/pkg-plist b/textproc/docbook-410/pkg-plist index f160405a0c15..d6d3f19a1542 100644 --- a/textproc/docbook-410/pkg-plist +++ b/textproc/docbook-410/pkg-plist @@ -16,4 +16,4 @@ share/sgml/docbook/4.1/docbook.dcl share/sgml/docbook/4.1/docbook.dtd share/sgml/docbook/4.1/readme.txt @dirrm share/sgml/docbook/4.1 -@unexec rmdir %D/share/sgml/docbook 2>/dev/null || true +@dirrmtry share/sgml/docbook diff --git a/textproc/docbook-420/pkg-plist b/textproc/docbook-420/pkg-plist index f9bdddb45683..3ee8d6291a44 100644 --- a/textproc/docbook-420/pkg-plist +++ b/textproc/docbook-420/pkg-plist @@ -16,4 +16,4 @@ share/sgml/docbook/4.2/docbookx.dtd share/sgml/docbook/4.2/soextblx.dtd share/sgml/docbook/4.2/README @dirrm share/sgml/docbook/4.2 -@unexec rmdir %D/share/sgml/docbook 2>/dev/null || true +@dirrmtry share/sgml/docbook diff --git a/textproc/dsssl-docbook-cygnus/pkg-plist b/textproc/dsssl-docbook-cygnus/pkg-plist index 463999af6997..07c3bbffa50e 100644 --- a/textproc/dsssl-docbook-cygnus/pkg-plist +++ b/textproc/dsssl-docbook-cygnus/pkg-plist @@ -9,4 +9,4 @@ share/sgml/docbook/dsssl/cygnus/catalog share/sgml/docbook/dsssl/cygnus/cygnus-both.dsl share/sgml/docbook/dsssl/cygnus/dbtohtml.dsl @dirrm share/sgml/docbook/dsssl/cygnus -@unexec rmdir %D/share/sgml/docbook/dsssl 2>/dev/null || true +@dirrmtry share/sgml/docbook/dsssl diff --git a/textproc/dtdinst/pkg-plist b/textproc/dtdinst/pkg-plist index ef504f4454f4..d77689f2242c 100644 --- a/textproc/dtdinst/pkg-plist +++ b/textproc/dtdinst/pkg-plist @@ -1,7 +1,7 @@ %%JAVAJARDIR%%/dtdinst.jar share/xsl/dtdinst/dtdinst2rng.xsl @dirrm share/xsl/dtdinst -@unexec rmdir %D/share/xsl 2>/dev/null || true +@dirrmtry share/xsl %%PORTDOCS%%%%DOCSDIR%%/copying.txt %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/dtdinst.rng diff --git a/textproc/dtdparse/pkg-plist b/textproc/dtdparse/pkg-plist index e3fbdf82f1de..5ca6003996e4 100644 --- a/textproc/dtdparse/pkg-plist +++ b/textproc/dtdparse/pkg-plist @@ -16,5 +16,5 @@ bin/dtdparse @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SGML/DTDParse @dirrm %%SITE_PERL%%/SGML/DTDParse/Format @dirrm %%SITE_PERL%%/SGML/DTDParse -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SGML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/SGML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SGML +@dirrmtry %%SITE_PERL%%/SGML diff --git a/textproc/fldiff/pkg-plist b/textproc/fldiff/pkg-plist index acbcf97bd6e9..242c29728e77 100644 --- a/textproc/fldiff/pkg-plist +++ b/textproc/fldiff/pkg-plist @@ -1,4 +1,4 @@ bin/fldiff share/applications/fldiff.desktop share/pixmaps/fldiff.png -@unexec rmdir %D/share/applications 2>/dev/null || true +@dirrmtry share/applications diff --git a/textproc/fop/pkg-plist b/textproc/fop/pkg-plist index d435d22daa9b..08a718f4860c 100644 --- a/textproc/fop/pkg-plist +++ b/textproc/fop/pkg-plist @@ -178,9 +178,9 @@ bin/fop @dirrm %%DATADIR%%/conf @dirrm %%DATADIR%%/build @dirrm %%DATADIR%% -@unexec rmdir %D/%%DOCSDIR%%/skin/css 2>/dev/null || true +@dirrmtry %%DOCSDIR%%/skin/css @dirrm %%DOCSDIR%%/skin/images -@unexec rmdir %D/%%DOCSDIR%%/skin/scripts 2>/dev/null || true +@dirrmtry %%DOCSDIR%%/skin/scripts @dirrm %%DOCSDIR%%/skin @dirrm %%DOCSDIR%%/images @dirrm %%DOCSDIR%%/fo/images diff --git a/textproc/gtkspell/pkg-plist b/textproc/gtkspell/pkg-plist index 4a1c19a7600a..cbd47c558bc1 100644 --- a/textproc/gtkspell/pkg-plist +++ b/textproc/gtkspell/pkg-plist @@ -37,5 +37,5 @@ share/locale/zh_TW/LC_MESSAGES/gtkspell.mo @dirrm %%DOCSDIR%% @dirrm include/gtkspell-2.0/gtkspell @dirrm include/gtkspell-2.0 -@unexec rmdir %D/share/locale/rm/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/rm 2>/dev/null || true +@dirrmtry share/locale/rm/LC_MESSAGES +@dirrmtry share/locale/rm diff --git a/textproc/gtkspell2/pkg-plist b/textproc/gtkspell2/pkg-plist index 4a1c19a7600a..cbd47c558bc1 100644 --- a/textproc/gtkspell2/pkg-plist +++ b/textproc/gtkspell2/pkg-plist @@ -37,5 +37,5 @@ share/locale/zh_TW/LC_MESSAGES/gtkspell.mo @dirrm %%DOCSDIR%% @dirrm include/gtkspell-2.0/gtkspell @dirrm include/gtkspell-2.0 -@unexec rmdir %D/share/locale/rm/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/rm 2>/dev/null || true +@dirrmtry share/locale/rm/LC_MESSAGES +@dirrmtry share/locale/rm diff --git a/textproc/htdig/pkg-plist b/textproc/htdig/pkg-plist index 53a9dad7e359..0e7d93df5374 100644 --- a/textproc/htdig/pkg-plist +++ b/textproc/htdig/pkg-plist @@ -265,7 +265,7 @@ www/icons/htdig/star_blank.png @dirrm lib/htdig @dirrm lib/htdig_db @dirrm www/icons/htdig -@unexec rmdir %D/%%DATADIR%%/common 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%%/database 2>/dev/null || true -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true -@unexec rmdir %D/etc/htdig 2>/dev/null || true +@dirrmtry %%DATADIR%%/common +@dirrmtry %%DATADIR%%/database +@dirrmtry %%DATADIR%% +@dirrmtry etc/htdig diff --git a/textproc/liblrdf/pkg-plist b/textproc/liblrdf/pkg-plist index 263a5746dcb8..a8f6a2e42c24 100644 --- a/textproc/liblrdf/pkg-plist +++ b/textproc/liblrdf/pkg-plist @@ -5,5 +5,5 @@ lib/liblrdf.so lib/liblrdf.so.2 libdata/pkgconfig/lrdf.pc share/ladspa/rdf/ladspa.rdfs -@unexec rmdir %D/share/ladspa/rdf 2>/dev/null || true -@unexec rmdir %D/share/ladspa 2>/dev/null || true +@dirrmtry share/ladspa/rdf +@dirrmtry share/ladspa diff --git a/textproc/manued.el/pkg-plist b/textproc/manued.el/pkg-plist index 11772ce0a7be..5709b03cc020 100644 --- a/textproc/manued.el/pkg-plist +++ b/textproc/manued.el/pkg-plist @@ -2,8 +2,8 @@ share/emacs/site-lisp/manued.el @exec mkdir -p %D/lib/xemacs/site-lisp @exec ln -sf %D/%F %D/lib/xemacs/site-lisp/manued.el @unexec rm %D/lib/xemacs/site-lisp/manued.el -@unexec rmdir %D/lib/xemacs/site-lisp 2>/dev/null || true -@unexec rmdir %D/lib/xemacs 2>/dev/null || true +@dirrmtry lib/xemacs/site-lisp +@dirrmtry lib/xemacs %%PORTDOCS%%share/examples/manued.el/sample1.manued %%PORTDOCS%%share/examples/manued.el/sample2.manued %%PORTDOCS%%share/examples/manued.el/sample3.manued diff --git a/textproc/mifluz/pkg-plist b/textproc/mifluz/pkg-plist index 10f68fd4d06a..cc8b62bbcda2 100644 --- a/textproc/mifluz/pkg-plist +++ b/textproc/mifluz/pkg-plist @@ -93,4 +93,4 @@ lib/libmifluz.so lib/libmifluz.so.0 @dirrm include/mifluz @exec mkdir -p %D/var/cache/mifluz -@unexec rmdir %D/var/cache/mifluz 2>/dev/null || true +@dirrmtry var/cache/mifluz diff --git a/textproc/p5-Apache-ParseLog/pkg-plist b/textproc/p5-Apache-ParseLog/pkg-plist index 95769851c9de..dc661eec948e 100644 --- a/textproc/p5-Apache-ParseLog/pkg-plist +++ b/textproc/p5-Apache-ParseLog/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Apache/ParseLog.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ParseLog/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ParseLog 2>/dev/null || true -@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/ParseLog +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache +@dirrmtry %%SITE_PERL%%/Apache diff --git a/textproc/p5-Apache-XBEL/pkg-plist b/textproc/p5-Apache-XBEL/pkg-plist index a5ad0721c31d..9d783857e83a 100644 --- a/textproc/p5-Apache-XBEL/pkg-plist +++ b/textproc/p5-Apache-XBEL/pkg-plist @@ -3,5 +3,5 @@ %%XSL%%%%DATADIR%%/apache-xbel.xsl %%XSL%%@dirrm %%DATADIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/XBEL -@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/textproc/p5-Bloom-Filter/pkg-plist b/textproc/p5-Bloom-Filter/pkg-plist index 3c6cc5f2f4ec..36d2bdee7814 100644 --- a/textproc/p5-Bloom-Filter/pkg-plist +++ b/textproc/p5-Bloom-Filter/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Bloom/Filter.pm -@unexec rmdir %D/%%SITE_PERL%%/Bloom 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Bloom %%SITE_PERL%%/mach/auto/Bloom/Filter/.packlist -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Bloom/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Bloom 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/mach/auto/Bloom/Filter +@dirrmtry %%SITE_PERL%%/mach/auto/Bloom diff --git a/textproc/p5-CSS-SAC/pkg-plist b/textproc/p5-CSS-SAC/pkg-plist index ab0f1dad7c6f..ecbd9a1cdb13 100644 --- a/textproc/p5-CSS-SAC/pkg-plist +++ b/textproc/p5-CSS-SAC/pkg-plist @@ -26,5 +26,5 @@ @dirrm %%SITE_PERL%%/CSS/SAC/Selector @dirrm %%SITE_PERL%%/CSS/SAC @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/SAC -@unexec rmdir %D/%%SITE_PERL%%/CSS 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/CSS +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS diff --git a/textproc/p5-CSS-Tiny/pkg-plist b/textproc/p5-CSS-Tiny/pkg-plist index 0dea64fc634d..72f7d10b80c4 100644 --- a/textproc/p5-CSS-Tiny/pkg-plist +++ b/textproc/p5-CSS-Tiny/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/CSS/Tiny.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Tiny/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS/Tiny -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/CSS 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CSS +@dirrmtry %%SITE_PERL%%/CSS diff --git a/textproc/p5-Chess-PGN-Parse/pkg-plist b/textproc/p5-Chess-PGN-Parse/pkg-plist index 9ddb2a4abac9..87590d443363 100644 --- a/textproc/p5-Chess-PGN-Parse/pkg-plist +++ b/textproc/p5-Chess-PGN-Parse/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Chess/PGN/Parse.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chess/PGN/Parse/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chess/PGN/Parse -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chess/PGN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Chess 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Chess/PGN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Chess 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chess/PGN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Chess +@dirrmtry %%SITE_PERL%%/Chess/PGN +@dirrmtry %%SITE_PERL%%/Chess diff --git a/textproc/p5-Data-FormValidator/pkg-plist b/textproc/p5-Data-FormValidator/pkg-plist index 8583ea54b839..879e22b90939 100644 --- a/textproc/p5-Data-FormValidator/pkg-plist +++ b/textproc/p5-Data-FormValidator/pkg-plist @@ -7,4 +7,4 @@ %%SITE_PERL%%/Data/FormValidator/Results.pm @dirrm %%SITE_PERL%%/Data/FormValidator/Constraints @dirrm %%SITE_PERL%%/Data/FormValidator -@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Data diff --git a/textproc/p5-DelimMatch/pkg-plist b/textproc/p5-DelimMatch/pkg-plist index 03e14a538488..15f021d11872 100644 --- a/textproc/p5-DelimMatch/pkg-plist +++ b/textproc/p5-DelimMatch/pkg-plist @@ -3,6 +3,6 @@ %%SITE_PERL%%/Text/DelimMatch.pm @dirrm %%SITE_PERL%%/auto/Text/DelimMatch @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DelimMatch -@unexec rmdir %D/%%SITE_PERL%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/Text +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Devel-TraceSAX/pkg-plist b/textproc/p5-Devel-TraceSAX/pkg-plist index ab83bf2c8051..831a9a368040 100644 --- a/textproc/p5-Devel-TraceSAX/pkg-plist +++ b/textproc/p5-Devel-TraceSAX/pkg-plist @@ -2,6 +2,6 @@ %%SITE_PERL%%/Devel/TraceSAX/DB.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/TraceSAX/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/TraceSAX -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel @dirrm %%SITE_PERL%%/Devel/TraceSAX -@unexec rmdir %D/lib/perl5/site_perl/5.8.7/Devel 2>/dev/null || true +@dirrmtry lib/perl5/site_perl/5.8.7/Devel diff --git a/textproc/p5-Filter-Simple/pkg-plist b/textproc/p5-Filter-Simple/pkg-plist index 27ef22715155..59e2c6c13aeb 100644 --- a/textproc/p5-Filter-Simple/pkg-plist +++ b/textproc/p5-Filter-Simple/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Filter/Simple.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Simple/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter/Simple -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Filter 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Filter +@dirrmtry %%SITE_PERL%%/Filter diff --git a/textproc/p5-FormValidator-Simple/pkg-plist b/textproc/p5-FormValidator-Simple/pkg-plist index 791db68574f5..24f99fc1a54d 100644 --- a/textproc/p5-FormValidator-Simple/pkg-plist +++ b/textproc/p5-FormValidator-Simple/pkg-plist @@ -12,7 +12,7 @@ %%SITE_PERL%%/FormValidator/Simple/Data.pm %%SITE_PERL%%/FormValidator/Simple.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FormValidator/Simple/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/FormValidator/Simple 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/FormValidator 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/FormValidator/Simple 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/FormValidator 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FormValidator/Simple +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FormValidator +@dirrmtry %%SITE_PERL%%/FormValidator/Simple +@dirrmtry %%SITE_PERL%%/FormValidator diff --git a/textproc/p5-HTML-Entities-Numbered/pkg-plist b/textproc/p5-HTML-Entities-Numbered/pkg-plist index 7e349566dd25..f4d48d3e0e3d 100644 --- a/textproc/p5-HTML-Entities-Numbered/pkg-plist +++ b/textproc/p5-HTML-Entities-Numbered/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/HTML/Entities/Numbered.pm %%SITE_PERL%%/HTML/Entities/Numbered/Table.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Entities/Numbered/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Entities/Numbered 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Entities 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Entities/Numbered +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Entities @dirrm %%SITE_PERL%%/HTML/Entities/Numbered -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML/Entities 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/HTML/Entities +@dirrmtry %%SITE_PERL%%/HTML diff --git a/textproc/p5-HTML-Format/pkg-plist b/textproc/p5-HTML-Format/pkg-plist index 840824ec9183..f5d25375b559 100644 --- a/textproc/p5-HTML-Format/pkg-plist +++ b/textproc/p5-HTML-Format/pkg-plist @@ -4,4 +4,4 @@ %%SITE_PERL%%/HTML/Formatter.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Format/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Format -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTML diff --git a/textproc/p5-HTML-Fraction/pkg-plist b/textproc/p5-HTML-Fraction/pkg-plist index da8db5f66ece..ba678ba7cd2c 100644 --- a/textproc/p5-HTML-Fraction/pkg-plist +++ b/textproc/p5-HTML-Fraction/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/HTML/Fraction.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Fraction/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Fraction 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Fraction +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/HTML diff --git a/textproc/p5-HTML-TagFilter/pkg-plist b/textproc/p5-HTML-TagFilter/pkg-plist index 2a3f9b323803..3d5523d0c4fa 100644 --- a/textproc/p5-HTML-TagFilter/pkg-plist +++ b/textproc/p5-HTML-TagFilter/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/HTML/TagFilter.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagFilter/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagFilter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagFilter +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/HTML diff --git a/textproc/p5-HTML-Tidy/pkg-plist b/textproc/p5-HTML-Tidy/pkg-plist index b0a39cc8829a..5013d49fc6f0 100644 --- a/textproc/p5-HTML-Tidy/pkg-plist +++ b/textproc/p5-HTML-Tidy/pkg-plist @@ -5,6 +5,6 @@ bin/webtidy %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Tidy/Tidy.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Tidy/Tidy.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Tidy -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/HTML/Tidy -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTML diff --git a/textproc/p5-HTML-Truncate/pkg-plist b/textproc/p5-HTML-Truncate/pkg-plist index 6d0d8ddcbdbb..81f35454fb31 100644 --- a/textproc/p5-HTML-Truncate/pkg-plist +++ b/textproc/p5-HTML-Truncate/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/HTML/Truncate.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Truncate/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Truncate 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Truncate +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/HTML diff --git a/textproc/p5-Hash-Merge/pkg-plist b/textproc/p5-Hash-Merge/pkg-plist index 17514642296d..e76788b72bbf 100644 --- a/textproc/p5-Hash-Merge/pkg-plist +++ b/textproc/p5-Hash-Merge/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/Hash/Merge.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/Merge/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/Merge -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash @dirrm %%SITE_PERL%%/Hash -@unexec rmdir %D/%%SITE_PERL%%/Hash 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Hash diff --git a/textproc/p5-IDNA-Punycode/pkg-plist b/textproc/p5-IDNA-Punycode/pkg-plist index f094715883ce..8633ed251d7f 100644 --- a/textproc/p5-IDNA-Punycode/pkg-plist +++ b/textproc/p5-IDNA-Punycode/pkg-plist @@ -2,5 +2,5 @@ %%SITE_PERL%%/IDNA/Punycode.pm %%SITE_PERL%%/IDNA/.Punycode.pm.swp @dirrm %%SITE_PERL%%/mach/auto/IDNA/Punycode -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/IDNA 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/IDNA 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/mach/auto/IDNA +@dirrmtry %%SITE_PERL%%/IDNA diff --git a/textproc/p5-IO-CSVHeaderFile/pkg-plist b/textproc/p5-IO-CSVHeaderFile/pkg-plist index f05dec2d79f0..5f9906e100b4 100644 --- a/textproc/p5-IO-CSVHeaderFile/pkg-plist +++ b/textproc/p5-IO-CSVHeaderFile/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/IO/CSVHeaderFile.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/CSVHeaderFile/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/CSVHeaderFile -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO +@dirrmtry %%SITE_PERL%%/IO diff --git a/textproc/p5-JSON-Syck/pkg-plist b/textproc/p5-JSON-Syck/pkg-plist index 5aa72cb54f7e..90de263acabe 100644 --- a/textproc/p5-JSON-Syck/pkg-plist +++ b/textproc/p5-JSON-Syck/pkg-plist @@ -2,6 +2,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/Syck/Syck.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/Syck/Syck.bs %%SITE_PERL%%/%%PERL_ARCH%%/JSON/Syck.pm -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/Syck 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/JSON 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON/Syck +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/JSON +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/JSON diff --git a/textproc/p5-LJ-SpellCheck/pkg-plist b/textproc/p5-LJ-SpellCheck/pkg-plist index 2707ab5b9d8c..098595ea6e62 100644 --- a/textproc/p5-LJ-SpellCheck/pkg-plist +++ b/textproc/p5-LJ-SpellCheck/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/LJ/SpellCheck.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ/SpellCheck/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ/SpellCheck -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/LJ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LJ +@dirrmtry %%SITE_PERL%%/LJ diff --git a/textproc/p5-Lingua-Conjunction/pkg-plist b/textproc/p5-Lingua-Conjunction/pkg-plist index e33c2c526586..d30fb0a8ee5f 100644 --- a/textproc/p5-Lingua-Conjunction/pkg-plist +++ b/textproc/p5-Lingua-Conjunction/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Lingua/Conjunction.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Conjunction/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Conjunction -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-EN-AddressParse/pkg-plist b/textproc/p5-Lingua-EN-AddressParse/pkg-plist index ee4050cbedef..fb6115518263 100644 --- a/textproc/p5-Lingua-EN-AddressParse/pkg-plist +++ b/textproc/p5-Lingua-EN-AddressParse/pkg-plist @@ -2,7 +2,7 @@ %%SITE_PERL%%/Lingua/EN/AddressParse.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/AddressParse/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/AddressParse -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/EN +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-EN-Gender/pkg-plist b/textproc/p5-Lingua-EN-Gender/pkg-plist index 28114c39e6bf..9655837d329d 100644 --- a/textproc/p5-Lingua-EN-Gender/pkg-plist +++ b/textproc/p5-Lingua-EN-Gender/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Lingua/EN/gender.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Gender/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Gender -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/EN +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-EN-Infinitive/pkg-plist b/textproc/p5-Lingua-EN-Infinitive/pkg-plist index 948c563f7166..b4534626fadd 100644 --- a/textproc/p5-Lingua-EN-Infinitive/pkg-plist +++ b/textproc/p5-Lingua-EN-Infinitive/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Lingua/EN/Infinitive.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Infinitive/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Infinitive 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Lingua/EN +@dirrmtry %%SITE_PERL%%/Lingua +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Infinitive +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua diff --git a/textproc/p5-Lingua-EN-Inflect-Number/pkg-plist b/textproc/p5-Lingua-EN-Inflect-Number/pkg-plist index e899b4df00e1..d65c706410df 100644 --- a/textproc/p5-Lingua-EN-Inflect-Number/pkg-plist +++ b/textproc/p5-Lingua-EN-Inflect-Number/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/Lingua/EN/Inflect/Number.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect/Number/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect/Number -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN/Inflect 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/EN/Inflect +@dirrmtry %%SITE_PERL%%/Lingua/EN +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-EN-Inflect/pkg-plist b/textproc/p5-Lingua-EN-Inflect/pkg-plist index b397e1ebc7ab..14626be28314 100644 --- a/textproc/p5-Lingua-EN-Inflect/pkg-plist +++ b/textproc/p5-Lingua-EN-Inflect/pkg-plist @@ -6,7 +6,7 @@ %%SITE_PERL%%/Lingua/EN/demo_inflect.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Inflect -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/EN +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-EN-MatchNames/pkg-plist b/textproc/p5-Lingua-EN-MatchNames/pkg-plist index bf1f57546ad7..623ef46bfe60 100644 --- a/textproc/p5-Lingua-EN-MatchNames/pkg-plist +++ b/textproc/p5-Lingua-EN-MatchNames/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Lingua/EN/MatchNames.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/MatchNames/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/MatchNames -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/EN +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-EN-NameCase/pkg-plist b/textproc/p5-Lingua-EN-NameCase/pkg-plist index 411f8b0a5870..faea960fc391 100644 --- a/textproc/p5-Lingua-EN-NameCase/pkg-plist +++ b/textproc/p5-Lingua-EN-NameCase/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Lingua/EN/NameCase.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NameCase/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NameCase -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/EN +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-EN-NameParse/pkg-plist b/textproc/p5-Lingua-EN-NameParse/pkg-plist index 8fa382da5db7..277a5f4f7111 100644 --- a/textproc/p5-Lingua-EN-NameParse/pkg-plist +++ b/textproc/p5-Lingua-EN-NameParse/pkg-plist @@ -3,7 +3,7 @@ %%SITE_PERL%%/Lingua/EN/demo.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NameParse/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/NameParse -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua @dirrm %%SITE_PERL%%/Lingua/EN -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-EN-Nickname/pkg-plist b/textproc/p5-Lingua-EN-Nickname/pkg-plist index ace6d667c365..69f0994db68a 100644 --- a/textproc/p5-Lingua-EN-Nickname/pkg-plist +++ b/textproc/p5-Lingua-EN-Nickname/pkg-plist @@ -2,7 +2,7 @@ %%SITE_PERL%%/Lingua/EN/nickhash.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Nickname/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Nickname -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua @dirrm %%SITE_PERL%%/Lingua/EN -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist b/textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist index dd1824999427..74c113e872cd 100644 --- a/textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist +++ b/textproc/p5-Lingua-EN-Numbers-Ordinate/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/Lingua/EN/Numbers/Ordinate.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/Ordinate/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/Ordinate -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN/Numbers 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/EN/Numbers +@dirrmtry %%SITE_PERL%%/Lingua/EN +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-EN-Numbers/pkg-plist b/textproc/p5-Lingua-EN-Numbers/pkg-plist index c3ca9338a694..3ff09c5d8fb8 100644 --- a/textproc/p5-Lingua-EN-Numbers/pkg-plist +++ b/textproc/p5-Lingua-EN-Numbers/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Lingua/EN/Numbers.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Numbers -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/EN +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-EN-Sentence/pkg-plist b/textproc/p5-Lingua-EN-Sentence/pkg-plist index 86455eb85b62..14a39ec7e756 100644 --- a/textproc/p5-Lingua-EN-Sentence/pkg-plist +++ b/textproc/p5-Lingua-EN-Sentence/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Lingua/EN/Sentence.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Sentence/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Sentence -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/EN +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-EN-Squeeze/pkg-plist b/textproc/p5-Lingua-EN-Squeeze/pkg-plist index 3d631d057207..9b8c4c77dfa5 100644 --- a/textproc/p5-Lingua-EN-Squeeze/pkg-plist +++ b/textproc/p5-Lingua-EN-Squeeze/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Lingua/EN/Squeeze.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Squeeze/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Squeeze -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/EN +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-EN-Summarize/pkg-plist b/textproc/p5-Lingua-EN-Summarize/pkg-plist index dcff42a5271e..6b9bdaf53acd 100644 --- a/textproc/p5-Lingua-EN-Summarize/pkg-plist +++ b/textproc/p5-Lingua-EN-Summarize/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/Lingua/EN/Summarize.pm %%SITE_PERL%%/Lingua/EN/Summarize/Filters.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Summarize/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Summarize 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN/Summarize 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Summarize +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/EN/Summarize +@dirrmtry %%SITE_PERL%%/Lingua/EN +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-EN-Syllable/pkg-plist b/textproc/p5-Lingua-EN-Syllable/pkg-plist index 6e3fb503a2f7..3e63f67fb33e 100644 --- a/textproc/p5-Lingua-EN-Syllable/pkg-plist +++ b/textproc/p5-Lingua-EN-Syllable/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Lingua/EN/Syllable.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Syllable/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Syllable -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/EN +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-EN-Tagger/pkg-plist b/textproc/p5-Lingua-EN-Tagger/pkg-plist index 9328bac4a424..f513fb9e9438 100644 --- a/textproc/p5-Lingua-EN-Tagger/pkg-plist +++ b/textproc/p5-Lingua-EN-Tagger/pkg-plist @@ -7,7 +7,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Tagger/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN/Tagger @dirrm %%SITE_PERL%%/Lingua/EN/Tagger -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/EN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/EN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/EN +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-Ident/pkg-plist b/textproc/p5-Lingua-Ident/pkg-plist index 380848cbc407..b5f8a8e84a58 100644 --- a/textproc/p5-Lingua-Ident/pkg-plist +++ b/textproc/p5-Lingua-Ident/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/Lingua/Ident.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Ident/.packlist bin/trainlid -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Ident 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Lingua +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Ident +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua diff --git a/textproc/p5-Lingua-Identify/pkg-plist b/textproc/p5-Lingua-Identify/pkg-plist index 925cb3bb5062..5dbef2536ef4 100644 --- a/textproc/p5-Lingua-Identify/pkg-plist +++ b/textproc/p5-Lingua-Identify/pkg-plist @@ -36,7 +36,7 @@ bin/make-lingua-identify-language %%SITE_PERL%%/Lingua/Identify/SW.pm %%SITE_PERL%%/Lingua/Identify/TR.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Identify/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Identify 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/Identify 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Identify +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/Identify +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-Ispell/pkg-plist b/textproc/p5-Lingua-Ispell/pkg-plist index a35b414b5b19..ae8f5a8946cc 100644 --- a/textproc/p5-Lingua-Ispell/pkg-plist +++ b/textproc/p5-Lingua-Ispell/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Ispell/.packlist %%SITE_PERL%%/Lingua/Ispell.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Ispell -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua @dirrm %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-PT-Stemmer/pkg-plist b/textproc/p5-Lingua-PT-Stemmer/pkg-plist index fb93d4fa980e..c29e01de456d 100644 --- a/textproc/p5-Lingua-PT-Stemmer/pkg-plist +++ b/textproc/p5-Lingua-PT-Stemmer/pkg-plist @@ -2,8 +2,8 @@ %%SITE_PERL%%/Lingua/PT/Stemmer.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/PT/Stemmer/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/PT/Stemmer -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/PT 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/PT +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua @dirrm %%SITE_PERL%%/Lingua/PT @dirrm %%SITE_PERL%%/Lingua/GL -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-Preferred/pkg-plist b/textproc/p5-Lingua-Preferred/pkg-plist index 392f69888d2a..2a6a5d5a273e 100644 --- a/textproc/p5-Lingua-Preferred/pkg-plist +++ b/textproc/p5-Lingua-Preferred/pkg-plist @@ -2,7 +2,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Preferred/.packlist %%SITE_PERL%%/auto/Lingua/Preferred/autosplit.ix @dirrm %%SITE_PERL%%/auto/Lingua/Preferred -@unexec rmdir %D/%%SITE_PERL%%/auto/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/Lingua @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Preferred -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-Stem-Fr/pkg-plist b/textproc/p5-Lingua-Stem-Fr/pkg-plist index d13cb58743c2..85a389afe7fc 100644 --- a/textproc/p5-Lingua-Stem-Fr/pkg-plist +++ b/textproc/p5-Lingua-Stem-Fr/pkg-plist @@ -1,8 +1,8 @@ %%SITE_PERL%%/Lingua/Stem/Fr.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Fr/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Fr -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/Stem 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/Stem +@dirrmtry %%SITE_PERL%%/Lingua +@dirrmtry %%SITE_PERL%% diff --git a/textproc/p5-Lingua-Stem-It/pkg-plist b/textproc/p5-Lingua-Stem-It/pkg-plist index d7319b9eabc4..cbb5addd3ca4 100644 --- a/textproc/p5-Lingua-Stem-It/pkg-plist +++ b/textproc/p5-Lingua-Stem-It/pkg-plist @@ -1,8 +1,8 @@ %%SITE_PERL%%/Lingua/Stem/It.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/It/.packlist @dirrm %%SITE_PERL%%/mach/auto/Lingua/Stem/It -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua/Stem 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/Stem 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/mach/auto/Lingua/Stem +@dirrmtry %%SITE_PERL%%/mach/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/Stem +@dirrmtry %%SITE_PERL%%/Lingua +@dirrmtry %%SITE_PERL%% diff --git a/textproc/p5-Lingua-Stem-Ru/pkg-plist b/textproc/p5-Lingua-Stem-Ru/pkg-plist index b38dd454d718..ef5aa7b024a9 100644 --- a/textproc/p5-Lingua-Stem-Ru/pkg-plist +++ b/textproc/p5-Lingua-Stem-Ru/pkg-plist @@ -1,8 +1,8 @@ %%SITE_PERL%%/Lingua/Stem/Ru.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Ru/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Ru -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/Stem 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/Stem +@dirrmtry %%SITE_PERL%%/Lingua +@dirrmtry %%SITE_PERL%% diff --git a/textproc/p5-Lingua-Stem-Snowball-Da/pkg-plist b/textproc/p5-Lingua-Stem-Snowball-Da/pkg-plist index 7b49f6aa4846..c2469ad7a76f 100644 --- a/textproc/p5-Lingua-Stem-Snowball-Da/pkg-plist +++ b/textproc/p5-Lingua-Stem-Snowball-Da/pkg-plist @@ -2,9 +2,9 @@ %%SITE_PERL%%/Lingua/Stem/Snowball/Da.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/Da/.packlist @dirrm %%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball/Da -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua/Stem 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/Stem/Snowball 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/Stem 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball +@dirrmtry %%SITE_PERL%%/mach/auto/Lingua/Stem +@dirrmtry %%SITE_PERL%%/mach/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/Stem/Snowball +@dirrmtry %%SITE_PERL%%/Lingua/Stem +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-Stem-Snowball-No/pkg-plist b/textproc/p5-Lingua-Stem-Snowball-No/pkg-plist index db98117cba88..22975341b0a5 100644 --- a/textproc/p5-Lingua-Stem-Snowball-No/pkg-plist +++ b/textproc/p5-Lingua-Stem-Snowball-No/pkg-plist @@ -2,9 +2,9 @@ %%SITE_PERL%%/Lingua/Stem/Snowball/No.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/No/.packlist @dirrm %%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball/No -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua/Stem 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/Stem/Snowball 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/Stem 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball +@dirrmtry %%SITE_PERL%%/mach/auto/Lingua/Stem +@dirrmtry %%SITE_PERL%%/mach/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/Stem/Snowball +@dirrmtry %%SITE_PERL%%/Lingua/Stem +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-Stem-Snowball-Se/pkg-plist b/textproc/p5-Lingua-Stem-Snowball-Se/pkg-plist index e4920e2da592..76027153274c 100644 --- a/textproc/p5-Lingua-Stem-Snowball-Se/pkg-plist +++ b/textproc/p5-Lingua-Stem-Snowball-Se/pkg-plist @@ -2,9 +2,9 @@ %%SITE_PERL%%/Lingua/Stem/Snowball/Se.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/Se/.packlist @dirrm %%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball/Se -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua/Stem 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/Stem/Snowball 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/Stem 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/mach/auto/Lingua/Stem/Snowball +@dirrmtry %%SITE_PERL%%/mach/auto/Lingua/Stem +@dirrmtry %%SITE_PERL%%/mach/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/Stem/Snowball +@dirrmtry %%SITE_PERL%%/Lingua/Stem +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-Stem-Snowball/pkg-plist b/textproc/p5-Lingua-Stem-Snowball/pkg-plist index 21d90f7177d2..96b35789455d 100644 --- a/textproc/p5-Lingua-Stem-Snowball/pkg-plist +++ b/textproc/p5-Lingua-Stem-Snowball/pkg-plist @@ -3,8 +3,8 @@ bin/add_stemmer.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/Snowball.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball/Snowball.so -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Lingua/Stem 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/Snowball +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Lingua/Stem +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Lingua diff --git a/textproc/p5-Lingua-Stem/pkg-plist b/textproc/p5-Lingua-Stem/pkg-plist index 923196006fe3..50472eeec8ee 100644 --- a/textproc/p5-Lingua-Stem/pkg-plist +++ b/textproc/p5-Lingua-Stem/pkg-plist @@ -9,5 +9,5 @@ %%SITE_PERL%%/Lingua/Stem/Pt.pm %%SITE_PERL%%/Lingua/Stem/Sv.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/Stem/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Lingua/Stem 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Lingua/Stem +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-Lingua-StopWords/pkg-plist b/textproc/p5-Lingua-StopWords/pkg-plist index c277f6236c9f..2737b17a4dab 100644 --- a/textproc/p5-Lingua-StopWords/pkg-plist +++ b/textproc/p5-Lingua-StopWords/pkg-plist @@ -11,7 +11,7 @@ %%SITE_PERL%%/Lingua/StopWords/SV.pm %%SITE_PERL%%/Lingua/parse.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/StopWords/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/StopWords 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua/StopWords 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Lingua 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua/StopWords +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Lingua +@dirrmtry %%SITE_PERL%%/Lingua/StopWords +@dirrmtry %%SITE_PERL%%/Lingua diff --git a/textproc/p5-NetAddr-IP-Find/pkg-plist b/textproc/p5-NetAddr-IP-Find/pkg-plist index 09e01e051d9b..fa7c101e052d 100644 --- a/textproc/p5-NetAddr-IP-Find/pkg-plist +++ b/textproc/p5-NetAddr-IP-Find/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/NetAddr/IP/Find.pm -@unexec rmdir %D/%%SITE_PERL%%/NetAddr/IP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/NetAddr 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/NetAddr/IP +@dirrmtry %%SITE_PERL%%/NetAddr %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Find/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP/Find -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr/IP +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/NetAddr diff --git a/textproc/p5-Number-Format/pkg-plist b/textproc/p5-Number-Format/pkg-plist index 75772136a33d..a23404dfd774 100644 --- a/textproc/p5-Number-Format/pkg-plist +++ b/textproc/p5-Number-Format/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Format/.packlist %%SITE_PERL%%/Number/Format.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number/Format -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Number 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Number 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Number +@dirrmtry %%SITE_PERL%%/Number diff --git a/textproc/p5-PDF-API2/pkg-plist b/textproc/p5-PDF-API2/pkg-plist index 3fd93dac5a4b..ae1d7c978e39 100644 --- a/textproc/p5-PDF-API2/pkg-plist +++ b/textproc/p5-PDF-API2/pkg-plist @@ -167,7 +167,7 @@ %%SITE_PERL%%/PDF/API2/Resource/unipaper.txt %%SITE_PERL%%/PDF/API2/Content/Text.pm @dirrm %%SITE_PERL%%/mach/auto/PDF/API2 -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/PDF 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/mach/auto/PDF @dirrm %%SITE_PERL%%/PDF/API2/Basic/PDF @dirrm %%SITE_PERL%%/PDF/API2/Basic/TTF/Mort @dirrm %%SITE_PERL%%/PDF/API2/Basic/TTF/Kern @@ -188,4 +188,4 @@ @dirrm %%SITE_PERL%%/PDF/API2/Resource @dirrm %%SITE_PERL%%/PDF/API2/Content @dirrm %%SITE_PERL%%/PDF/API2 -@unexec rmdir %D/%%SITE_PERL%%/PDF 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/PDF diff --git a/textproc/p5-PDF-API3/pkg-plist b/textproc/p5-PDF-API3/pkg-plist index 3fd93dac5a4b..ae1d7c978e39 100644 --- a/textproc/p5-PDF-API3/pkg-plist +++ b/textproc/p5-PDF-API3/pkg-plist @@ -167,7 +167,7 @@ %%SITE_PERL%%/PDF/API2/Resource/unipaper.txt %%SITE_PERL%%/PDF/API2/Content/Text.pm @dirrm %%SITE_PERL%%/mach/auto/PDF/API2 -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/PDF 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/mach/auto/PDF @dirrm %%SITE_PERL%%/PDF/API2/Basic/PDF @dirrm %%SITE_PERL%%/PDF/API2/Basic/TTF/Mort @dirrm %%SITE_PERL%%/PDF/API2/Basic/TTF/Kern @@ -188,4 +188,4 @@ @dirrm %%SITE_PERL%%/PDF/API2/Resource @dirrm %%SITE_PERL%%/PDF/API2/Content @dirrm %%SITE_PERL%%/PDF/API2 -@unexec rmdir %D/%%SITE_PERL%%/PDF 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/PDF diff --git a/textproc/p5-PDF-Create/pkg-plist b/textproc/p5-PDF-Create/pkg-plist index a5a1dd6f531b..95c0e1b4fc27 100644 --- a/textproc/p5-PDF-Create/pkg-plist +++ b/textproc/p5-PDF-Create/pkg-plist @@ -5,5 +5,5 @@ %%SITE_PERL%%/PDF/Create.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF/Create @dirrm %%SITE_PERL%%/PDF/Create -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PDF 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PDF +@dirrmtry %%SITE_PERL%%/PDF diff --git a/textproc/p5-POE-Filter-XML/pkg-plist b/textproc/p5-POE-Filter-XML/pkg-plist index dba16b53a2e9..89a705c95ed9 100644 --- a/textproc/p5-POE-Filter-XML/pkg-plist +++ b/textproc/p5-POE-Filter-XML/pkg-plist @@ -7,8 +7,8 @@ %%SITE_PERL%%/POE/Filter/XML/Utils.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/XML/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter/XML -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Filter +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE @dirrm %%SITE_PERL%%/POE/Filter/XML -@unexec rmdir %D/%%SITE_PERL%%/POE/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/POE/Filter +@dirrmtry %%SITE_PERL%%/POE diff --git a/textproc/p5-PPI-HTML/pkg-plist b/textproc/p5-PPI-HTML/pkg-plist index 169c60ac18d6..d6522777ae07 100644 --- a/textproc/p5-PPI-HTML/pkg-plist +++ b/textproc/p5-PPI-HTML/pkg-plist @@ -3,6 +3,6 @@ bin/ppi2html %%SITE_PERL%%/PPI/HTML/Fragment.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PPI/HTML/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PPI/HTML -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PPI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PPI @dirrm %%SITE_PERL%%/PPI/HTML -@unexec rmdir %D/%%SITE_PERL%%/PPI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/PPI diff --git a/textproc/p5-PPI/pkg-plist b/textproc/p5-PPI/pkg-plist index 8335085b8bfb..80e41af763cf 100644 --- a/textproc/p5-PPI/pkg-plist +++ b/textproc/p5-PPI/pkg-plist @@ -79,10 +79,10 @@ @dirrm %%SITE_PERL%%/PPI/Token/QuoteLike @dirrm %%SITE_PERL%%/PPI/Token/Regexp @dirrm %%SITE_PERL%%/PPI/Token/Quote -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PPI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PPI/Statement 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PPI/Structure 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PPI/Document 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PPI/Normal 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PPI/Token 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PPI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PPI +@dirrmtry %%SITE_PERL%%/PPI/Statement +@dirrmtry %%SITE_PERL%%/PPI/Structure +@dirrmtry %%SITE_PERL%%/PPI/Document +@dirrmtry %%SITE_PERL%%/PPI/Normal +@dirrmtry %%SITE_PERL%%/PPI/Token +@dirrmtry %%SITE_PERL%%/PPI diff --git a/textproc/p5-Parse-FixedLength/pkg-plist b/textproc/p5-Parse-FixedLength/pkg-plist index 4ba2d4e7e054..7484ba36a8a8 100644 --- a/textproc/p5-Parse-FixedLength/pkg-plist +++ b/textproc/p5-Parse-FixedLength/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Parse/FixedLength.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/FixedLength/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/FixedLength 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Parse 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/FixedLength +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse +@dirrmtry %%SITE_PERL%%/Parse diff --git a/textproc/p5-Parse-Syslog/pkg-plist b/textproc/p5-Parse-Syslog/pkg-plist index 074c9048d381..2db71c4e7168 100644 --- a/textproc/p5-Parse-Syslog/pkg-plist +++ b/textproc/p5-Parse-Syslog/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Parse/Syslog.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Syslog/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse/Syslog -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Parse 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Parse +@dirrmtry %%SITE_PERL%%/Parse diff --git a/textproc/p5-Perl-Critic/pkg-plist b/textproc/p5-Perl-Critic/pkg-plist index f63d42fec1ec..51c09ca7124f 100644 --- a/textproc/p5-Perl-Critic/pkg-plist +++ b/textproc/p5-Perl-Critic/pkg-plist @@ -67,4 +67,4 @@ bin/perlcritic @dirrm %%SITE_PERL%%/Perl/Critic/Policy/BuiltinFunctions @dirrm %%SITE_PERL%%/Perl/Critic/Policy @dirrm %%SITE_PERL%%/Perl/Critic -@unexec rmdir %D/%%SITE_PERL%%/Perl 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Perl diff --git a/textproc/p5-Perl-MinimumVersion/pkg-plist b/textproc/p5-Perl-MinimumVersion/pkg-plist index 0ee7e6e0445c..69a79e8fed0d 100644 --- a/textproc/p5-Perl-MinimumVersion/pkg-plist +++ b/textproc/p5-Perl-MinimumVersion/pkg-plist @@ -2,5 +2,5 @@ bin/perlver %%SITE_PERL%%/Perl/MinimumVersion.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl/MinimumVersion/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl/MinimumVersion -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Perl 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Perl +@dirrmtry %%SITE_PERL%%/Perl diff --git a/textproc/p5-PerlPoint-Converters/pkg-plist b/textproc/p5-PerlPoint-Converters/pkg-plist index 04c0515ff08e..5c77e0247600 100644 --- a/textproc/p5-PerlPoint-Converters/pkg-plist +++ b/textproc/p5-PerlPoint-Converters/pkg-plist @@ -7,6 +7,6 @@ bin/pp2latex %%SITE_PERL%%/PerlPoint/Tags/LaTeX.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlPoint-Converters/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlPoint-Converters -@unexec rmdir %D/%%SITE_PERL%%/PerlPoint/Tags 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PerlPoint 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/PerlPoint/Tags +@dirrmtry %%SITE_PERL%%/PerlPoint +@dirrmtry %%SITE_PERL%%/Bundle diff --git a/textproc/p5-PerlPoint-Package/pkg-plist b/textproc/p5-PerlPoint-Package/pkg-plist index 594b8406469a..df1911ea4c66 100644 --- a/textproc/p5-PerlPoint-Package/pkg-plist +++ b/textproc/p5-PerlPoint-Package/pkg-plist @@ -24,9 +24,9 @@ bin/pp2tdo %%PORTDOCS%%%%EXAMPLESDIR%%/pp2tree %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlPoint/Package -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlPoint 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/PerlPoint/Tags 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlPoint +@dirrmtry %%SITE_PERL%%/PerlPoint/Tags @dirrm %%SITE_PERL%%/PerlPoint/Generator/SDF @dirrm %%SITE_PERL%%/PerlPoint/Generator/Object @dirrm %%SITE_PERL%%/PerlPoint/Generator -@unexec rmdir %D/%%SITE_PERL%%/PerlPoint 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/PerlPoint diff --git a/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/pkg-plist b/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/pkg-plist index 3602279b59ff..65da3935eea0 100644 --- a/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/pkg-plist +++ b/textproc/p5-Plucene-Plugin-Analyzer-SnowballAnalyzer/pkg-plist @@ -2,10 +2,10 @@ %%SITE_PERL%%/Plucene/Plugin/Analyzer/SnowballFilter.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene/Plugin/Analyzer/SnowballAnalyzer/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene/Plugin/Analyzer/SnowballAnalyzer -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene/Plugin/Analyzer 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Plucene/Plugin/Analyzer 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Plucene/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Plucene 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene/Plugin/Analyzer +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene/Plugin +@dirrmtry %%SITE_PERL%%/Plucene/Plugin/Analyzer +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene +@dirrmtry %%SITE_PERL%%/Plucene/Plugin +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto +@dirrmtry %%SITE_PERL%%/Plucene diff --git a/textproc/p5-Plucene/pkg-plist b/textproc/p5-Plucene/pkg-plist index d43962d78a70..3ad0ec42574d 100644 --- a/textproc/p5-Plucene/pkg-plist +++ b/textproc/p5-Plucene/pkg-plist @@ -66,12 +66,12 @@ %%SITE_PERL%%/Plucene/Document/DateSerializer.pm %%SITE_PERL%%/Plucene/Store/OutputStream.pm %%SITE_PERL%%/Plucene/Store/InputStream.pm -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plucene @dirrm %%SITE_PERL%%/Plucene/Analysis/Standard -@unexec rmdir %D/%%SITE_PERL%%/Plucene/Analysis 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Plucene/Search/PhraseScorer 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Plucene/Search 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Plucene/Index 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Plucene/Document 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Plucene/Store 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Plucene 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Plucene/Analysis +@dirrmtry %%SITE_PERL%%/Plucene/Search/PhraseScorer +@dirrmtry %%SITE_PERL%%/Plucene/Search +@dirrmtry %%SITE_PERL%%/Plucene/Index +@dirrmtry %%SITE_PERL%%/Plucene/Document +@dirrmtry %%SITE_PERL%%/Plucene/Store +@dirrmtry %%SITE_PERL%%/Plucene diff --git a/textproc/p5-Pod-Constants/pkg-plist b/textproc/p5-Pod-Constants/pkg-plist index b2fd4e9fa53f..74b0a5bc987a 100644 --- a/textproc/p5-Pod-Constants/pkg-plist +++ b/textproc/p5-Pod-Constants/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Constants/.packlist %%SITE_PERL%%/Pod/Constants.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Constants -@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Pod +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod diff --git a/textproc/p5-Pod-DocBook/pkg-plist b/textproc/p5-Pod-DocBook/pkg-plist index be2ab24f469a..4b4ee1494626 100644 --- a/textproc/p5-Pod-DocBook/pkg-plist +++ b/textproc/p5-Pod-DocBook/pkg-plist @@ -1,6 +1,6 @@ bin/pod2docbook %%SITE_PERL%%/Pod/DocBook.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/DocBook/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Pod @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/DocBook -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod diff --git a/textproc/p5-Pod-Escapes/pkg-plist b/textproc/p5-Pod-Escapes/pkg-plist index 805bf0b26141..b92ce86626cb 100644 --- a/textproc/p5-Pod-Escapes/pkg-plist +++ b/textproc/p5-Pod-Escapes/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Pod/Escapes.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Escapes/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Escapes -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod +@dirrmtry %%SITE_PERL%%/Pod diff --git a/textproc/p5-Pod-POM-View-HTML-Filter/pkg-plist b/textproc/p5-Pod-POM-View-HTML-Filter/pkg-plist index 582fefd984b6..bdde65d96c3c 100644 --- a/textproc/p5-Pod-POM-View-HTML-Filter/pkg-plist +++ b/textproc/p5-Pod-POM-View-HTML-Filter/pkg-plist @@ -1,11 +1,11 @@ %%SITE_PERL%%/Pod/POM/View/HTML/Filter.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM/View/HTML/Filter/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM/View/HTML/Filter -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM/View/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM/View 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Pod/POM/View/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Pod/POM/View 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Pod/POM 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM/View/HTML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM/View +@dirrmtry %%SITE_PERL%%/Pod/POM/View/HTML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod +@dirrmtry %%SITE_PERL%%/Pod/POM/View +@dirrmtry %%SITE_PERL%%/Pod/POM +@dirrmtry %%SITE_PERL%%/Pod diff --git a/textproc/p5-Pod-POM/pkg-plist b/textproc/p5-Pod-POM/pkg-plist index 6176a8df90b7..033e9927a9e9 100644 --- a/textproc/p5-Pod-POM/pkg-plist +++ b/textproc/p5-Pod-POM/pkg-plist @@ -13,5 +13,5 @@ bin/podlint @dirrm %%SITE_PERL%%/Pod/POM/View @dirrm %%SITE_PERL%%/Pod/POM @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/POM -@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Pod +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod diff --git a/textproc/p5-Pod-Parser/pkg-plist b/textproc/p5-Pod-Parser/pkg-plist index 767ad94ec02d..1a7e7b17bbb5 100644 --- a/textproc/p5-Pod-Parser/pkg-plist +++ b/textproc/p5-Pod-Parser/pkg-plist @@ -11,5 +11,5 @@ %%SITE_PERL%%/Pod/Select.pm %%SITE_PERL%%/Pod/Usage.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Parser -@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Pod +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod diff --git a/textproc/p5-Pod-ProjectDocs/pkg-plist b/textproc/p5-Pod-ProjectDocs/pkg-plist index 591a47ffc72a..404817d06e83 100644 --- a/textproc/p5-Pod-ProjectDocs/pkg-plist +++ b/textproc/p5-Pod-ProjectDocs/pkg-plist @@ -14,6 +14,6 @@ bin/pod2projdocs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/ProjectDocs/.packlist @dirrm %%SITE_PERL%%/Pod/ProjectDocs/Parser @dirrm %%SITE_PERL%%/Pod/ProjectDocs -@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Pod @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/ProjectDocs -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod diff --git a/textproc/p5-Pod-Simple/pkg-plist b/textproc/p5-Pod-Simple/pkg-plist index bb00ce27b2ee..b503ea4cece5 100644 --- a/textproc/p5-Pod-Simple/pkg-plist +++ b/textproc/p5-Pod-Simple/pkg-plist @@ -32,6 +32,6 @@ %%SITE_PERL%%/perlpod.pod %%SITE_PERL%%/perlpodspec.pod @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Simple -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod @dirrm %%SITE_PERL%%/Pod/Simple -@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Pod diff --git a/textproc/p5-Pod-Stripper/pkg-plist b/textproc/p5-Pod-Stripper/pkg-plist index cfe1a215dd09..8c32bd1c9b03 100644 --- a/textproc/p5-Pod-Stripper/pkg-plist +++ b/textproc/p5-Pod-Stripper/pkg-plist @@ -2,5 +2,5 @@ bin/podstrip %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Stripper/.packlist %%SITE_PERL%%/Pod/Stripper.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Stripper -@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Pod +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod diff --git a/textproc/p5-Pod-Tree/pkg-plist b/textproc/p5-Pod-Tree/pkg-plist index 38ff276c86be..d2e94dadfdc8 100644 --- a/textproc/p5-Pod-Tree/pkg-plist +++ b/textproc/p5-Pod-Tree/pkg-plist @@ -14,7 +14,7 @@ bin/pods2html %%SITE_PERL%%/Pod/Tree/PerlUtil.pm %%SITE_PERL%%/Pod/Tree/Pod.pm @dirrm %%SITE_PERL%%/Pod/Tree -@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Pod %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Tree/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod/Tree -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod diff --git a/textproc/p5-RADIUS-UserFile/pkg-plist b/textproc/p5-RADIUS-UserFile/pkg-plist index db40ae1d6961..5bab81da0b46 100644 --- a/textproc/p5-RADIUS-UserFile/pkg-plist +++ b/textproc/p5-RADIUS-UserFile/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/RADIUS/UserFile.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RADIUS/UserFile/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RADIUS/UserFile -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RADIUS 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/RADIUS 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RADIUS +@dirrmtry %%SITE_PERL%%/RADIUS diff --git a/textproc/p5-RDF-Core/pkg-plist b/textproc/p5-RDF-Core/pkg-plist index d59d5eb972dc..ccf45d57d32e 100644 --- a/textproc/p5-RDF-Core/pkg-plist +++ b/textproc/p5-RDF-Core/pkg-plist @@ -60,6 +60,6 @@ @dirrm %%SITE_PERL%%/RDF/Core/Model @dirrm %%SITE_PERL%%/RDF/Core/Storage @dirrm %%SITE_PERL%%/RDF/Core -@unexec rmdir %D/%%SITE_PERL%%/RDF 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/RDF @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Core -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF diff --git a/textproc/p5-RDF-Notation3/pkg-plist b/textproc/p5-RDF-Notation3/pkg-plist index 16cf2514d9a3..567c94c21e01 100644 --- a/textproc/p5-RDF-Notation3/pkg-plist +++ b/textproc/p5-RDF-Notation3/pkg-plist @@ -14,6 +14,6 @@ %%SITE_PERL%%/RDF/Notation3/XML.pm @dirrm %%SITE_PERL%%/RDF/Notation3/Template @dirrm %%SITE_PERL%%/RDF/Notation3 -@unexec rmdir %D/%%SITE_PERL%%/RDF 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/RDF @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Notation3 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF diff --git a/textproc/p5-RDF-Simple/pkg-plist b/textproc/p5-RDF-Simple/pkg-plist index 6fce34366380..278e397bea43 100644 --- a/textproc/p5-RDF-Simple/pkg-plist +++ b/textproc/p5-RDF-Simple/pkg-plist @@ -4,6 +4,6 @@ %%SITE_PERL%%/RDF/Simple/Serialiser.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Simple/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF/Simple -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDF @dirrm %%SITE_PERL%%/RDF/Simple -@unexec rmdir %D/%%SITE_PERL%%/RDF 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/RDF diff --git a/textproc/p5-RDFStore/pkg-plist b/textproc/p5-RDFStore/pkg-plist index f161d2c7611e..8c30d03818d5 100644 --- a/textproc/p5-RDFStore/pkg-plist +++ b/textproc/p5-RDFStore/pkg-plist @@ -42,4 +42,4 @@ @dirrm %%SITE_PERL%%/RDFStore/Vocabulary @dirrm %%SITE_PERL%%/RDFStore @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RDFStore -@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Data diff --git a/textproc/p5-RTF-Parser/pkg-plist b/textproc/p5-RTF-Parser/pkg-plist index 3394236eec9f..8cf4e65abf1b 100644 --- a/textproc/p5-RTF-Parser/pkg-plist +++ b/textproc/p5-RTF-Parser/pkg-plist @@ -17,4 +17,4 @@ bin/rtf2html @dirrm %%SITE_PERL%%/RTF/TEXT/Converter @dirrm %%SITE_PERL%%/RTF/TEXT @dirrm %%SITE_PERL%%/RTF -@unexec rmdir %D/%%SITE_PERL%%/RTF 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/RTF diff --git a/textproc/p5-RTF-Tokenizer/pkg-plist b/textproc/p5-RTF-Tokenizer/pkg-plist index 63b3027a0b40..5a66ffc36753 100644 --- a/textproc/p5-RTF-Tokenizer/pkg-plist +++ b/textproc/p5-RTF-Tokenizer/pkg-plist @@ -4,5 +4,5 @@ bin/rtfdump %%SITE_PERL%%/RTF/Tokenizer.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RTF/Tokenizer @dirrm %%SITE_PERL%%/RTF -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RTF 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/RTF 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RTF +@dirrmtry %%SITE_PERL%%/RTF diff --git a/textproc/p5-RTF-Writer/pkg-plist b/textproc/p5-RTF-Writer/pkg-plist index 37820f7ff8f6..d4a99a0b7448 100644 --- a/textproc/p5-RTF-Writer/pkg-plist +++ b/textproc/p5-RTF-Writer/pkg-plist @@ -6,5 +6,5 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RTF/Writer @dirrm %%SITE_PERL%%/RTF/Writer @dirrm %%SITE_PERL%%/RTF -@unexec rmdir %D/%%SITE_PERL%%/RTF 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/RTF 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/RTF +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/RTF diff --git a/textproc/p5-Regex-PreSuf/pkg-plist b/textproc/p5-Regex-PreSuf/pkg-plist index e1f513cecfdf..2df3774350ce 100644 --- a/textproc/p5-Regex-PreSuf/pkg-plist +++ b/textproc/p5-Regex-PreSuf/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Regex/PreSuf.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regex/PreSuf/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regex/PreSuf -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regex 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Regex 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regex +@dirrmtry %%SITE_PERL%%/Regex diff --git a/textproc/p5-Regexp-Common/pkg-plist b/textproc/p5-Regexp-Common/pkg-plist index 109b839d36aa..21dbaf98c686 100644 --- a/textproc/p5-Regexp-Common/pkg-plist +++ b/textproc/p5-Regexp-Common/pkg-plist @@ -33,7 +33,7 @@ %%SITE_PERL%%/Regexp/Common/profanity.pm %%SITE_PERL%%/Regexp/Common.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Common -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp @dirrm %%SITE_PERL%%/Regexp/Common/URI @dirrm %%SITE_PERL%%/Regexp/Common -@unexec rmdir %D/%%SITE_PERL%%/Regexp 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Regexp diff --git a/textproc/p5-Regexp-Log-Common/pkg-plist b/textproc/p5-Regexp-Log-Common/pkg-plist index 0a227adaf89a..7910fa61f1b9 100644 --- a/textproc/p5-Regexp-Log-Common/pkg-plist +++ b/textproc/p5-Regexp-Log-Common/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Regexp/Log/Common.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Log/Common/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Log/Common 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Log 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Regexp/Log 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Regexp 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Log/Common +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Log +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp +@dirrmtry %%SITE_PERL%%/Regexp/Log +@dirrmtry %%SITE_PERL%%/Regexp diff --git a/textproc/p5-Regexp-Log/pkg-plist b/textproc/p5-Regexp-Log/pkg-plist index b97c70cca28e..074170dab5fd 100644 --- a/textproc/p5-Regexp-Log/pkg-plist +++ b/textproc/p5-Regexp-Log/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Regexp/Log.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Log/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Log 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Regexp 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp/Log +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Regexp +@dirrmtry %%SITE_PERL%%/Regexp diff --git a/textproc/p5-SVG/pkg-plist b/textproc/p5-SVG/pkg-plist index ce4c86c4c9fb..c53a924d4f3e 100644 --- a/textproc/p5-SVG/pkg-plist +++ b/textproc/p5-SVG/pkg-plist @@ -5,8 +5,8 @@ %%SITE_PERL%%/SVG/Extension.pm %%SITE_PERL%%/SVG/Manual.pm %%SITE_PERL%%/SVG/XML.pm -@unexec rmdir %D/%%SITE_PERL%%/SVG 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SVG 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/SVG +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVG %%PORTDOCS%%%%EXAMPLESDIR%%/SVG_02_sample.pl %%PORTDOCS%%%%EXAMPLESDIR%%/attributeManip.pl %%PORTDOCS%%%%EXAMPLESDIR%%/image_sample.pl diff --git a/textproc/p5-Search-Saryer/pkg-plist b/textproc/p5-Search-Saryer/pkg-plist index 97b2244a408e..4d84dd2c4b18 100644 --- a/textproc/p5-Search-Saryer/pkg-plist +++ b/textproc/p5-Search-Saryer/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Saryer/Saryer.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Saryer/Saryer.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Saryer -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Search 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Search +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search diff --git a/textproc/p5-Search-VectorSpace/pkg-plist b/textproc/p5-Search-VectorSpace/pkg-plist index a3d733f7344a..d92a669a0045 100644 --- a/textproc/p5-Search-VectorSpace/pkg-plist +++ b/textproc/p5-Search-VectorSpace/pkg-plist @@ -2,5 +2,5 @@ %%SITE_PERL%%/Search/VectorSpace.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/VectorSpace/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/VectorSpace -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Search 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search +@dirrmtry %%SITE_PERL%%/Search diff --git a/textproc/p5-Sort-ArbBiLex/pkg-plist b/textproc/p5-Sort-ArbBiLex/pkg-plist index e41b834b39fb..7dfefc64bf94 100644 --- a/textproc/p5-Sort-ArbBiLex/pkg-plist +++ b/textproc/p5-Sort-ArbBiLex/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Sort/ArbBiLex.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/ArbBiLex/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/ArbBiLex -@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/textproc/p5-Sort-Fields/pkg-plist b/textproc/p5-Sort-Fields/pkg-plist index 09c561b1fc78..839a8bc93e9f 100644 --- a/textproc/p5-Sort-Fields/pkg-plist +++ b/textproc/p5-Sort-Fields/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Fields/.packlist %%SITE_PERL%%/Sort/Fields.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Fields -@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/textproc/p5-Sort-Naturally/pkg-plist b/textproc/p5-Sort-Naturally/pkg-plist index 368983855711..fe64ead4e682 100644 --- a/textproc/p5-Sort-Naturally/pkg-plist +++ b/textproc/p5-Sort-Naturally/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Sort/Naturally.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Naturally/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sort/Naturally -@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/textproc/p5-Spreadsheet-ParseExcel/pkg-plist b/textproc/p5-Spreadsheet-ParseExcel/pkg-plist index dd9834b55602..7dc5881f6090 100644 --- a/textproc/p5-Spreadsheet-ParseExcel/pkg-plist +++ b/textproc/p5-Spreadsheet-ParseExcel/pkg-plist @@ -8,9 +8,9 @@ %%SITE_PERL%%/Spreadsheet/ParseExcel/Utility.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/ParseExcel/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/ParseExcel -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet @dirrm %%SITE_PERL%%/Spreadsheet/ParseExcel -@unexec rmdir %D/%%SITE_PERL%%/Spreadsheet 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Spreadsheet %%PORTDOCS%%%%EXAMPLESDIR%%/Excel/AuthorK.xls %%PORTDOCS%%%%EXAMPLESDIR%%/Excel/AuthorK95.xls %%PORTDOCS%%%%EXAMPLESDIR%%/Excel/FmtTest.xls diff --git a/textproc/p5-Spreadsheet-WriteExcel-FromXML/pkg-plist b/textproc/p5-Spreadsheet-WriteExcel-FromXML/pkg-plist index 346eb6bd4bbe..03d88b8a3828 100644 --- a/textproc/p5-Spreadsheet-WriteExcel-FromXML/pkg-plist +++ b/textproc/p5-Spreadsheet-WriteExcel-FromXML/pkg-plist @@ -3,8 +3,8 @@ %%SITE_PERL%%/Spreadsheet/WriteExcel/FromXML/Worksheet.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcel/FromXML/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcel/FromXML -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcel 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcel +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet @dirrm %%SITE_PERL%%/Spreadsheet/WriteExcel/FromXML -@unexec rmdir %D/%%SITE_PERL%%/Spreadsheet/WriteExcel 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Spreadsheet 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Spreadsheet/WriteExcel +@dirrmtry %%SITE_PERL%%/Spreadsheet diff --git a/textproc/p5-Spreadsheet-WriteExcel/pkg-plist b/textproc/p5-Spreadsheet-WriteExcel/pkg-plist index a92819a55c7c..d0d7c0047288 100644 --- a/textproc/p5-Spreadsheet-WriteExcel/pkg-plist +++ b/textproc/p5-Spreadsheet-WriteExcel/pkg-plist @@ -128,6 +128,6 @@ bin/chartex %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet/WriteExcel -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spreadsheet @dirrm %%SITE_PERL%%/Spreadsheet/WriteExcel -@unexec rmdir %D/%%SITE_PERL%%/Spreadsheet 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Spreadsheet diff --git a/textproc/p5-String-Divert/pkg-plist b/textproc/p5-String-Divert/pkg-plist index fd0f2c56d4a6..086c2cf33541 100644 --- a/textproc/p5-String-Divert/pkg-plist +++ b/textproc/p5-String-Divert/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/String/Divert.pm %%SITE_PERL%%/String/Divert.pod %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Divert/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Divert 2>/dev/null || true -@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/Divert +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String +@dirrmtry %%SITE_PERL%%/String diff --git a/textproc/p5-String-Koremutake/pkg-plist b/textproc/p5-String-Koremutake/pkg-plist index 8f6acf38fba1..a622fa38a889 100644 --- a/textproc/p5-String-Koremutake/pkg-plist +++ b/textproc/p5-String-Koremutake/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/String/Koremutake.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Koremutake/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Koremutake 2>/dev/null || true -@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/Koremutake +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/String +@dirrmtry %%SITE_PERL%%/String diff --git a/textproc/p5-String-Scanf/pkg-plist b/textproc/p5-String-Scanf/pkg-plist index 603efc4b5c2d..63060ffce52d 100644 --- a/textproc/p5-String-Scanf/pkg-plist +++ b/textproc/p5-String-Scanf/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Scanf/.packlist %%SITE_PERL%%/String/Scanf.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Scanf -@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/textproc/p5-String-ShellQuote/pkg-plist b/textproc/p5-String-ShellQuote/pkg-plist index f7041dee08e7..fdd55b1e7d27 100644 --- a/textproc/p5-String-ShellQuote/pkg-plist +++ b/textproc/p5-String-ShellQuote/pkg-plist @@ -2,5 +2,5 @@ bin/shell-quote %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/ShellQuote/.packlist %%SITE_PERL%%/String/ShellQuote.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/ShellQuote -@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/textproc/p5-String-ShowDiff/pkg-plist b/textproc/p5-String-ShowDiff/pkg-plist index e559f8f71cab..1d17c2bfdaae 100644 --- a/textproc/p5-String-ShowDiff/pkg-plist +++ b/textproc/p5-String-ShowDiff/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/String/ShowDiff.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/ShowDiff/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/ShowDiff -@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/textproc/p5-String-Strip/pkg-plist b/textproc/p5-String-Strip/pkg-plist index 9fb91550c52e..f40dfce73b2d 100644 --- a/textproc/p5-String-Strip/pkg-plist +++ b/textproc/p5-String-Strip/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Strip/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/String/Strip.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/String/Strip -@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/textproc/p5-Syntax-Highlight-Perl-Improved/pkg-plist b/textproc/p5-Syntax-Highlight-Perl-Improved/pkg-plist index 90a2717818bf..d091b981263a 100644 --- a/textproc/p5-Syntax-Highlight-Perl-Improved/pkg-plist +++ b/textproc/p5-Syntax-Highlight-Perl-Improved/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/Syntax/Highlight/Perl/Improved.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Perl/Improved/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Perl/Improved -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Perl 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Syntax/Highlight/Perl 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Syntax/Highlight 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Syntax 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Perl +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax +@dirrmtry %%SITE_PERL%%/Syntax/Highlight/Perl +@dirrmtry %%SITE_PERL%%/Syntax/Highlight +@dirrmtry %%SITE_PERL%%/Syntax diff --git a/textproc/p5-TeX-Hyphen/pkg-plist b/textproc/p5-TeX-Hyphen/pkg-plist index 6d6cfca3fde7..c1623c6053a2 100644 --- a/textproc/p5-TeX-Hyphen/pkg-plist +++ b/textproc/p5-TeX-Hyphen/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/TeX/Hyphen/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/TeX/Hyphen @dirrm %%SITE_PERL%%/TeX/Hyphen -@unexec rmdir %D/%%SITE_PERL%%/TeX 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/TeX 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/TeX +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/TeX diff --git a/textproc/p5-Template-Extract/pkg-plist b/textproc/p5-Template-Extract/pkg-plist index 97d0f66ecf97..cd293b6246c7 100644 --- a/textproc/p5-Template-Extract/pkg-plist +++ b/textproc/p5-Template-Extract/pkg-plist @@ -3,7 +3,7 @@ %%SITE_PERL%%/Template/Extract/Parser.pm %%SITE_PERL%%/Template/Extract/Run.pm @dirrm %%SITE_PERL%%/Template/Extract -@unexec rmdir %D/%%SITE_PERL%%/Template 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Template %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Extract/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Extract -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template diff --git a/textproc/p5-Template-Magic/pkg-plist b/textproc/p5-Template-Magic/pkg-plist index 5244226e31fc..6557ed3f9fe5 100644 --- a/textproc/p5-Template-Magic/pkg-plist +++ b/textproc/p5-Template-Magic/pkg-plist @@ -15,7 +15,7 @@ @dirrm %%SITE_PERL%%/auto/Template/Magic @dirrm %%SITE_PERL%%/auto/Template @dirrm %%SITE_PERL%%/Template/Magic -@unexec rmdir %D/%%SITE_PERL%%/Template 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Bundle/Template 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Template +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template +@dirrmtry %%SITE_PERL%%/Bundle/Template +@dirrmtry %%SITE_PERL%%/Bundle diff --git a/textproc/p5-Text-ASCIITable/pkg-plist b/textproc/p5-Text-ASCIITable/pkg-plist index 1e5e864adab4..f75c707205f8 100644 --- a/textproc/p5-Text-ASCIITable/pkg-plist +++ b/textproc/p5-Text-ASCIITable/pkg-plist @@ -2,8 +2,8 @@ %%SITE_PERL%%/Text/ASCIITable/Wrap.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ASCIITable/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ASCIITable -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text @dirrm %%SITE_PERL%%/Text/ASCIITable -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Text %%PORTDOCS%%%%EXAMPLESDIR%%/ansi-example.pl %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% diff --git a/textproc/p5-Text-Affixes/pkg-plist b/textproc/p5-Text-Affixes/pkg-plist index c4cea6ed15d6..b4abcbc0ad1d 100644 --- a/textproc/p5-Text-Affixes/pkg-plist +++ b/textproc/p5-Text-Affixes/pkg-plist @@ -3,6 +3,6 @@ %%SITE_PERL%%/Text/Affixes.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Affixes @dirrm %%SITE_PERL%%/auto/Text/Affixes -@unexec rmdir %D/%%SITE_PERL%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/Text +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Aligner/pkg-plist b/textproc/p5-Text-Aligner/pkg-plist index 093547840c58..7016a60c2ad8 100644 --- a/textproc/p5-Text-Aligner/pkg-plist +++ b/textproc/p5-Text-Aligner/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Text/Aligner.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Aligner/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Text @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Aligner -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text diff --git a/textproc/p5-Text-Aspell/pkg-plist b/textproc/p5-Text-Aspell/pkg-plist index 2bfcd9725ba1..f934f7a97a86 100644 --- a/textproc/p5-Text-Aspell/pkg-plist +++ b/textproc/p5-Text-Aspell/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Aspell/Aspell.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Aspell/Aspell.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Aspell -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text diff --git a/textproc/p5-Text-Autoformat/pkg-plist b/textproc/p5-Text-Autoformat/pkg-plist index 90d918cdb338..c72125c91b85 100644 --- a/textproc/p5-Text-Autoformat/pkg-plist +++ b/textproc/p5-Text-Autoformat/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Text/Autoformat.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Autoformat/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Autoformat -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Balanced/pkg-plist b/textproc/p5-Text-Balanced/pkg-plist index f96ab93507be..5817ba02d5c5 100644 --- a/textproc/p5-Text-Balanced/pkg-plist +++ b/textproc/p5-Text-Balanced/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Balanced/.packlist %%SITE_PERL%%/Text/Balanced.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Balanced -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-BibTeX/pkg-plist b/textproc/p5-Text-BibTeX/pkg-plist index bc7c224496cd..cb5fa428d9cb 100644 --- a/textproc/p5-Text-BibTeX/pkg-plist +++ b/textproc/p5-Text-BibTeX/pkg-plist @@ -14,6 +14,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/BibTeX/BibTeX.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Text/BibTeX @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/BibTeX -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Text @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text diff --git a/textproc/p5-Text-Bind/pkg-plist b/textproc/p5-Text-Bind/pkg-plist index d528cb84fbfa..9daa96817abe 100644 --- a/textproc/p5-Text-Bind/pkg-plist +++ b/textproc/p5-Text-Bind/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Bind/.packlist %%SITE_PERL%%/Text/Bind.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Bind -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-CSV-Simple/pkg-plist b/textproc/p5-Text-CSV-Simple/pkg-plist index 4eb38dcad786..e7cce3444697 100644 --- a/textproc/p5-Text-CSV-Simple/pkg-plist +++ b/textproc/p5-Text-CSV-Simple/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/Text/CSV/Simple.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV/Simple/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV/Simple -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text/CSV 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV +@dirrmtry %%SITE_PERL%%/Text/CSV +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-CSV/pkg-plist b/textproc/p5-Text-CSV/pkg-plist index 884dc486ee10..7d0716135b9c 100644 --- a/textproc/p5-Text-CSV/pkg-plist +++ b/textproc/p5-Text-CSV/pkg-plist @@ -11,7 +11,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV/.packlist %%SITE_PERL%%/Text/CSV.pm @dirrm %%SITE_PERL%%/auto/Text/CSV -@unexec rmdir %D/%%SITE_PERL%%/auto/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/Text @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/CSV -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Chomp/pkg-plist b/textproc/p5-Text-Chomp/pkg-plist index fa47e1a0a37d..a0920cf991e7 100644 --- a/textproc/p5-Text-Chomp/pkg-plist +++ b/textproc/p5-Text-Chomp/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Text/Chomp.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Chomp/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Chomp -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Context-EitherSide/pkg-plist b/textproc/p5-Text-Context-EitherSide/pkg-plist index 6fd1754ba900..86593615ed17 100644 --- a/textproc/p5-Text-Context-EitherSide/pkg-plist +++ b/textproc/p5-Text-Context-EitherSide/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Text/Context/EitherSide.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Context/EitherSide/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Context/EitherSide 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Context 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text/Context 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Context/EitherSide +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Context +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text/Context +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Diff-HTML/pkg-plist b/textproc/p5-Text-Diff-HTML/pkg-plist index 1d1b9c052857..e066197c36bd 100644 --- a/textproc/p5-Text-Diff-HTML/pkg-plist +++ b/textproc/p5-Text-Diff-HTML/pkg-plist @@ -1,3 +1,3 @@ %%SITE_PERL%%/Text/Diff/HTML.pm -@unexec rmdir %D/%%SITE_PERL%%/Text/Diff 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Text/Diff +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Diff/pkg-plist b/textproc/p5-Text-Diff/pkg-plist index d59ca682fb75..d65398db9628 100644 --- a/textproc/p5-Text-Diff/pkg-plist +++ b/textproc/p5-Text-Diff/pkg-plist @@ -2,6 +2,6 @@ %%SITE_PERL%%/Text/Diff/Table.pm %%SITE_PERL%%/Text/Diff.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Diff -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text @dirrm %%SITE_PERL%%/Text/Diff -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-DoubleMetaphone/pkg-plist b/textproc/p5-Text-DoubleMetaphone/pkg-plist index d2ec9b13893d..564e3cf57ade 100644 --- a/textproc/p5-Text-DoubleMetaphone/pkg-plist +++ b/textproc/p5-Text-DoubleMetaphone/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/Text/DoubleMetaphone.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/DoubleMetaphone -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text diff --git a/textproc/p5-Text-EtText/pkg-plist b/textproc/p5-Text-EtText/pkg-plist index 242e02a0f3e1..348016a24140 100644 --- a/textproc/p5-Text-EtText/pkg-plist +++ b/textproc/p5-Text-EtText/pkg-plist @@ -8,6 +8,6 @@ bin/ettext2html %%SITE_PERL%%/Text/EtText/HTML2EtText.pm %%SITE_PERL%%/Text/EtText/EtText2HTML.pm @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/EtText -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2> /dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text @unexec rmdir %D/%%SITE_PERL%%/Text/EtText -@unexec rmdir %D/%%SITE_PERL%%/Text 2> /dev/null || true +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-ExtractWords/pkg-plist b/textproc/p5-Text-ExtractWords/pkg-plist index e06cc814957a..423729672827 100644 --- a/textproc/p5-Text-ExtractWords/pkg-plist +++ b/textproc/p5-Text-ExtractWords/pkg-plist @@ -4,6 +4,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ExtractWords/ExtractWords.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ExtractWords/autosplit.ix @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ExtractWords -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ExtractWords 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ExtractWords +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text diff --git a/textproc/p5-Text-FillIn/pkg-plist b/textproc/p5-Text-FillIn/pkg-plist index 211fa5669e6f..ee7fac3e0ec9 100644 --- a/textproc/p5-Text-FillIn/pkg-plist +++ b/textproc/p5-Text-FillIn/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FillIn/.packlist %%SITE_PERL%%/Text/FillIn.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FillIn -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Filter-Chain/pkg-plist b/textproc/p5-Text-Filter-Chain/pkg-plist index 0a2e61f99637..58edb7d32329 100644 --- a/textproc/p5-Text-Filter-Chain/pkg-plist +++ b/textproc/p5-Text-Filter-Chain/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Filter/Chain/.packlist %%SITE_PERL%%/Text/Filter/Chain.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Filter/Chain -@unexec rmdir %D/%%SITE_PERL%%/Text/Filter 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Text/Filter diff --git a/textproc/p5-Text-Filter/pkg-plist b/textproc/p5-Text-Filter/pkg-plist index bebd509d24d2..6f0745592af9 100644 --- a/textproc/p5-Text-Filter/pkg-plist +++ b/textproc/p5-Text-Filter/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Filter/.packlist %%SITE_PERL%%/Text/Filter.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Filter -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-FixedLength-Extra/pkg-plist b/textproc/p5-Text-FixedLength-Extra/pkg-plist index a6fe8de83e28..94c61b52ec32 100644 --- a/textproc/p5-Text-FixedLength-Extra/pkg-plist +++ b/textproc/p5-Text-FixedLength-Extra/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FixedLength/Extra/.packlist %%SITE_PERL%%/Text/FixedLength/Extra.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FixedLength/Extra -@unexec rmdir %D/%%SITE_PERL%%/Text/FixedLength 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Text/FixedLength diff --git a/textproc/p5-Text-FixedLength/pkg-plist b/textproc/p5-Text-FixedLength/pkg-plist index 247a041f1050..8f34bc4a2bce 100644 --- a/textproc/p5-Text-FixedLength/pkg-plist +++ b/textproc/p5-Text-FixedLength/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FixedLength/.packlist %%SITE_PERL%%/Text/FixedLength.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FixedLength -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Flowchart/pkg-plist b/textproc/p5-Text-Flowchart/pkg-plist index 59f6ddccf34e..75382e08f58b 100644 --- a/textproc/p5-Text-Flowchart/pkg-plist +++ b/textproc/p5-Text-Flowchart/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Flowchart/.packlist %%SITE_PERL%%/Text/Flowchart.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Flowchart -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Format/pkg-plist b/textproc/p5-Text-Format/pkg-plist index f7dfaa4c6207..fe670e04790d 100644 --- a/textproc/p5-Text-Format/pkg-plist +++ b/textproc/p5-Text-Format/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Format/.packlist %%SITE_PERL%%/Text/Format.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Format -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-FormatTable/pkg-plist b/textproc/p5-Text-FormatTable/pkg-plist index 815052f34e75..20b9b443beef 100644 --- a/textproc/p5-Text-FormatTable/pkg-plist +++ b/textproc/p5-Text-FormatTable/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FormatTable/.packlist %%SITE_PERL%%/Text/FormatTable.pm %%SITE_PERL%%/Text/example.pl -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FormatTable 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Text +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/FormatTable +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text diff --git a/textproc/p5-Text-German/pkg-plist b/textproc/p5-Text-German/pkg-plist index 559f77c4985b..41ce0fe6fb3e 100644 --- a/textproc/p5-Text-German/pkg-plist +++ b/textproc/p5-Text-German/pkg-plist @@ -10,6 +10,6 @@ %%SITE_PERL%%/Text/German/Vorsilbe.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/German/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/German -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text/German 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text/German +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Glob/pkg-plist b/textproc/p5-Text-Glob/pkg-plist index d48254e71c70..6afcd969fc9b 100644 --- a/textproc/p5-Text-Glob/pkg-plist +++ b/textproc/p5-Text-Glob/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Glob/.packlist %%SITE_PERL%%/Text/Glob.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Glob -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Text +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text diff --git a/textproc/p5-Text-Graphics/pkg-plist b/textproc/p5-Text-Graphics/pkg-plist index e6daf9f81182..f14481c224da 100644 --- a/textproc/p5-Text-Graphics/pkg-plist +++ b/textproc/p5-Text-Graphics/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Graphics/.packlist %%SITE_PERL%%/Text/Graphics.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Graphics -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-MagicTemplate/pkg-plist b/textproc/p5-Text-MagicTemplate/pkg-plist index e92fe01c3400..36f35e420189 100644 --- a/textproc/p5-Text-MagicTemplate/pkg-plist +++ b/textproc/p5-Text-MagicTemplate/pkg-plist @@ -11,11 +11,11 @@ %%SITE_PERL%%/auto/Text/MagicTemplate/FillInForm.al %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/MagicTemplate/.packlist @dirrm %%SITE_PERL%%/Text/MagicTemplate -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTML +@dirrmtry %%SITE_PERL%%/Text @dirrm %%SITE_PERL%%/auto/Text/MagicTemplate @dirrm %%SITE_PERL%%/mach/auto/Text/MagicTemplate -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Bundle/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/auto/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/mach/auto/Text +@dirrmtry %%SITE_PERL%%/Bundle/Text +@dirrmtry %%SITE_PERL%%/Bundle +@dirrmtry %%SITE_PERL%%/auto/Text diff --git a/textproc/p5-Text-Metaphone/pkg-plist b/textproc/p5-Text-Metaphone/pkg-plist index 0c37d8351f80..f52d34f6c6c3 100644 --- a/textproc/p5-Text-Metaphone/pkg-plist +++ b/textproc/p5-Text-Metaphone/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Metaphone/Metaphone.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Metaphone/Metaphone.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Metaphone -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text diff --git a/textproc/p5-Text-NSP/pkg-plist b/textproc/p5-Text-NSP/pkg-plist index af6d40ef0100..1e96f2b1b548 100644 --- a/textproc/p5-Text-NSP/pkg-plist +++ b/textproc/p5-Text-NSP/pkg-plist @@ -66,6 +66,6 @@ bin/sort-bigrams.pl %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/NSP @dirrm %%SITE_PERL%%/auto/Text/NSP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Ngram/pkg-plist b/textproc/p5-Text-Ngram/pkg-plist index ee1fda6040c1..357071127e34 100644 --- a/textproc/p5-Text-Ngram/pkg-plist +++ b/textproc/p5-Text-Ngram/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Ngram/Ngram.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Ngram/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Ngram -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text diff --git a/textproc/p5-Text-Ngrams/pkg-plist b/textproc/p5-Text-Ngrams/pkg-plist index 5897a19a870e..517514fdba64 100644 --- a/textproc/p5-Text-Ngrams/pkg-plist +++ b/textproc/p5-Text-Ngrams/pkg-plist @@ -3,5 +3,5 @@ bin/ngrams.pl %%SITE_PERL%%/Text/ngrams.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Ngrams/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Ngrams -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Original/pkg-plist b/textproc/p5-Text-Original/pkg-plist index f25ab7da98f2..a9fdef0f6d17 100644 --- a/textproc/p5-Text-Original/pkg-plist +++ b/textproc/p5-Text-Original/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Text/Original.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Original/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Original -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-ParagraphDiff/pkg-plist b/textproc/p5-Text-ParagraphDiff/pkg-plist index 12300733672b..8e7c1340e09c 100644 --- a/textproc/p5-Text-ParagraphDiff/pkg-plist +++ b/textproc/p5-Text-ParagraphDiff/pkg-plist @@ -6,5 +6,5 @@ %%SITE_PERL%%/Text/ParagraphDiff.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ParagraphDiff/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ParagraphDiff -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Text +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text diff --git a/textproc/p5-Text-Query/pkg-plist b/textproc/p5-Text-Query/pkg-plist index 915a490f642f..70d79f81a5bf 100644 --- a/textproc/p5-Text-Query/pkg-plist +++ b/textproc/p5-Text-Query/pkg-plist @@ -14,5 +14,5 @@ %%SITE_PERL%%/Text/Query/ParseSimple.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Query @dirrm %%SITE_PERL%%/Text/Query -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Quoted/pkg-plist b/textproc/p5-Text-Quoted/pkg-plist index b05e25a5112f..27c1a744bdca 100644 --- a/textproc/p5-Text-Quoted/pkg-plist +++ b/textproc/p5-Text-Quoted/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/mach/auto/Text/Quoted/.packlist %%SITE_PERL%%/Text/Quoted.pm @dirrm %%SITE_PERL%%/mach/auto/Text/Quoted -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-RecordParser/pkg-plist b/textproc/p5-Text-RecordParser/pkg-plist index f503a91b53fb..345ead037cf7 100644 --- a/textproc/p5-Text-RecordParser/pkg-plist +++ b/textproc/p5-Text-RecordParser/pkg-plist @@ -3,4 +3,4 @@ bin/tabmerge %%SITE_PERL%%/Text/RecordParser.pm %%SITE_PERL%%/Text/RecordParser/Tab.pm @dirrm %%SITE_PERL%%/Text/RecordParser -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Reflow/pkg-plist b/textproc/p5-Text-Reflow/pkg-plist index e33d8f1484b8..b13cb0883cdd 100644 --- a/textproc/p5-Text-Reflow/pkg-plist +++ b/textproc/p5-Text-Reflow/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Reflow/Reflow.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Reflow/Reflow.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Reflow -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text diff --git a/textproc/p5-Text-Reform/pkg-plist b/textproc/p5-Text-Reform/pkg-plist index a8c92a807d59..9b0275ae0c35 100644 --- a/textproc/p5-Text-Reform/pkg-plist +++ b/textproc/p5-Text-Reform/pkg-plist @@ -6,5 +6,5 @@ %%SITE_PERL%%/Text/demo_ws.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Reform/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Reform -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Repository/pkg-plist b/textproc/p5-Text-Repository/pkg-plist index b2c6d838e139..3e16c76336a4 100644 --- a/textproc/p5-Text-Repository/pkg-plist +++ b/textproc/p5-Text-Repository/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Repository/.packlist %%SITE_PERL%%/Text/Repository.pm -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Repository 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Text +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Repository +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text diff --git a/textproc/p5-Text-Shellwords/pkg-plist b/textproc/p5-Text-Shellwords/pkg-plist index 3dd3fa82f9fd..01e55fc2d4da 100644 --- a/textproc/p5-Text-Shellwords/pkg-plist +++ b/textproc/p5-Text-Shellwords/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Text/Shellwords.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Shellwords/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Shellwords -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Similarity/pkg-plist b/textproc/p5-Text-Similarity/pkg-plist index 07bee2c47519..8fffbee49b10 100644 --- a/textproc/p5-Text-Similarity/pkg-plist +++ b/textproc/p5-Text-Similarity/pkg-plist @@ -5,5 +5,5 @@ bin/text_compare.pl %%SITE_PERL%%/Text/Similarity/Overlaps.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Similarity @dirrm %%SITE_PERL%%/Text/Similarity -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-SimpleTable/pkg-plist b/textproc/p5-Text-SimpleTable/pkg-plist index e5dfcb0280b5..3ba462a3440a 100644 --- a/textproc/p5-Text-SimpleTable/pkg-plist +++ b/textproc/p5-Text-SimpleTable/pkg-plist @@ -1,2 +1,2 @@ %%SITE_PERL%%/Text/SimpleTable.pm -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-SimpleTemplate/pkg-plist b/textproc/p5-Text-SimpleTemplate/pkg-plist index 9c482e006df9..eb7f4ab18f27 100644 --- a/textproc/p5-Text-SimpleTemplate/pkg-plist +++ b/textproc/p5-Text-SimpleTemplate/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/SimpleTemplate/.packlist %%SITE_PERL%%/Text/SimpleTemplate.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/SimpleTemplate -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Striphigh/pkg-plist b/textproc/p5-Text-Striphigh/pkg-plist index 32bc1c7d0345..5f90e412f4c6 100644 --- a/textproc/p5-Text-Striphigh/pkg-plist +++ b/textproc/p5-Text-Striphigh/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Text/Striphigh.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Striphigh/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Striphigh -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Table/pkg-plist b/textproc/p5-Text-Table/pkg-plist index 6e948666e1fd..ff01e55a327c 100644 --- a/textproc/p5-Text-Table/pkg-plist +++ b/textproc/p5-Text-Table/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Text/Table.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Table/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Text @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Table -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text diff --git a/textproc/p5-Text-Tabs+Wrap/pkg-plist b/textproc/p5-Text-Tabs+Wrap/pkg-plist index b5a0eafed825..9978b2e401a0 100644 --- a/textproc/p5-Text-Tabs+Wrap/pkg-plist +++ b/textproc/p5-Text-Tabs+Wrap/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/.packlist %%SITE_PERL%%/Text/Wrap.pm %%SITE_PERL%%/Text/Tabs.pm -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-TabularDisplay/pkg-plist b/textproc/p5-Text-TabularDisplay/pkg-plist index 8bd64ef40d30..145982ee604d 100644 --- a/textproc/p5-Text-TabularDisplay/pkg-plist +++ b/textproc/p5-Text-TabularDisplay/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Text/TabularDisplay.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/TabularDisplay/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/TabularDisplay -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Template/pkg-plist b/textproc/p5-Text-Template/pkg-plist index b8dcff442e26..ac586f1f540d 100644 --- a/textproc/p5-Text-Template/pkg-plist +++ b/textproc/p5-Text-Template/pkg-plist @@ -2,6 +2,6 @@ %%SITE_PERL%%/Text/Template/Preprocess.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Template/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Template -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text @dirrm %%SITE_PERL%%/Text/Template -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Textile/pkg-plist b/textproc/p5-Text-Textile/pkg-plist index f5e2ba788026..f41548b2611f 100644 --- a/textproc/p5-Text-Textile/pkg-plist +++ b/textproc/p5-Text-Textile/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Text/Textile.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Textile/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Textile -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Tmpl/pkg-plist b/textproc/p5-Text-Tmpl/pkg-plist index 9094eac83d63..d279dd83e13a 100644 --- a/textproc/p5-Text-Tmpl/pkg-plist +++ b/textproc/p5-Text-Tmpl/pkg-plist @@ -7,5 +7,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/Text/template_extend.pod %%SITE_PERL%%/%%PERL_ARCH%%/Text/Tmpl.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Tmpl -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Text diff --git a/textproc/p5-Text-VimColor/pkg-plist b/textproc/p5-Text-VimColor/pkg-plist index d809319020c3..4c389bf4a6b9 100644 --- a/textproc/p5-Text-VimColor/pkg-plist +++ b/textproc/p5-Text-VimColor/pkg-plist @@ -7,5 +7,5 @@ bin/text-vimcolor %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/VimColor/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/VimColor @dirrm %%SITE_PERL%%/Text/VimColor -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-WikiFormat/pkg-plist b/textproc/p5-Text-WikiFormat/pkg-plist index 76316f1969bf..7db249bcff76 100644 --- a/textproc/p5-Text-WikiFormat/pkg-plist +++ b/textproc/p5-Text-WikiFormat/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/Text/WikiFormat.pm %%SITE_PERL%%/Text/WikiFormat/Blocks.pm -@unexec rmdir %D/%%SITE_PERL%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text/WikiFormat 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/Text +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text/WikiFormat +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Text-Wrapper/pkg-plist b/textproc/p5-Text-Wrapper/pkg-plist index 3a7e09e44eb4..d64eae0a8df9 100644 --- a/textproc/p5-Text-Wrapper/pkg-plist +++ b/textproc/p5-Text-Wrapper/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Wrapper/.packlist %%SITE_PERL%%/Text/Wrapper.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Wrapper -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text +@dirrmtry %%SITE_PERL%%/Text diff --git a/textproc/p5-Time-Human/pkg-plist b/textproc/p5-Time-Human/pkg-plist index 68be7dc8675f..843739fd7eeb 100644 --- a/textproc/p5-Time-Human/pkg-plist +++ b/textproc/p5-Time-Human/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Human/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time/Human -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Time 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Time %%SITE_PERL%%/Time/Human.pm -@unexec rmdir %D/%%SITE_PERL%%/Time 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Time diff --git a/textproc/p5-Tk-XMLViewer/pkg-plist b/textproc/p5-Tk-XMLViewer/pkg-plist index fa12c1a4749d..6740be896bae 100644 --- a/textproc/p5-Tk-XMLViewer/pkg-plist +++ b/textproc/p5-Tk-XMLViewer/pkg-plist @@ -3,5 +3,5 @@ bin/tkxmlview %%SITE_PERL%%/Tk/XMLViewer.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/XMLViewer/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/XMLViewer -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk +@dirrmtry %%SITE_PERL%%/Tk diff --git a/textproc/p5-Tree-Nary/pkg-plist b/textproc/p5-Tree-Nary/pkg-plist index 97994796f75c..87020f311914 100644 --- a/textproc/p5-Tree-Nary/pkg-plist +++ b/textproc/p5-Tree-Nary/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Nary/.packlist %%SITE_PERL%%/Tree/Nary.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tree/Nary -@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/textproc/p5-UML-Sequence/pkg-plist b/textproc/p5-UML-Sequence/pkg-plist index 0d49d1a79850..5931a57f358b 100644 --- a/textproc/p5-UML-Sequence/pkg-plist +++ b/textproc/p5-UML-Sequence/pkg-plist @@ -14,6 +14,6 @@ bin/seq2svg.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/UML/Sequence/.packlist @dirrm %%SITE_PERL%%/UML/Sequence @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/UML/Sequence -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/UML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/UML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Devel 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/UML +@dirrmtry %%SITE_PERL%%/UML +@dirrmtry %%SITE_PERL%%/Devel diff --git a/textproc/p5-UML-State/pkg-plist b/textproc/p5-UML-State/pkg-plist index 5e9532923539..f6175f852ffd 100644 --- a/textproc/p5-UML-State/pkg-plist +++ b/textproc/p5-UML-State/pkg-plist @@ -6,5 +6,5 @@ bin/drawstate.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/UML/State/.packlist @dirrm %%SITE_PERL%%/UML @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/UML/State -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/UML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/UML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/UML +@dirrmtry %%SITE_PERL%%/UML diff --git a/textproc/p5-URI-Find/pkg-plist b/textproc/p5-URI-Find/pkg-plist index c2d831fef15c..83ee9ddb862e 100644 --- a/textproc/p5-URI-Find/pkg-plist +++ b/textproc/p5-URI-Find/pkg-plist @@ -2,6 +2,6 @@ %%SITE_PERL%%/URI/Find/Schemeless.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Find/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Find -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI @dirrm %%SITE_PERL%%/URI/Find -@unexec rmdir %D/%%SITE_PERL%%/URI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/URI diff --git a/textproc/p5-WordNet-QueryData/pkg-plist b/textproc/p5-WordNet-QueryData/pkg-plist index 40c9bcd1c173..27c4840289f2 100644 --- a/textproc/p5-WordNet-QueryData/pkg-plist +++ b/textproc/p5-WordNet-QueryData/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/WordNet/QueryData.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet/QueryData/.packlist -@unexec rmdir %D/%%SITE_PERL%%/WordNet 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet/QueryData 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/WordNet +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet/QueryData +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet diff --git a/textproc/p5-WordNet-Similarity/pkg-plist b/textproc/p5-WordNet-Similarity/pkg-plist index b26984aa27c2..69892220f085 100644 --- a/textproc/p5-WordNet-Similarity/pkg-plist +++ b/textproc/p5-WordNet-Similarity/pkg-plist @@ -35,7 +35,7 @@ bin/semCorFreq.pl %%SITE_PERL%%/WordNet/Similarity/ICFinder.pm %%SITE_PERL%%/WordNet/Similarity/PathFinder.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet/Similarity/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet/Similarity 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WordNet/Similarity 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WordNet 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet/Similarity +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WordNet +@dirrmtry %%SITE_PERL%%/WordNet/Similarity +@dirrmtry %%SITE_PERL%%/WordNet diff --git a/textproc/p5-XML-Atom-Filter/pkg-plist b/textproc/p5-XML-Atom-Filter/pkg-plist index 419f06c9b6c3..f05cd9bfd056 100644 --- a/textproc/p5-XML-Atom-Filter/pkg-plist +++ b/textproc/p5-XML-Atom-Filter/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/XML/Atom/Filter.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/Filter/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML/Atom 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/Filter +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML +@dirrmtry %%SITE_PERL%%/XML/Atom +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-Atom-SimpleFeed/pkg-plist b/textproc/p5-XML-Atom-SimpleFeed/pkg-plist index 5a5ed466fa12..eb0c3b2dbcde 100644 --- a/textproc/p5-XML-Atom-SimpleFeed/pkg-plist +++ b/textproc/p5-XML-Atom-SimpleFeed/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/XML/Atom/SimpleFeed.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/SimpleFeed/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/SimpleFeed 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML/Atom 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/SimpleFeed +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML +@dirrmtry %%SITE_PERL%%/XML/Atom +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-Atom-Syndication/pkg-plist b/textproc/p5-XML-Atom-Syndication/pkg-plist index ff6696941e1b..be948a93ded6 100644 --- a/textproc/p5-XML-Atom-Syndication/pkg-plist +++ b/textproc/p5-XML-Atom-Syndication/pkg-plist @@ -4,8 +4,8 @@ %%SITE_PERL%%/XML/Atom/Syndication/Characters.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/Syndication/.packlist @dirrm %%SITE_PERL%%/XML/Atom/Syndication -@unexec rmdir %D/%%SITE_PERL%%/XML/Atom 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/Atom +@dirrmtry %%SITE_PERL%%/XML @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom/Syndication -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Atom +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-Atom/pkg-plist b/textproc/p5-XML-Atom/pkg-plist index abc959fff4d1..d3dda073aa6f 100644 --- a/textproc/p5-XML-Atom/pkg-plist +++ b/textproc/p5-XML-Atom/pkg-plist @@ -10,4 +10,4 @@ %%SITE_PERL%%/XML/Atom/Thing.pm %%SITE_PERL%%/XML/Atom/Util.pm @dirrm %%SITE_PERL%%/XML/Atom -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-AutoWriter/pkg-plist b/textproc/p5-XML-AutoWriter/pkg-plist index ade8b824b029..6e9509e5aa10 100644 --- a/textproc/p5-XML-AutoWriter/pkg-plist +++ b/textproc/p5-XML-AutoWriter/pkg-plist @@ -6,5 +6,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/AutoWriter/.packlist @dirrm %%SITE_PERL%%/XML/Doctype @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/AutoWriter -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-Catalog/pkg-plist b/textproc/p5-XML-Catalog/pkg-plist index 3dcc2a3063e7..b32bb89f4741 100644 --- a/textproc/p5-XML-Catalog/pkg-plist +++ b/textproc/p5-XML-Catalog/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/XML/Catalog.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Catalog/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Catalog -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-Clean/pkg-plist b/textproc/p5-XML-Clean/pkg-plist index 25c06aff75a5..e6f5c3c2770a 100644 --- a/textproc/p5-XML-Clean/pkg-plist +++ b/textproc/p5-XML-Clean/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Clean/.packlist %%SITE_PERL%%/XML/Clean.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Clean -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-DBMS/pkg-plist b/textproc/p5-XML-DBMS/pkg-plist index 7211b99d2c91..8f3fe0571663 100644 --- a/textproc/p5-XML-DBMS/pkg-plist +++ b/textproc/p5-XML-DBMS/pkg-plist @@ -8,5 +8,5 @@ %%PORTDOCS%%%%EXAMPLESDIR%%/sales2.map %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XMLtoDBMS -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-DOM-XPath/pkg-plist b/textproc/p5-XML-DOM-XPath/pkg-plist index fcc1a61d856c..643f92715afb 100644 --- a/textproc/p5-XML-DOM-XPath/pkg-plist +++ b/textproc/p5-XML-DOM-XPath/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/XML/DOM/XPath.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DOM/XPath/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DOM/XPath -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DOM 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML/DOM 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DOM +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML +@dirrmtry %%SITE_PERL%%/XML/DOM +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-DT/pkg-plist b/textproc/p5-XML-DT/pkg-plist index 5ac51467f078..5fb522de7a5c 100644 --- a/textproc/p5-XML-DT/pkg-plist +++ b/textproc/p5-XML-DT/pkg-plist @@ -3,4 +3,4 @@ bin/mkdtdskel %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DT/.packlist %%SITE_PERL%%/XML/DT.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DT -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-DTDParser/pkg-plist b/textproc/p5-XML-DTDParser/pkg-plist index 9fe4a9825ea8..77a36a10d52d 100644 --- a/textproc/p5-XML-DTDParser/pkg-plist +++ b/textproc/p5-XML-DTDParser/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/XML/DTDParser.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DTDParser/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DTDParser -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-DifferenceMarkup/pkg-plist b/textproc/p5-XML-DifferenceMarkup/pkg-plist index 22298e5526dc..545611a1f78c 100644 --- a/textproc/p5-XML-DifferenceMarkup/pkg-plist +++ b/textproc/p5-XML-DifferenceMarkup/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DifferenceMarkup/.packlist %%SITE_PERL%%/XML/DifferenceMarkup.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/DifferenceMarkup -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-Directory/pkg-plist b/textproc/p5-XML-Directory/pkg-plist index 05878eb9b77e..9b15e87887b2 100644 --- a/textproc/p5-XML-Directory/pkg-plist +++ b/textproc/p5-XML-Directory/pkg-plist @@ -5,5 +5,5 @@ %%SITE_PERL%%/XML/Directory/String.pm @dirrm %%SITE_PERL%%/XML/Directory @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Directory -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-Driver-HTML/pkg-plist b/textproc/p5-XML-Driver-HTML/pkg-plist index f43da6cc1ddf..a2974fab6ecc 100644 --- a/textproc/p5-XML-Driver-HTML/pkg-plist +++ b/textproc/p5-XML-Driver-HTML/pkg-plist @@ -2,8 +2,8 @@ bin/html2xhtml %%SITE_PERL%%/XML/Driver/HTML.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Driver/HTML/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Driver/HTML -@unexec rmdir %D/%%SITE_PERL%%/XML/Driver 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Driver/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Driver 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/Driver +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Driver/HTML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Driver +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-Dumper/pkg-plist b/textproc/p5-XML-Dumper/pkg-plist index 10f520c1a76e..b53e285088cc 100644 --- a/textproc/p5-XML-Dumper/pkg-plist +++ b/textproc/p5-XML-Dumper/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Dumper/.packlist %%SITE_PERL%%/XML/Dumper.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Dumper -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-Elemental/pkg-plist b/textproc/p5-XML-Elemental/pkg-plist index c6c7235b8233..18835ab86a0d 100644 --- a/textproc/p5-XML-Elemental/pkg-plist +++ b/textproc/p5-XML-Elemental/pkg-plist @@ -11,4 +11,4 @@ @dirrm %%SITE_PERL%%/XML/Parser/Style @dirrm %%SITE_PERL%%/XML/Parser @dirrm %%SITE_PERL%%/XML/Elemental -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-Encoding/pkg-plist b/textproc/p5-XML-Encoding/pkg-plist index cea86c5de505..4a6b72995117 100644 --- a/textproc/p5-XML-Encoding/pkg-plist +++ b/textproc/p5-XML-Encoding/pkg-plist @@ -3,5 +3,5 @@ bin/make_encmap %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Encoding/.packlist %%SITE_PERL%%/XML/Encoding.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Encoding -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-Feed/pkg-plist b/textproc/p5-XML-Feed/pkg-plist index 70df8ff11dc7..96632effd143 100644 --- a/textproc/p5-XML-Feed/pkg-plist +++ b/textproc/p5-XML-Feed/pkg-plist @@ -4,4 +4,4 @@ %%SITE_PERL%%/XML/Feed/Entry.pm %%SITE_PERL%%/XML/Feed/RSS.pm @dirrm %%SITE_PERL%%/XML/Feed -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-Filter-BufferText/pkg-plist b/textproc/p5-XML-Filter-BufferText/pkg-plist index 5b3ec2828b6b..57ccdc18d6fb 100644 --- a/textproc/p5-XML-Filter-BufferText/pkg-plist +++ b/textproc/p5-XML-Filter-BufferText/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/BufferText/.packlist %%SITE_PERL%%/XML/Filter/BufferText.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/BufferText -@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/Filter +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-Filter-DetectWS/pkg-plist b/textproc/p5-XML-Filter-DetectWS/pkg-plist index 6f5380d016c2..cc49c6327951 100644 --- a/textproc/p5-XML-Filter-DetectWS/pkg-plist +++ b/textproc/p5-XML-Filter-DetectWS/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/DetectWS/.packlist %%SITE_PERL%%/XML/Filter/DetectWS.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/DetectWS -@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/Filter +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-Filter-GenericChunk/pkg-plist b/textproc/p5-XML-Filter-GenericChunk/pkg-plist index 80e36d11ea31..d5b9cfb5b5a5 100644 --- a/textproc/p5-XML-Filter-GenericChunk/pkg-plist +++ b/textproc/p5-XML-Filter-GenericChunk/pkg-plist @@ -2,8 +2,8 @@ %%SITE_PERL%%/XML/Filter/CharacterChunk.pm %%SITE_PERL%%/XML/Filter/GenericChunk.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/GenericChunk -@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/GenericChunk 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/Filter +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/GenericChunk +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-Filter-Reindent/pkg-plist b/textproc/p5-XML-Filter-Reindent/pkg-plist index f70f6504f983..27641ef412cf 100644 --- a/textproc/p5-XML-Filter-Reindent/pkg-plist +++ b/textproc/p5-XML-Filter-Reindent/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/Reindent/.packlist %%SITE_PERL%%/XML/Filter/Reindent.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/Reindent -@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/Filter +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-Filter-SAX1toSAX2/pkg-plist b/textproc/p5-XML-Filter-SAX1toSAX2/pkg-plist index 2fe67388ebc7..4a5c00beb8e5 100644 --- a/textproc/p5-XML-Filter-SAX1toSAX2/pkg-plist +++ b/textproc/p5-XML-Filter-SAX1toSAX2/pkg-plist @@ -2,6 +2,6 @@ %%SITE_PERL%%/XML/Filter/SAX1toSAX2.pm %%SITE_PERL%%/XML/Filter/SAX2toSAX1.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/SAX1toSAX2 -@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/Filter +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-Filter-SAXT/pkg-plist b/textproc/p5-XML-Filter-SAXT/pkg-plist index 629338a8642e..7d1997876c6c 100644 --- a/textproc/p5-XML-Filter-SAXT/pkg-plist +++ b/textproc/p5-XML-Filter-SAXT/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/SAXT/.packlist %%SITE_PERL%%/XML/Filter/SAXT.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/SAXT -@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/Filter +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-Filter-XInclude/pkg-plist b/textproc/p5-XML-Filter-XInclude/pkg-plist index 130b64b321de..1faf29a475ab 100644 --- a/textproc/p5-XML-Filter-XInclude/pkg-plist +++ b/textproc/p5-XML-Filter-XInclude/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/XInclude/.packlist %%SITE_PERL%%/XML/Filter/XInclude.pm -@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/Filter +@dirrmtry %%SITE_PERL%%/XML @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/XInclude -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-Filter-XSLT/pkg-plist b/textproc/p5-XML-Filter-XSLT/pkg-plist index da376ee4441d..5887a0fa42f7 100644 --- a/textproc/p5-XML-Filter-XSLT/pkg-plist +++ b/textproc/p5-XML-Filter-XSLT/pkg-plist @@ -2,8 +2,8 @@ %%SITE_PERL%%/XML/Filter/XSLT.pm %%SITE_PERL%%/XML/Filter/XSLT/LibXSLT.pm @dirrm %%SITE_PERL%%/XML/Filter/XSLT -@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/Filter +@dirrmtry %%SITE_PERL%%/XML @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter/XSLT -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Filter +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-Generator-DBI/pkg-plist b/textproc/p5-XML-Generator-DBI/pkg-plist index 7e5b40aec0ac..57730fb0c48d 100644 --- a/textproc/p5-XML-Generator-DBI/pkg-plist +++ b/textproc/p5-XML-Generator-DBI/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator/DBI/.packlist %%SITE_PERL%%/XML/Generator/DBI.pm -@unexec rmdir %D/%%SITE_PERL%%/XML/Generator 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/Generator +@dirrmtry %%SITE_PERL%%/XML @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator/DBI -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-Generator-PerlData/pkg-plist b/textproc/p5-XML-Generator-PerlData/pkg-plist index cdf813f18c00..84468c26d66f 100644 --- a/textproc/p5-XML-Generator-PerlData/pkg-plist +++ b/textproc/p5-XML-Generator-PerlData/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/XML/Generator/PerlData.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator/PerlData/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator/PerlData -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML/Generator 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/XML/Generator +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator diff --git a/textproc/p5-XML-Generator/pkg-plist b/textproc/p5-XML-Generator/pkg-plist index 2e9093120fcc..a00d12db8ac8 100644 --- a/textproc/p5-XML-Generator/pkg-plist +++ b/textproc/p5-XML-Generator/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator/.packlist %%SITE_PERL%%/XML/Generator/DOM.pm %%SITE_PERL%%/XML/Generator.pm -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML/Generator 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Generator +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML +@dirrmtry %%SITE_PERL%%/XML/Generator +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-Grove/pkg-plist b/textproc/p5-XML-Grove/pkg-plist index 43887eb0b053..c75e404e9972 100644 --- a/textproc/p5-XML-Grove/pkg-plist +++ b/textproc/p5-XML-Grove/pkg-plist @@ -12,6 +12,6 @@ %%SITE_PERL%%/XML/Grove/XPointer.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Grove/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Grove -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML @dirrm %%SITE_PERL%%/XML/Grove -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-Hadler-HTMLWriter/pkg-plist b/textproc/p5-XML-Hadler-HTMLWriter/pkg-plist index e7ba67f04ba2..42501a4f6e8d 100644 --- a/textproc/p5-XML-Hadler-HTMLWriter/pkg-plist +++ b/textproc/p5-XML-Hadler-HTMLWriter/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/XML/Handler/HTMLWriter.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/HTMLWriter/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/HTMLWriter -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML/Handler 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML +@dirrmtry %%SITE_PERL%%/XML/Handler +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-Handler-Trees/pkg-plist b/textproc/p5-XML-Handler-Trees/pkg-plist index 54e137f21bd1..e99fde22e520 100644 --- a/textproc/p5-XML-Handler-Trees/pkg-plist +++ b/textproc/p5-XML-Handler-Trees/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/Trees/.packlist %%SITE_PERL%%/XML/Handler/Trees.pm -@unexec rmdir %D/%%SITE_PERL%%/XML/Handler 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/Handler +@dirrmtry %%SITE_PERL%%/XML @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/Trees -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-Handler-YAWriter/pkg-plist b/textproc/p5-XML-Handler-YAWriter/pkg-plist index f34eba0011d9..16e368d157a4 100644 --- a/textproc/p5-XML-Handler-YAWriter/pkg-plist +++ b/textproc/p5-XML-Handler-YAWriter/pkg-plist @@ -2,7 +2,7 @@ bin/xmlpretty %%SITE_PERL%%/XML/Handler/YAWriter.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler/YAWriter -@unexec rmdir %D/%%SITE_PERL%%/XML/Handler 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/Handler +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Handler +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-LibRSVG/pkg-plist b/textproc/p5-XML-LibRSVG/pkg-plist index 86578b451ad4..4b42c67356dd 100644 --- a/textproc/p5-XML-LibRSVG/pkg-plist +++ b/textproc/p5-XML-LibRSVG/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibRSVG/LibRSVG.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibRSVG/LibRSVG.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibRSVG -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML diff --git a/textproc/p5-XML-LibXML-Common/pkg-plist b/textproc/p5-XML-LibXML-Common/pkg-plist index 43553b9bf828..c8ed94e6d69a 100644 --- a/textproc/p5-XML-LibXML-Common/pkg-plist +++ b/textproc/p5-XML-LibXML-Common/pkg-plist @@ -3,7 +3,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Common/Common.so %%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Common.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Common -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-LibXML-Iterator/pkg-plist b/textproc/p5-XML-LibXML-Iterator/pkg-plist index 25d2c724bd60..64a9e9cf42eb 100644 --- a/textproc/p5-XML-LibXML-Iterator/pkg-plist +++ b/textproc/p5-XML-LibXML-Iterator/pkg-plist @@ -2,8 +2,8 @@ %%SITE_PERL%%/XML/LibXML/NodeList/Iterator.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Iterator/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/Iterator -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML @dirrm %%SITE_PERL%%/XML/LibXML/NodeList -@unexec rmdir %D/%%SITE_PERL%%/XML/LibXML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/LibXML +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-LibXML-XPathContext/pkg-plist b/textproc/p5-XML-LibXML-XPathContext/pkg-plist index f499f0dd0cb8..ead6c944ae15 100644 --- a/textproc/p5-XML-LibXML-XPathContext/pkg-plist +++ b/textproc/p5-XML-LibXML-XPathContext/pkg-plist @@ -4,7 +4,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/XPathContext/XPathContext.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/XPathContext/XPathContext.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/XPathContext -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML diff --git a/textproc/p5-XML-LibXML/pkg-plist b/textproc/p5-XML-LibXML/pkg-plist index c4afb81fb009..353623c14236 100644 --- a/textproc/p5-XML-LibXML/pkg-plist +++ b/textproc/p5-XML-LibXML/pkg-plist @@ -26,8 +26,8 @@ %%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/Text.pod %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/LibXML.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML/LibXML.so -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/SAX 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML/SAX +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/LibXML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML diff --git a/textproc/p5-XML-LibXSLT/pkg-plist b/textproc/p5-XML-LibXSLT/pkg-plist index 22f090040a21..ec656832fbd6 100644 --- a/textproc/p5-XML-LibXSLT/pkg-plist +++ b/textproc/p5-XML-LibXSLT/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXSLT/LibXSLT.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXSLT/LibXSLT.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/LibXSLT -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-NamespaceSupport/pkg-plist b/textproc/p5-XML-NamespaceSupport/pkg-plist index caf403ad7273..5ea514b2f4c7 100644 --- a/textproc/p5-XML-NamespaceSupport/pkg-plist +++ b/textproc/p5-XML-NamespaceSupport/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/NamespaceSupport/.packlist %%SITE_PERL%%/XML/NamespaceSupport.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/NamespaceSupport -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-Node/pkg-plist b/textproc/p5-XML-Node/pkg-plist index 6f52ccd88f8b..fc4bc8eeffc6 100644 --- a/textproc/p5-XML-Node/pkg-plist +++ b/textproc/p5-XML-Node/pkg-plist @@ -4,4 +4,4 @@ %%SITE_PERL%%/XML/parse-testsuite.pl %%SITE_PERL%%/%%PERL_ARCH%%//auto/XML/Node/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Node -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-NodeFilter/pkg-plist b/textproc/p5-XML-NodeFilter/pkg-plist index 44fd2755bf1f..01155fb046c8 100644 --- a/textproc/p5-XML-NodeFilter/pkg-plist +++ b/textproc/p5-XML-NodeFilter/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/XML/NodeFilter.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/NodeFilter/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/NodeFilter -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-Parser-EasyTree/pkg-plist b/textproc/p5-XML-Parser-EasyTree/pkg-plist index 456e6a400e2a..5c281b6c2752 100644 --- a/textproc/p5-XML-Parser-EasyTree/pkg-plist +++ b/textproc/p5-XML-Parser-EasyTree/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/EasyTree/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/EasyTree -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML %%SITE_PERL%%/XML/Parser/EasyTree.pm -@unexec rmdir %D/%%SITE_PERL%%/XML/Parser 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/Parser +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-Parser-Lite-Tree/pkg-plist b/textproc/p5-XML-Parser-Lite-Tree/pkg-plist index b54e32340f97..095ca1df862a 100644 --- a/textproc/p5-XML-Parser-Lite-Tree/pkg-plist +++ b/textproc/p5-XML-Parser-Lite-Tree/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/XML/Parser/Lite/Tree.pm -@unexec rmdir %D/%%SITE_PERL%%/XML/Parser/Lite 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML/Parser 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/Parser/Lite +@dirrmtry %%SITE_PERL%%/XML/Parser +@dirrmtry %%SITE_PERL%%/XML %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Lite/Tree/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Lite/Tree -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Lite 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Lite +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-Parser-Style-Elemental/pkg-plist b/textproc/p5-XML-Parser-Style-Elemental/pkg-plist index b3e95b585c16..57f179ba15a3 100644 --- a/textproc/p5-XML-Parser-Style-Elemental/pkg-plist +++ b/textproc/p5-XML-Parser-Style-Elemental/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/XML/Parser/Style/Elemental.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Style/Elemental/.packlist @dirrm %%SITE_PERL%%/XML/Parser/Style -@unexec rmdir %D/%%SITE_PERL%%/XML/Parser 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/Parser +@dirrmtry %%SITE_PERL%%/XML @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Style/Elemental @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Style -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML diff --git a/textproc/p5-XML-Parser/pkg-plist b/textproc/p5-XML-Parser/pkg-plist index 93a72aad8e45..999e5dbab161 100644 --- a/textproc/p5-XML-Parser/pkg-plist +++ b/textproc/p5-XML-Parser/pkg-plist @@ -32,8 +32,8 @@ %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/LWPExternEnt.pl @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser/Expat @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Parser -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Encodings @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser/Style @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/Parser -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML diff --git a/textproc/p5-XML-Quote/pkg-plist b/textproc/p5-XML-Quote/pkg-plist index 0f801611d94e..a270fce1bcde 100644 --- a/textproc/p5-XML-Quote/pkg-plist +++ b/textproc/p5-XML-Quote/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Quote/Quote.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Quote/autosplit.ix @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Quote -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-RAI/pkg-plist b/textproc/p5-XML-RAI/pkg-plist index 3974e5619f57..0311ba883fc7 100644 --- a/textproc/p5-XML-RAI/pkg-plist +++ b/textproc/p5-XML-RAI/pkg-plist @@ -12,4 +12,4 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RAI @dirrm %%SITE_PERL%%/XML/RSS/Parser @dirrm %%SITE_PERL%%/XML/RSS -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-RSS-JavaScript/pkg-plist b/textproc/p5-XML-RSS-JavaScript/pkg-plist index 0dccc3b0c9be..aa8dbf9a40c0 100644 --- a/textproc/p5-XML-RSS-JavaScript/pkg-plist +++ b/textproc/p5-XML-RSS-JavaScript/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS/JavaScript/.packlist %%SITE_PERL%%/XML/RSS/JavaScript.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS/JavaScript -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML/RSS 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML +@dirrmtry %%SITE_PERL%%/XML/RSS +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-RSS-LibXML/pkg-plist b/textproc/p5-XML-RSS-LibXML/pkg-plist index 8d1a18db642c..e94b0e51e426 100644 --- a/textproc/p5-XML-RSS-LibXML/pkg-plist +++ b/textproc/p5-XML-RSS-LibXML/pkg-plist @@ -10,5 +10,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-RSS-LibXML/.packlist @dirrm %%SITE_PERL%%/XML/RSS/LibXML @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-RSS-LibXML -@unexec rmdir %D/%%SITE_PERL%%/XML/RSS 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/RSS +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-RSS/pkg-plist b/textproc/p5-XML-RSS/pkg-plist index 92f4cfc3896b..90650a7b2470 100644 --- a/textproc/p5-XML-RSS/pkg-plist +++ b/textproc/p5-XML-RSS/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/XML/RSS.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RSS -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-RegExp/pkg-plist b/textproc/p5-XML-RegExp/pkg-plist index 66c16735198d..c05a5832cc39 100644 --- a/textproc/p5-XML-RegExp/pkg-plist +++ b/textproc/p5-XML-RegExp/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RegExp/.packlist %%SITE_PERL%%/XML/RegExp.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/RegExp -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-SAX-Expat-Incremental/pkg-plist b/textproc/p5-XML-SAX-Expat-Incremental/pkg-plist index e5e02606699f..bb297acc23b1 100644 --- a/textproc/p5-XML-SAX-Expat-Incremental/pkg-plist +++ b/textproc/p5-XML-SAX-Expat-Incremental/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/XML/SAX/Expat/Incremental.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Expat/Incremental/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Expat/Incremental -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Expat 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML/SAX/Expat 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML/SAX 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Expat +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML +@dirrmtry %%SITE_PERL%%/XML/SAX/Expat +@dirrmtry %%SITE_PERL%%/XML/SAX +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-SAX-Expat/pkg-plist b/textproc/p5-XML-SAX-Expat/pkg-plist index 9a0699c56fc8..b8a710ac166f 100644 --- a/textproc/p5-XML-SAX-Expat/pkg-plist +++ b/textproc/p5-XML-SAX-Expat/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Expat/.packlist %%SITE_PERL%%/XML/SAX/Expat.pm -@unexec rmdir %D/%%SITE_PERL%%/XML/SAX 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/SAX @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Expat -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-SAX-ExpatXS/pkg-plist b/textproc/p5-XML-SAX-ExpatXS/pkg-plist index 1e07d41730e2..45e0f2dc2e52 100644 --- a/textproc/p5-XML-SAX-ExpatXS/pkg-plist +++ b/textproc/p5-XML-SAX-ExpatXS/pkg-plist @@ -23,7 +23,7 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS/Encodings @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX/ExpatXS @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/ExpatXS -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML/SAX +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-SAX-Machines/pkg-plist b/textproc/p5-XML-SAX-Machines/pkg-plist index e54b6ee30a77..eb5fd805bf15 100644 --- a/textproc/p5-XML-SAX-Machines/pkg-plist +++ b/textproc/p5-XML-SAX-Machines/pkg-plist @@ -14,12 +14,12 @@ %%SITE_PERL%%/XML/SAX/Pipeline.pm %%SITE_PERL%%/XML/SAX/Tap.pm @dirrm %%SITE_PERL%%/XML/SAX/Machines -@unexec rmdir %D/%%SITE_PERL%%/XML/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML/SAX 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/Filter +@dirrmtry %%SITE_PERL%%/XML/SAX +@dirrmtry %%SITE_PERL%%/XML @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Machines -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML %%EXAMPLESDIR%%/append_to_xml_file %%EXAMPLESDIR%%/output_to_process %%EXAMPLESDIR%%/xml_records_thru_libxslt diff --git a/textproc/p5-XML-SAX-Simple/pkg-plist b/textproc/p5-XML-SAX-Simple/pkg-plist index 09c659fa7771..421cf276ced2 100644 --- a/textproc/p5-XML-SAX-Simple/pkg-plist +++ b/textproc/p5-XML-SAX-Simple/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Simple/.packlist %%SITE_PERL%%/XML/SAX/Simple.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Simple -@unexec rmdir %D/%%SITE_PERL%%/XML/SAX 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/SAX +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-SAX-Writer/pkg-plist b/textproc/p5-XML-SAX-Writer/pkg-plist index 6c39bdf88bba..398b40a6c9b9 100644 --- a/textproc/p5-XML-SAX-Writer/pkg-plist +++ b/textproc/p5-XML-SAX-Writer/pkg-plist @@ -3,7 +3,7 @@ %%SITE_PERL%%/XML/SAX/Writer/XML.pm @dirrm %%SITE_PERL%%/XML/SAX/Writer @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX/Writer -@unexec rmdir %D/%%SITE_PERL%%/XML/SAX 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/SAX +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-SAX/pkg-plist b/textproc/p5-XML-SAX/pkg-plist index 85fede55996c..001c110d01fa 100644 --- a/textproc/p5-XML-SAX/pkg-plist +++ b/textproc/p5-XML-SAX/pkg-plist @@ -24,8 +24,8 @@ %%SITE_PERL%%/XML/SAX/PurePerl/XMLDecl.pm %%SITE_PERL%%/XML/SAX/placeholder.pl @dirrm %%SITE_PERL%%/XML/SAX/PurePerl/Reader -@unexec rmdir %D/%%SITE_PERL%%/XML/SAX/PurePerl 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML/SAX 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/SAX/PurePerl +@dirrmtry %%SITE_PERL%%/XML/SAX +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAX +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-SAXDriver-Sablotron/pkg-plist b/textproc/p5-XML-SAXDriver-Sablotron/pkg-plist index 6cc0140de83a..490584b9e1ec 100644 --- a/textproc/p5-XML-SAXDriver-Sablotron/pkg-plist +++ b/textproc/p5-XML-SAXDriver-Sablotron/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAXDriver/Sablotron/.packlist %%SITE_PERL%%/XML/SAXDriver/Sablotron.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAXDriver/Sablotron -@unexec rmdir %D/%%SITE_PERL%%/XML/SAXDriver 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAXDriver 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/SAXDriver +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SAXDriver +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-STX/pkg-plist b/textproc/p5-XML-STX/pkg-plist index 56e94ed278a7..28f6e13755d7 100644 --- a/textproc/p5-XML-STX/pkg-plist +++ b/textproc/p5-XML-STX/pkg-plist @@ -13,8 +13,8 @@ bin/stxview.pl %%SITE_PERL%%/XML/STX/Writer.pm @dirrm %%SITE_PERL%%/XML/STX @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/STX -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML %%PORTDOCS%%%%EXAMPLESDIR%%/stx-filter.pl %%PORTDOCS%%%%EXAMPLESDIR%%/tester.pl %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% diff --git a/textproc/p5-XML-Sablotron/pkg-plist b/textproc/p5-XML-Sablotron/pkg-plist index 260a538e961b..b57154ad6f2f 100644 --- a/textproc/p5-XML-Sablotron/pkg-plist +++ b/textproc/p5-XML-Sablotron/pkg-plist @@ -10,8 +10,8 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Sablotron/Sablotron.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Sablotron/Sablotron.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Sablotron -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/Sablotron/DOM @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/Sablotron/Situation @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/XML/Sablotron -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/XML diff --git a/textproc/p5-XML-Schematron/pkg-plist b/textproc/p5-XML-Schematron/pkg-plist index 119153e0c2db..b4d522e3a364 100644 --- a/textproc/p5-XML-Schematron/pkg-plist +++ b/textproc/p5-XML-Schematron/pkg-plist @@ -3,7 +3,7 @@ %%SITE_PERL%%/XML/Schematron/LibXSLT.pm %%SITE_PERL%%/XML/Schematron/Sablotron.pm %%SITE_PERL%%/XML/Schematron/XPath.pm -@unexec rmdir %D/%%SITE_PERL%%/XML/Schematron 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Schematron 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/Schematron +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Schematron +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML diff --git a/textproc/p5-XML-SemanticDiff/pkg-plist b/textproc/p5-XML-SemanticDiff/pkg-plist index e751bff9d526..c4e579c5c63a 100644 --- a/textproc/p5-XML-SemanticDiff/pkg-plist +++ b/textproc/p5-XML-SemanticDiff/pkg-plist @@ -3,6 +3,6 @@ bin/xmlsemdiff %%SITE_PERL%%/XML/SemanticDiff/BasicHandler.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SemanticDiff/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SemanticDiff -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML @dirrm %%SITE_PERL%%/XML/SemanticDiff -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-Simple/pkg-plist b/textproc/p5-XML-Simple/pkg-plist index 3c97b5dc4e4c..42033e0f855f 100644 --- a/textproc/p5-XML-Simple/pkg-plist +++ b/textproc/p5-XML-Simple/pkg-plist @@ -2,6 +2,6 @@ %%SITE_PERL%%/XML/Simple.pm %%SITE_PERL%%/XML/Simple/FAQ.pod @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Simple -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML @dirrm %%SITE_PERL%%/XML/Simple -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-SimpleObject-LibXML/pkg-plist b/textproc/p5-XML-SimpleObject-LibXML/pkg-plist index ce8c961b7ca9..a0e602079d7e 100644 --- a/textproc/p5-XML-SimpleObject-LibXML/pkg-plist +++ b/textproc/p5-XML-SimpleObject-LibXML/pkg-plist @@ -2,7 +2,7 @@ %%SITE_PERL%%/XML/SimpleObject/LibXML.pm %%SITE_PERL%%/XML/SimpleObject/ex.pl @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SimpleObject/LibXML -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SimpleObject 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML/SimpleObject 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SimpleObject +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML +@dirrmtry %%SITE_PERL%%/XML/SimpleObject +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-SimpleObject/pkg-plist b/textproc/p5-XML-SimpleObject/pkg-plist index f48ca8526745..61d017cdc87b 100644 --- a/textproc/p5-XML-SimpleObject/pkg-plist +++ b/textproc/p5-XML-SimpleObject/pkg-plist @@ -2,7 +2,7 @@ %%SITE_PERL%%/XML/SimpleObject.pm %%SITE_PERL%%/XML/SimpleObject/Enhanced.pm %%SITE_PERL%%/XML/ex.pl -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SimpleObject 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML/SimpleObject 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/SimpleObject +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML +@dirrmtry %%SITE_PERL%%/XML/SimpleObject +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-Smart/pkg-plist b/textproc/p5-XML-Smart/pkg-plist index 933510d9bb2d..c961d8c07bca 100644 --- a/textproc/p5-XML-Smart/pkg-plist +++ b/textproc/p5-XML-Smart/pkg-plist @@ -14,6 +14,6 @@ %%SITE_PERL%%/XML/Smart/XPath.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Smart/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Smart -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML @dirrm %%SITE_PERL%%/XML/Smart -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-Stream/pkg-plist b/textproc/p5-XML-Stream/pkg-plist index 2b193d5fc710..589affba7cb3 100644 --- a/textproc/p5-XML-Stream/pkg-plist +++ b/textproc/p5-XML-Stream/pkg-plist @@ -13,4 +13,4 @@ @dirrm %%SITE_PERL%%/XML/Stream/Parser @dirrm %%SITE_PERL%%/XML/Stream/XPath @dirrm %%SITE_PERL%%/XML/Stream -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-TreeBuilder/pkg-plist b/textproc/p5-XML-TreeBuilder/pkg-plist index 91d97f64549f..82c78c33971e 100644 --- a/textproc/p5-XML-TreeBuilder/pkg-plist +++ b/textproc/p5-XML-TreeBuilder/pkg-plist @@ -2,4 +2,4 @@ %%SITE_PERL%%/XML/Element.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-TreeBuilder/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML-TreeBuilder -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-Twig/pkg-plist b/textproc/p5-XML-Twig/pkg-plist index f96a7b90d2f8..6059ab166903 100644 --- a/textproc/p5-XML-Twig/pkg-plist +++ b/textproc/p5-XML-Twig/pkg-plist @@ -8,6 +8,6 @@ bin/xml_split %%SITE_PERL%%/XML/Twig/XPath.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Twig/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Twig -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML @dirrm %%SITE_PERL%%/XML/Twig -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-Validator-Schema/pkg-plist b/textproc/p5-XML-Validator-Schema/pkg-plist index 25726eb3028e..59e21385e115 100644 --- a/textproc/p5-XML-Validator-Schema/pkg-plist +++ b/textproc/p5-XML-Validator-Schema/pkg-plist @@ -16,8 +16,8 @@ %%SITE_PERL%%/XML/Validator/Schema/Util.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Validator/Schema/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Validator/Schema -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Validator 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Validator +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML @dirrm %%SITE_PERL%%/XML/Validator/Schema -@unexec rmdir %D/%%SITE_PERL%%/XML/Validator 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML/Validator +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-Writer/pkg-plist b/textproc/p5-XML-Writer/pkg-plist index c2cb893f639c..63e7181a7ed4 100644 --- a/textproc/p5-XML-Writer/pkg-plist +++ b/textproc/p5-XML-Writer/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/XML/Writer.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Writer/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/Writer -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-XBEL/pkg-plist b/textproc/p5-XML-XBEL/pkg-plist index 69a4c6bb2ad2..a64cade9398e 100644 --- a/textproc/p5-XML-XBEL/pkg-plist +++ b/textproc/p5-XML-XBEL/pkg-plist @@ -12,6 +12,6 @@ %%SITE_PERL%%/XML/XBEL/url.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XBEL/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XBEL -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML @dirrm %%SITE_PERL%%/XML/XBEL -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-XPath/pkg-plist b/textproc/p5-XML-XPath/pkg-plist index 5b9376390dc3..39d3c1df23bd 100644 --- a/textproc/p5-XML-XPath/pkg-plist +++ b/textproc/p5-XML-XPath/pkg-plist @@ -23,6 +23,6 @@ bin/xpath %%SITE_PERL%%/XML/XPath/Boolean.pm %%SITE_PERL%%/XML/XPath.pm @dirrm %%SITE_PERL%%/XML/XPath/Node -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XPath 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML/XPath 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XPath +@dirrmtry %%SITE_PERL%%/XML/XPath +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-XSH/pkg-plist b/textproc/p5-XML-XSH/pkg-plist index 4488604f3ada..55e5a12f0ed2 100644 --- a/textproc/p5-XML-XSH/pkg-plist +++ b/textproc/p5-XML-XSH/pkg-plist @@ -12,9 +12,9 @@ bin/xsh %%SITE_PERL%%/XML/XSH/LibXMLCompat.pm %%SITE_PERL%%/XML/XSH/Parser.pm @dirrm %%SITE_PERL%%/XML/XSH -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/XML %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XSH/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XSH -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML %%SITE_PERL%%/Inline/XSH.pm -@unexec rmdir %D/%%SITE_PERL%%/Inline 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Inline diff --git a/textproc/p5-XML-XSLT/pkg-plist b/textproc/p5-XML-XSLT/pkg-plist index 00e2539e44d9..8505bde5b2f2 100644 --- a/textproc/p5-XML-XSLT/pkg-plist +++ b/textproc/p5-XML-XSLT/pkg-plist @@ -2,5 +2,5 @@ bin/xslt-parser %%SITE_PERL%%/XML/XSLT.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XSLT/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XSLT -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-XML-XUpdate-LibXML/pkg-plist b/textproc/p5-XML-XUpdate-LibXML/pkg-plist index 85568936a176..94e49e4c3a93 100644 --- a/textproc/p5-XML-XUpdate-LibXML/pkg-plist +++ b/textproc/p5-XML-XUpdate-LibXML/pkg-plist @@ -3,8 +3,8 @@ bin/xupdate %%SITE_PERL%%/XML/XUpdate/LibXML.pm %%SITE_PERL%%/XML/Normalize/LibXML.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XUpdate/LibXML -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XUpdate 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML/XUpdate 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML/Normalize 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/XUpdate +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML +@dirrmtry %%SITE_PERL%%/XML/XUpdate +@dirrmtry %%SITE_PERL%%/XML/Normalize +@dirrmtry %%SITE_PERL%%/XML diff --git a/textproc/p5-YAML-Syck/pkg-plist b/textproc/p5-YAML-Syck/pkg-plist index f40dc00bc31d..35157dd0077d 100644 --- a/textproc/p5-YAML-Syck/pkg-plist +++ b/textproc/p5-YAML-Syck/pkg-plist @@ -5,8 +5,8 @@ %%SITE_PERL%%/%%PERL_ARCH%%/YAML/Syck.pm %%SITE_PERL%%/%%PERL_ARCH%%/YAML/Loader/Syck.pm %%SITE_PERL%%/%%PERL_ARCH%%/YAML/Dumper/Syck.pm -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/Syck 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/YAML/Loader 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/YAML/Dumper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/YAML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML/Syck +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/YAML/Loader +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/YAML/Dumper +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/YAML diff --git a/textproc/p5-YAML/pkg-plist b/textproc/p5-YAML/pkg-plist index 5c4357ccad7c..fcb08d4384c0 100644 --- a/textproc/p5-YAML/pkg-plist +++ b/textproc/p5-YAML/pkg-plist @@ -12,8 +12,8 @@ bin/ysh %%SITE_PERL%%/YAML/Node.pm %%SITE_PERL%%/YAML/Tag.pm %%SITE_PERL%%/YAML/Types.pm -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/YAML/Dumper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/YAML/Loader 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/YAML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAML +@dirrmtry %%SITE_PERL%%/YAML/Dumper +@dirrmtry %%SITE_PERL%%/YAML/Loader +@dirrmtry %%SITE_PERL%%/Test +@dirrmtry %%SITE_PERL%%/YAML diff --git a/textproc/p5-YAPE-HTML/pkg-plist b/textproc/p5-YAPE-HTML/pkg-plist index 4ce85d9fec38..7d7bb7de8af6 100644 --- a/textproc/p5-YAPE-HTML/pkg-plist +++ b/textproc/p5-YAPE-HTML/pkg-plist @@ -2,8 +2,8 @@ %%SITE_PERL%%/YAPE/HTML/Element.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/HTML/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/HTML -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE @dirrm %%SITE_PERL%%/YAPE/HTML -@unexec rmdir %D/%%SITE_PERL%%/YAPE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/YAPE @unexec rmdir %D%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE 2>/dev/null || true @unexec rmdir %D%%SITE_PERL%%/YAPE 2>/dev/null || true diff --git a/textproc/p5-YAPE-Regex-Explain/pkg-plist b/textproc/p5-YAPE-Regex-Explain/pkg-plist index 60cff8626a0f..c33eece8d906 100644 --- a/textproc/p5-YAPE-Regex-Explain/pkg-plist +++ b/textproc/p5-YAPE-Regex-Explain/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/YAPE/Regex/Explain.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/Regex/Explain/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/Regex/Explain -@unexec rmdir %D/%%SITE_PERL%%/YAPE/Regex 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/YAPE/Regex @unexec rmdir %D%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/Regex 2>/dev/null || true @unexec rmdir %D%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE 2>/dev/null || true @unexec rmdir %D%%SITE_PERL%%/YAPE 2>/dev/null || true diff --git a/textproc/p5-YAPE-Regex/pkg-plist b/textproc/p5-YAPE-Regex/pkg-plist index b26ee65fa7a9..a10e0b62383e 100644 --- a/textproc/p5-YAPE-Regex/pkg-plist +++ b/textproc/p5-YAPE-Regex/pkg-plist @@ -3,8 +3,8 @@ %%SITE_PERL%%/YAPE/Regex/Element.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/Regex/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE/Regex -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE @dirrm %%SITE_PERL%%/YAPE/Regex -@unexec rmdir %D/%%SITE_PERL%%/YAPE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/YAPE @unexec rmdir %D%%SITE_PERL%%/%%PERL_ARCH%%/auto/YAPE 2>/dev/null || true @unexec rmdir %D%%SITE_PERL%%/YAPE 2>/dev/null || true diff --git a/textproc/p5-dTemplate/pkg-plist b/textproc/p5-dTemplate/pkg-plist index a525be2b21aa..1f398b0b6464 100644 --- a/textproc/p5-dTemplate/pkg-plist +++ b/textproc/p5-dTemplate/pkg-plist @@ -1,3 +1,3 @@ %%SITE_PERL%%/dTemplate.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/dTemplate/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/dTemplate 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/dTemplate diff --git a/textproc/p5-libxml/pkg-plist b/textproc/p5-libxml/pkg-plist index d0b2d65d3708..b875dc67eef1 100644 --- a/textproc/p5-libxml/pkg-plist +++ b/textproc/p5-libxml/pkg-plist @@ -16,9 +16,9 @@ %%SITE_PERL%%/XML/Perl2SAX.pm %%SITE_PERL%%/XML/SAX2Perl.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libxml-perl -@unexec rmdir %D/%%SITE_PERL%%/Data/Grove 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML/Handler 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML/Parser 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML/PatAct 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Data 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Data/Grove +@dirrmtry %%SITE_PERL%%/XML/Handler +@dirrmtry %%SITE_PERL%%/XML/Parser +@dirrmtry %%SITE_PERL%%/XML/PatAct +@dirrmtry %%SITE_PERL%%/XML +@dirrmtry %%SITE_PERL%%/Data diff --git a/textproc/p5-podlators/pkg-plist b/textproc/p5-podlators/pkg-plist index 63a817c1e6f9..7bfaf495571b 100644 --- a/textproc/p5-podlators/pkg-plist +++ b/textproc/p5-podlators/pkg-plist @@ -7,6 +7,6 @@ %%SITE_PERL%%/Pod/Text/Color.pm %%SITE_PERL%%/Pod/Text/Overstrike.pm %%SITE_PERL%%/Pod/Text/Termcap.pm -@unexec rmdir %D/%%SITE_PERL%%/Pod/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Pod/Text +@dirrmtry %%SITE_PERL%%/Pod +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Pod diff --git a/textproc/p5-xmltv/pkg-plist b/textproc/p5-xmltv/pkg-plist index 29f905d03b25..26f7ed0ebabf 100644 --- a/textproc/p5-xmltv/pkg-plist +++ b/textproc/p5-xmltv/pkg-plist @@ -83,5 +83,5 @@ bin/tv_to_text @dirrm %%SITE_PERL%%/XMLTV/ProgressBar @dirrm %%SITE_PERL%%/XMLTV/Ask @dirrm %%SITE_PERL%%/XMLTV -@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true -@unexec rmdir %D/%%CGIDIR%% 2>/dev/null || true +@dirrmtry %%SITE_PERL%% +@dirrmtry %%CGIDIR%% diff --git a/textproc/print-n-times/pkg-plist b/textproc/print-n-times/pkg-plist index 240647013cf8..11b2213f5049 100644 --- a/textproc/print-n-times/pkg-plist +++ b/textproc/print-n-times/pkg-plist @@ -1,3 +1,3 @@ share/xsl/string/print-n-times.xsl -@unexec rmdir %D/share/xsl/string 2>/dev/null || true -@unexec rmdir %D/share/xsl 2>/dev/null || true +@dirrmtry share/xsl/string +@dirrmtry share/xsl diff --git a/textproc/py-tvgrab/pkg-plist b/textproc/py-tvgrab/pkg-plist index 9a51cc79a3f4..03647531b7de 100644 --- a/textproc/py-tvgrab/pkg-plist +++ b/textproc/py-tvgrab/pkg-plist @@ -60,5 +60,5 @@ %%PYTHON_SITELIBDIR%%/tvgrab/xmltv.pyo share/locale/pt_BR/LC_MESSAGES/pytvgrab.mo @dirrm %%PYTHON_SITELIBDIR%%/tvgrab -@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true -@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true +@dirrmtry %%PYTHON_SITELIBDIR%% +@dirrmtry %%PYTHON_LIBDIR%% diff --git a/textproc/py-xml/pkg-plist b/textproc/py-xml/pkg-plist index 2c78fba98e1a..4129e958ba1c 100644 --- a/textproc/py-xml/pkg-plist +++ b/textproc/py-xml/pkg-plist @@ -1060,4 +1060,4 @@ bin/xmlproc_val @dirrm %%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/dom/de @dirrm %%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/dom @dirrm %%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%% -@unexec rmdir %D/%%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%% 2>/dev/null || true +@dirrmtry %%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%% diff --git a/textproc/py-xmltv/pkg-plist b/textproc/py-xmltv/pkg-plist index 644befa2b12d..76c1d95a58be 100644 --- a/textproc/py-xmltv/pkg-plist +++ b/textproc/py-xmltv/pkg-plist @@ -1,5 +1,5 @@ %%PYTHON_SITELIBDIR%%/xmltv.py %%PYTHON_SITELIBDIR%%/xmltv.pyc %%PYTHON_SITELIBDIR%%/xmltv.pyo -@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true -@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true +@dirrmtry %%PYTHON_SITELIBDIR%% +@dirrmtry %%PYTHON_LIBDIR%% diff --git a/textproc/resume-extensions/pkg-plist b/textproc/resume-extensions/pkg-plist index f096681cd894..e6dcc1c5e6d7 100644 --- a/textproc/resume-extensions/pkg-plist +++ b/textproc/resume-extensions/pkg-plist @@ -8,4 +8,4 @@ share/xsl/resume-extensions/params.xsl @dirrm share/xsl/resume-extensions/lib @dirrm share/xsl/resume-extensions/format @dirrm share/xsl/resume-extensions -@unexec rmdir %D/share/xsl 2>/dev/null || true +@dirrmtry share/xsl diff --git a/textproc/resume/pkg-plist b/textproc/resume/pkg-plist index 78b8101ab8aa..007f8f32c924 100644 --- a/textproc/resume/pkg-plist +++ b/textproc/resume/pkg-plist @@ -67,7 +67,7 @@ share/xsl/resume/params.xsl @dirrm share/xsl/resume/format @dirrm share/xsl/resume/country @dirrm share/xsl/resume -@unexec rmdir %D/share/xsl 2>/dev/null || true +@dirrmtry share/xsl %%JAVAJARDIR%%/xmlresume-filter.jar %%PORTDOCS%%%%EXAMPLESDIR%%/Makefile %%PORTDOCS%%%%EXAMPLESDIR%%/addressing/Makefile diff --git a/textproc/romdict/pkg-plist b/textproc/romdict/pkg-plist index ac2ede2d8908..4da2bd37aa97 100644 --- a/textproc/romdict/pkg-plist +++ b/textproc/romdict/pkg-plist @@ -1,3 +1,3 @@ lib/dictd/eng-rom.dict.dz lib/dictd/eng-rom.index -@unexec rmdir %D/lib/dictd 2>/dev/null || true +@dirrmtry lib/dictd diff --git a/textproc/ruby-html-fillinform/pkg-plist b/textproc/ruby-html-fillinform/pkg-plist index 305f7d252276..68fe105bce5e 100644 --- a/textproc/ruby-html-fillinform/pkg-plist +++ b/textproc/ruby-html-fillinform/pkg-plist @@ -1,6 +1,6 @@ %%RUBY_SITELIBDIR%%/html/fillform.rb %%RUBY_SITELIBDIR%%/html/fillinform.rb -@unexec rmdir %D/%%RUBY_SITELIBDIR%%/html 2>/dev/null || true +@dirrmtry %%RUBY_SITELIBDIR%%/html %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/demo.cgi %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/demo.rhtml %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%% diff --git a/textproc/ruby-html-template/pkg-plist b/textproc/ruby-html-template/pkg-plist index 9315fe262b31..9e2d1df1ab7b 100644 --- a/textproc/ruby-html-template/pkg-plist +++ b/textproc/ruby-html-template/pkg-plist @@ -1,5 +1,5 @@ %%RUBY_SITELIBDIR%%/html/template.rb -@unexec rmdir %D/%%RUBY_SITELIBDIR%%/html 2>/dev/null || true +@dirrmtry %%RUBY_SITELIBDIR%%/html %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cond.html %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/cond.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/env.html diff --git a/textproc/scim-input-pad/pkg-plist b/textproc/scim-input-pad/pkg-plist index dc41f7a6da3e..5d04e36b1dc2 100644 --- a/textproc/scim-input-pad/pkg-plist +++ b/textproc/scim-input-pad/pkg-plist @@ -11,6 +11,6 @@ share/scim/input-pad/base.pad share/scim/input-pad/chinese.pad share/scim/input-pad/japanese.pad share/scim/input-pad/keyboard.pad -@unexec rmdir %D/lib/scim-1.0/Helper 2>/dev/null || true -@unexec rmdir %D/lib 2>/dev/null || true -@unexec rmdir %D/share/scim/input-pad 2>/dev/null || true +@dirrmtry lib/scim-1.0/Helper +@dirrmtry lib +@dirrmtry share/scim/input-pad diff --git a/textproc/scim-openvanilla/pkg-plist b/textproc/scim-openvanilla/pkg-plist index d60f1f7eca68..666252e200d6 100644 --- a/textproc/scim-openvanilla/pkg-plist +++ b/textproc/scim-openvanilla/pkg-plist @@ -1,4 +1,4 @@ lib/scim-1.0/IMEngine/OVLoader-SCIM.a lib/scim-1.0/IMEngine/OVLoader-SCIM.la lib/scim-1.0/IMEngine/OVLoader-SCIM.so -@unexec rmdir %D/lib/scim-1.0/IMEngine 2>/dev/null || true +@dirrmtry lib/scim-1.0/IMEngine diff --git a/textproc/scim-table-imengine/pkg-plist b/textproc/scim-table-imengine/pkg-plist index bdfb7463866d..5711d78a0204 100644 --- a/textproc/scim-table-imengine/pkg-plist +++ b/textproc/scim-table-imengine/pkg-plist @@ -27,5 +27,5 @@ share/locale/it/LC_MESSAGES/scim-tables.mo %%SKIM%%@unexec rmdir %D/share/config.kcfg 2>/dev/null || true %%SKIM%%@unexec rmdir %D/share/services/skimconfiguredialog 2>/dev/null || true %%SKIM%%@cwd %%X11BASE%% -@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/textproc/scim/pkg-plist b/textproc/scim/pkg-plist index 6f88e6143b5e..c843bf6eeecc 100644 --- a/textproc/scim/pkg-plist +++ b/textproc/scim/pkg-plist @@ -110,7 +110,7 @@ share/locale/zh_TW/LC_MESSAGES/scim.mo @dirrm include/scim-1.0/x11 @dirrm include/scim-1.0/gtk @dirrm include/scim-1.0 -@unexec rmdir %D/lib/gtk-2.0/immodules 2>/dev/null || true +@dirrmtry lib/gtk-2.0/immodules @dirrm lib/scim-1.0/1.4.0/Config @dirrm lib/scim-1.0/1.4.0/Filter @dirrm lib/scim-1.0/1.4.0/FrontEnd diff --git a/textproc/sdf/pkg-plist b/textproc/sdf/pkg-plist index 6a8f15e0459e..975589db3a6a 100644 --- a/textproc/sdf/pkg-plist +++ b/textproc/sdf/pkg-plist @@ -651,5 +651,5 @@ share/doc/sdf/website @dirrm %%SITE_PERL%%/sdf/home/images @dirrm %%SITE_PERL%%/sdf/home @dirrm %%SITE_PERL%%/sdf -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/SDF 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/SDF +@dirrmtry %%SITE_PERL%%/Pod diff --git a/textproc/sgmltools-lite/pkg-plist b/textproc/sgmltools-lite/pkg-plist index b2e9b8e6e926..901e495d47c1 100644 --- a/textproc/sgmltools-lite/pkg-plist +++ b/textproc/sgmltools-lite/pkg-plist @@ -40,6 +40,6 @@ share/sgml/misc/sgmltools/VERSION @dirrm share/sgml/misc/sgmltools/python @dirrm share/sgml/misc/sgmltools @dirrm etc/sgml/catalog.d -@unexec rmdir %D/etc/sgml 2>/dev/null || true -@unexec rmdir %D/share/sgml/dtd 2>/dev/null || true -@unexec rmdir %D/share/sgml/misc 2>/dev/null || true +@dirrmtry etc/sgml +@dirrmtry share/sgml/dtd +@dirrmtry share/sgml/misc diff --git a/textproc/smartdoc-devel/pkg-plist b/textproc/smartdoc-devel/pkg-plist index 7ee3158bf8e8..8d25a980a618 100644 --- a/textproc/smartdoc-devel/pkg-plist +++ b/textproc/smartdoc-devel/pkg-plist @@ -18,4 +18,4 @@ share/xml/smartdoc/catalog @dirrm %%EXAMPLESDIR%%/pure @dirrm %%EXAMPLESDIR%%/html4 @dirrm %%EXAMPLESDIR%% -@unexec rmdir %D/lib/xemacs/site-lisp 2>/dev/null || true +@dirrmtry lib/xemacs/site-lisp diff --git a/textproc/smartdoc/pkg-plist b/textproc/smartdoc/pkg-plist index 1b51618dbc73..c7d2111a7939 100644 --- a/textproc/smartdoc/pkg-plist +++ b/textproc/smartdoc/pkg-plist @@ -14,8 +14,8 @@ share/emacs/site-lisp/sdoc-mode.el share/xml/catalog share/xml/smartdoc/PureSmartDoc.dtd share/xml/smartdoc/catalog -@unexec rmdir %D/lib/xemacs/site-lisp 2>/dev/null || true -@unexec rmdir %D/lib/xemacs 2>/dev/null || true +@dirrmtry lib/xemacs/site-lisp +@dirrmtry lib/xemacs @dirrm share/xml/smartdoc @dirrm %%EXAMPLESDIR%%/pure @dirrm %%EXAMPLESDIR%%/html4 diff --git a/textproc/tei-guidelines-p3/pkg-plist b/textproc/tei-guidelines-p3/pkg-plist index 4e804caca236..0179eb505451 100644 --- a/textproc/tei-guidelines-p3/pkg-plist +++ b/textproc/tei-guidelines-p3/pkg-plist @@ -726,4 +726,4 @@ %%PDF%%@dirrm share/doc/tei/p3/pdf %%P3X%%@dirrm share/doc/tei/p3/p3x @dirrm share/doc/tei/p3 -@unexec rmdir %D/share/doc/tei 2> /dev/null || true +@dirrmtry share/doc/tei diff --git a/textproc/tei-guidelines-p4/pkg-plist b/textproc/tei-guidelines-p4/pkg-plist index 680e22af19b9..45f48f981132 100644 --- a/textproc/tei-guidelines-p4/pkg-plist +++ b/textproc/tei-guidelines-p4/pkg-plist @@ -743,4 +743,4 @@ @dirrm %%DOCSDIR%%/DTD @dirrm %%DOCSDIR%%/Figures @dirrm %%DOCSDIR%% -@unexec rmdir %D/share/doc/tei/ 2>/dev/null || true +@dirrmtry share/doc/tei/ diff --git a/textproc/tei-lite/pkg-plist b/textproc/tei-lite/pkg-plist index a48f39e84f16..d29f59638994 100644 --- a/textproc/tei-lite/pkg-plist +++ b/textproc/tei-lite/pkg-plist @@ -4,4 +4,4 @@ share/sgml/tei/lite/teilite.tag share/sgml/tei/lite/catalog @exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTDDIR%%/catalog @dirrm share/sgml/tei/lite -@unexec rmdir %D/share/sgml/tei 2>/dev/null || true +@dirrmtry share/sgml/tei diff --git a/textproc/tei-p3/pkg-plist b/textproc/tei-p3/pkg-plist index 4b61ae2aa245..f678994e2ab3 100644 --- a/textproc/tei-p3/pkg-plist +++ b/textproc/tei-p3/pkg-plist @@ -49,4 +49,4 @@ share/sgml/tei/p3/teivers2.ent share/sgml/tei/p3/catalog @exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTDDIR%%/catalog @dirrm share/sgml/tei/p3 -@unexec rmdir %D/share/sgml/tei 2>/dev/null || true +@dirrmtry share/sgml/tei diff --git a/textproc/tei-p4/pkg-plist b/textproc/tei-p4/pkg-plist index 779f44c0b349..9513c1df6c1e 100644 --- a/textproc/tei-p4/pkg-plist +++ b/textproc/tei-p4/pkg-plist @@ -55,4 +55,4 @@ share/sgml/tei/p4/teilite.dec share/sgml/tei/p4/catalog @exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTDDIR%%/catalog @dirrm share/sgml/tei/p4/ -@unexec rmdir %D/share/sgml/tei 2>/dev/null || true +@dirrmtry share/sgml/tei diff --git a/textproc/txt2html/pkg-plist b/textproc/txt2html/pkg-plist index 13fc957da52b..478f6cdfc48d 100644 --- a/textproc/txt2html/pkg-plist +++ b/textproc/txt2html/pkg-plist @@ -1,3 +1,3 @@ bin/txt2html %%SITE_PERL%%/HTML/TextToHTML.pm -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTML diff --git a/textproc/uim/pkg-plist b/textproc/uim/pkg-plist index fc023a235fd8..9a1025058df9 100644 --- a/textproc/uim/pkg-plist +++ b/textproc/uim/pkg-plist @@ -129,7 +129,7 @@ share/locale/ko/LC_MESSAGES/uim.mo @dirrm include/uim @dirrm lib/uim/plugin @dirrm lib/uim -@unexec rmdir %D/share/applications 2>/dev/null || true +@dirrmtry share/applications %%GNOME%%@dirrm %%DATADIR%%/helperdata %%PORTDOCS%%@dirrm %%DOCSDIR_JA%% %%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/textproc/xhtml-11/pkg-plist b/textproc/xhtml-11/pkg-plist index 4762fdd9e1c2..6790561eaae4 100644 --- a/textproc/xhtml-11/pkg-plist +++ b/textproc/xhtml-11/pkg-plist @@ -8,4 +8,4 @@ share/xml/xhtml/1.1/xhtml11.dtd share/xml/xhtml/1.1/xml1.dcl share/xml/xhtml/1.1/xml1n.dcl @dirrm share/xml/xhtml/1.1 -@unexec rmdir %D/share/xml/xhtml 2>/dev/null || true +@dirrmtry share/xml/xhtml diff --git a/textproc/xhtml/pkg-plist b/textproc/xhtml/pkg-plist index 879764ad7541..146f74bca152 100644 --- a/textproc/xhtml/pkg-plist +++ b/textproc/xhtml/pkg-plist @@ -13,4 +13,4 @@ share/xml/dtd/xhtml/xhtml1-strict.dtd share/xml/dtd/xhtml/xhtml1-transitional.dtd share/xml/dtd/xhtml/xhtml1.dcl @dirrm share/xml/dtd/xhtml -@unexec rmdir %D/share/xml/dtd 2>/dev/null || true +@dirrmtry share/xml/dtd diff --git a/textproc/xmlroff/pkg-plist b/textproc/xmlroff/pkg-plist index c56e216a1c74..cbf89be9750b 100644 --- a/textproc/xmlroff/pkg-plist +++ b/textproc/xmlroff/pkg-plist @@ -358,7 +358,7 @@ share/xml/libfo-0.3.3/catalog.xml share/xml/libfo-0.3.3/libfo-compat.xsl share/xml/libfo-0.3.3/xmlroff.fo @dirrm share/xml/libfo-0.3.3 -@unexec rmdir %D/share/xml 2>/dev/null || true +@dirrmtry share/xml @dirrm %%DOCSDIR%% @dirrm include/libfo-0.3/util @dirrm include/libfo-0.3/property diff --git a/www/MT/pkg-plist b/www/MT/pkg-plist index 9b3c4744c532..e8b11abb9c57 100644 --- a/www/MT/pkg-plist +++ b/www/MT/pkg-plist @@ -989,5 +989,5 @@ @dirrm %%DATADIR%%/mt-static/images/nav_icons @dirrm %%DATADIR%%/mt-static/images @dirrm %%DATADIR%%/mt-static -@unexec rmdir %D/%%CGIDIR%%/db 2>/dev/null || true -@unexec rmdir %D/%%CGIDIR%% 2>/dev/null || true +@dirrmtry %%CGIDIR%%/db +@dirrmtry %%CGIDIR%% diff --git a/www/abcache/pkg-plist b/www/abcache/pkg-plist index eb9cb91fd308..385a13ebc401 100644 --- a/www/abcache/pkg-plist +++ b/www/abcache/pkg-plist @@ -1,2 +1,2 @@ lib/php/%%PHP_EXT_DIR%%/bware_cache.so -@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2>/dev/null || true +@dirrmtry lib/php/%%PHP_EXT_DIR%% diff --git a/www/amaya/pkg-plist b/www/amaya/pkg-plist index ccc9eff6525d..ccf4551476aa 100644 --- a/www/amaya/pkg-plist +++ b/www/amaya/pkg-plist @@ -1425,8 +1425,8 @@ bin/amaya-%%GUI%% %%DATADIR%%/resources/xrc/WinPrintDlgWX.xrc share/applications/amaya-8.8.1.desktop share/pixmaps/amaya-8.8.1.png -@unexec rmdir %D/share/applications 2>/dev/null || true -@unexec rmdir %D/share/pixmaps 2>/dev/null || true +@dirrmtry share/applications +@dirrmtry share/pixmaps @dirrm %%DATADIR%%/resources/xrc @dirrm %%DATADIR%%/resources/icons/misc @dirrm %%DATADIR%%/resources/icons/22x22 diff --git a/www/amphetadesk/pkg-plist b/www/amphetadesk/pkg-plist index 4ecbcbe46dce..a81e2fd97292 100644 --- a/www/amphetadesk/pkg-plist +++ b/www/amphetadesk/pkg-plist @@ -52,6 +52,6 @@ etc/rc.d/amphetadesk.sh @dirrm %%SITE_PERL%%/AmphetaDesk/AmphetaDesk/OS @dirrm %%SITE_PERL%%/AmphetaDesk/AmphetaDesk @dirrm %%SITE_PERL%%/AmphetaDesk -@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true -@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true -@unexec rmdir %D/lib/perl5 2>/dev/null || true +@dirrmtry %%SITE_PERL%% +@dirrmtry lib/perl5/site_perl +@dirrmtry lib/perl5 diff --git a/www/amyc/pkg-plist b/www/amyc/pkg-plist index 115e943325a5..5dfea208e53b 100644 --- a/www/amyc/pkg-plist +++ b/www/amyc/pkg-plist @@ -1,6 +1,6 @@ bin/amyc %%WITH_GTK%%bin/amycg share/locale/fr/LC_MESSAGES/amyc.mo -@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/fr 2>/dev/null || true -@unexec rmdir %D/share/locale 2>/dev/null || true +@dirrmtry share/locale/fr/LC_MESSAGES +@dirrmtry share/locale/fr +@dirrmtry share/locale diff --git a/www/analog/pkg-plist b/www/analog/pkg-plist index b76e2a8fbd0a..f2d12ff74daf 100644 --- a/www/analog/pkg-plist +++ b/www/analog/pkg-plist @@ -393,4 +393,4 @@ share/analog/lang/yudom.tab %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/css %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/%%IMGDIR%% 2>/dev/null || true +@dirrmtry %%IMGDIR%% diff --git a/www/apache13-modperl/pkg-plist b/www/apache13-modperl/pkg-plist index d2f6f6e34182..a5e39f8b3a58 100644 --- a/www/apache13-modperl/pkg-plist +++ b/www/apache13-modperl/pkg-plist @@ -662,8 +662,8 @@ www/icons/world2.png @dirrm share/doc/apache/howto @dirrm share/doc/apache/programs @dirrm share/doc/apache -@unexec rmdir %D/www/data-dist 2>/dev/null || true -@unexec rmdir %D/www/cgi-bin-dist 2>/dev/null || true +@dirrmtry www/data-dist +@dirrmtry www/cgi-bin-dist @unexec rm -f %D/etc/apache/httpd.conf.bak 2> /dev/null || true @dirrm www/icons/small @dirrm www/icons @@ -837,5 +837,5 @@ www/icons/world2.png @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/Constants @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2> /dev/null || true -@unexec rmdir %D/etc/apache 2> /dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle +@dirrmtry etc/apache diff --git a/www/apache13-modssl/pkg-plist b/www/apache13-modssl/pkg-plist index 8eedf17e23ba..1838cc3248bf 100644 --- a/www/apache13-modssl/pkg-plist +++ b/www/apache13-modssl/pkg-plist @@ -753,8 +753,8 @@ www/icons/world2.png @dirrm %%DOCSDIR%%/howto @dirrm %%DOCSDIR%%/programs @dirrm %%DOCSDIR%% -@unexec rmdir %D/www/data-dist 2>/dev/null || true -@unexec rmdir %D/www/cgi-bin-dist 2>/dev/null || true +@dirrmtry www/data-dist +@dirrmtry www/cgi-bin-dist @dirrm www/icons/small @dirrm www/icons @dirrm www/proxy diff --git a/www/apache13-ssl/pkg-plist b/www/apache13-ssl/pkg-plist index 5e916c354830..2ca0c04f648f 100644 --- a/www/apache13-ssl/pkg-plist +++ b/www/apache13-ssl/pkg-plist @@ -656,7 +656,7 @@ www/icons/world2.gif www/icons/world2.png @exec mkdir -p %D/www/proxy @unexec rm -f %D/etc/apache/httpsd.conf.bak 2> /dev/null || true -@unexec rmdir %D/etc/apache 2> /dev/null || true +@dirrmtry etc/apache @dirrm include/apache/xml @dirrm include/apache @dirrm libexec/apache diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist index 90d2c03b0574..3ad2a7266a9c 100644 --- a/www/apache20/pkg-plist +++ b/www/apache20/pkg-plist @@ -518,12 +518,12 @@ share/apache2/build/special.mk @dirrm %%EXAMPLESDIR%% @dirrm share/apache2/build @dirrm share/apache2 -@unexec rmdir %D/libexec/apache2 2> /dev/null || true +@dirrmtry libexec/apache2 @dirrm lib/apache2 @dirrm include/apache2 @exec mkdir -p %D/etc/apache2/Includes 2> /dev/null || true @exec mkdir -p %D/etc/apache2/envvars.d 2> /dev/null || true -@unexec rmdir %D/etc/apache2/Includes 2> /dev/null || true -@unexec rmdir %D/etc/apache2/envvars.d 2> /dev/null || true +@dirrmtry etc/apache2/Includes +@dirrmtry etc/apache2/envvars.d @unexec rm -f %D/etc/apache2/httpd.conf.bak 2> /dev/null || true @unexec rmdir %D/etc/apache2 2> /dev/null || echo "===> If you plan to do not reinstall apache2, you can safely remove %D/etc/apache2." diff --git a/www/apache21/pkg-plist b/www/apache21/pkg-plist index e8e253e3edce..9c09d2bda7ff 100644 --- a/www/apache21/pkg-plist +++ b/www/apache21/pkg-plist @@ -536,12 +536,12 @@ share/apache21/build/special.mk @dirrm share/apache21 %%APR_PORTS%%@dirrm include/apr-1 %%APR_PORTS%%@dirrm build-1 -@unexec rmdir %D/libexec/apache21 2> /dev/null || true +@dirrmtry libexec/apache21 @dirrm include/apache21 @exec mkdir -p %D/etc/apache21/Includes 2> /dev/null || true @exec mkdir -p %D/etc/apache21/envvars.d 2> /dev/null || true -@unexec rmdir %D/etc/apache21/Includes 2> /dev/null || true +@dirrmtry etc/apache21/Includes @unexec rm -f %D/etc/apache21/httpd.conf.bak 2> /dev/null || true -@unexec rmdir %D/etc/apache21/envvars.d 2> /dev/null || true -@unexec rmdir %D/etc/apache21/extra 2> /dev/null || true +@dirrmtry etc/apache21/envvars.d +@dirrmtry etc/apache21/extra @unexec rmdir %D/etc/apache21 2> /dev/null || echo "===> If you plan to do not reinstall apache21, you can safely remove %D/etc/apache21." diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist index c2f27f3b92a3..f6e4d0787cac 100644 --- a/www/apache22/pkg-plist +++ b/www/apache22/pkg-plist @@ -532,11 +532,11 @@ www/apache22/icons/world2.png @dirrm share/apache22 %%APR_PORTS%%@dirrm include/apr-1 %%APR_PORTS%%@dirrm build-1 -@unexec rmdir %D/libexec/apache22 2> /dev/null || true +@dirrmtry libexec/apache22 @dirrm include/apache22 -@unexec rmdir %D/www/apache22 2> /dev/null || true -@unexec rmdir %D/etc/apache22/Includes 2> /dev/null || true +@dirrmtry www/apache22 +@dirrmtry etc/apache22/Includes @unexec rm -f %D/etc/apache22/httpd.conf.bak 2> /dev/null || true -@unexec rmdir %D/etc/apache22/envvars.d 2> /dev/null || true -@unexec rmdir %D/etc/apache22/extra 2> /dev/null || true +@dirrmtry etc/apache22/envvars.d +@dirrmtry etc/apache22/extra @unexec rmdir %D/etc/apache22 2> /dev/null || echo "===> If you plan to do not reinstall apache22, you can safely remove %D/etc/apache22." diff --git a/www/bannerfilter/pkg-plist b/www/bannerfilter/pkg-plist index ffe5c35949e8..77724efcc89c 100644 --- a/www/bannerfilter/pkg-plist +++ b/www/bannerfilter/pkg-plist @@ -42,6 +42,6 @@ libexec/bannerfilter/redirector.pl %%WWW_ROOT%%/bannerfilter/xbbackground.gif %%WWW_ROOT%%/bannerfilter/xoom.html %%WWW_ROOT%%/bannerfilter/yahoo.html -@unexec rmdir %D/etc/bannerfilter 2> /dev/null || true +@dirrmtry etc/bannerfilter @dirrm libexec/bannerfilter @dirrm %%WWW_ROOT%%/bannerfilter diff --git a/www/bins/pkg-plist b/www/bins/pkg-plist index 70178e2ad8e6..18af6dc36aae 100644 --- a/www/bins/pkg-plist +++ b/www/bins/pkg-plist @@ -122,20 +122,20 @@ share/locale/it/LC_MESSAGES/bins.mo share/locale/pl/LC_MESSAGES/bins.mo share/locale/ru/LC_MESSAGES/bins.mo share/locale/zh/LC_MESSAGES/bins.mo -@unexec rmdir %D/share/locale/zh/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/zh 2>/dev/null || true -@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/ru 2>/dev/null || true -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/pl 2>/dev/null || true -@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/it 2>/dev/null || true -@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/fr 2>/dev/null || true -@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/es 2>/dev/null || true -@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/de 2>/dev/null || true +@dirrmtry share/locale/zh/LC_MESSAGES +@dirrmtry share/locale/zh +@dirrmtry share/locale/ru/LC_MESSAGES +@dirrmtry share/locale/ru +@dirrmtry share/locale/pl/LC_MESSAGES +@dirrmtry share/locale/pl +@dirrmtry share/locale/it/LC_MESSAGES +@dirrmtry share/locale/it +@dirrmtry share/locale/fr/LC_MESSAGES +@dirrmtry share/locale/fr +@dirrmtry share/locale/es/LC_MESSAGES +@dirrmtry share/locale/es +@dirrmtry share/locale/de/LC_MESSAGES +@dirrmtry share/locale/de %%PORTDOCS%%@dirrm share/doc/bins @dirrm share/bins/templates.joi/static @dirrm share/bins/templates.joi diff --git a/www/caudium10/pkg-plist b/www/caudium10/pkg-plist index b93033ab0de2..e69cb8f2afe4 100644 --- a/www/caudium10/pkg-plist +++ b/www/caudium10/pkg-plist @@ -558,12 +558,12 @@ caudium/server/install caudium/server/configvar caudium/server/.cvsignore @unexec rm %D/caudium/server/lib/7.0.361/PiXSL.so 2>/dev/null || true -@unexec rmdir %D/caudium/configurations 2>/dev/null || true -@unexec rmdir %D/caudium/local/modules 2>/dev/null || true -@unexec rmdir %D/caudium/local/nfonts 2>/dev/null || true -@unexec rmdir %D/caudium/local 2>/dev/null || true -@unexec rmdir %D/caudium/logs 2>/dev/null || true -@unexec rmdir %D/caudium/server/include 2>/dev/null || true +@dirrmtry caudium/configurations +@dirrmtry caudium/local/modules +@dirrmtry caudium/local/nfonts +@dirrmtry caudium/local +@dirrmtry caudium/logs +@dirrmtry caudium/server/include @dirrm caudium/readme @dirrm caudium/server/more_modules @dirrm caudium/server/base_server/config diff --git a/www/caudium12/pkg-plist b/www/caudium12/pkg-plist index 1b3981f66983..925ef994b78c 100644 --- a/www/caudium12/pkg-plist +++ b/www/caudium12/pkg-plist @@ -723,13 +723,13 @@ caudium/server/testca.pem caudium/server/install caudium/server/configvar caudium/server/.cvsignore -@unexec rmdir %D/caudium/configurations 2>/dev/null || true -@unexec rmdir %D/caudium/local/modules 2>/dev/null || true -@unexec rmdir %D/caudium/local/nfonts 2>/dev/null || true -@unexec rmdir %D/caudium/local 2>/dev/null || true -@unexec rmdir %D/caudium/logs 2>/dev/null || true -@unexec rmdir %D/caudium/var 2>/dev/null || true -@unexec rmdir %D/caudium/server/include 2>/dev/null || true +@dirrmtry caudium/configurations +@dirrmtry caudium/local/modules +@dirrmtry caudium/local/nfonts +@dirrmtry caudium/local +@dirrmtry caudium/logs +@dirrmtry caudium/var +@dirrmtry caudium/server/include @dirrm caudium/readme @dirrm caudium/server/more_modules @dirrm caudium/server/base_server/config diff --git a/www/caudium14/pkg-plist b/www/caudium14/pkg-plist index 1b3981f66983..925ef994b78c 100644 --- a/www/caudium14/pkg-plist +++ b/www/caudium14/pkg-plist @@ -723,13 +723,13 @@ caudium/server/testca.pem caudium/server/install caudium/server/configvar caudium/server/.cvsignore -@unexec rmdir %D/caudium/configurations 2>/dev/null || true -@unexec rmdir %D/caudium/local/modules 2>/dev/null || true -@unexec rmdir %D/caudium/local/nfonts 2>/dev/null || true -@unexec rmdir %D/caudium/local 2>/dev/null || true -@unexec rmdir %D/caudium/logs 2>/dev/null || true -@unexec rmdir %D/caudium/var 2>/dev/null || true -@unexec rmdir %D/caudium/server/include 2>/dev/null || true +@dirrmtry caudium/configurations +@dirrmtry caudium/local/modules +@dirrmtry caudium/local/nfonts +@dirrmtry caudium/local +@dirrmtry caudium/logs +@dirrmtry caudium/var +@dirrmtry caudium/server/include @dirrm caudium/readme @dirrm caudium/server/more_modules @dirrm caudium/server/base_server/config diff --git a/www/cgiwrap/pkg-plist b/www/cgiwrap/pkg-plist index 12b7a58134e2..c5b90fde8c84 100644 --- a/www/cgiwrap/pkg-plist +++ b/www/cgiwrap/pkg-plist @@ -2,4 +2,4 @@ www/cgi-bin/cgiwrap %%DEBUGFLAG%%www/cgi-bin/cgiwrapd %%NPHFLAG%%www/cgi-bin/nph-cgiwrap %%NPHFLAG%%%%DEBUGFLAG%%www/cgi-bin/nph-cgiwrapd -@unexec rmdir %D/www/cgi-bin 2>/dev/null || true +@dirrmtry www/cgi-bin diff --git a/www/cherokee-devel/pkg-plist b/www/cherokee-devel/pkg-plist index d9933fc61797..b92829348b5b 100644 --- a/www/cherokee-devel/pkg-plist +++ b/www/cherokee-devel/pkg-plist @@ -146,5 +146,5 @@ www/index.html @dirrm etc/cherokee/mods-enabled @dirrm etc/cherokee/mods-available @dirrm etc/cherokee -@unexec rmdir %D/www/images 2>/dev/null || true -@unexec rmdir %D/www/data 2>/dev/null || true +@dirrmtry www/images +@dirrmtry www/data diff --git a/www/cherokee/pkg-plist b/www/cherokee/pkg-plist index d9933fc61797..b92829348b5b 100644 --- a/www/cherokee/pkg-plist +++ b/www/cherokee/pkg-plist @@ -146,5 +146,5 @@ www/index.html @dirrm etc/cherokee/mods-enabled @dirrm etc/cherokee/mods-available @dirrm etc/cherokee -@unexec rmdir %D/www/images 2>/dev/null || true -@unexec rmdir %D/www/data 2>/dev/null || true +@dirrmtry www/images +@dirrmtry www/data diff --git a/www/coppermine/pkg-plist b/www/coppermine/pkg-plist index b6a526e656b3..d54f527753b2 100644 --- a/www/coppermine/pkg-plist +++ b/www/coppermine/pkg-plist @@ -699,4 +699,4 @@ @dirrm %%CPGDIR%%/albums/edit @dirrm %%CPGDIR%%/albums %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/%%CPGDIR%% 2>/dev/null || true +@dirrmtry %%CPGDIR%% diff --git a/www/dalbum/pkg-plist b/www/dalbum/pkg-plist index 3cb95c4644a4..9d872c59529c 100644 --- a/www/dalbum/pkg-plist +++ b/www/dalbum/pkg-plist @@ -81,12 +81,12 @@ %%DALBUM_DIR%%/reindex.php %%DALBUM_DIR%%/showimg.php %%DALBUM_DIR%%/version.txt -@unexec rmdir %D/%%DALBUM_DIR%%/pictures/Sample\ album 2>/dev/null || true -@unexec rmdir %D/%%DALBUM_DIR%%/pictures 2>/dev/null || true +@dirrmtry %%DALBUM_DIR%%/pictures/Sample\ album +@dirrmtry %%DALBUM_DIR%%/pictures @dirrm %%DALBUM_DIR%%/include/lang @dirrm %%DALBUM_DIR%%/include @dirrm %%DALBUM_DIR%%/images/folder @dirrm %%DALBUM_DIR%%/images @dirrm %%DALBUM_DIR%%/config -@unexec rmdir %D/%%DALBUM_DIR%%/.private 2>/dev/null || true +@dirrmtry %%DALBUM_DIR%%/.private @dirrm %%DALBUM_DIR%% diff --git a/www/dummyflash/pkg-plist b/www/dummyflash/pkg-plist index 29513d7aa154..1d5c408d69d0 100644 --- a/www/dummyflash/pkg-plist +++ b/www/dummyflash/pkg-plist @@ -1,2 +1,2 @@ lib/browser_plugins/dummyflash.so -@unexec rmdir %D/lib/browser_plugins 2>/dev/null || true +@dirrmtry lib/browser_plugins diff --git a/www/eaccelerator/pkg-plist b/www/eaccelerator/pkg-plist index 661dca538810..d94827ec5535 100644 --- a/www/eaccelerator/pkg-plist +++ b/www/eaccelerator/pkg-plist @@ -1,6 +1,6 @@ bin/encoder lib/php/%%PHP_EXT_DIR%%/eaccelerator.so -@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2> /dev/null || true +@dirrmtry lib/php/%%PHP_EXT_DIR%% %%EXAMPLESDIR%%/eaccelerator.ini %%EXAMPLESDIR%%/eaccelerator.php %%EXAMPLESDIR%%/eaccelerator_password.php diff --git a/www/emacs-w3m-xemacs21-mule/pkg-plist b/www/emacs-w3m-xemacs21-mule/pkg-plist index 47ae8959604c..701e6ff393f7 100644 --- a/www/emacs-w3m-xemacs21-mule/pkg-plist +++ b/www/emacs-w3m-xemacs21-mule/pkg-plist @@ -324,5 +324,5 @@ %%PORTDOCS%%@dirrm share/doc/ja/emacs-w3m %%PORTDOCS%%@dirrm share/doc/emacs-w3m @dirrm %%ICONDIR%% -@unexec rmdir %D/%%EMACS_PACKAGESDIR%%/etc/images 2>/dev/null || true +@dirrmtry %%EMACS_PACKAGESDIR%%/etc/images @dirrm %%LISPDIR%% diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist index 345aa634f2dd..6b952958030b 100644 --- a/www/epiphany-extensions/pkg-plist +++ b/www/epiphany-extensions/pkg-plist @@ -75,11 +75,11 @@ share/locale/uk/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/wa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo -@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 @dirrm share/gnome/epiphany-extensions/xml @dirrm share/gnome/epiphany-extensions/glade @dirrm share/gnome/epiphany-extensions -@unexec rmdir %D/lib/epiphany/%%VERSION%%/extensions 2>/dev/null || true -@unexec rmdir %D/lib/epiphany/%%VERSION%% 2>/dev/null || true -@unexec rmdir %D/lib/epiphany 2>/dev/null || true +@dirrmtry lib/epiphany/%%VERSION%%/extensions +@dirrmtry lib/epiphany/%%VERSION%% +@dirrmtry lib/epiphany diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist index a37f1e0548df..78669fe92aee 100644 --- a/www/evolution-webcal/pkg-plist +++ b/www/evolution-webcal/pkg-plist @@ -55,5 +55,5 @@ share/locale/vi/LC_MESSAGES/evolution-webcal.mo share/locale/xh/LC_MESSAGES/evolution-webcal.mo share/locale/zh_CN/LC_MESSAGES/evolution-webcal.mo share/locale/zh_TW/LC_MESSAGES/evolution-webcal.mo -@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ug 2> /dev/null || true +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug diff --git a/www/feedonfeeds/pkg-plist b/www/feedonfeeds/pkg-plist index c6017d870d31..2317cf7ea220 100644 --- a/www/feedonfeeds/pkg-plist +++ b/www/feedonfeeds/pkg-plist @@ -38,4 +38,4 @@ @dirrm %%DATADIR%%/frames @dirrm %%DATADIR%%/magpierss/extlib @dirrm %%DATADIR%%/magpierss -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true +@dirrmtry %%DATADIR%% diff --git a/www/flashplugin-mozilla/pkg-plist b/www/flashplugin-mozilla/pkg-plist index c8ebfc6508dd..58310e6b2b4d 100644 --- a/www/flashplugin-mozilla/pkg-plist +++ b/www/flashplugin-mozilla/pkg-plist @@ -1,2 +1,2 @@ %%PLUGIN_DIR%%/libnpflash.so -@unexec rmdir %D/%%PLUGIN_DIR%% 2>/dev/null || true +@dirrmtry %%PLUGIN_DIR%% diff --git a/www/flashplugin/pkg-plist b/www/flashplugin/pkg-plist index a96d3a0c8bfb..31369d02a103 100644 --- a/www/flashplugin/pkg-plist +++ b/www/flashplugin/pkg-plist @@ -1,3 +1,3 @@ lib/netscape/plugins/libswf.so -@unexec rmdir %D/lib/netscape/plugins 2>/dev/null || true -@unexec rmdir %D/lib/netscape 2>/dev/null || true +@dirrmtry lib/netscape/plugins +@dirrmtry lib/netscape diff --git a/www/frontpage/pkg-plist b/www/frontpage/pkg-plist index c26c15d136ff..7714232a8bc5 100644 --- a/www/frontpage/pkg-plist +++ b/www/frontpage/pkg-plist @@ -264,8 +264,8 @@ frontpage/version%%FP_VER%%/set_default_perms.sh @dirrm frontpage/version%%FP_VER%%/apache2 @dirrm frontpage/version%%FP_VER%%/admin/1033 @dirrm frontpage/version%%FP_VER%%/admin -@unexec rmdir %D/frontpage/version%%FP_VER%% 2> /dev/null || true -@unexec rmdir %D/frontpage 2> /dev/null || true +@dirrmtry frontpage/version%%FP_VER%% +@dirrmtry frontpage %%PORTDOCS%%%%DOCSDIR%%/readme.htm %%PORTDOCS%%%%DOCSDIR%%/readme_apache_dso.txt %%PORTDOCS%%%%DOCSDIR%%/LICENSE.TXT diff --git a/www/fxhtml/pkg-plist b/www/fxhtml/pkg-plist index dfa17a5282c6..b63fd70c9a6a 100644 --- a/www/fxhtml/pkg-plist +++ b/www/fxhtml/pkg-plist @@ -1,4 +1,4 @@ www/data/demo.fx www/cgi-bin/fxhtml -@unexec rmdir %D/www/data 2> /dev/null || true -@unexec rmdir %D/www/cgi-bin 2> /dev/null || true +@dirrmtry www/data +@dirrmtry www/cgi-bin diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist index 1d66d0cd4add..97f0a8cfdccc 100644 --- a/www/galeon/pkg-plist +++ b/www/galeon/pkg-plist @@ -213,8 +213,8 @@ share/locale/vi/LC_MESSAGES/galeon-2.0.mo share/locale/wa/LC_MESSAGES/galeon-2.0.mo share/locale/zh_CN/LC_MESSAGES/galeon-2.0.mo share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo -@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 @dirrm share/gnome/sounds/galeon @dirrm share/gnome/omf/galeon @dirrm share/gnome/help/galeon/es/figures diff --git a/www/gallery/pkg-plist b/www/gallery/pkg-plist index 8bc77c96ccb6..2cd08c4d7a11 100644 --- a/www/gallery/pkg-plist +++ b/www/gallery/pkg-plist @@ -1175,4 +1175,4 @@ @dirrm %%GALLERYDIR%%/classes/Mail @dirrm %%GALLERYDIR%%/classes/HTML @dirrm %%GALLERYDIR%%/classes -@unexec rmdir %D/%%GALLERYDIR%% 2>/dev/null || true +@dirrmtry %%GALLERYDIR%% diff --git a/www/gallery2/pkg-plist b/www/gallery2/pkg-plist index 59e03a116574..ee97b0465670 100644 --- a/www/gallery2/pkg-plist +++ b/www/gallery2/pkg-plist @@ -5624,7 +5624,7 @@ @dirrm %%GALLERY2DIR%%/install/locale/bg_BG @dirrm %%GALLERY2DIR%%/install/locale @dirrm %%GALLERY2DIR%%/install/images -@unexec rmdir %D/%%GALLERYDIR%%/install 2>/dev/null || true +@dirrmtry %%GALLERYDIR%%/install @dirrm %%GALLERY2DIR%%/images @dirrm %%GALLERY2DIR%%/docs -@unexec rmdir %D/%%GALLERYDIR%% 2>/dev/null || true +@dirrmtry %%GALLERYDIR%% diff --git a/www/gallery3/pkg-plist b/www/gallery3/pkg-plist index 59e03a116574..ee97b0465670 100644 --- a/www/gallery3/pkg-plist +++ b/www/gallery3/pkg-plist @@ -5624,7 +5624,7 @@ @dirrm %%GALLERY2DIR%%/install/locale/bg_BG @dirrm %%GALLERY2DIR%%/install/locale @dirrm %%GALLERY2DIR%%/install/images -@unexec rmdir %D/%%GALLERYDIR%%/install 2>/dev/null || true +@dirrmtry %%GALLERYDIR%%/install @dirrm %%GALLERY2DIR%%/images @dirrm %%GALLERY2DIR%%/docs -@unexec rmdir %D/%%GALLERYDIR%% 2>/dev/null || true +@dirrmtry %%GALLERYDIR%% diff --git a/www/gforge/pkg-plist b/www/gforge/pkg-plist index 21ed4cfab687..b26d5bd7719a 100644 --- a/www/gforge/pkg-plist +++ b/www/gforge/pkg-plist @@ -1370,19 +1370,19 @@ %%WWW_ROOT%%/gforge/www/tarballs.php %%WWW_ROOT%%/gforge/www/\ %%WWW_ROOT%%/gforge/www/index.php -@unexec rmdir %D/%%ETC_DIR%% 2>/dev/null || true -@unexec rmdir %D/%%BACKEND_DIR%%/backend/zones 2>/dev/null || true -@unexec rmdir %D/%%BACKEND_DIR%%/backend/shell 2>/dev/null || true -@unexec rmdir %D/%%BACKEND_DIR%%/backend 2>/dev/null || true -@unexec rmdir %D/%%BACKEND_DIR%%/cronjobs/mail 2>/dev/null || true -@unexec rmdir %D/%%BACKEND_DIR%%/cronjobs/tarballs 2>/dev/null || true -@unexec rmdir %D/%%BACKEND_DIR%%/cronjobs/dav-svn/mail 2>/dev/null || true -@unexec rmdir %D/%%BACKEND_DIR%%/cronjobs/dav-svn/www 2>/dev/null || true -@unexec rmdir %D/%%BACKEND_DIR%%/cronjobs/dav-svn 2>/dev/null || true -@unexec rmdir %D/%%BACKEND_DIR%%/cronjobs/cvs-cron/mail 2>/dev/null || true -@unexec rmdir %D/%%BACKEND_DIR%%/cronjobs/cvs-cron/www 2>/dev/null || true -@unexec rmdir %D/%%BACKEND_DIR%%/cronjobs/cvs-cron 2>/dev/null || true -@unexec rmdir %D/%%BACKEND_DIR%%/cronjobs 2>/dev/null || true +@dirrmtry %%ETC_DIR%% +@dirrmtry %%BACKEND_DIR%%/backend/zones +@dirrmtry %%BACKEND_DIR%%/backend/shell +@dirrmtry %%BACKEND_DIR%%/backend +@dirrmtry %%BACKEND_DIR%%/cronjobs/mail +@dirrmtry %%BACKEND_DIR%%/cronjobs/tarballs +@dirrmtry %%BACKEND_DIR%%/cronjobs/dav-svn/mail +@dirrmtry %%BACKEND_DIR%%/cronjobs/dav-svn/www +@dirrmtry %%BACKEND_DIR%%/cronjobs/dav-svn +@dirrmtry %%BACKEND_DIR%%/cronjobs/cvs-cron/mail +@dirrmtry %%BACKEND_DIR%%/cronjobs/cvs-cron/www +@dirrmtry %%BACKEND_DIR%%/cronjobs/cvs-cron +@dirrmtry %%BACKEND_DIR%%/cronjobs @dirrm %%BACKEND_DIR%%/monitor @dirrm %%BACKEND_DIR%%/utils/underworld-dummy @dirrm %%BACKEND_DIR%%/utils/cvs1 diff --git a/www/guile-www/pkg-plist b/www/guile-www/pkg-plist index b219c5463648..0bcedbc3979c 100644 --- a/www/guile-www/pkg-plist +++ b/www/guile-www/pkg-plist @@ -3,4 +3,4 @@ share/guile/www/http.scm share/guile/www/main.scm share/guile/www/url.scm @dirrm share/guile/www -@unexec rmdir %D/share/guile 2>/dev/null || true +@dirrmtry share/guile diff --git a/www/horde-base/pkg-plist b/www/horde-base/pkg-plist index ee9c61e2095a..e3902824891b 100644 --- a/www/horde-base/pkg-plist +++ b/www/horde-base/pkg-plist @@ -1578,16 +1578,16 @@ @dirrm %%HORDEDIR%%/lib/File/PDF @dirrm %%HORDEDIR%%/lib/File @dirrm %%HORDEDIR%%/lib/Block -@unexec rmdir %D/%%HORDEDIR%%/lib/data 2>/dev/null || true +@dirrmtry %%HORDEDIR%%/lib/data @dirrm %%HORDEDIR%%/lib @dirrm %%HORDEDIR%%/js -@unexec rmdir %D/%%HORDEDIR%%/config 2>/dev/null || true +@dirrmtry %%HORDEDIR%%/config @dirrm %%HORDEDIR%%/admin/setup @dirrm %%HORDEDIR%%/admin/perms @dirrm %%HORDEDIR%%/admin/locale/fi_FI @dirrm %%HORDEDIR%%/admin/locale/en_US @dirrm %%HORDEDIR%%/admin/locale @dirrm %%HORDEDIR%%/admin -@unexec rmdir %D/%%HORDEDIR%% 2>/dev/null || true +@dirrmtry %%HORDEDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% %%RMDIRINC%%@unexec rmdir %D/%%HORDE_INC%% 2>/dev/null || true diff --git a/www/horde-passwd/pkg-plist b/www/horde-passwd/pkg-plist index f774ee530482..6ec9e254af94 100644 --- a/www/horde-passwd/pkg-plist +++ b/www/horde-passwd/pkg-plist @@ -166,5 +166,5 @@ @dirrm %%LPWDDIR%%/locale @dirrm %%LPWDDIR%%/lib/Driver @dirrm %%LPWDDIR%%/lib -@unexec rmdir %D/%%LPWDDIR%%/config 2>/dev/null || true -@unexec rmdir %D/%%LPWDDIR%% 2>/dev/null || true +@dirrmtry %%LPWDDIR%%/config +@dirrmtry %%LPWDDIR%% diff --git a/www/horde/pkg-plist b/www/horde/pkg-plist index ee9c61e2095a..e3902824891b 100644 --- a/www/horde/pkg-plist +++ b/www/horde/pkg-plist @@ -1578,16 +1578,16 @@ @dirrm %%HORDEDIR%%/lib/File/PDF @dirrm %%HORDEDIR%%/lib/File @dirrm %%HORDEDIR%%/lib/Block -@unexec rmdir %D/%%HORDEDIR%%/lib/data 2>/dev/null || true +@dirrmtry %%HORDEDIR%%/lib/data @dirrm %%HORDEDIR%%/lib @dirrm %%HORDEDIR%%/js -@unexec rmdir %D/%%HORDEDIR%%/config 2>/dev/null || true +@dirrmtry %%HORDEDIR%%/config @dirrm %%HORDEDIR%%/admin/setup @dirrm %%HORDEDIR%%/admin/perms @dirrm %%HORDEDIR%%/admin/locale/fi_FI @dirrm %%HORDEDIR%%/admin/locale/en_US @dirrm %%HORDEDIR%%/admin/locale @dirrm %%HORDEDIR%%/admin -@unexec rmdir %D/%%HORDEDIR%% 2>/dev/null || true +@dirrmtry %%HORDEDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% %%RMDIRINC%%@unexec rmdir %D/%%HORDE_INC%% 2>/dev/null || true diff --git a/www/horde4-base/pkg-plist b/www/horde4-base/pkg-plist index ee9c61e2095a..e3902824891b 100644 --- a/www/horde4-base/pkg-plist +++ b/www/horde4-base/pkg-plist @@ -1578,16 +1578,16 @@ @dirrm %%HORDEDIR%%/lib/File/PDF @dirrm %%HORDEDIR%%/lib/File @dirrm %%HORDEDIR%%/lib/Block -@unexec rmdir %D/%%HORDEDIR%%/lib/data 2>/dev/null || true +@dirrmtry %%HORDEDIR%%/lib/data @dirrm %%HORDEDIR%%/lib @dirrm %%HORDEDIR%%/js -@unexec rmdir %D/%%HORDEDIR%%/config 2>/dev/null || true +@dirrmtry %%HORDEDIR%%/config @dirrm %%HORDEDIR%%/admin/setup @dirrm %%HORDEDIR%%/admin/perms @dirrm %%HORDEDIR%%/admin/locale/fi_FI @dirrm %%HORDEDIR%%/admin/locale/en_US @dirrm %%HORDEDIR%%/admin/locale @dirrm %%HORDEDIR%%/admin -@unexec rmdir %D/%%HORDEDIR%% 2>/dev/null || true +@dirrmtry %%HORDEDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% %%RMDIRINC%%@unexec rmdir %D/%%HORDE_INC%% 2>/dev/null || true diff --git a/www/httrack/pkg-plist b/www/httrack/pkg-plist index 8c007b3b4d8d..100c2b572443 100644 --- a/www/httrack/pkg-plist +++ b/www/httrack/pkg-plist @@ -215,5 +215,5 @@ share/pixmaps/httrack.xpm @dirrm %%DOCSDIR%% @dirrm lib/httrack @dirrm include/httrack -@unexec rmdir %D/share/pixmaps 2>/dev/null || true -@unexec rmdir %D/share/applications 2>/dev/null || true +@dirrmtry share/pixmaps +@dirrmtry share/applications diff --git a/www/instiki/pkg-plist b/www/instiki/pkg-plist index fd060dc9760d..84857aa1092c 100644 --- a/www/instiki/pkg-plist +++ b/www/instiki/pkg-plist @@ -1025,6 +1025,6 @@ etc/rc.d/instiki.sh @dirrm %%INSTIKIDIR%%app/views @dirrm %%INSTIKIDIR%%app @dirrm %%INSTIKIDIR%%lib -@unexec rmdir %D/%%INSTIKIDIR%%storage/2500 2>/dev/null || true -@unexec rmdir %D/%%INSTIKIDIR%%storage 2>/dev/null || true -@unexec rmdir %D/%%INSTIKIDIR%% 2>/dev/null || true +@dirrmtry %%INSTIKIDIR%%storage/2500 +@dirrmtry %%INSTIKIDIR%%storage +@dirrmtry %%INSTIKIDIR%% diff --git a/www/interchange/pkg-plist b/www/interchange/pkg-plist index 24f5b6d3ecac..7b75b1bb1071 100644 --- a/www/interchange/pkg-plist +++ b/www/interchange/pkg-plist @@ -1754,6 +1754,6 @@ interchange/standard/variables/THEME_CSS @dirrm interchange/code/Filter @dirrm interchange/code/ActionMap @dirrm interchange/code -@unexec rmdir %D/interchange/src 2>/dev/null || true -@unexec rmdir %D/interchange/etc 2>/dev/null || true -@unexec rmdir %D/interchange 2>/dev/null || true +@dirrmtry interchange/src +@dirrmtry interchange/etc +@dirrmtry interchange diff --git a/www/jakarta-tomcat3/pkg-plist b/www/jakarta-tomcat3/pkg-plist index 139e4fd7199c..dc79a97ae169 100644 --- a/www/jakarta-tomcat3/pkg-plist +++ b/www/jakarta-tomcat3/pkg-plist @@ -146,11 +146,11 @@ etc/rc.d/020.jakarta-tomcat3.sh @exec mkdir -p %D/%%T%%/conf/auto || true @exec mkdir -p %D/%%T%%/modules || true @exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/ -@unexec rmdir %D/%%T%%/conf/users 2>/dev/null || true -@unexec rmdir %D/%%T%%/conf/auto 2>/dev/null || true -@unexec rmdir %D/%%T%%/conf/jserv 2>/dev/null || true -@unexec rmdir %D/%%T%%/conf/jk 2>/dev/null || true -@unexec rmdir %D/%%T%%/conf 2>/dev/null || true +@dirrmtry %%T%%/conf/users +@dirrmtry %%T%%/conf/auto +@dirrmtry %%T%%/conf/jserv +@dirrmtry %%T%%/conf/jk +@dirrmtry %%T%%/conf @dirrm %%T%%/logs @dirrm %%T%%/doc/images @dirrm %%T%%/doc/appdev/sample/etc @@ -172,4 +172,4 @@ etc/rc.d/020.jakarta-tomcat3.sh @dirrm %%T%%/webapps @dirrm %%T%%/bin @dirrm %%T%%/ant -@unexec rmdir %D/%%T%% 2>/dev/null || true +@dirrmtry %%T%% diff --git a/www/jakarta-tomcat4/pkg-plist b/www/jakarta-tomcat4/pkg-plist index 45855e0e3f87..95e5b3ae4ed9 100644 --- a/www/jakarta-tomcat4/pkg-plist +++ b/www/jakarta-tomcat4/pkg-plist @@ -971,7 +971,7 @@ etc/rc.d/020.jakarta-tomcat4.sh @exec mkdir %D/%%T%%/server/classes || true @exec mkdir %D/%%T%%/work || true @exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/ -@unexec rmdir %D/%%T%%/conf 2>/dev/null || true +@dirrmtry %%T%%/conf @dirrm %%T%%/logs @dirrm %%T%%/webapps/tomcat-docs/appdev/sample/src/mypackage @dirrm %%T%%/webapps/tomcat-docs/appdev/sample/src @@ -1095,4 +1095,4 @@ etc/rc.d/020.jakarta-tomcat4.sh @dirrm %%T%%/server/classes @dirrm %%T%%/server @dirrm %%T%%/work -@unexec rmdir %D/%%T%% 2>/dev/null || true +@dirrmtry %%T%% diff --git a/www/kdedict/pkg-plist b/www/kdedict/pkg-plist index 0809046a8346..53302d31d29e 100644 --- a/www/kdedict/pkg-plist +++ b/www/kdedict/pkg-plist @@ -17,4 +17,4 @@ www/cgi-bin/kdedictionary/sessiondb www/cgi-bin/kdedictionary/userdb www/cgi-bin/kdedictionary/users @dirrm www/cgi-bin/kdedictionary -@unexec rmdir %D/www/cgi-bin 2>/dev/null || true +@dirrmtry www/cgi-bin diff --git a/www/middleman/pkg-plist b/www/middleman/pkg-plist index b161031690a6..6f4a6dca7488 100644 --- a/www/middleman/pkg-plist +++ b/www/middleman/pkg-plist @@ -6,5 +6,5 @@ etc/mman.xml.dist %%PORTDOCS%%@dirrm %%DOCSDIR%% @cwd / @exec mkdir -p %%MMAN_CACHE%% -@unexec rmdir %D/%%MMAN_CACHE%% 2>/dev/null || true +@dirrmtry %%MMAN_CACHE%% @dirrm /var/cache diff --git a/www/mnogosearch/pkg-plist b/www/mnogosearch/pkg-plist index 334717109018..bc1e333ea336 100644 --- a/www/mnogosearch/pkg-plist +++ b/www/mnogosearch/pkg-plist @@ -439,5 +439,5 @@ sbin/indexer @dirrm etc/mnogosearch/synonym @dirrm etc/mnogosearch/stopwords @dirrm etc/mnogosearch/langmap -@unexec rmdir %D/etc/mnogosearch 2>/dev/null || true +@dirrmtry etc/mnogosearch @dirrm %%DOCSDIR%% diff --git a/www/mod_perl/pkg-plist b/www/mod_perl/pkg-plist index dcf31a2abd45..c38fcda33a25 100644 --- a/www/mod_perl/pkg-plist +++ b/www/mod_perl/pkg-plist @@ -71,9 +71,9 @@ libexec/apache/libperl.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/include @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Leak @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Symbol -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/Constants -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache 2>/dev/null || true -@unexec rmdir %D/etc/apache 2> /dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache +@dirrmtry etc/apache diff --git a/www/mod_perl2/pkg-plist b/www/mod_perl2/pkg-plist index 2c9634b1dac9..0a8a5e9bd032 100644 --- a/www/mod_perl2/pkg-plist +++ b/www/mod_perl2/pkg-plist @@ -324,11 +324,11 @@ bin/mp2bug @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR/Base64 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/APR @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/ModPerl -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/APR @dirrm include/apache2/modules/perl -@unexec rmdir %D/include/apache2/modules 2>/dev/null || true -@unexec rmdir %D/include/apache2 2>/dev/null || true +@dirrmtry include/apache2/modules +@dirrmtry include/apache2 diff --git a/www/mozplugger/pkg-plist b/www/mozplugger/pkg-plist index a78302e1df15..b7970ed4319b 100644 --- a/www/mozplugger/pkg-plist +++ b/www/mozplugger/pkg-plist @@ -2,4 +2,4 @@ bin/mozplugger-helper bin/mozplugger-controller etc/mozpluggerrc lib/browser_plugins/mozplugger.so -@unexec rmdir %D/lib/browser_plugins 2> /dev/null || true +@dirrmtry lib/browser_plugins diff --git a/www/mplayer-plugin/pkg-plist b/www/mplayer-plugin/pkg-plist index 39c9f1b0f11e..92dba19e7082 100644 --- a/www/mplayer-plugin/pkg-plist +++ b/www/mplayer-plugin/pkg-plist @@ -24,6 +24,6 @@ share/locale/nl/LC_MESSAGES/mplayerplug-in.mo share/locale/pl/LC_MESSAGES/mplayerplug-in.mo share/locale/pt_BR/LC_MESSAGES/mplayerplug-in.mo share/locale/ru/LC_MESSAGES/mplayerplug-in.mo -@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/en_US 2> /dev/null || true +@dirrmtry share/locale/en_US/LC_MESSAGES +@dirrmtry share/locale/en_US @unexec rmdir %D/lib/browser_plugins 2>/dev/null || /usr/bin/true diff --git a/www/nginx-devel/pkg-plist b/www/nginx-devel/pkg-plist index ace48038cb95..460817a8abeb 100644 --- a/www/nginx-devel/pkg-plist +++ b/www/nginx-devel/pkg-plist @@ -6,7 +6,7 @@ etc/nginx/mime.types-dist @unexec if cmp -s %D/etc/nginx/nginx.conf %D/etc/nginx/nginx.conf-dist; then rm -f %D/etc/nginx/nginx.conf; fi etc/nginx/nginx.conf-dist @exec [ -f %B/nginx.conf ] || cp %B/%f %B/nginx.conf -@unexec rmdir %D/etc/nginx 2>/dev/null || true +@dirrmtry etc/nginx %%WWWDATA%%@exec mkdir -p -m 755 www/nginx-dist @comment @unexec chmod u+w www/nginx-dist %%WWWDATA%%www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING diff --git a/www/nginx/pkg-plist b/www/nginx/pkg-plist index ace48038cb95..460817a8abeb 100644 --- a/www/nginx/pkg-plist +++ b/www/nginx/pkg-plist @@ -6,7 +6,7 @@ etc/nginx/mime.types-dist @unexec if cmp -s %D/etc/nginx/nginx.conf %D/etc/nginx/nginx.conf-dist; then rm -f %D/etc/nginx/nginx.conf; fi etc/nginx/nginx.conf-dist @exec [ -f %B/nginx.conf ] || cp %B/%f %B/nginx.conf -@unexec rmdir %D/etc/nginx 2>/dev/null || true +@dirrmtry etc/nginx %%WWWDATA%%@exec mkdir -p -m 755 www/nginx-dist @comment @unexec chmod u+w www/nginx-dist %%WWWDATA%%www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING diff --git a/www/oops/pkg-plist b/www/oops/pkg-plist index 392066cca2fb..b63dd14e05e2 100644 --- a/www/oops/pkg-plist +++ b/www/oops/pkg-plist @@ -53,11 +53,11 @@ sbin/oops sbin/oopsctl @dirrm libexec/oops @dirrm etc/oops/tables -@unexec rmdir %D/etc/oops 2>/dev/null || true -@unexec rmdir %D/oops/DB 2>/dev/null || true -@unexec rmdir %D/oops/logs 2>/dev/null || true -@unexec rmdir %D/oops/storages 2>/dev/null || true -@unexec rmdir %D/oops 2>/dev/null || true +@dirrmtry etc/oops +@dirrmtry oops/DB +@dirrmtry oops/logs +@dirrmtry oops/storages +@dirrmtry oops @unexec rmdir /var/log/oops 2>/dev/null || true @unexec rm -f /var/run/oops/oopsctl 2>/dev/null || true @unexec rm -f /var/run/oops/oops_statfile 2>/dev/null || true diff --git a/www/openvrml/pkg-plist b/www/openvrml/pkg-plist index 3e4153beca3a..fccde3a4391d 100644 --- a/www/openvrml/pkg-plist +++ b/www/openvrml/pkg-plist @@ -54,6 +54,6 @@ lib/mozilla/plugins/openvrml.xpt @dirrm include/openvrml @dirrm share/idl/openvrml-%%VER%% %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% -@unexec rmdir %D/share/gtk-doc/html/gtkglext 2>/dev/null || true -@unexec rmdir %D/share/gtk-doc/html 2>/dev/null || true -@unexec rmdir %D/share/gtk-doc 2>/dev/null || true +@dirrmtry share/gtk-doc/html/gtkglext +@dirrmtry share/gtk-doc/html +@dirrmtry share/gtk-doc diff --git a/www/p5-AMF-Perl/pkg-plist b/www/p5-AMF-Perl/pkg-plist index b8ba63095b36..f06626f9606e 100644 --- a/www/p5-AMF-Perl/pkg-plist +++ b/www/p5-AMF-Perl/pkg-plist @@ -14,5 +14,5 @@ @dirrm %%SITE_PERL%%/AMF/Perl/Util @dirrm %%SITE_PERL%%/AMF/Perl @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AMF/Perl -@unexec rmdir %D/%%SITE_PERL%%/AMF 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AMF 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/AMF +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AMF diff --git a/www/p5-Acme-Monta/pkg-plist b/www/p5-Acme-Monta/pkg-plist index 633f4bed0aa7..eadda4465a92 100644 --- a/www/p5-Acme-Monta/pkg-plist +++ b/www/p5-Acme-Monta/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Acme/Monta.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme/Monta/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme/Monta -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Acme 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Acme +@dirrmtry %%SITE_PERL%%/Acme diff --git a/www/p5-Apache-ASP/pkg-plist b/www/p5-Apache-ASP/pkg-plist index bd9ab42fdbf9..7c597c9f35c7 100644 --- a/www/p5-Apache-ASP/pkg-plist +++ b/www/p5-Apache-ASP/pkg-plist @@ -32,8 +32,8 @@ bin/asp-perl @dirrm %%SITE_PERL%%/Apache/ASP/Share/CORE @dirrm %%SITE_PERL%%/Apache/ASP/Share @dirrm %%SITE_PERL%%/Apache/ASP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache @dirrm %%SITE_PERL%%/Bundle/Apache/ASP @dirrm %%SITE_PERL%%/Bundle/Apache -@unexec rmdir %D/%%SITE_PERL%%/Bundle/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Bundle/Apache +@dirrmtry %%SITE_PERL%%/Apache diff --git a/www/p5-Apache-AddHostPath/pkg-plist b/www/p5-Apache-AddHostPath/pkg-plist index 336c74ba47ff..0723bae3ed08 100644 --- a/www/p5-Apache-AddHostPath/pkg-plist +++ b/www/p5-Apache-AddHostPath/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Apache/AddHostPath.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AddHostPath/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AddHostPath -@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/www/p5-Apache-Admin-Config/pkg-plist b/www/p5-Apache-Admin-Config/pkg-plist index de408c3e1b13..62eb47afcabc 100644 --- a/www/p5-Apache-Admin-Config/pkg-plist +++ b/www/p5-Apache-Admin-Config/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin/Config/.packlist %%SITE_PERL%%/Apache/Admin/Config.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin/Config -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Apache/Admin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Admin +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache +@dirrmtry %%SITE_PERL%%/Apache/Admin +@dirrmtry %%SITE_PERL%%/Apache diff --git a/www/p5-Apache-AntiSpam/pkg-plist b/www/p5-Apache-AntiSpam/pkg-plist index ab0f54471da8..b1ef8604476f 100644 --- a/www/p5-Apache-AntiSpam/pkg-plist +++ b/www/p5-Apache-AntiSpam/pkg-plist @@ -4,6 +4,6 @@ %%SITE_PERL%%/Apache/AntiSpam/Heuristic.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AntiSpam/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AntiSpam -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache @dirrm %%SITE_PERL%%/Apache/AntiSpam -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Apache diff --git a/www/p5-Apache-Archive/pkg-plist b/www/p5-Apache-Archive/pkg-plist index 5b50a615ac23..b76bf519092d 100644 --- a/www/p5-Apache-Archive/pkg-plist +++ b/www/p5-Apache-Archive/pkg-plist @@ -3,6 +3,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Archive/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Archive @dirrm %%SITE_PERL%%/auto/Apache/Archive -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/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%%/auto/Apache +@dirrmtry %%SITE_PERL%%/Apache diff --git a/www/p5-Apache-AuthCookie/pkg-plist b/www/p5-Apache-AuthCookie/pkg-plist index a09b80078cbb..b47cfdffb299 100644 --- a/www/p5-Apache-AuthCookie/pkg-plist +++ b/www/p5-Apache-AuthCookie/pkg-plist @@ -4,5 +4,5 @@ @dirrm %%SITE_PERL%%/Apache/AuthCookie %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthCookie/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthCookie -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Apache2 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Apache +@dirrmtry %%SITE_PERL%%/Apache2 diff --git a/www/p5-Apache-AuthTicket/pkg-plist b/www/p5-Apache-AuthTicket/pkg-plist index 6abe3abb4a32..3a4d75c0483a 100644 --- a/www/p5-Apache-AuthTicket/pkg-plist +++ b/www/p5-Apache-AuthTicket/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Apache/AuthTicket.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthTicket/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthTicket -@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/www/p5-Apache-AuthenCache/pkg-plist b/www/p5-Apache-AuthenCache/pkg-plist index 5d53fbeff37f..eb9012894e5f 100644 --- a/www/p5-Apache-AuthenCache/pkg-plist +++ b/www/p5-Apache-AuthenCache/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Apache/AuthenCache.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthenCache/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthenCache -@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/www/p5-Apache-AxKit-Plugin-AddXSLParams-Request/pkg-plist b/www/p5-Apache-AxKit-Plugin-AddXSLParams-Request/pkg-plist index b80557d222b8..1abe75a763aa 100644 --- a/www/p5-Apache-AxKit-Plugin-AddXSLParams-Request/pkg-plist +++ b/www/p5-Apache-AxKit-Plugin-AddXSLParams-Request/pkg-plist @@ -1,11 +1,11 @@ %%SITE_PERL%%/Apache/AxKit/Plugin/AddXSLParams/Request.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/Plugin/AddXSLParams/Request/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/Plugin/AddXSLParams/Request -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/Plugin/AddXSLParams 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Apache/AxKit/Plugin/AddXSLParams 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Apache/AxKit/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Apache/AxKit 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/Plugin/AddXSLParams +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit/Plugin +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AxKit +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache +@dirrmtry %%SITE_PERL%%/Apache/AxKit/Plugin/AddXSLParams +@dirrmtry %%SITE_PERL%%/Apache/AxKit/Plugin +@dirrmtry %%SITE_PERL%%/Apache/AxKit +@dirrmtry %%SITE_PERL%%/Apache diff --git a/www/p5-Apache-Clean/pkg-plist b/www/p5-Apache-Clean/pkg-plist index 65a28fe6254c..2ef7e3b83235 100644 --- a/www/p5-Apache-Clean/pkg-plist +++ b/www/p5-Apache-Clean/pkg-plist @@ -3,5 +3,5 @@ %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Clean -@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/www/p5-Apache-Clean2/pkg-plist b/www/p5-Apache-Clean2/pkg-plist index 65a28fe6254c..2ef7e3b83235 100644 --- a/www/p5-Apache-Clean2/pkg-plist +++ b/www/p5-Apache-Clean2/pkg-plist @@ -3,5 +3,5 @@ %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Clean -@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/www/p5-Apache-Compress/pkg-plist b/www/p5-Apache-Compress/pkg-plist index f6acd4686cdb..355aacd3cee6 100644 --- a/www/p5-Apache-Compress/pkg-plist +++ b/www/p5-Apache-Compress/pkg-plist @@ -3,5 +3,5 @@ %%PORTDOCS%%%%DOCSDIR%%/Changes %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Compress -@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/www/p5-Apache-CompressClientFixup/pkg-plist b/www/p5-Apache-CompressClientFixup/pkg-plist index a59692c136cd..9a4e1cac6184 100644 --- a/www/p5-Apache-CompressClientFixup/pkg-plist +++ b/www/p5-Apache-CompressClientFixup/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Apache/CompressClientFixup.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/CompressClientFixup/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/CompressClientFixup -@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/www/p5-Apache-ConfigFile/pkg-plist b/www/p5-Apache-ConfigFile/pkg-plist index bdd04740a326..3150160c9942 100644 --- a/www/p5-Apache-ConfigFile/pkg-plist +++ b/www/p5-Apache-ConfigFile/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ConfigFile/.packlist %%SITE_PERL%%/Apache/ConfigFile.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ConfigFile -@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/www/p5-Apache-DB/pkg-plist b/www/p5-Apache-DB/pkg-plist index 8efb1e03b070..11f55c6bb0a3 100644 --- a/www/p5-Apache-DB/pkg-plist +++ b/www/p5-Apache-DB/pkg-plist @@ -6,5 +6,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DB/DB.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DB/DB.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DB -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache diff --git a/www/p5-Apache-DBI/pkg-plist b/www/p5-Apache-DBI/pkg-plist index e93f4e5a09b9..814e8dc2141f 100644 --- a/www/p5-Apache-DBI/pkg-plist +++ b/www/p5-Apache-DBI/pkg-plist @@ -2,4 +2,4 @@ %%SITE_PERL%%/Apache/AuthDBI.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DBI/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DBI -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Apache diff --git a/www/p5-Apache-DebugInfo/pkg-plist b/www/p5-Apache-DebugInfo/pkg-plist index 2c2c346006b9..3e7b1c6c1ac8 100644 --- a/www/p5-Apache-DebugInfo/pkg-plist +++ b/www/p5-Apache-DebugInfo/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DebugInfo/.packlist %%SITE_PERL%%/Apache/DebugInfo.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DebugInfo -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Apache +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache diff --git a/www/p5-Apache-DumpHeaders/pkg-plist b/www/p5-Apache-DumpHeaders/pkg-plist index 330bdeb2352d..02bb1945f327 100644 --- a/www/p5-Apache-DumpHeaders/pkg-plist +++ b/www/p5-Apache-DumpHeaders/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/Apache/DumpHeaders.pm %%SITE_PERL%%/Apache/ProxyPassThru.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DumpHeaders/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DumpHeaders 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Apache +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DumpHeaders +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache diff --git a/www/p5-Apache-Filter/pkg-plist b/www/p5-Apache-Filter/pkg-plist index 0a8849bfe148..a7bd80158794 100644 --- a/www/p5-Apache-Filter/pkg-plist +++ b/www/p5-Apache-Filter/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Apache/PerlRunFilter.pm %%SITE_PERL%%/Apache/Filter.pm %%SITE_PERL%%/Apache/RegistryFilter.pm -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Apache %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Filter/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Filter -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache diff --git a/www/p5-Apache-Gallery/pkg-plist b/www/p5-Apache-Gallery/pkg-plist index e8d75002730f..63d7e7e5d7f6 100644 --- a/www/p5-Apache-Gallery/pkg-plist +++ b/www/p5-Apache-Gallery/pkg-plist @@ -59,7 +59,7 @@ www/icons/gallery/video-mpeg.png www/icons/gallery/video-mpg.png www/icons/gallery/video-wmv.png @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Gallery -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Apache @dirrm %%DATADIR%%/templates/default @dirrm %%DATADIR%%/templates/new @dirrm %%DATADIR%%/templates diff --git a/www/p5-Apache-GopherHandler/pkg-plist b/www/p5-Apache-GopherHandler/pkg-plist index ee1491ab97eb..94c6b9e72445 100644 --- a/www/p5-Apache-GopherHandler/pkg-plist +++ b/www/p5-Apache-GopherHandler/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/Apache/GopherHandler.pm %%SITE_PERL%%/Apache/GopherHandler/TiedSocket.pm @dirrm %%SITE_PERL%%/Apache/GopherHandler -@unexec rmdir %D/%%SITE_PERL%%/Apache 2> /dev/null || true +@dirrmtry %%SITE_PERL%%/Apache diff --git a/www/p5-Apache-MP3/pkg-plist b/www/p5-Apache-MP3/pkg-plist index 522977529696..a8fbdc3a2033 100644 --- a/www/p5-Apache-MP3/pkg-plist +++ b/www/p5-Apache-MP3/pkg-plist @@ -55,8 +55,8 @@ share/Apache-MP3/playlist.gif share/Apache-MP3/right_arrow.gif share/Apache-MP3/sound.gif @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/MP3 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache @dirrm %%SITE_PERL%%/Apache/MP3/L10N @dirrm %%SITE_PERL%%/Apache/MP3 -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Apache @dirrm share/Apache-MP3 diff --git a/www/p5-Apache-NNTPGateway/pkg-plist b/www/p5-Apache-NNTPGateway/pkg-plist index 5fd095ccb30d..2bbed3adf5f8 100644 --- a/www/p5-Apache-NNTPGateway/pkg-plist +++ b/www/p5-Apache-NNTPGateway/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/NNTPGateway/.packlist %%SITE_PERL%%/Apache/NNTPGateway.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/NNTPGateway -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Apache +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache diff --git a/www/p5-Apache-PageKit/pkg-plist b/www/p5-Apache-PageKit/pkg-plist index 25a600cd17df..a1cd5f375cba 100644 --- a/www/p5-Apache-PageKit/pkg-plist +++ b/www/p5-Apache-PageKit/pkg-plist @@ -81,7 +81,7 @@ %%PORTDOCS%%@dirrm share/examples/Apache-PageKit/Config %%PORTDOCS%%@dirrm share/examples/Apache-PageKit @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/PageKit -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Apache/PageKit 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/XML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache +@dirrmtry %%SITE_PERL%%/Apache/PageKit +@dirrmtry %%SITE_PERL%%/Apache +@dirrmtry %%SITE_PERL%%/XML diff --git a/www/p5-Apache-ParseFormData/pkg-plist b/www/p5-Apache-ParseFormData/pkg-plist index 1876f09f6a6c..6dee2911ca1c 100644 --- a/www/p5-Apache-ParseFormData/pkg-plist +++ b/www/p5-Apache-ParseFormData/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Apache/ParseFormData.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ParseFormData/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/ParseFormData -@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/www/p5-Apache-Peek/pkg-plist b/www/p5-Apache-Peek/pkg-plist index 5e9cdb7cfe36..c5415d947b62 100644 --- a/www/p5-Apache-Peek/pkg-plist +++ b/www/p5-Apache-Peek/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Peek/Peek.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Peek/Peek.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Peek -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache diff --git a/www/p5-Apache-Profiler/pkg-plist b/www/p5-Apache-Profiler/pkg-plist index 194c4d298eb3..8fcf805561b5 100644 --- a/www/p5-Apache-Profiler/pkg-plist +++ b/www/p5-Apache-Profiler/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Apache/Profiler.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Profiler/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Apache @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Profiler -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache diff --git a/www/p5-Apache-Radius/pkg-plist b/www/p5-Apache-Radius/pkg-plist index 993178b1ff56..32a2ba993368 100644 --- a/www/p5-Apache-Radius/pkg-plist +++ b/www/p5-Apache-Radius/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Apache/AuthenRadius.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthenRadius/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/AuthenRadius -@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/www/p5-Apache-Reload/pkg-plist b/www/p5-Apache-Reload/pkg-plist index ed834e651972..bbf37c9b0fc0 100644 --- a/www/p5-Apache-Reload/pkg-plist +++ b/www/p5-Apache-Reload/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Reload/.packlist %%SITE_PERL%%/Apache/Reload.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Reload -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Apache +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache diff --git a/www/p5-Apache-SSI/pkg-plist b/www/p5-Apache-SSI/pkg-plist index 0106cecb4d23..1e7f8f750b71 100644 --- a/www/p5-Apache-SSI/pkg-plist +++ b/www/p5-Apache-SSI/pkg-plist @@ -2,5 +2,5 @@ %%SITE_PERL%%/Apache/FakeSSI.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SSI/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SSI -@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/www/p5-Apache-Scoreboard/pkg-plist b/www/p5-Apache-Scoreboard/pkg-plist index c1a0f41ea691..cdf7d9b1293e 100644 --- a/www/p5-Apache-Scoreboard/pkg-plist +++ b/www/p5-Apache-Scoreboard/pkg-plist @@ -8,5 +8,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Scoreboard/Scoreboard.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Scoreboard @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DummyScoreboard -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache diff --git a/www/p5-Apache-Session-PHP/pkg-plist b/www/p5-Apache-Session-PHP/pkg-plist index 73f8eb3b8046..db58da2fea32 100644 --- a/www/p5-Apache-Session-PHP/pkg-plist +++ b/www/p5-Apache-Session-PHP/pkg-plist @@ -3,9 +3,9 @@ %%SITE_PERL%%/Apache/Session/Store/PHP.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/PHP/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/PHP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Apache/Session/Store 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Apache/Session/Serialize 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Apache/Session 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache +@dirrmtry %%SITE_PERL%%/Apache/Session/Store +@dirrmtry %%SITE_PERL%%/Apache/Session/Serialize +@dirrmtry %%SITE_PERL%%/Apache/Session +@dirrmtry %%SITE_PERL%%/Apache diff --git a/www/p5-Apache-Session-SQLite3/pkg-plist b/www/p5-Apache-Session-SQLite3/pkg-plist index 9eb0af14907b..0d221c282f17 100644 --- a/www/p5-Apache-Session-SQLite3/pkg-plist +++ b/www/p5-Apache-Session-SQLite3/pkg-plist @@ -2,8 +2,8 @@ %%SITE_PERL%%/Apache/Session/Store/SQLite3.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/SQLite3/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/SQLite3 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Apache/Session/Store 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Apache/Session 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache +@dirrmtry %%SITE_PERL%%/Apache/Session/Store +@dirrmtry %%SITE_PERL%%/Apache/Session +@dirrmtry %%SITE_PERL%%/Apache diff --git a/www/p5-Apache-Session-Wrapper/pkg-plist b/www/p5-Apache-Session-Wrapper/pkg-plist index 0beeaef6a73c..ebbfdb1ea5d7 100644 --- a/www/p5-Apache-Session-Wrapper/pkg-plist +++ b/www/p5-Apache-Session-Wrapper/pkg-plist @@ -1,4 +1,4 @@ @comment $FreeBSD$ %%SITE_PERL%%/Apache/Session/Wrapper.pm -@unexec rmdir %D/%%SITE_PERL%%/Apache/Session 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Apache/Session +@dirrmtry %%SITE_PERL%%/Apache diff --git a/www/p5-Apache-Session/pkg-plist b/www/p5-Apache-Session/pkg-plist index 07cba1864a45..6253d7a185dc 100644 --- a/www/p5-Apache-Session/pkg-plist +++ b/www/p5-Apache-Session/pkg-plist @@ -29,10 +29,10 @@ %%SITE_PERL%%/Apache/Session/Sybase.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Session -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache @dirrm %%SITE_PERL%%/Apache/Session/Store @dirrm %%SITE_PERL%%/Apache/Session/Serialize @dirrm %%SITE_PERL%%/Apache/Session/Lock @dirrm %%SITE_PERL%%/Apache/Session/Generate @dirrm %%SITE_PERL%%/Apache/Session -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Apache diff --git a/www/p5-Apache-Singleton/pkg-plist b/www/p5-Apache-Singleton/pkg-plist index d553ab236f05..462418836c1b 100644 --- a/www/p5-Apache-Singleton/pkg-plist +++ b/www/p5-Apache-Singleton/pkg-plist @@ -1,9 +1,9 @@ @comment $FreeBSD$ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Singleton/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Singleton -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache %%SITE_PERL%%/Apache/Singleton.pm %%SITE_PERL%%/Apache/Singleton/Process.pm %%SITE_PERL%%/Apache/Singleton/Request.pm @dirrm %%SITE_PERL%%/Apache/Singleton -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Apache diff --git a/www/p5-Apache-SubProcess/pkg-plist b/www/p5-Apache-SubProcess/pkg-plist index ae0a2a44fde0..1cba77d25b85 100644 --- a/www/p5-Apache-SubProcess/pkg-plist +++ b/www/p5-Apache-SubProcess/pkg-plist @@ -2,6 +2,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SubProcess/SubProcess.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SubProcess/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/Apache/SubProcess.pm -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SubProcess 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/SubProcess +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache diff --git a/www/p5-Apache-Template/pkg-plist b/www/p5-Apache-Template/pkg-plist index 930b82762090..38001c61a5b8 100644 --- a/www/p5-Apache-Template/pkg-plist +++ b/www/p5-Apache-Template/pkg-plist @@ -3,8 +3,8 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Template/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Template/Template.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Template/Template.so -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Template 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Template/Service 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Template 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Template +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Template/Service +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Template +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache diff --git a/www/p5-Apache-Test/pkg-plist b/www/p5-Apache-Test/pkg-plist index f5aa83733da8..dab7e3f9807a 100644 --- a/www/p5-Apache-Test/pkg-plist +++ b/www/p5-Apache-Test/pkg-plist @@ -34,6 +34,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestUtil.pm %%SITE_PERL%%/%%PERL_ARCH%%/Bundle/ApacheTest.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Test -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache diff --git a/www/p5-Apache2-Scoreboard/pkg-plist b/www/p5-Apache2-Scoreboard/pkg-plist index c1a0f41ea691..cdf7d9b1293e 100644 --- a/www/p5-Apache2-Scoreboard/pkg-plist +++ b/www/p5-Apache2-Scoreboard/pkg-plist @@ -8,5 +8,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Scoreboard/Scoreboard.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Scoreboard @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/DummyScoreboard -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache diff --git a/www/p5-ApacheBench/pkg-plist b/www/p5-ApacheBench/pkg-plist index 08cd40f033fc..9856a914d2ed 100644 --- a/www/p5-ApacheBench/pkg-plist +++ b/www/p5-ApacheBench/pkg-plist @@ -5,8 +5,8 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench/ApacheBench.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench/ApacheBench.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/HTTPD/Bench/ApacheBench -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTTPD/Bench 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTTPD 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTTPD/Bench +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTTPD @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench/ApacheBench -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Bench +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD diff --git a/www/p5-AxKit-XSP-Cookie/pkg-plist b/www/p5-AxKit-XSP-Cookie/pkg-plist index 0a56fc181685..ef680251e85b 100644 --- a/www/p5-AxKit-XSP-Cookie/pkg-plist +++ b/www/p5-AxKit-XSP-Cookie/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/AxKit/XSP/Cookie.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Cookie/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Cookie -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP +@dirrmtry %%SITE_PERL%%/AxKit/XSP +@dirrmtry %%SITE_PERL%%/AxKit diff --git a/www/p5-AxKit-XSP-ESQL/pkg-plist b/www/p5-AxKit-XSP-ESQL/pkg-plist index 1f406480c1f8..72b8a66576c0 100644 --- a/www/p5-AxKit-XSP-ESQL/pkg-plist +++ b/www/p5-AxKit-XSP-ESQL/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/AxKit/XSP/ESQL.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/ESQL/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/ESQL -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP +@dirrmtry %%SITE_PERL%%/AxKit/XSP +@dirrmtry %%SITE_PERL%%/AxKit diff --git a/www/p5-AxKit-XSP-Exception/pkg-plist b/www/p5-AxKit-XSP-Exception/pkg-plist index c5719ed7fea0..99b424849e76 100644 --- a/www/p5-AxKit-XSP-Exception/pkg-plist +++ b/www/p5-AxKit-XSP-Exception/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/AxKit/XSP/Exception.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Exception/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Exception -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP +@dirrmtry %%SITE_PERL%%/AxKit/XSP +@dirrmtry %%SITE_PERL%%/AxKit diff --git a/www/p5-AxKit-XSP-IfParam/pkg-plist b/www/p5-AxKit-XSP-IfParam/pkg-plist index 7a2a491b2e6a..b5a03be7f601 100644 --- a/www/p5-AxKit-XSP-IfParam/pkg-plist +++ b/www/p5-AxKit-XSP-IfParam/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/AxKit/XSP/IfParam.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/IfParam/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/IfParam -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP +@dirrmtry %%SITE_PERL%%/AxKit/XSP +@dirrmtry %%SITE_PERL%%/AxKit diff --git a/www/p5-AxKit-XSP-Param/pkg-plist b/www/p5-AxKit-XSP-Param/pkg-plist index fb338161421e..efb6255e7f94 100644 --- a/www/p5-AxKit-XSP-Param/pkg-plist +++ b/www/p5-AxKit-XSP-Param/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/AxKit/XSP/Param.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Param/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Param -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP +@dirrmtry %%SITE_PERL%%/AxKit/XSP +@dirrmtry %%SITE_PERL%%/AxKit diff --git a/www/p5-AxKit-XSP-PerForm/pkg-plist b/www/p5-AxKit-XSP-PerForm/pkg-plist index a7f9cdaa4b6c..d92677209180 100644 --- a/www/p5-AxKit-XSP-PerForm/pkg-plist +++ b/www/p5-AxKit-XSP-PerForm/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/AxKit/XSP/PerForm.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/PerForm/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/PerForm -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP +@dirrmtry %%SITE_PERL%%/AxKit/XSP +@dirrmtry %%SITE_PERL%%/AxKit diff --git a/www/p5-AxKit-XSP-Sendmail/pkg-plist b/www/p5-AxKit-XSP-Sendmail/pkg-plist index 9be0d56f8575..7cf4545462a1 100644 --- a/www/p5-AxKit-XSP-Sendmail/pkg-plist +++ b/www/p5-AxKit-XSP-Sendmail/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/AxKit/XSP/Sendmail.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Sendmail/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Sendmail -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP +@dirrmtry %%SITE_PERL%%/AxKit/XSP +@dirrmtry %%SITE_PERL%%/AxKit diff --git a/www/p5-AxKit-XSP-Util/pkg-plist b/www/p5-AxKit-XSP-Util/pkg-plist index f017e0569600..66f3934b1167 100644 --- a/www/p5-AxKit-XSP-Util/pkg-plist +++ b/www/p5-AxKit-XSP-Util/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/AxKit/XSP/Util.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Util/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/Util -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP +@dirrmtry %%SITE_PERL%%/AxKit/XSP +@dirrmtry %%SITE_PERL%%/AxKit diff --git a/www/p5-AxKit-XSP-WebUtils/pkg-plist b/www/p5-AxKit-XSP-WebUtils/pkg-plist index 66a6e3038074..53c9c095aadb 100644 --- a/www/p5-AxKit-XSP-WebUtils/pkg-plist +++ b/www/p5-AxKit-XSP-WebUtils/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/AxKit/XSP/WebUtils.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/WebUtils/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP/WebUtils -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/AxKit/XSP +@dirrmtry %%SITE_PERL%%/AxKit/XSP +@dirrmtry %%SITE_PERL%%/AxKit diff --git a/www/p5-B-LexInfo/pkg-plist b/www/p5-B-LexInfo/pkg-plist index 983d1fcfef0f..2874a13b9c0c 100644 --- a/www/p5-B-LexInfo/pkg-plist +++ b/www/p5-B-LexInfo/pkg-plist @@ -4,6 +4,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/LexInfo/LexInfo.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/LexInfo/LexInfo.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/B/LexInfo -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/B 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/B 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/B +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/B +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Apache diff --git a/www/p5-Bundle-Catalyst/pkg-plist b/www/p5-Bundle-Catalyst/pkg-plist index 88713c2582b2..dcbdf9afc985 100644 --- a/www/p5-Bundle-Catalyst/pkg-plist +++ b/www/p5-Bundle-Catalyst/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Bundle/Catalyst.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Catalyst/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Catalyst +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle +@dirrmtry %%SITE_PERL%%/Bundle diff --git a/www/p5-Bundle-Slash/pkg-plist b/www/p5-Bundle-Slash/pkg-plist index 82bda6482a5e..39b557982042 100644 --- a/www/p5-Bundle-Slash/pkg-plist +++ b/www/p5-Bundle-Slash/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Bundle/Slash.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Slash/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Slash 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Slash +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle +@dirrmtry %%SITE_PERL%%/Bundle diff --git a/www/p5-Bundle-Sledge/pkg-plist b/www/p5-Bundle-Sledge/pkg-plist index 820f5f823258..e8be11489410 100644 --- a/www/p5-Bundle-Sledge/pkg-plist +++ b/www/p5-Bundle-Sledge/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Bundle/Sledge.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Sledge/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Sledge 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle/Sledge +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Bundle +@dirrmtry %%SITE_PERL%%/Bundle diff --git a/www/p5-CGI-Ajax/pkg-plist b/www/p5-CGI-Ajax/pkg-plist index 7eff39dfbb7a..6768d6805d13 100644 --- a/www/p5-CGI-Ajax/pkg-plist +++ b/www/p5-CGI-Ajax/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/CGI/Ajax.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Ajax/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Ajax 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Ajax +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI +@dirrmtry %%SITE_PERL%%/CGI diff --git a/www/p5-CGI-Application-Plugin-DBH/pkg-plist b/www/p5-CGI-Application-Plugin-DBH/pkg-plist index 64a77f3ab4f7..0733387f51f0 100644 --- a/www/p5-CGI-Application-Plugin-DBH/pkg-plist +++ b/www/p5-CGI-Application-Plugin-DBH/pkg-plist @@ -1,2 +1,2 @@ %%SITE_PERL%%/CGI/Application/Plugin/DBH.pm -@unexec rmdir %D/%%SITE_PERL%%/CGI/Application/Plugin 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin diff --git a/www/p5-CGI-Application-Plugin-ValidateRM/pkg-plist b/www/p5-CGI-Application-Plugin-ValidateRM/pkg-plist index a7ab37051f18..3548c9b53e18 100644 --- a/www/p5-CGI-Application-Plugin-ValidateRM/pkg-plist +++ b/www/p5-CGI-Application-Plugin-ValidateRM/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/CGI/Application/Plugin/ValidateRM.pm -@unexec rmdir %D/%%SITE_PERL%%/CGI/Application/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/CGI/Application 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/CGI/Application/Plugin +@dirrmtry %%SITE_PERL%%/CGI/Application +@dirrmtry %%SITE_PERL%%/CGI diff --git a/www/p5-CGI-Application-ValidateRM/pkg-plist b/www/p5-CGI-Application-ValidateRM/pkg-plist index 267514a6d6c3..9564c5463471 100644 --- a/www/p5-CGI-Application-ValidateRM/pkg-plist +++ b/www/p5-CGI-Application-ValidateRM/pkg-plist @@ -1,3 +1,3 @@ %%SITE_PERL%%/CGI/Application/ValidateRM.pm -@unexec rmdir %D/%%SITE_PERL%%/CGI/Application 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/CGI/Application +@dirrmtry %%SITE_PERL%%/CGI diff --git a/www/p5-CGI-Application/pkg-plist b/www/p5-CGI-Application/pkg-plist index 559dc1fac363..e25357986579 100644 --- a/www/p5-CGI-Application/pkg-plist +++ b/www/p5-CGI-Application/pkg-plist @@ -2,6 +2,6 @@ %%SITE_PERL%%/CGI/Application/Mailform.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Application -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI @dirrm %%SITE_PERL%%/CGI/Application -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/CGI diff --git a/www/p5-CGI-ArgChecker/pkg-plist b/www/p5-CGI-ArgChecker/pkg-plist index 767facd633ca..b2821305f25e 100644 --- a/www/p5-CGI-ArgChecker/pkg-plist +++ b/www/p5-CGI-ArgChecker/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/CGI/ArgChecker.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/ArgChecker/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/ArgChecker -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI +@dirrmtry %%SITE_PERL%%/CGI diff --git a/www/p5-CGI-Builder/pkg-plist b/www/p5-CGI-Builder/pkg-plist index a0ac8c195c21..6429753d8fc5 100644 --- a/www/p5-CGI-Builder/pkg-plist +++ b/www/p5-CGI-Builder/pkg-plist @@ -4,9 +4,9 @@ %%SITE_PERL%%/CGI/Builder/Test.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Builder/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Builder -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI @dirrm %%SITE_PERL%%/CGI/Builder -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/CGI @dirrm %%SITE_PERL%%/Bundle/CGI/Builder -@unexec rmdir %D/%%SITE_PERL%%/Bundle/CGI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Bundle/CGI +@dirrmtry %%SITE_PERL%%/Bundle diff --git a/www/p5-CGI-Cache/pkg-plist b/www/p5-CGI-Cache/pkg-plist index 395eaca1328f..f42269517279 100644 --- a/www/p5-CGI-Cache/pkg-plist +++ b/www/p5-CGI-Cache/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/CGI/Cache.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Cache/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Cache -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI +@dirrmtry %%SITE_PERL%%/CGI diff --git a/www/p5-CGI-FastTemplate/pkg-plist b/www/p5-CGI-FastTemplate/pkg-plist index ea8c2e2f26fc..f23628bad891 100644 --- a/www/p5-CGI-FastTemplate/pkg-plist +++ b/www/p5-CGI-FastTemplate/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/CGI/FastTemplate.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FastTemplate/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/FastTemplate -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/CGI +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI diff --git a/www/p5-CGI-Framework/pkg-plist b/www/p5-CGI-Framework/pkg-plist index c95885d0c764..7b357ddff7d2 100644 --- a/www/p5-CGI-Framework/pkg-plist +++ b/www/p5-CGI-Framework/pkg-plist @@ -2,5 +2,5 @@ %%SITE_PERL%%/CGI/Framework.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Framework/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Framework -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI +@dirrmtry %%SITE_PERL%%/CGI diff --git a/www/p5-CGI-Kwiki/pkg-plist b/www/p5-CGI-Kwiki/pkg-plist index f0fb4322da70..ae2f308c1ffc 100644 --- a/www/p5-CGI-Kwiki/pkg-plist +++ b/www/p5-CGI-Kwiki/pkg-plist @@ -43,4 +43,4 @@ bin/kwiki-install @dirrm %%SITE_PERL%%/CGI/Kwiki/I18N @dirrm %%SITE_PERL%%/CGI/Kwiki/Backup @dirrm %%SITE_PERL%%/CGI/Kwiki -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/CGI diff --git a/www/p5-CGI-Minimal/pkg-plist b/www/p5-CGI-Minimal/pkg-plist index a5f5fe7f99da..c1b3844353d1 100644 --- a/www/p5-CGI-Minimal/pkg-plist +++ b/www/p5-CGI-Minimal/pkg-plist @@ -5,6 +5,6 @@ %%SITE_PERL%%/CGI/Minimal/Multipart.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Minimal/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Minimal -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI @dirrm %%SITE_PERL%%/CGI/Minimal -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/CGI diff --git a/www/p5-CGI-Response/pkg-plist b/www/p5-CGI-Response/pkg-plist index 2e05b26b10cb..ebf63603dc91 100644 --- a/www/p5-CGI-Response/pkg-plist +++ b/www/p5-CGI-Response/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Response/.packlist %%SITE_PERL%%/CGI/Response.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Response -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/CGI +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI diff --git a/www/p5-CGI-SSI/pkg-plist b/www/p5-CGI-SSI/pkg-plist index 0558346c7e48..789c4ae6d78b 100644 --- a/www/p5-CGI-SSI/pkg-plist +++ b/www/p5-CGI-SSI/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/CGI/SSI.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SSI/.packlist -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SSI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/CGI +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SSI +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI diff --git a/www/p5-CGI-Session/pkg-plist b/www/p5-CGI-Session/pkg-plist index ab2478d76d05..4ac79c11f0aa 100644 --- a/www/p5-CGI-Session/pkg-plist +++ b/www/p5-CGI-Session/pkg-plist @@ -38,10 +38,10 @@ %%SITE_PERL%%/auto/CGI/Session/autosplit.ix %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Session/.packlist @dirrm %%SITE_PERL%%/CGI/Session -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/CGI @dirrm %%SITE_PERL%%/auto/CGI/Session -@unexec rmdir %D/%%SITE_PERL%%/auto/CGI/Session 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/auto/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/CGI/Session +@dirrmtry %%SITE_PERL%%/auto/CGI @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Session -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/mach/auto/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI +@dirrmtry %%SITE_PERL%%/mach/auto/CGI diff --git a/www/p5-CGI-Simple/pkg-plist b/www/p5-CGI-Simple/pkg-plist index 847908071b89..758789d0d593 100644 --- a/www/p5-CGI-Simple/pkg-plist +++ b/www/p5-CGI-Simple/pkg-plist @@ -4,6 +4,6 @@ %%SITE_PERL%%/CGI/Simple/Util.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Simple/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Simple -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI @dirrm %%SITE_PERL%%/CGI/Simple -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/CGI diff --git a/www/p5-CGI-SpeedyCGI/pkg-plist b/www/p5-CGI-SpeedyCGI/pkg-plist index c436ddb2033b..a494840e85db 100644 --- a/www/p5-CGI-SpeedyCGI/pkg-plist +++ b/www/p5-CGI-SpeedyCGI/pkg-plist @@ -5,5 +5,5 @@ bin/speedy bin/speedy_backend bin/speedy_suidperl @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/SpeedyCGI -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI +@dirrmtry %%SITE_PERL%%/CGI diff --git a/www/p5-CGI-Untaint/pkg-plist b/www/p5-CGI-Untaint/pkg-plist index 1ac9927658f6..6a605a2adec4 100644 --- a/www/p5-CGI-Untaint/pkg-plist +++ b/www/p5-CGI-Untaint/pkg-plist @@ -6,6 +6,6 @@ %%SITE_PERL%%/CGI/Untaint/printable.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Untaint/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Untaint -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI @dirrm %%SITE_PERL%%/CGI/Untaint -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/CGI diff --git a/www/p5-CGI-Upload/pkg-plist b/www/p5-CGI-Upload/pkg-plist index c803b8e5128d..87220b0260e2 100644 --- a/www/p5-CGI-Upload/pkg-plist +++ b/www/p5-CGI-Upload/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Upload/.packlist %%SITE_PERL%%/CGI/Upload.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Upload -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/CGI +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI diff --git a/www/p5-CGI-XMLApplication/pkg-plist b/www/p5-CGI-XMLApplication/pkg-plist index f8d52ebe3eb7..402aadb2b8a6 100644 --- a/www/p5-CGI-XMLApplication/pkg-plist +++ b/www/p5-CGI-XMLApplication/pkg-plist @@ -1,8 +1,8 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/XMLApplication/.packlist %%SITE_PERL%%/CGI/XMLApplication.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/XMLApplication -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/CGI +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI %%PORTDOCS%%%%EXAMPLESDIR%%/ex2_finish.xsl %%PORTDOCS%%%%EXAMPLESDIR%%/ex2_form.xsl %%PORTDOCS%%%%EXAMPLESDIR%%/example1.pl diff --git a/www/p5-CGI.pm/pkg-plist b/www/p5-CGI.pm/pkg-plist index 00e8184d7093..e9e52beb5084 100644 --- a/www/p5-CGI.pm/pkg-plist +++ b/www/p5-CGI.pm/pkg-plist @@ -30,5 +30,5 @@ %%PORTDOCS%%%%EXAMPLESDIR%%/tryit.cgi %%PORTDOCS%%%%EXAMPLESDIR%%/wilogo.gif %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI +@dirrmtry %%SITE_PERL%%/CGI diff --git a/www/p5-CGI_Lite/pkg-plist b/www/p5-CGI_Lite/pkg-plist index 6144a4aa7b9d..a59d82feceac 100644 --- a/www/p5-CGI_Lite/pkg-plist +++ b/www/p5-CGI_Lite/pkg-plist @@ -13,5 +13,5 @@ %%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Lite -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI +@dirrmtry %%SITE_PERL%%/CGI diff --git a/www/p5-Catalyst-Engine-Apache/pkg-plist b/www/p5-Catalyst-Engine-Apache/pkg-plist index 2b286bf6b5dd..de50e0499ac2 100644 --- a/www/p5-Catalyst-Engine-Apache/pkg-plist +++ b/www/p5-Catalyst-Engine-Apache/pkg-plist @@ -3,6 +3,6 @@ %%SITE_PERL%%/Catalyst/Engine/Apache/MP13.pm %%SITE_PERL%%/Catalyst/Engine/Apache2/MP19.pm %%SITE_PERL%%/Catalyst/Engine/Apache2/MP20.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Engine/Apache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Engine/Apache2 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Engine 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Engine/Apache +@dirrmtry %%SITE_PERL%%/Catalyst/Engine/Apache2 +@dirrmtry %%SITE_PERL%%/Catalyst/Engine diff --git a/www/p5-Catalyst-Helper-Controller-Scaffold/pkg-plist b/www/p5-Catalyst-Helper-Controller-Scaffold/pkg-plist index 5d7351c68a51..94e909e2c0c8 100644 --- a/www/p5-Catalyst-Helper-Controller-Scaffold/pkg-plist +++ b/www/p5-Catalyst-Helper-Controller-Scaffold/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/Catalyst/Helper/Controller/Scaffold.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Helper/Controller/Scaffold/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Helper/Controller/Scaffold 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Helper/Controller 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Helper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper/Controller 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Helper/Controller/Scaffold +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Helper/Controller +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Helper +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst +@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Controller +@dirrmtry %%SITE_PERL%%/Catalyst/Helper +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Log-Log4perl/pkg-plist b/www/p5-Catalyst-Log-Log4perl/pkg-plist index 39662d24f44b..d96c5ea4ae13 100644 --- a/www/p5-Catalyst-Log-Log4perl/pkg-plist +++ b/www/p5-Catalyst-Log-Log4perl/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Catalyst/Log/Log4perl.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Log/Log4perl/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Log/Log4perl 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Log 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Log 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Log/Log4perl +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Log +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst +@dirrmtry %%SITE_PERL%%/Catalyst/Log +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Model-CDBI-Sweet/pkg-plist b/www/p5-Catalyst-Model-CDBI-Sweet/pkg-plist index 015e15a0f915..66858beee67f 100644 --- a/www/p5-Catalyst-Model-CDBI-Sweet/pkg-plist +++ b/www/p5-Catalyst-Model-CDBI-Sweet/pkg-plist @@ -1,3 +1,3 @@ %%SITE_PERL%%/Catalyst/Model/CDBI/Sweet.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Model/CDBI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Model 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Model/CDBI +@dirrmtry %%SITE_PERL%%/Catalyst/Model diff --git a/www/p5-Catalyst-Model-CDBI/pkg-plist b/www/p5-Catalyst-Model-CDBI/pkg-plist index 8a495d5cdfd3..6d77b145ef21 100644 --- a/www/p5-Catalyst-Model-CDBI/pkg-plist +++ b/www/p5-Catalyst-Model-CDBI/pkg-plist @@ -2,9 +2,9 @@ %%SITE_PERL%%/Catalyst/Model/CDBI.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/CDBI/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/CDBI -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst @dirrm %%SITE_PERL%%/Catalyst/Helper/Model -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Model 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Helper +@dirrmtry %%SITE_PERL%%/Catalyst/Model +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Model-DBIC-Plain/pkg-plist b/www/p5-Catalyst-Model-DBIC-Plain/pkg-plist index 160d17aa15da..ce3552ecb930 100644 --- a/www/p5-Catalyst-Model-DBIC-Plain/pkg-plist +++ b/www/p5-Catalyst-Model-DBIC-Plain/pkg-plist @@ -2,12 +2,12 @@ %%SITE_PERL%%/Catalyst/Model/DBIC/Plain.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC/Plain/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC/Plain -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper/Model/DBIC 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper/Model 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Model/DBIC 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Model 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst +@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model/DBIC +@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model +@dirrmtry %%SITE_PERL%%/Catalyst/Helper +@dirrmtry %%SITE_PERL%%/Catalyst/Model/DBIC +@dirrmtry %%SITE_PERL%%/Catalyst/Model +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Model-DBIC/pkg-plist b/www/p5-Catalyst-Model-DBIC/pkg-plist index 0fd005761fe8..8c66818edf37 100644 --- a/www/p5-Catalyst-Model-DBIC/pkg-plist +++ b/www/p5-Catalyst-Model-DBIC/pkg-plist @@ -2,9 +2,9 @@ %%SITE_PERL%%/Catalyst/Model/DBIC.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model/DBIC -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper/Model 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Model 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Model +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst +@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model +@dirrmtry %%SITE_PERL%%/Catalyst/Helper +@dirrmtry %%SITE_PERL%%/Catalyst/Model +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Authentication-CDBI/pkg-plist b/www/p5-Catalyst-Plugin-Authentication-CDBI/pkg-plist index 3219aae718ba..c41b3f74d6d6 100644 --- a/www/p5-Catalyst-Plugin-Authentication-CDBI/pkg-plist +++ b/www/p5-Catalyst-Plugin-Authentication-CDBI/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/Catalyst/Plugin/Authentication/CDBI.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authentication/CDBI/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authentication/CDBI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authentication 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authentication/CDBI +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Authentication +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Authentication-Store-DBIC/pkg-plist b/www/p5-Catalyst-Plugin-Authentication-Store-DBIC/pkg-plist index 2eab9cc1de87..544a84d44719 100644 --- a/www/p5-Catalyst-Plugin-Authentication-Store-DBIC/pkg-plist +++ b/www/p5-Catalyst-Plugin-Authentication-Store-DBIC/pkg-plist @@ -1,8 +1,8 @@ %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/DBIC/User.pm %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/DBIC/Backend.pm %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/DBIC.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/DBIC 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/DBIC +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/pkg-plist b/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/pkg-plist index 482f2725a6f5..17f11853f711 100644 --- a/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/pkg-plist +++ b/www/p5-Catalyst-Plugin-Authentication-Store-Htpasswd/pkg-plist @@ -1,8 +1,8 @@ %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Htpasswd/User.pm %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Htpasswd/Backend.pm %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Htpasswd.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Htpasswd 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Htpasswd +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Authentication/pkg-plist b/www/p5-Catalyst-Plugin-Authentication/pkg-plist index 5eb771db1d55..fee85b373bed 100644 --- a/www/p5-Catalyst-Plugin-Authentication/pkg-plist +++ b/www/p5-Catalyst-Plugin-Authentication/pkg-plist @@ -5,10 +5,10 @@ %%SITE_PERL%%/Catalyst/Plugin/Authentication/User/Hash.pm %%SITE_PERL%%/Catalyst/Plugin/Authentication/User.pm %%SITE_PERL%%/Catalyst/Plugin/Authentication.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Minimal 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication/Store 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication/User 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication/Credential 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authentication 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store/Minimal +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/Store +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/User +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication/Credential +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authentication +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Authorization-ACL/pkg-plist b/www/p5-Catalyst-Plugin-Authorization-ACL/pkg-plist index e0ca79f9a316..3bc16ab0a00a 100644 --- a/www/p5-Catalyst-Plugin-Authorization-ACL/pkg-plist +++ b/www/p5-Catalyst-Plugin-Authorization-ACL/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/Catalyst/Plugin/Authorization/ACL/Engine.pm %%SITE_PERL%%/Catalyst/Plugin/Authorization/ACL.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authorization/ACL 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authorization 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authorization/ACL +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authorization +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Authorization-Roles/pkg-plist b/www/p5-Catalyst-Plugin-Authorization-Roles/pkg-plist index be8be82c71d3..fd3076922c8d 100644 --- a/www/p5-Catalyst-Plugin-Authorization-Roles/pkg-plist +++ b/www/p5-Catalyst-Plugin-Authorization-Roles/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/Catalyst/Plugin/Authorization/Roles.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Authorization 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Authorization +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Cache-FastMmap/pkg-plist b/www/p5-Catalyst-Plugin-Cache-FastMmap/pkg-plist index c08631eee016..b1ece4fb4335 100644 --- a/www/p5-Catalyst-Plugin-Cache-FastMmap/pkg-plist +++ b/www/p5-Catalyst-Plugin-Cache-FastMmap/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/Catalyst/Plugin/Cache/FastMmap.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Cache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Cache +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Cache-FileCache/pkg-plist b/www/p5-Catalyst-Plugin-Cache-FileCache/pkg-plist index f4cf98e5ff6a..38af79968a84 100644 --- a/www/p5-Catalyst-Plugin-Cache-FileCache/pkg-plist +++ b/www/p5-Catalyst-Plugin-Cache-FileCache/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/Catalyst/Plugin/Cache/FileCache.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Cache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Cache +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Cache-Memcached/pkg-plist b/www/p5-Catalyst-Plugin-Cache-Memcached/pkg-plist index 480d48314878..b1a8463f85b2 100644 --- a/www/p5-Catalyst-Plugin-Cache-Memcached/pkg-plist +++ b/www/p5-Catalyst-Plugin-Cache-Memcached/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/Catalyst/Plugin/Cache/Memcached.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Cache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Cache +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-DefaultEnd/pkg-plist b/www/p5-Catalyst-Plugin-DefaultEnd/pkg-plist index b16ead1bfb2a..28c32042d23b 100644 --- a/www/p5-Catalyst-Plugin-DefaultEnd/pkg-plist +++ b/www/p5-Catalyst-Plugin-DefaultEnd/pkg-plist @@ -1,3 +1,3 @@ %%SITE_PERL%%/Catalyst/Plugin/DefaultEnd.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-FillInForm/pkg-plist b/www/p5-Catalyst-Plugin-FillInForm/pkg-plist index b8d8f8601d39..a45e3142dca1 100644 --- a/www/p5-Catalyst-Plugin-FillInForm/pkg-plist +++ b/www/p5-Catalyst-Plugin-FillInForm/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Catalyst/Plugin/FillInForm.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FillInForm/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FillInForm -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-FormValidator-Simple/pkg-plist b/www/p5-Catalyst-Plugin-FormValidator-Simple/pkg-plist index d8d3cf601feb..b9cd33567793 100644 --- a/www/p5-Catalyst-Plugin-FormValidator-Simple/pkg-plist +++ b/www/p5-Catalyst-Plugin-FormValidator-Simple/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/Catalyst/Plugin/FormValidator/Simple.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FormValidator/Simple/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FormValidator/Simple -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FormValidator 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/FormValidator 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FormValidator +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/FormValidator +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-FormValidator/pkg-plist b/www/p5-Catalyst-Plugin-FormValidator/pkg-plist index a8bda003712f..7a539c2c4c61 100644 --- a/www/p5-Catalyst-Plugin-FormValidator/pkg-plist +++ b/www/p5-Catalyst-Plugin-FormValidator/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Catalyst/Plugin/FormValidator.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FormValidator/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/FormValidator -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-HTML-Widget/pkg-plist b/www/p5-Catalyst-Plugin-HTML-Widget/pkg-plist index 596917815171..f17b79acab27 100644 --- a/www/p5-Catalyst-Plugin-HTML-Widget/pkg-plist +++ b/www/p5-Catalyst-Plugin-HTML-Widget/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/Catalyst/Plugin/HTML/Widget.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/HTML/Widget/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/HTML/Widget 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/HTML/Widget +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/HTML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/HTML +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-I18N/pkg-plist b/www/p5-Catalyst-Plugin-I18N/pkg-plist index 73fc94da8b63..ab719990b91d 100644 --- a/www/p5-Catalyst-Plugin-I18N/pkg-plist +++ b/www/p5-Catalyst-Plugin-I18N/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Catalyst/Plugin/I18N.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/I18N/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/I18N 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/I18N +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-PageCache/pkg-plist b/www/p5-Catalyst-Plugin-PageCache/pkg-plist index 8f7f4e981ca0..0b8109a754b5 100644 --- a/www/p5-Catalyst-Plugin-PageCache/pkg-plist +++ b/www/p5-Catalyst-Plugin-PageCache/pkg-plist @@ -1,3 +1,3 @@ %%SITE_PERL%%/Catalyst/Plugin/PageCache.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Pluggable/pkg-plist b/www/p5-Catalyst-Plugin-Pluggable/pkg-plist index 813e636bffee..2756b97e3b52 100644 --- a/www/p5-Catalyst-Plugin-Pluggable/pkg-plist +++ b/www/p5-Catalyst-Plugin-Pluggable/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Catalyst/Plugin/Pluggable.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Pluggable/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Pluggable 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Pluggable +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Prototype/pkg-plist b/www/p5-Catalyst-Plugin-Prototype/pkg-plist index 5b191b8d036f..c0f2211278a2 100644 --- a/www/p5-Catalyst-Plugin-Prototype/pkg-plist +++ b/www/p5-Catalyst-Plugin-Prototype/pkg-plist @@ -2,8 +2,8 @@ %%SITE_PERL%%/Catalyst/Plugin/Prototype.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Prototype/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Prototype -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst +@dirrmtry %%SITE_PERL%%/Catalyst/Helper +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Session-FastMmap/pkg-plist b/www/p5-Catalyst-Plugin-Session-FastMmap/pkg-plist index 263572e5c269..bf8690c97a5c 100644 --- a/www/p5-Catalyst-Plugin-Session-FastMmap/pkg-plist +++ b/www/p5-Catalyst-Plugin-Session-FastMmap/pkg-plist @@ -2,8 +2,8 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/FastMmap/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/FastMmap @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst @dirrm %%SITE_PERL%%/Catalyst/Plugin/Session -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Session-State-Cookie/pkg-plist b/www/p5-Catalyst-Plugin-Session-State-Cookie/pkg-plist index 6d4f211a584d..f8360bfd96f5 100644 --- a/www/p5-Catalyst-Plugin-Session-State-Cookie/pkg-plist +++ b/www/p5-Catalyst-Plugin-Session-State-Cookie/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/Catalyst/Plugin/Session/State/Cookie.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session/State/Cookie 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session/State 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/State/Cookie +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/State +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Session-State-URI/pkg-plist b/www/p5-Catalyst-Plugin-Session-State-URI/pkg-plist index 7187e1492176..9787436a0447 100644 --- a/www/p5-Catalyst-Plugin-Session-State-URI/pkg-plist +++ b/www/p5-Catalyst-Plugin-Session-State-URI/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Catalyst/Plugin/Session/State/URI.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session/State 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/State +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Session-Store-DBI/pkg-plist b/www/p5-Catalyst-Plugin-Session-Store-DBI/pkg-plist index 40b382f40163..36a57a5fc44f 100644 --- a/www/p5-Catalyst-Plugin-Session-Store-DBI/pkg-plist +++ b/www/p5-Catalyst-Plugin-Session-Store-DBI/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Catalyst/Plugin/Session/Store/DBI.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session/Store 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Session-Store-FastMmap/pkg-plist b/www/p5-Catalyst-Plugin-Session-Store-FastMmap/pkg-plist index 653d37669533..ff4c15886690 100644 --- a/www/p5-Catalyst-Plugin-Session-Store-FastMmap/pkg-plist +++ b/www/p5-Catalyst-Plugin-Session-Store-FastMmap/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Catalyst/Plugin/Session/Store/FastMmap.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session/Store 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Session-Store-File/pkg-plist b/www/p5-Catalyst-Plugin-Session-Store-File/pkg-plist index 03c28c093350..9ae435e8fc22 100644 --- a/www/p5-Catalyst-Plugin-Session-Store-File/pkg-plist +++ b/www/p5-Catalyst-Plugin-Session-Store-File/pkg-plist @@ -1,11 +1,11 @@ %%SITE_PERL%%/Catalyst/Plugin/Session/Store/File.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/File/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store/File -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session/Store 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session/Store +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Session +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Session-Store-Memcached/pkg-plist b/www/p5-Catalyst-Plugin-Session-Store-Memcached/pkg-plist index 0e98ee2ccbc1..b38fcb574e72 100644 --- a/www/p5-Catalyst-Plugin-Session-Store-Memcached/pkg-plist +++ b/www/p5-Catalyst-Plugin-Session-Store-Memcached/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Catalyst/Plugin/Session/Store/Memcached.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session/Store 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Session/pkg-plist b/www/p5-Catalyst-Plugin-Session/pkg-plist index 1e7673b82bc8..ed1acfc068e6 100644 --- a/www/p5-Catalyst-Plugin-Session/pkg-plist +++ b/www/p5-Catalyst-Plugin-Session/pkg-plist @@ -3,8 +3,8 @@ %%SITE_PERL%%/Catalyst/Plugin/Session/Store.pm %%SITE_PERL%%/Catalyst/Plugin/Session/Store/Dummy.pm %%SITE_PERL%%/Catalyst/Plugin/Session/Test/Store.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session/Test 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session/Store 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Session 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Test +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session/Store +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Session +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Singleton/pkg-plist b/www/p5-Catalyst-Plugin-Singleton/pkg-plist index d61685c8ffe2..d606fb7e74b6 100644 --- a/www/p5-Catalyst-Plugin-Singleton/pkg-plist +++ b/www/p5-Catalyst-Plugin-Singleton/pkg-plist @@ -1,3 +1,3 @@ %%SITE_PERL%%/Catalyst/Plugin/Singleton.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-StackTrace/pkg-plist b/www/p5-Catalyst-Plugin-StackTrace/pkg-plist index 569d2b1d8c3d..bf794bb05812 100644 --- a/www/p5-Catalyst-Plugin-StackTrace/pkg-plist +++ b/www/p5-Catalyst-Plugin-StackTrace/pkg-plist @@ -1,3 +1,3 @@ %%SITE_PERL%%/Catalyst/Plugin/StackTrace.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Static/pkg-plist b/www/p5-Catalyst-Plugin-Static/pkg-plist index 657017f9969d..31c7243a0c7f 100644 --- a/www/p5-Catalyst-Plugin-Static/pkg-plist +++ b/www/p5-Catalyst-Plugin-Static/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Catalyst/Plugin/Static.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Static/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Static -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-SubRequest/pkg-plist b/www/p5-Catalyst-Plugin-SubRequest/pkg-plist index 28d3b578d111..0fc4ee69b8ab 100644 --- a/www/p5-Catalyst-Plugin-SubRequest/pkg-plist +++ b/www/p5-Catalyst-Plugin-SubRequest/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Catalyst/Plugin/SubRequest.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/SubRequest/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/SubRequest -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-Textile/pkg-plist b/www/p5-Catalyst-Plugin-Textile/pkg-plist index e089cb908cd3..cafe5d8ef4fb 100644 --- a/www/p5-Catalyst-Plugin-Textile/pkg-plist +++ b/www/p5-Catalyst-Plugin-Textile/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Catalyst/Plugin/Textile.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Textile/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/Textile -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-Plugin-XMLRPC/pkg-plist b/www/p5-Catalyst-Plugin-XMLRPC/pkg-plist index d0850b6a9105..e7a32c066f8b 100644 --- a/www/p5-Catalyst-Plugin-XMLRPC/pkg-plist +++ b/www/p5-Catalyst-Plugin-XMLRPC/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Catalyst/Plugin/XMLRPC.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/XMLRPC/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/XMLRPC 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin/XMLRPC +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-View-HTML-Template/pkg-plist b/www/p5-Catalyst-View-HTML-Template/pkg-plist index 70521afda63b..7acd471967b1 100644 --- a/www/p5-Catalyst-View-HTML-Template/pkg-plist +++ b/www/p5-Catalyst-View-HTML-Template/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Catalyst/Helper/View/HTML/Template.pm %%SITE_PERL%%/Catalyst/View/HTML/Template.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper/View/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper/View 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/View/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/View 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View/HTML +@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View +@dirrmtry %%SITE_PERL%%/Catalyst/Helper +@dirrmtry %%SITE_PERL%%/Catalyst/View/HTML +@dirrmtry %%SITE_PERL%%/Catalyst/View diff --git a/www/p5-Catalyst-View-Mason/pkg-plist b/www/p5-Catalyst-View-Mason/pkg-plist index a538eda6b900..e2586a8dad1c 100644 --- a/www/p5-Catalyst-View-Mason/pkg-plist +++ b/www/p5-Catalyst-View-Mason/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/Catalyst/Helper/View/Mason.pm %%SITE_PERL%%/Catalyst/View/Mason.pm -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper/View 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/View 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View +@dirrmtry %%SITE_PERL%%/Catalyst/Helper +@dirrmtry %%SITE_PERL%%/Catalyst/View +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst-View-TT/pkg-plist b/www/p5-Catalyst-View-TT/pkg-plist index f7c598236a06..b43431f895ea 100644 --- a/www/p5-Catalyst-View-TT/pkg-plist +++ b/www/p5-Catalyst-View-TT/pkg-plist @@ -3,9 +3,9 @@ %%SITE_PERL%%/Catalyst/View/TT.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/TT/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View/TT -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper/View 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/View 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/View +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst +@dirrmtry %%SITE_PERL%%/Catalyst/Helper/View +@dirrmtry %%SITE_PERL%%/Catalyst/Helper +@dirrmtry %%SITE_PERL%%/Catalyst/View +@dirrmtry %%SITE_PERL%%/Catalyst diff --git a/www/p5-Catalyst/pkg-plist b/www/p5-Catalyst/pkg-plist index a550363119bd..b0fae6142b9e 100644 --- a/www/p5-Catalyst/pkg-plist +++ b/www/p5-Catalyst/pkg-plist @@ -40,15 +40,15 @@ bin/catalyst.pl %%SITE_PERL%%/Catalyst/View.pm %%SITE_PERL%%/Module/Install/Catalyst.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst 2> /dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/DispatchType 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Engine/HTTP/Restarter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Engine/HTTP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Engine 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Manual 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin/Static 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Request 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Module/Install 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Module 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Catalyst +@dirrmtry %%SITE_PERL%%/Catalyst/DispatchType +@dirrmtry %%SITE_PERL%%/Catalyst/Engine/HTTP/Restarter +@dirrmtry %%SITE_PERL%%/Catalyst/Engine/HTTP +@dirrmtry %%SITE_PERL%%/Catalyst/Engine +@dirrmtry %%SITE_PERL%%/Catalyst/Manual +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin/Static +@dirrmtry %%SITE_PERL%%/Catalyst/Plugin +@dirrmtry %%SITE_PERL%%/Catalyst/Request +@dirrmtry %%SITE_PERL%%/Catalyst +@dirrmtry %%SITE_PERL%%/Module/Install +@dirrmtry %%SITE_PERL%%/Module diff --git a/www/p5-Class-DBI-FromForm/pkg-plist b/www/p5-Class-DBI-FromForm/pkg-plist index 1be30d48491a..8bb5d2d6c57a 100644 --- a/www/p5-Class-DBI-FromForm/pkg-plist +++ b/www/p5-Class-DBI-FromForm/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Class/DBI/FromForm.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/FromForm/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Class/DBI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Class 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/FromForm 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Class 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Class/DBI +@dirrmtry %%SITE_PERL%%/Class +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI/FromForm +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/DBI +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class diff --git a/www/p5-Compress-LeadingBlankSpaces/pkg-plist b/www/p5-Compress-LeadingBlankSpaces/pkg-plist index 3538799b6553..c7ec216728be 100644 --- a/www/p5-Compress-LeadingBlankSpaces/pkg-plist +++ b/www/p5-Compress-LeadingBlankSpaces/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Compress/LeadingBlankSpaces.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/LeadingBlankSpaces/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/LeadingBlankSpaces -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Compress 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress +@dirrmtry %%SITE_PERL%%/Compress diff --git a/www/p5-Data-TreeDumper-Renderer-DHTML/pkg-plist b/www/p5-Data-TreeDumper-Renderer-DHTML/pkg-plist index e7993e5f2dd3..751568eb0172 100644 --- a/www/p5-Data-TreeDumper-Renderer-DHTML/pkg-plist +++ b/www/p5-Data-TreeDumper-Renderer-DHTML/pkg-plist @@ -4,7 +4,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/TreeDumper/Renderer/DHTML/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/TreeDumper/Renderer/DHTML @dirrm %%SITE_PERL%%/auto/Data/TreeDumper/Renderer/DHTML -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/TreeDumper/Renderer 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/auto/Data/TreeDumper/Renderer 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Data/TreeDumper/Renderer 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Data/TreeDumper 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/TreeDumper/Renderer +@dirrmtry %%SITE_PERL%%/auto/Data/TreeDumper/Renderer +@dirrmtry %%SITE_PERL%%/Data/TreeDumper/Renderer +@dirrmtry %%SITE_PERL%%/Data/TreeDumper diff --git a/www/p5-FAQ-OMatic/pkg-plist b/www/p5-FAQ-OMatic/pkg-plist index c112f722672e..96270c500f8b 100644 --- a/www/p5-FAQ-OMatic/pkg-plist +++ b/www/p5-FAQ-OMatic/pkg-plist @@ -63,7 +63,7 @@ %%SITE_PERL%%/FAQ/OMatic/API.pm %%SITE_PERL%%/FAQ/OMatic.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FAQ/OMatic/.packlist -@unexec rmdir %D/%%SITE_PERL%%/FAQ/OMatic 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/FAQ 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/FAQ/OMatic 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/FAQ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/FAQ/OMatic +@dirrmtry %%SITE_PERL%%/FAQ +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FAQ/OMatic +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FAQ diff --git a/www/p5-FastCGI-ProcManager/pkg-plist b/www/p5-FastCGI-ProcManager/pkg-plist index a2403f921a7a..b3088cff72f7 100644 --- a/www/p5-FastCGI-ProcManager/pkg-plist +++ b/www/p5-FastCGI-ProcManager/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/FCGI/ProcManager.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/ProcManager/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI/ProcManager -@unexec rmdir %D/%%SITE_PERL%%/FCGI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/FCGI +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/FCGI diff --git a/www/p5-Feed-Find/pkg-plist b/www/p5-Feed-Find/pkg-plist index 77cdebeb053d..4f4634bba1ca 100644 --- a/www/p5-Feed-Find/pkg-plist +++ b/www/p5-Feed-Find/pkg-plist @@ -1,2 +1,2 @@ %%SITE_PERL%%/Feed/Find.pm -@unexec rmdir %D/%%SITE_PERL%%/Feed 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Feed diff --git a/www/p5-Flickr-API/pkg-plist b/www/p5-Flickr-API/pkg-plist index 8efb5b0cd1e8..272f7dc29e42 100644 --- a/www/p5-Flickr-API/pkg-plist +++ b/www/p5-Flickr-API/pkg-plist @@ -2,7 +2,7 @@ %%SITE_PERL%%/Flickr/API/Request.pm %%SITE_PERL%%/Flickr/API/Response.pm @dirrm %%SITE_PERL%%/Flickr/API -@unexec rmdir %D/%%SITE_PERL%%/Flickr 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Flickr %%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr/API/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr/API -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr diff --git a/www/p5-Flickr-Upload/pkg-plist b/www/p5-Flickr-Upload/pkg-plist index 5e876bc6fa72..de925edaf358 100644 --- a/www/p5-Flickr-Upload/pkg-plist +++ b/www/p5-Flickr-Upload/pkg-plist @@ -1,9 +1,9 @@ bin/flickr_upload %%SITE_PERL%%/Flickr/Upload.pm -@unexec rmdir %D/%%SITE_PERL%%/Flickr 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Flickr %%SITE_PERL%%/auto/Flickr/Upload/autosplit.ix @dirrm %%SITE_PERL%%/auto/Flickr/Upload -@unexec rmdir %D/%%SITE_PERL%%/auto/Flickr 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/Flickr %%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr/Upload/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr/Upload -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Flickr diff --git a/www/p5-HTML-Breadcrumbs/pkg-plist b/www/p5-HTML-Breadcrumbs/pkg-plist index d39528c22171..58034c50aa4c 100644 --- a/www/p5-HTML-Breadcrumbs/pkg-plist +++ b/www/p5-HTML-Breadcrumbs/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Breadcrumbs/.packlist %%SITE_PERL%%/HTML/Breadcrumbs.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Breadcrumbs -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-CalendarMonthSimple/pkg-plist b/www/p5-HTML-CalendarMonthSimple/pkg-plist index e2e10efe7ca1..158db18f9747 100644 --- a/www/p5-HTML-CalendarMonthSimple/pkg-plist +++ b/www/p5-HTML-CalendarMonthSimple/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/HTML/CalendarMonthSimple.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/CalendarMonthSimple/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/CalendarMonthSimple -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTML +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-Chunks/pkg-plist b/www/p5-HTML-Chunks/pkg-plist index 3652b5ea1f91..15d524f22265 100644 --- a/www/p5-HTML-Chunks/pkg-plist +++ b/www/p5-HTML-Chunks/pkg-plist @@ -4,6 +4,6 @@ %%SITE_PERL%%/HTML/ChunksLocal.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Chunks/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Chunks -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML @dirrm %%SITE_PERL%%/HTML/Chunks -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-Clean/pkg-plist b/www/p5-HTML-Clean/pkg-plist index e31ee7128e86..fabade1c8be6 100644 --- a/www/p5-HTML-Clean/pkg-plist +++ b/www/p5-HTML-Clean/pkg-plist @@ -1,10 +1,10 @@ bin/htmlclean %%SITE_PERL%%/HTML/Clean.pm -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTML %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Clean/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Clean -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML %%SITE_PERL%%/auto/HTML/Clean/autosplit.ix @dirrm %%SITE_PERL%%/auto/HTML/Clean -@unexec rmdir %D/%%SITE_PERL%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/lib/perl5/%%PERL_VERSION%%/man/man1 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/HTML +@dirrmtry lib/perl5/%%PERL_VERSION%%/man/man1 diff --git a/www/p5-HTML-Diff/pkg-plist b/www/p5-HTML-Diff/pkg-plist index 1a4850ff270c..ce2b4b723ec2 100644 --- a/www/p5-HTML-Diff/pkg-plist +++ b/www/p5-HTML-Diff/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/HTML/Diff.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Diff/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Diff -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-Element-Extended/pkg-plist b/www/p5-HTML-Element-Extended/pkg-plist index b0e1579763cf..1b709e4435d2 100644 --- a/www/p5-HTML-Element-Extended/pkg-plist +++ b/www/p5-HTML-Element-Extended/pkg-plist @@ -4,4 +4,4 @@ %%SITE_PERL%%/HTML/ElementTable.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Element-Extended/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Element-Extended -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-Embperl/pkg-plist b/www/p5-HTML-Embperl/pkg-plist index cc5823ed56a7..8a7d0a356947 100644 --- a/www/p5-HTML-Embperl/pkg-plist +++ b/www/p5-HTML-Embperl/pkg-plist @@ -22,5 +22,5 @@ bin/embpexec.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Embperl/Embperl.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/HTML/Embperl @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Embperl -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML diff --git a/www/p5-HTML-FillInForm/pkg-plist b/www/p5-HTML-FillInForm/pkg-plist index 83242ad2d25a..d6b35483fe33 100644 --- a/www/p5-HTML-FillInForm/pkg-plist +++ b/www/p5-HTML-FillInForm/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/HTML/FillInForm.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FillInForm/.packlist -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTML @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FillInForm @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null|| true diff --git a/www/p5-HTML-FromText/pkg-plist b/www/p5-HTML-FromText/pkg-plist index 280cd860dc70..b5365d780b2e 100644 --- a/www/p5-HTML-FromText/pkg-plist +++ b/www/p5-HTML-FromText/pkg-plist @@ -3,5 +3,5 @@ bin/text2html %%SITE_PERL%%/HTML/FromText.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FromText/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/FromText -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-LinkExtractor/pkg-plist b/www/p5-HTML-LinkExtractor/pkg-plist index fffa0b88631a..7a471f350a00 100644 --- a/www/p5-HTML-LinkExtractor/pkg-plist +++ b/www/p5-HTML-LinkExtractor/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/HTML/LinkExtractor.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/LinkExtractor/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/LinkExtractor -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-Lint/pkg-plist b/www/p5-HTML-Lint/pkg-plist index 88cfa1d8a011..9b3d044cd185 100644 --- a/www/p5-HTML-Lint/pkg-plist +++ b/www/p5-HTML-Lint/pkg-plist @@ -4,9 +4,9 @@ bin/weblint %%SITE_PERL%%/HTML/Lint/HTML4.pm %%SITE_PERL%%/Test/HTML/Lint.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Lint/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Lint 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Test/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML/Lint 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Lint +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/Test/HTML +@dirrmtry %%SITE_PERL%%/HTML/Lint +@dirrmtry %%SITE_PERL%%/HTML +@dirrmtry %%SITE_PERL%%/Test diff --git a/www/p5-HTML-Mason/pkg-plist b/www/p5-HTML-Mason/pkg-plist index 7664ac9edcf1..cffd0acd51d0 100644 --- a/www/p5-HTML-Mason/pkg-plist +++ b/www/p5-HTML-Mason/pkg-plist @@ -39,8 +39,8 @@ @dirrm %%SITE_PERL%%/HTML/Mason/Resolver @dirrm %%SITE_PERL%%/HTML/Mason @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Mason -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Bundle/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/Bundle/HTML +@dirrmtry %%SITE_PERL%%/Bundle +@dirrmtry %%SITE_PERL%%/HTML +@dirrmtry %%SITE_PERL%%/Apache diff --git a/www/p5-HTML-Parser/pkg-plist b/www/p5-HTML-Parser/pkg-plist index 0a06b8174372..d311ced7a258 100644 --- a/www/p5-HTML-Parser/pkg-plist +++ b/www/p5-HTML-Parser/pkg-plist @@ -9,5 +9,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Parser/Parser.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Parser/Parser.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Parser -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTML diff --git a/www/p5-HTML-Prototype/pkg-plist b/www/p5-HTML-Prototype/pkg-plist index b99b1de674a2..dbc449f05fe5 100644 --- a/www/p5-HTML-Prototype/pkg-plist +++ b/www/p5-HTML-Prototype/pkg-plist @@ -5,6 +5,6 @@ %%SITE_PERL%%/HTML/Prototype/Helper.pm %%SITE_PERL%%/HTML/Prototype/Helper/Tag.pm %%SITE_PERL%%/HTML/Prototype/Js.pm -@unexec rmdir %D/%%SITE_PERL%%/HTML/Prototype/Helper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML/Prototype 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTML/Prototype/Helper +@dirrmtry %%SITE_PERL%%/HTML/Prototype +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-QuickCheck/pkg-plist b/www/p5-HTML-QuickCheck/pkg-plist index abef439bded9..d3056cabd002 100644 --- a/www/p5-HTML-QuickCheck/pkg-plist +++ b/www/p5-HTML-QuickCheck/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/HTML/QuickCheck.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/QuickCheck/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/QuickCheck -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML diff --git a/www/p5-HTML-Scrubber/pkg-plist b/www/p5-HTML-Scrubber/pkg-plist index cc79ec0ca3a4..05e05cb305f7 100644 --- a/www/p5-HTML-Scrubber/pkg-plist +++ b/www/p5-HTML-Scrubber/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Scrubber/.packlist %%SITE_PERL%%/HTML/Scrubber.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Scrubber -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTML diff --git a/www/p5-HTML-SimpleLinkExtor/pkg-plist b/www/p5-HTML-SimpleLinkExtor/pkg-plist index 26d202ae6a98..175fddf7819e 100644 --- a/www/p5-HTML-SimpleLinkExtor/pkg-plist +++ b/www/p5-HTML-SimpleLinkExtor/pkg-plist @@ -4,6 +4,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/SimpleLinkExtor/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/SimpleLinkExtor @dirrm %%SITE_PERL%%/auto/HTML/SimpleLinkExtor -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/auto/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/HTML +@dirrmtry %%SITE_PERL%%/auto/HTML diff --git a/www/p5-HTML-SimpleParse/pkg-plist b/www/p5-HTML-SimpleParse/pkg-plist index 0e7690828e13..65bd8e47f4ea 100644 --- a/www/p5-HTML-SimpleParse/pkg-plist +++ b/www/p5-HTML-SimpleParse/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/HTML/SimpleParse.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/SimpleParse/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/SimpleParse -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML diff --git a/www/p5-HTML-StickyQuery/pkg-plist b/www/p5-HTML-StickyQuery/pkg-plist index 88aaf69b9bf6..00ecef4f7eb2 100644 --- a/www/p5-HTML-StickyQuery/pkg-plist +++ b/www/p5-HTML-StickyQuery/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/HTML/StickyQuery.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/StickyQuery/.packlist -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/StickyQuery 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/StickyQuery +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML diff --git a/www/p5-HTML-Stream/pkg-plist b/www/p5-HTML-Stream/pkg-plist index aaffda928919..6256a43eede9 100644 --- a/www/p5-HTML-Stream/pkg-plist +++ b/www/p5-HTML-Stream/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/HTML/Stream.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Stream/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Stream -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-Strip/pkg-plist b/www/p5-HTML-Strip/pkg-plist index f5e664a5166e..6c9eb157f017 100644 --- a/www/p5-HTML-Strip/pkg-plist +++ b/www/p5-HTML-Strip/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Strip/Strip.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Strip/Strip.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Strip -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTML diff --git a/www/p5-HTML-Summary/pkg-plist b/www/p5-HTML-Summary/pkg-plist index 43a4c01c56d8..fa939084daa1 100644 --- a/www/p5-HTML-Summary/pkg-plist +++ b/www/p5-HTML-Summary/pkg-plist @@ -6,6 +6,6 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Summary @dirrm %%SITE_PERL%%/Lingua/JA @dirrm %%SITE_PERL%%/Lingua -@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Text +@dirrmtry %%SITE_PERL%%/HTML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML diff --git a/www/p5-HTML-Table/pkg-plist b/www/p5-HTML-Table/pkg-plist index c9313f4af599..88b489b3fd80 100644 --- a/www/p5-HTML-Table/pkg-plist +++ b/www/p5-HTML-Table/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/HTML/Table.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Table/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Table -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-TableLayout/pkg-plist b/www/p5-HTML-TableLayout/pkg-plist index cb24d8d16e06..94c934097147 100644 --- a/www/p5-HTML-TableLayout/pkg-plist +++ b/www/p5-HTML-TableLayout/pkg-plist @@ -6,5 +6,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TableLayout/.packlist @dirrm %%SITE_PERL%%/HTML/TableLayout @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TableLayout -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-TableTiler/pkg-plist b/www/p5-HTML-TableTiler/pkg-plist index 484070249435..5aed8a116fb6 100644 --- a/www/p5-HTML-TableTiler/pkg-plist +++ b/www/p5-HTML-TableTiler/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/HTML/TableTiler.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TableTiler/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TableTiler -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-TagCloud-Extended/pkg-plist b/www/p5-HTML-TagCloud-Extended/pkg-plist index b6695d83175f..b76c7b6ba411 100644 --- a/www/p5-HTML-TagCloud-Extended/pkg-plist +++ b/www/p5-HTML-TagCloud-Extended/pkg-plist @@ -5,9 +5,9 @@ %%SITE_PERL%%/HTML/TagCloud/Extended/TagColors.pm %%SITE_PERL%%/HTML/TagCloud/Extended/TagList.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagCloud/Extended/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagCloud/Extended 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagCloud 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagCloud/Extended +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagCloud @dirrm %%SITE_PERL%%/HTML/TagCloud/Extended -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML/TagCloud 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/HTML/TagCloud +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-TagCloud/pkg-plist b/www/p5-HTML-TagCloud/pkg-plist index 643af5e39476..062af50fe8a4 100644 --- a/www/p5-HTML-TagCloud/pkg-plist +++ b/www/p5-HTML-TagCloud/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/HTML/TagCloud.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagCloud/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagCloud 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TagCloud +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-Tagset/pkg-plist b/www/p5-HTML-Tagset/pkg-plist index 1da36d193566..f85adb777edb 100644 --- a/www/p5-HTML-Tagset/pkg-plist +++ b/www/p5-HTML-Tagset/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/HTML/Tagset.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Tagset/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Tagset -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML diff --git a/www/p5-HTML-Template-Associate/pkg-plist b/www/p5-HTML-Template-Associate/pkg-plist index 78bc19a697f8..c56ab038c256 100644 --- a/www/p5-HTML-Template-Associate/pkg-plist +++ b/www/p5-HTML-Template-Associate/pkg-plist @@ -3,4 +3,4 @@ @dirrm %%SITE_PERL%%/HTML/Template/Associate %%SITE_PERL%%/mach/auto/HTML/Template/Associate/.packlist @dirrm %%SITE_PERL%%/mach/auto/HTML/Template/Associate -@unexec rmdir %D/%%SITE_PERL%%/HTML/Template 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTML/Template diff --git a/www/p5-HTML-Template-Compiled/pkg-plist b/www/p5-HTML-Template-Compiled/pkg-plist index 91a6b90a1b86..fc959d46a167 100644 --- a/www/p5-HTML-Template-Compiled/pkg-plist +++ b/www/p5-HTML-Template-Compiled/pkg-plist @@ -5,9 +5,9 @@ %%SITE_PERL%%/HTML/Template/Compiled/Filter.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Compiled/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Compiled -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML @dirrm %%SITE_PERL%%/HTML/Template/Compiled/Plugin @dirrm %%SITE_PERL%%/HTML/Template/Compiled -@unexec rmdir %D/%%SITE_PERL%%/HTML/Template 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTML/Template +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-Template-Expr/pkg-plist b/www/p5-HTML-Template-Expr/pkg-plist index e95da97a3f45..fa9dd519860e 100644 --- a/www/p5-HTML-Template-Expr/pkg-plist +++ b/www/p5-HTML-Template-Expr/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/HTML/Template/Expr.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Expr/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Expr 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML/Template 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/Expr +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/HTML/Template +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-Template-HashWrapper/pkg-plist b/www/p5-HTML-Template-HashWrapper/pkg-plist index 7e2bbdf5b566..37276bc067bf 100644 --- a/www/p5-HTML-Template-HashWrapper/pkg-plist +++ b/www/p5-HTML-Template-HashWrapper/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/HTML/Template/HashWrapper.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/HashWrapper/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/HashWrapper -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML/Template 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/HTML/Template +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-Template-JIT/pkg-plist b/www/p5-HTML-Template-JIT/pkg-plist index f86bf94b1544..a8e05d5f48f2 100644 --- a/www/p5-HTML-Template-JIT/pkg-plist +++ b/www/p5-HTML-Template-JIT/pkg-plist @@ -3,8 +3,8 @@ %%SITE_PERL%%/HTML/Template/JIT/Compiler.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/JIT/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/JIT -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML @dirrm %%SITE_PERL%%/HTML/Template/JIT -@unexec rmdir %D/%%SITE_PERL%%/HTML/Template 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTML/Template +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-Template/pkg-plist b/www/p5-HTML-Template/pkg-plist index 0d7c0878a683..ca0a9d5e5bcc 100644 --- a/www/p5-HTML-Template/pkg-plist +++ b/www/p5-HTML-Template/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/HTML/Template.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template/.packlist -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTML @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Template -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML diff --git a/www/p5-HTML-TokeParser-Simple/pkg-plist b/www/p5-HTML-TokeParser-Simple/pkg-plist index 5231bc5a195e..8a207a8dd47c 100644 --- a/www/p5-HTML-TokeParser-Simple/pkg-plist +++ b/www/p5-HTML-TokeParser-Simple/pkg-plist @@ -10,9 +10,9 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TokeParser/Simple/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TokeParser/Simple @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/TokeParser -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML @dirrm %%SITE_PERL%%/HTML/TokeParser/Simple/Token/Tag @dirrm %%SITE_PERL%%/HTML/TokeParser/Simple/Token @dirrm %%SITE_PERL%%/HTML/TokeParser/Simple @dirrm %%SITE_PERL%%/HTML/TokeParser -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-Tree/pkg-plist b/www/p5-HTML-Tree/pkg-plist index bd7ab6577d15..83c44800b9eb 100644 --- a/www/p5-HTML-Tree/pkg-plist +++ b/www/p5-HTML-Tree/pkg-plist @@ -11,4 +11,4 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML-Tree @dirrm %%SITE_PERL%%/HTML/Element @dirrm %%SITE_PERL%%/HTML/Tree -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-Webmake/pkg-plist b/www/p5-HTML-Webmake/pkg-plist index a7f977acc5a5..f762e20c79a4 100644 --- a/www/p5-HTML-Webmake/pkg-plist +++ b/www/p5-HTML-Webmake/pkg-plist @@ -62,5 +62,5 @@ bin/webmake @dirrm %%SITE_PERL%%/HTML/WebMake/PerlLib @dirrm %%SITE_PERL%%/HTML/WebMake @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WebMake -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2> /dev/null || true +@dirrmtry %%SITE_PERL%%/HTML +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML diff --git a/www/p5-HTML-Widget/pkg-plist b/www/p5-HTML-Widget/pkg-plist index b50381b83c45..492773f69c5e 100644 --- a/www/p5-HTML-Widget/pkg-plist +++ b/www/p5-HTML-Widget/pkg-plist @@ -41,10 +41,10 @@ %%SITE_PERL%%/HTML/Widget/Filter/Whitespace.pm %%SITE_PERL%%/HTML/Widget/Result.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widget/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widget 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML/Widget/Constraint 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML/Widget/Element 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML/Widget/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML/Widget 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widget +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/HTML/Widget/Constraint +@dirrmtry %%SITE_PERL%%/HTML/Widget/Element +@dirrmtry %%SITE_PERL%%/HTML/Widget/Filter +@dirrmtry %%SITE_PERL%%/HTML/Widget +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-Widgets-SelectLayers/pkg-plist b/www/p5-HTML-Widgets-SelectLayers/pkg-plist index c5294704d0f8..2b8631f4641e 100644 --- a/www/p5-HTML-Widgets-SelectLayers/pkg-plist +++ b/www/p5-HTML-Widgets-SelectLayers/pkg-plist @@ -2,7 +2,7 @@ %%SITE_PERL%%/HTML/Widgets/homepage.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widgets/SelectLayers/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widgets/SelectLayers -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widgets 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML/Widgets 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Widgets +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/HTML/Widgets +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML-WikiConverter/pkg-plist b/www/p5-HTML-WikiConverter/pkg-plist index 810499fbaba2..217463aa6a1b 100644 --- a/www/p5-HTML-WikiConverter/pkg-plist +++ b/www/p5-HTML-WikiConverter/pkg-plist @@ -13,5 +13,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter/.packlist @dirrm %%SITE_PERL%%/HTML/WikiConverter @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/WikiConverter -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTML/pkg-plist b/www/p5-HTML/pkg-plist index 390a88d58588..3aec0929dc33 100644 --- a/www/p5-HTML/pkg-plist +++ b/www/p5-HTML/pkg-plist @@ -1,3 +1,3 @@ %%SITE_PERL%%/HTML/Base.pm %%SITE_PERL%%/html_base.pod -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-HTTP-Body/pkg-plist b/www/p5-HTTP-Body/pkg-plist index b928e67b7534..123ea839bde1 100644 --- a/www/p5-HTTP-Body/pkg-plist +++ b/www/p5-HTTP-Body/pkg-plist @@ -3,7 +3,7 @@ %%SITE_PERL%%/HTTP/Body/OctetStream.pm %%SITE_PERL%%/HTTP/Body/UrlEncoded.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Body/.packlist -@unexec rmdir %D/%%SITE_PERL%%/HTTP/Body 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Body 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTTP/Body +@dirrmtry %%SITE_PERL%%/HTTP +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Body +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP diff --git a/www/p5-HTTP-BrowserDetect/pkg-plist b/www/p5-HTTP-BrowserDetect/pkg-plist index 38cb7cc4e558..69b0c6f5c753 100644 --- a/www/p5-HTTP-BrowserDetect/pkg-plist +++ b/www/p5-HTTP-BrowserDetect/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/BrowserDetect/.packlist %%SITE_PERL%%/HTTP/BrowserDetect.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/BrowserDetect -@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTTP +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP diff --git a/www/p5-HTTP-Cache-Transparent/pkg-plist b/www/p5-HTTP-Cache-Transparent/pkg-plist index fc2c59401e12..7b32368d01e0 100644 --- a/www/p5-HTTP-Cache-Transparent/pkg-plist +++ b/www/p5-HTTP-Cache-Transparent/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/HTTP/Cache/Transparent.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cache/Transparent/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cache/Transparent -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP/Cache 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Cache +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP +@dirrmtry %%SITE_PERL%%/HTTP/Cache +@dirrmtry %%SITE_PERL%%/HTTP diff --git a/www/p5-HTTP-DAV/pkg-plist b/www/p5-HTTP-DAV/pkg-plist index 342914b2abc9..a27292037c67 100644 --- a/www/p5-HTTP-DAV/pkg-plist +++ b/www/p5-HTTP-DAV/pkg-plist @@ -9,5 +9,5 @@ bin/dave %%SITE_PERL%%/HTTP/DAV/Utils.pm @dirrm %%SITE_PERL%%/HTTP/DAV @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/DAV -@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTTP +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP diff --git a/www/p5-HTTP-GHTTP/pkg-plist b/www/p5-HTTP-GHTTP/pkg-plist index 1631ac674433..fcee72ace330 100644 --- a/www/p5-HTTP-GHTTP/pkg-plist +++ b/www/p5-HTTP-GHTTP/pkg-plist @@ -4,5 +4,5 @@ bin/g-request %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/GHTTP/GHTTP.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/GHTTP/GHTTP.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/GHTTP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTTP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTTP +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP diff --git a/www/p5-HTTP-Lite/pkg-plist b/www/p5-HTTP-Lite/pkg-plist index 3ee74e46cab4..fe747324d981 100644 --- a/www/p5-HTTP-Lite/pkg-plist +++ b/www/p5-HTTP-Lite/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/HTTP/Lite.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Lite/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Lite -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP +@dirrmtry %%SITE_PERL%%/HTTP diff --git a/www/p5-HTTP-MHTTP/pkg-plist b/www/p5-HTTP-MHTTP/pkg-plist index adeb772b59ac..a599001f1646 100644 --- a/www/p5-HTTP-MHTTP/pkg-plist +++ b/www/p5-HTTP-MHTTP/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MHTTP/MHTTP.so %%SITE_PERL%%/%%PERL_ARCH%%/HTTP/MHTTP.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MHTTP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTTP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/HTTP +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP diff --git a/www/p5-HTTP-MobileAgent/pkg-plist b/www/p5-HTTP-MobileAgent/pkg-plist index 9acc07e374cf..745365f0d0b4 100644 --- a/www/p5-HTTP-MobileAgent/pkg-plist +++ b/www/p5-HTTP-MobileAgent/pkg-plist @@ -11,4 +11,4 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MobileAgent/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/MobileAgent @dirrm %%SITE_PERL%%/HTTP/MobileAgent -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP diff --git a/www/p5-HTTP-Proxy/pkg-plist b/www/p5-HTTP-Proxy/pkg-plist index 973b415f6c91..5ecc75f1307a 100644 --- a/www/p5-HTTP-Proxy/pkg-plist +++ b/www/p5-HTTP-Proxy/pkg-plist @@ -19,4 +19,4 @@ @dirrm %%SITE_PERL%%/HTTP/Proxy/Engine @dirrm %%SITE_PERL%%/HTTP/Proxy/BodyFilter @dirrm %%SITE_PERL%%/HTTP/Proxy -@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTTP diff --git a/www/p5-HTTP-Recorder/pkg-plist b/www/p5-HTTP-Recorder/pkg-plist index a5fc8dbe3bfe..e5727351ea4d 100644 --- a/www/p5-HTTP-Recorder/pkg-plist +++ b/www/p5-HTTP-Recorder/pkg-plist @@ -3,6 +3,6 @@ %%SITE_PERL%%/HTTP/Recorder/Logger.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Recorder/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Recorder -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP @dirrm %%SITE_PERL%%/HTTP/Recorder -@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTTP diff --git a/www/p5-HTTP-Request-AsCGI/pkg-plist b/www/p5-HTTP-Request-AsCGI/pkg-plist index 59af892a5742..38e832875daf 100644 --- a/www/p5-HTTP-Request-AsCGI/pkg-plist +++ b/www/p5-HTTP-Request-AsCGI/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/HTTP/Request/AsCGI.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request/AsCGI/.packlist -@unexec rmdir %D/%%SITE_PERL%%/HTTP/Request 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request/AsCGI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTTP/Request +@dirrmtry %%SITE_PERL%%/HTTP +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request/AsCGI +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP diff --git a/www/p5-HTTP-Request-Params/pkg-plist b/www/p5-HTTP-Request-Params/pkg-plist index 3533d30f9973..4db5998d274c 100644 --- a/www/p5-HTTP-Request-Params/pkg-plist +++ b/www/p5-HTTP-Request-Params/pkg-plist @@ -2,7 +2,7 @@ %%SITE_PERL%%/HTTP/Request/Params.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request/Params/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request/Params -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP/Request 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Request +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP +@dirrmtry %%SITE_PERL%%/HTTP/Request +@dirrmtry %%SITE_PERL%%/HTTP diff --git a/www/p5-HTTP-Server-Simple-Mason/pkg-plist b/www/p5-HTTP-Server-Simple-Mason/pkg-plist index 02f43a65eca8..a331a51d0cea 100644 --- a/www/p5-HTTP-Server-Simple-Mason/pkg-plist +++ b/www/p5-HTTP-Server-Simple-Mason/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/HTTP/Server/Simple/Mason.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple/Mason/.packlist @unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple/Mason -@unexec rmdir %D/%%SITE_PERL%%/HTTP/Server/Simple 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP/Server 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTTP/Server/Simple +@dirrmtry %%SITE_PERL%%/HTTP/Server +@dirrmtry %%SITE_PERL%%/HTTP diff --git a/www/p5-HTTP-Server-Simple-Recorder/pkg-plist b/www/p5-HTTP-Server-Simple-Recorder/pkg-plist index 31650c3f76b5..521195cd8cbe 100644 --- a/www/p5-HTTP-Server-Simple-Recorder/pkg-plist +++ b/www/p5-HTTP-Server-Simple-Recorder/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/HTTP/Server/Simple/Recorder.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple/Recorder/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple/Recorder 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP/Server/Simple 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP/Server 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple/Recorder +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server +@dirrmtry %%SITE_PERL%%/HTTP/Server/Simple +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP +@dirrmtry %%SITE_PERL%%/HTTP/Server +@dirrmtry %%SITE_PERL%%/HTTP diff --git a/www/p5-HTTP-Server-Simple-Static/pkg-plist b/www/p5-HTTP-Server-Simple-Static/pkg-plist index 2de22f14920d..7ae46c3a83bb 100644 --- a/www/p5-HTTP-Server-Simple-Static/pkg-plist +++ b/www/p5-HTTP-Server-Simple-Static/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/HTTP/Server/Simple/Static.pm -@unexec rmdir %D/%%SITE_PERL%%/HTTP/Server/Simple 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP/Server 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTTP/Server/Simple +@dirrmtry %%SITE_PERL%%/HTTP/Server +@dirrmtry %%SITE_PERL%%/HTTP diff --git a/www/p5-HTTP-Server-Simple/pkg-plist b/www/p5-HTTP-Server-Simple/pkg-plist index 5ffa8ef4cc6b..25e2ed9ac09d 100644 --- a/www/p5-HTTP-Server-Simple/pkg-plist +++ b/www/p5-HTTP-Server-Simple/pkg-plist @@ -2,10 +2,10 @@ %%SITE_PERL%%/HTTP/Server/Simple/CGI.pm %%SITE_PERL%%/HTTP/Server/Simple/CGI/Environment.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP/Server/Simple/CGI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP/Server/Simple 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP/Server 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server/Simple +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/Server +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP +@dirrmtry %%SITE_PERL%%/HTTP/Server/Simple/CGI +@dirrmtry %%SITE_PERL%%/HTTP/Server/Simple +@dirrmtry %%SITE_PERL%%/HTTP/Server +@dirrmtry %%SITE_PERL%%/HTTP diff --git a/www/p5-HTTP-WebTest/pkg-plist b/www/p5-HTTP-WebTest/pkg-plist index 5a0013667c94..3bf812e99980 100644 --- a/www/p5-HTTP-WebTest/pkg-plist +++ b/www/p5-HTTP-WebTest/pkg-plist @@ -27,10 +27,10 @@ bin/wt %%SITE_PERL%%/HTTP/WebTest/TestResult.pm %%SITE_PERL%%/HTTP/WebTest/Utils.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTP/WebTest/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Bundle/HTTP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP/WebTest/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP/WebTest 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%//%%PERL_ARCH%%/auto/HTTP/WebTest 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%//%%PERL_ARCH%%/auto/HTTP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Bundle/HTTP +@dirrmtry %%SITE_PERL%%/Bundle +@dirrmtry %%SITE_PERL%%/HTTP/WebTest/Plugin +@dirrmtry %%SITE_PERL%%/HTTP/WebTest +@dirrmtry %%SITE_PERL%%/HTTP +@dirrmtry %%SITE_PERL%%//%%PERL_ARCH%%/auto/HTTP/WebTest +@dirrmtry %%SITE_PERL%%//%%PERL_ARCH%%/auto/HTTP diff --git a/www/p5-HTTPD-Log-Filter/pkg-plist b/www/p5-HTTPD-Log-Filter/pkg-plist index 22421ec66487..5be0be562b11 100644 --- a/www/p5-HTTPD-Log-Filter/pkg-plist +++ b/www/p5-HTTPD-Log-Filter/pkg-plist @@ -2,7 +2,7 @@ bin/exclude_robots %%SITE_PERL%%/HTTPD/Log/Filter.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Log/Filter/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Log/Filter -@unexec rmdir %D/%%SITE_PERL%%/HTTPD/Log 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTPD 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Log 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTTPD/Log +@dirrmtry %%SITE_PERL%%/HTTPD +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD/Log +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD diff --git a/www/p5-HTTPD-User-Manage/pkg-plist b/www/p5-HTTPD-User-Manage/pkg-plist index 578b124f2407..4add979b58ab 100644 --- a/www/p5-HTTPD-User-Manage/pkg-plist +++ b/www/p5-HTTPD-User-Manage/pkg-plist @@ -22,4 +22,4 @@ @dirrm %%SITE_PERL%%/HTTPD/GroupAdmin/DBM @dirrm %%SITE_PERL%%/HTTPD/GroupAdmin @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTTPD-User-Manage -@unexec rmdir %D/%%SITE_PERL%%/HTTPD 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/HTTPD diff --git a/www/p5-Handel/pkg-plist b/www/p5-Handel/pkg-plist index 9f6eaa1e3716..0cdade859bbb 100644 --- a/www/p5-Handel/pkg-plist +++ b/www/p5-Handel/pkg-plist @@ -46,12 +46,12 @@ @dirrm %%SITE_PERL%%/Handel/Order @dirrm %%SITE_PERL%%/Handel @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Handel -@unexec rmdir %D/%%SITE_PERL%%/Template/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Template 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper/Controller 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper/Model 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst/Helper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/AxKit/XSP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/AxKit 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Handel 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Template/Plugin +@dirrmtry %%SITE_PERL%%/Template +@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Controller +@dirrmtry %%SITE_PERL%%/Catalyst/Helper/Model +@dirrmtry %%SITE_PERL%%/Catalyst/Helper +@dirrmtry %%SITE_PERL%%/Catalyst +@dirrmtry %%SITE_PERL%%/AxKit/XSP +@dirrmtry %%SITE_PERL%%/AxKit +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Handel diff --git a/www/p5-IMDB-Movie/pkg-plist b/www/p5-IMDB-Movie/pkg-plist index c4362a242fe9..63330909460b 100644 --- a/www/p5-IMDB-Movie/pkg-plist +++ b/www/p5-IMDB-Movie/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/IMDB/Movie.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMDB/Movie/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMDB/Movie -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IMDB 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/IMDB 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IMDB +@dirrmtry %%SITE_PERL%%/IMDB diff --git a/www/p5-Jifty/pkg-plist b/www/p5-Jifty/pkg-plist index 86d0394a6046..7cefb8abdcf7 100644 --- a/www/p5-Jifty/pkg-plist +++ b/www/p5-Jifty/pkg-plist @@ -157,37 +157,37 @@ bin/jifty %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Model/Schema.pm %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Test/WWW/Mechanize.pm %%SITE_PERL%%/%%PERL_ARCH%%/Email/Send/Jifty/Test.pm -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static/js/ie7 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static/js/scriptaculous 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static/js 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static/css 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static/images 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/online_docs 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/admin/_elements 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/admin/fragments/list 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/admin/fragments 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/admin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/error 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/_elements 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/let 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Web/Form/Field 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Web/Form 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Web 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Action/Record 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Action 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Manual 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/JSON 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Script 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Request 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Model 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Test/WWW 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Test 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Jifty 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Email/Send/Jifty 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Email/Send 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Email 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static/js/ie7 +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static/js/scriptaculous +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static/js +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static/css +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static/images +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/static +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/online_docs +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/admin/_elements +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/admin/fragments/list +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/admin/fragments +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/admin +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty/error +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/__jifty +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/_elements +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates/let +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web/templates +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty/web +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Web/Form/Field +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Web/Form +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Web +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Action/Record +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Action +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Manual +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/JSON +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Script +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Request +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Model +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Test/WWW +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty/Test +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Jifty +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Email/Send/Jifty +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Email/Send +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Email +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Jifty diff --git a/www/p5-Kwiki-Archive-Rcs/pkg-plist b/www/p5-Kwiki-Archive-Rcs/pkg-plist index 01e966684365..665fd6154fd4 100644 --- a/www/p5-Kwiki-Archive-Rcs/pkg-plist +++ b/www/p5-Kwiki-Archive-Rcs/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/Kwiki/Archive/Rcs.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Archive/Rcs/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Archive/Rcs -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Archive 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Kwiki/Archive 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Archive +@dirrmtry %%SITE_PERL%%/Kwiki/Archive +@dirrmtry %%SITE_PERL%%/Kwiki diff --git a/www/p5-Kwiki-Archive-SVK/pkg-plist b/www/p5-Kwiki-Archive-SVK/pkg-plist index 23ce43fc38c0..a00fbc049a2e 100644 --- a/www/p5-Kwiki-Archive-SVK/pkg-plist +++ b/www/p5-Kwiki-Archive-SVK/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/Kwiki/Archive/SVK.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Archive/SVK/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Archive/SVK -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Archive 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Kwiki/Archive 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Archive +@dirrmtry %%SITE_PERL%%/Kwiki/Archive +@dirrmtry %%SITE_PERL%%/Kwiki diff --git a/www/p5-Kwiki-Atom/pkg-plist b/www/p5-Kwiki-Atom/pkg-plist index 7e9ee0843ac4..13ed707d3e6d 100644 --- a/www/p5-Kwiki-Atom/pkg-plist +++ b/www/p5-Kwiki-Atom/pkg-plist @@ -4,4 +4,4 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Atom/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Atom @dirrm %%SITE_PERL%%/Kwiki/Atom -@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Kwiki diff --git a/www/p5-Kwiki-Diff/pkg-plist b/www/p5-Kwiki-Diff/pkg-plist index e98233c5b4c9..2921fc240a80 100644 --- a/www/p5-Kwiki-Diff/pkg-plist +++ b/www/p5-Kwiki-Diff/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/Kwiki/Diff.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Diff/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Diff -@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Kwiki diff --git a/www/p5-Kwiki-Edit-RequireUserName/pkg-plist b/www/p5-Kwiki-Edit-RequireUserName/pkg-plist index 2007990b8455..6a064a17cda3 100644 --- a/www/p5-Kwiki-Edit-RequireUserName/pkg-plist +++ b/www/p5-Kwiki-Edit-RequireUserName/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/Kwiki/Edit/RequireUserName.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Edit/RequireUserName/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Edit/RequireUserName -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Edit 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Kwiki/Edit 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Edit +@dirrmtry %%SITE_PERL%%/Kwiki/Edit +@dirrmtry %%SITE_PERL%%/Kwiki diff --git a/www/p5-Kwiki-GDGraphGenerator/pkg-plist b/www/p5-Kwiki-GDGraphGenerator/pkg-plist index af5da18ddc86..c9456a650b20 100644 --- a/www/p5-Kwiki-GDGraphGenerator/pkg-plist +++ b/www/p5-Kwiki-GDGraphGenerator/pkg-plist @@ -2,4 +2,4 @@ %%SITE_PERL%%/Kwiki/GDGraphGenerator.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/GDGraphGenerator/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/GDGraphGenerator -@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Kwiki diff --git a/www/p5-Kwiki-Icons-Gnome/pkg-plist b/www/p5-Kwiki-Icons-Gnome/pkg-plist index 41f24eeb2ed8..db976134bf4f 100644 --- a/www/p5-Kwiki-Icons-Gnome/pkg-plist +++ b/www/p5-Kwiki-Icons-Gnome/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Kwiki/Icons/Gnome.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Icons/Gnome/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Icons/Gnome -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Icons 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Kwiki/Icons/ 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Icons +@dirrmtry %%SITE_PERL%%/Kwiki/Icons/ diff --git a/www/p5-Kwiki-Infobox/pkg-plist b/www/p5-Kwiki-Infobox/pkg-plist index 447f06ea521b..84bdf717af20 100644 --- a/www/p5-Kwiki-Infobox/pkg-plist +++ b/www/p5-Kwiki-Infobox/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/Kwiki/Infobox.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Infobox/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Infobox -@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Kwiki diff --git a/www/p5-Kwiki-NavigationToolbar/pkg-plist b/www/p5-Kwiki-NavigationToolbar/pkg-plist index 6fb4ee195bff..5906f8ac5581 100644 --- a/www/p5-Kwiki-NavigationToolbar/pkg-plist +++ b/www/p5-Kwiki-NavigationToolbar/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/Kwiki/NavigationToolbar.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/NavigationToolbar/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/NavigationToolbar -@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Kwiki diff --git a/www/p5-Kwiki-NewPage/pkg-plist b/www/p5-Kwiki-NewPage/pkg-plist index 1c2ab0d81814..d82eb6c2fcd1 100644 --- a/www/p5-Kwiki-NewPage/pkg-plist +++ b/www/p5-Kwiki-NewPage/pkg-plist @@ -2,4 +2,4 @@ %%SITE_PERL%%/Kwiki/NewPage.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/NewPage/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/NewPage -@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Kwiki diff --git a/www/p5-Kwiki-Notify-Mail/pkg-plist b/www/p5-Kwiki-Notify-Mail/pkg-plist index 61eea9760336..b0798141c683 100644 --- a/www/p5-Kwiki-Notify-Mail/pkg-plist +++ b/www/p5-Kwiki-Notify-Mail/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/Kwiki/Notify/Mail.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Notify/Mail/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Notify/Mail -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Notify 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Kwiki/Notify 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Notify +@dirrmtry %%SITE_PERL%%/Kwiki/Notify +@dirrmtry %%SITE_PERL%%/Kwiki diff --git a/www/p5-Kwiki-PagePrivacy/pkg-plist b/www/p5-Kwiki-PagePrivacy/pkg-plist index fede0efecff8..b397d2980391 100644 --- a/www/p5-Kwiki-PagePrivacy/pkg-plist +++ b/www/p5-Kwiki-PagePrivacy/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/Kwiki/PagePrivacy.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/PagePrivacy/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/PagePrivacy -@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Kwiki diff --git a/www/p5-Kwiki-RecentChanges/pkg-plist b/www/p5-Kwiki-RecentChanges/pkg-plist index 4fce6793326a..1543b5060b83 100644 --- a/www/p5-Kwiki-RecentChanges/pkg-plist +++ b/www/p5-Kwiki-RecentChanges/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/Kwiki/RecentChanges.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/RecentChanges/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/RecentChanges -@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Kwiki diff --git a/www/p5-Kwiki-RecentChangesRSS/pkg-plist b/www/p5-Kwiki-RecentChangesRSS/pkg-plist index 23789e38c606..a7cefc6b34a3 100644 --- a/www/p5-Kwiki-RecentChangesRSS/pkg-plist +++ b/www/p5-Kwiki-RecentChangesRSS/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Kwiki/RecentChangesRSS.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/RecentChangesRSS/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/RecentChangesRSS -@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Kwiki +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki diff --git a/www/p5-Kwiki-Revisions/pkg-plist b/www/p5-Kwiki-Revisions/pkg-plist index 86e546554504..a886442f71fd 100644 --- a/www/p5-Kwiki-Revisions/pkg-plist +++ b/www/p5-Kwiki-Revisions/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/Kwiki/Revisions.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Revisions/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Revisions -@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Kwiki diff --git a/www/p5-Kwiki-Search/pkg-plist b/www/p5-Kwiki-Search/pkg-plist index 24c807117177..47a787b58316 100644 --- a/www/p5-Kwiki-Search/pkg-plist +++ b/www/p5-Kwiki-Search/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/Kwiki/Search.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Search/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Search -@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Kwiki diff --git a/www/p5-Kwiki-Theme-ColumnLayout/pkg-plist b/www/p5-Kwiki-Theme-ColumnLayout/pkg-plist index 9df510633db3..88d8bf8d3f01 100644 --- a/www/p5-Kwiki-Theme-ColumnLayout/pkg-plist +++ b/www/p5-Kwiki-Theme-ColumnLayout/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/Kwiki/Theme/ColumnLayout.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Theme/ColumnLayout/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Theme/ColumnLayout -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Theme 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Kwiki/Theme 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/Theme +@dirrmtry %%SITE_PERL%%/Kwiki/Theme +@dirrmtry %%SITE_PERL%%/Kwiki diff --git a/www/p5-Kwiki-UserName/pkg-plist b/www/p5-Kwiki-UserName/pkg-plist index 58e1617c564b..9b21c48fb90a 100644 --- a/www/p5-Kwiki-UserName/pkg-plist +++ b/www/p5-Kwiki-UserName/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/Kwiki/UserName.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/UserName/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/UserName -@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Kwiki diff --git a/www/p5-Kwiki-UserPreferences/pkg-plist b/www/p5-Kwiki-UserPreferences/pkg-plist index 4c4467f6b34f..a8c63c50c0f9 100644 --- a/www/p5-Kwiki-UserPreferences/pkg-plist +++ b/www/p5-Kwiki-UserPreferences/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/Kwiki/UserPreferences.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/UserPreferences/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/UserPreferences -@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Kwiki diff --git a/www/p5-Kwiki-VimMode/pkg-plist b/www/p5-Kwiki-VimMode/pkg-plist index 5eb345d8fed5..bad66b6af3c3 100644 --- a/www/p5-Kwiki-VimMode/pkg-plist +++ b/www/p5-Kwiki-VimMode/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/Kwiki/VimMode.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/VimMode/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Kwiki/VimMode -@unexec rmdir %D/%%SITE_PERL%%/Kwiki 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Kwiki diff --git a/www/p5-LWP-Authen-Wsse/pkg-plist b/www/p5-LWP-Authen-Wsse/pkg-plist index 73b43e71e7c5..afedf5306127 100644 --- a/www/p5-LWP-Authen-Wsse/pkg-plist +++ b/www/p5-LWP-Authen-Wsse/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/LWP/Authen/Wsse.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Authen/Wsse/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Authen/Wsse 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Authen 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/LWP/Authen 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/LWP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Authen/Wsse +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Authen +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP +@dirrmtry %%SITE_PERL%%/LWP/Authen +@dirrmtry %%SITE_PERL%%/LWP diff --git a/www/p5-MasonX-Interp-WithCallbacks/pkg-plist b/www/p5-MasonX-Interp-WithCallbacks/pkg-plist index 8e35721ff100..a3384a7fac6a 100644 --- a/www/p5-MasonX-Interp-WithCallbacks/pkg-plist +++ b/www/p5-MasonX-Interp-WithCallbacks/pkg-plist @@ -1,3 +1,3 @@ %%SITE_PERL%%/MasonX/Interp/WithCallbacks.pm @dirrm %%SITE_PERL%%/MasonX/Interp -@unexec rmdir %D/%%SITE_PERL%%/MasonX 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/MasonX diff --git a/www/p5-MasonX-Profiler/pkg-plist b/www/p5-MasonX-Profiler/pkg-plist index 8faa3d9086b4..0f3032ee923c 100644 --- a/www/p5-MasonX-Profiler/pkg-plist +++ b/www/p5-MasonX-Profiler/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/MasonX/Profiler.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MasonX/Profiler/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MasonX/Profiler -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MasonX 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/MasonX 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MasonX +@dirrmtry %%SITE_PERL%%/MasonX diff --git a/www/p5-MasonX-Request-WithApacheSession/pkg-plist b/www/p5-MasonX-Request-WithApacheSession/pkg-plist index 381e38804c06..06d85033ab3c 100644 --- a/www/p5-MasonX-Request-WithApacheSession/pkg-plist +++ b/www/p5-MasonX-Request-WithApacheSession/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/MasonX/Request/WithApacheSession.pm %%SITE_PERL%%/MasonX/Request/WithMultiSession.pm -@unexec rmdir %D/%%SITE_PERL%%/MasonX/Request 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/MasonX 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/MasonX/Request +@dirrmtry %%SITE_PERL%%/MasonX diff --git a/www/p5-MasonX-WebApp/pkg-plist b/www/p5-MasonX-WebApp/pkg-plist index 87d650705136..f82b5c4668ca 100644 --- a/www/p5-MasonX-WebApp/pkg-plist +++ b/www/p5-MasonX-WebApp/pkg-plist @@ -1,2 +1,2 @@ %%SITE_PERL%%/MasonX/WebApp.pm -@unexec rmdir %D/%%SITE_PERL%%/MasonX 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/MasonX diff --git a/www/p5-Maypole-Authentication-UserSessionCookie/pkg-plist b/www/p5-Maypole-Authentication-UserSessionCookie/pkg-plist index 400da9f43fb0..c74dc46c4209 100644 --- a/www/p5-Maypole-Authentication-UserSessionCookie/pkg-plist +++ b/www/p5-Maypole-Authentication-UserSessionCookie/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Maypole/Authentication/UserSessionCookie.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/Authentication/UserSessionCookie/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/Authentication/UserSessionCookie -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/Authentication 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Maypole/Authentication 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Maypole 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/Authentication +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole +@dirrmtry %%SITE_PERL%%/Maypole/Authentication +@dirrmtry %%SITE_PERL%%/Maypole diff --git a/www/p5-Maypole-Component/pkg-plist b/www/p5-Maypole-Component/pkg-plist index 2b42d0b3039e..429518b85b9a 100644 --- a/www/p5-Maypole-Component/pkg-plist +++ b/www/p5-Maypole-Component/pkg-plist @@ -2,4 +2,4 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/Component/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole/Component @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole -@unexec rmdir %D/%%SITE_PERL%%/Maypole 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Maypole diff --git a/www/p5-Maypole/pkg-plist b/www/p5-Maypole/pkg-plist index 5e9bf9d24269..faed5891f2e9 100644 --- a/www/p5-Maypole/pkg-plist +++ b/www/p5-Maypole/pkg-plist @@ -57,10 +57,10 @@ %%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Maypole -@unexec rmdir %D/%%SITE_PERL%%/Maypole/Manual 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Maypole/Model/CDBI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Maypole/Model 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Maypole/View 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Maypole 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/CGI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Maypole/Manual +@dirrmtry %%SITE_PERL%%/Maypole/Model/CDBI +@dirrmtry %%SITE_PERL%%/Maypole/Model +@dirrmtry %%SITE_PERL%%/Maypole/View +@dirrmtry %%SITE_PERL%%/Maypole +@dirrmtry %%SITE_PERL%%/CGI +@dirrmtry %%SITE_PERL%%/Apache diff --git a/www/p5-PHP-Session/pkg-plist b/www/p5-PHP-Session/pkg-plist index 6e24a38f881f..1906a0afc26a 100644 --- a/www/p5-PHP-Session/pkg-plist +++ b/www/p5-PHP-Session/pkg-plist @@ -3,7 +3,7 @@ %%SITE_PERL%%/PHP/Session/Serializer/PHP.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PHP/Session/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PHP/Session -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PHP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PHP @dirrm %%SITE_PERL%%/PHP/Session/Serializer @dirrm %%SITE_PERL%%/PHP/Session -@unexec rmdir %D/%%SITE_PERL%%/PHP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/PHP diff --git a/www/p5-POE-Component-Client-HTTP/pkg-plist b/www/p5-POE-Component-Client-HTTP/pkg-plist index d6bab48f9a7f..17f5fc311fc7 100644 --- a/www/p5-POE-Component-Client-HTTP/pkg-plist +++ b/www/p5-POE-Component-Client-HTTP/pkg-plist @@ -6,10 +6,10 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/HTTP/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/HTTP @dirrm %%SITE_PERL%%/POE/Component/Client/HTTP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Client 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE/Filter 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE +@dirrmtry %%SITE_PERL%%/POE/Component/Client +@dirrmtry %%SITE_PERL%%/POE/Component +@dirrmtry %%SITE_PERL%%/POE/Filter +@dirrmtry %%SITE_PERL%%/POE diff --git a/www/p5-POE-Component-Client-UserAgent/pkg-plist b/www/p5-POE-Component-Client-UserAgent/pkg-plist index cc7a99bf5043..64a48df2d4fd 100644 --- a/www/p5-POE-Component-Client-UserAgent/pkg-plist +++ b/www/p5-POE-Component-Client-UserAgent/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/POE/Component/Client/UserAgent.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/UserAgent/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client/UserAgent -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Client 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Client 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/Client +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE +@dirrmtry %%SITE_PERL%%/POE/Component/Client +@dirrmtry %%SITE_PERL%%/POE/Component +@dirrmtry %%SITE_PERL%%/POE diff --git a/www/p5-POE-Component-Server-HTTP/pkg-plist b/www/p5-POE-Component-Server-HTTP/pkg-plist index c0f955ff0823..c07b67b63346 100644 --- a/www/p5-POE-Component-Server-HTTP/pkg-plist +++ b/www/p5-POE-Component-Server-HTTP/pkg-plist @@ -4,10 +4,10 @@ %%SITE_PERL%%/POE/Component/Server/HTTP/Response.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/HTTP/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/HTTP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE @dirrm %%SITE_PERL%%/POE/Component/Server/HTTP -@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Server 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%%/POE/Component/Server +@dirrmtry %%SITE_PERL%%/POE/Component +@dirrmtry %%SITE_PERL%%/POE diff --git a/www/p5-POE-Component-Server-HTTPServer/pkg-plist b/www/p5-POE-Component-Server-HTTPServer/pkg-plist index b8454721da28..0c9651956f94 100644 --- a/www/p5-POE-Component-Server-HTTPServer/pkg-plist +++ b/www/p5-POE-Component-Server-HTTPServer/pkg-plist @@ -8,10 +8,10 @@ %%SITE_PERL%%/POE/Component/Server/HTTPServer/TemplateHandler.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/HTTPServer/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/HTTPServer -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE @dirrm %%SITE_PERL%%/POE/Component/Server/HTTPServer -@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Server 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%%/POE/Component/Server +@dirrmtry %%SITE_PERL%%/POE/Component +@dirrmtry %%SITE_PERL%%/POE diff --git a/www/p5-POE-Component-Server-SOAP/pkg-plist b/www/p5-POE-Component-Server-SOAP/pkg-plist index c1fe327c9f01..b805c1bb9c73 100644 --- a/www/p5-POE-Component-Server-SOAP/pkg-plist +++ b/www/p5-POE-Component-Server-SOAP/pkg-plist @@ -2,10 +2,10 @@ %%SITE_PERL%%/POE/Component/Server/SOAP/Response.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/SOAP/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/SOAP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Server/SOAP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Server 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/Server +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE +@dirrmtry %%SITE_PERL%%/POE/Component/Server/SOAP +@dirrmtry %%SITE_PERL%%/POE/Component/Server +@dirrmtry %%SITE_PERL%%/POE/Component +@dirrmtry %%SITE_PERL%%/POE diff --git a/www/p5-POE-Component-Server-SimpleHTTP/pkg-plist b/www/p5-POE-Component-Server-SimpleHTTP/pkg-plist index 904dcd9bce23..c82ca1d50391 100644 --- a/www/p5-POE-Component-Server-SimpleHTTP/pkg-plist +++ b/www/p5-POE-Component-Server-SimpleHTTP/pkg-plist @@ -5,9 +5,9 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/SimpleHTTP/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server/SimpleHTTP @dirrm %%SITE_PERL%%/POE/Component/Server/SimpleHTTP -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component/Server 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/POE/Component/Server 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE 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/Server +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Component +@dirrmtry %%SITE_PERL%%/POE/Component/Server +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE +@dirrmtry %%SITE_PERL%%/POE/Component +@dirrmtry %%SITE_PERL%%/POE diff --git a/www/p5-ParallelUA/pkg-plist b/www/p5-ParallelUA/pkg-plist index d122d0cc841f..5a88c4813c9e 100644 --- a/www/p5-ParallelUA/pkg-plist +++ b/www/p5-ParallelUA/pkg-plist @@ -12,7 +12,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Parallel/.packlist @dirrm %%SITE_PERL%%/LWP/Parallel/Protocol @dirrm %%SITE_PERL%%/LWP/Parallel -@unexec rmdir %D/%%SITE_PERL%%/LWP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/LWP +@dirrmtry %%SITE_PERL%%/Bundle @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/Parallel @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP diff --git a/www/p5-PodToHTML/pkg-plist b/www/p5-PodToHTML/pkg-plist index 7edff0cab4b4..0d20e8ea00ae 100644 --- a/www/p5-PodToHTML/pkg-plist +++ b/www/p5-PodToHTML/pkg-plist @@ -3,5 +3,5 @@ bin/podtohtml %%SITE_PERL%%/Pod/HTML_Elements.pm %%SITE_PERL%%/Pod/Links.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PodToHTML/.packlist -@unexec rmdir %D/%%SITE_PERL%%/Pod 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PodToHTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Pod +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PodToHTML diff --git a/www/p5-Sledge-Plugin-CacheContent/pkg-plist b/www/p5-Sledge-Plugin-CacheContent/pkg-plist index 922c52e92033..b9f3a7c7e0cc 100644 --- a/www/p5-Sledge-Plugin-CacheContent/pkg-plist +++ b/www/p5-Sledge-Plugin-CacheContent/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Sledge/Plugin/CacheContent.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/CacheContent/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/CacheContent -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin +@dirrmtry %%SITE_PERL%%/Sledge/Plugin diff --git a/www/p5-Sledge-Plugin-Download/pkg-plist b/www/p5-Sledge-Plugin-Download/pkg-plist index 038c9a8203a2..390769afe350 100644 --- a/www/p5-Sledge-Plugin-Download/pkg-plist +++ b/www/p5-Sledge-Plugin-Download/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Sledge/Plugin/Download.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Download/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Download -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin +@dirrmtry %%SITE_PERL%%/Sledge/Plugin diff --git a/www/p5-Sledge-Plugin-Dumper/pkg-plist b/www/p5-Sledge-Plugin-Dumper/pkg-plist index a6bb543299ca..eee0055e4ce1 100644 --- a/www/p5-Sledge-Plugin-Dumper/pkg-plist +++ b/www/p5-Sledge-Plugin-Dumper/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Sledge/Plugin/Dumper.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Dumper/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Dumper -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin +@dirrmtry %%SITE_PERL%%/Sledge/Plugin diff --git a/www/p5-Sledge-Plugin-HTML2HDML/pkg-plist b/www/p5-Sledge-Plugin-HTML2HDML/pkg-plist index 84e0ccc50f31..13149f81ddfc 100644 --- a/www/p5-Sledge-Plugin-HTML2HDML/pkg-plist +++ b/www/p5-Sledge-Plugin-HTML2HDML/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Sledge/Plugin/HTML2HDML.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/HTML2HDML/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/HTML2HDML -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin +@dirrmtry %%SITE_PERL%%/Sledge/Plugin diff --git a/www/p5-Sledge-Plugin-Log/pkg-plist b/www/p5-Sledge-Plugin-Log/pkg-plist index dabfc3739f93..0936e8a6cf7f 100644 --- a/www/p5-Sledge-Plugin-Log/pkg-plist +++ b/www/p5-Sledge-Plugin-Log/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Sledge/Plugin/Log.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Log/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/Log -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin +@dirrmtry %%SITE_PERL%%/Sledge/Plugin diff --git a/www/p5-Sledge-Plugin-NoCache/pkg-plist b/www/p5-Sledge-Plugin-NoCache/pkg-plist index fa4a5d85fb8a..9a2c935bcd7c 100644 --- a/www/p5-Sledge-Plugin-NoCache/pkg-plist +++ b/www/p5-Sledge-Plugin-NoCache/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Sledge/Plugin/NoCache.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/NoCache/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/NoCache -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin +@dirrmtry %%SITE_PERL%%/Sledge/Plugin diff --git a/www/p5-Sledge-Plugin-SaveUpload/pkg-plist b/www/p5-Sledge-Plugin-SaveUpload/pkg-plist index 7ebb314b2957..f846435ec0e6 100644 --- a/www/p5-Sledge-Plugin-SaveUpload/pkg-plist +++ b/www/p5-Sledge-Plugin-SaveUpload/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Sledge/Plugin/SaveUpload.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SaveUpload/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SaveUpload -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin +@dirrmtry %%SITE_PERL%%/Sledge/Plugin diff --git a/www/p5-Sledge-Plugin-ScratchPad/pkg-plist b/www/p5-Sledge-Plugin-ScratchPad/pkg-plist index dc0fd60a2002..ab05aaa69e93 100644 --- a/www/p5-Sledge-Plugin-ScratchPad/pkg-plist +++ b/www/p5-Sledge-Plugin-ScratchPad/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Sledge/Plugin/ScratchPad.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/ScratchPad/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/ScratchPad -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin +@dirrmtry %%SITE_PERL%%/Sledge/Plugin diff --git a/www/p5-Sledge-Plugin-SessionAutoCleanup/pkg-plist b/www/p5-Sledge-Plugin-SessionAutoCleanup/pkg-plist index a3e59ed4fd6e..70603e1fdf1d 100644 --- a/www/p5-Sledge-Plugin-SessionAutoCleanup/pkg-plist +++ b/www/p5-Sledge-Plugin-SessionAutoCleanup/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Sledge/Plugin/SessionAutoCleanup.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SessionAutoCleanup/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/SessionAutoCleanup -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin +@dirrmtry %%SITE_PERL%%/Sledge/Plugin diff --git a/www/p5-Sledge-Plugin-XSLT/pkg-plist b/www/p5-Sledge-Plugin-XSLT/pkg-plist index 9c72b38b119f..4a67008d881b 100644 --- a/www/p5-Sledge-Plugin-XSLT/pkg-plist +++ b/www/p5-Sledge-Plugin-XSLT/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Sledge/Plugin/XSLT.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/XSLT/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin/XSLT -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Sledge/Plugin 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Plugin +@dirrmtry %%SITE_PERL%%/Sledge/Plugin diff --git a/www/p5-Sledge-SessionManager-CookieStore/pkg-plist b/www/p5-Sledge-SessionManager-CookieStore/pkg-plist index 659fec08334b..1b661db4dfda 100644 --- a/www/p5-Sledge-SessionManager-CookieStore/pkg-plist +++ b/www/p5-Sledge-SessionManager-CookieStore/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Sledge/SessionManager/CookieStore.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/SessionManager/CookieStore/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/SessionManager/CookieStore -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/SessionManager 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Sledge/SessionManager 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/SessionManager +@dirrmtry %%SITE_PERL%%/Sledge/SessionManager diff --git a/www/p5-Sledge-Template-Expr/pkg-plist b/www/p5-Sledge-Template-Expr/pkg-plist index db87ea04f737..fe97341c31a2 100644 --- a/www/p5-Sledge-Template-Expr/pkg-plist +++ b/www/p5-Sledge-Template-Expr/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Sledge/Template/Expr.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Template/Expr/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Template/Expr -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Template 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Sledge/Template 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Sledge/Template +@dirrmtry %%SITE_PERL%%/Sledge/Template diff --git a/www/p5-Syntax-Highlight-HTML/pkg-plist b/www/p5-Syntax-Highlight-HTML/pkg-plist index b1907b57d396..e79b2df98456 100644 --- a/www/p5-Syntax-Highlight-HTML/pkg-plist +++ b/www/p5-Syntax-Highlight-HTML/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Syntax/Highlight/HTML.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/HTML/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/HTML -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Syntax/Highlight 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Syntax 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight +@dirrmtry %%SITE_PERL%%/Syntax/Highlight +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax +@dirrmtry %%SITE_PERL%%/Syntax diff --git a/www/p5-Syntax-Highlight-Shell/pkg-plist b/www/p5-Syntax-Highlight-Shell/pkg-plist index 5ae424bb61a4..edcab421c89c 100644 --- a/www/p5-Syntax-Highlight-Shell/pkg-plist +++ b/www/p5-Syntax-Highlight-Shell/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/Syntax/Highlight/Shell.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Shell/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Shell -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Syntax/Highlight 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Syntax 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight +@dirrmtry %%SITE_PERL%%/Syntax/Highlight +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax +@dirrmtry %%SITE_PERL%%/Syntax diff --git a/www/p5-Task-Catalyst/pkg-plist b/www/p5-Task-Catalyst/pkg-plist index b7bd01720cf2..8df48249d091 100644 --- a/www/p5-Task-Catalyst/pkg-plist +++ b/www/p5-Task-Catalyst/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Task/Catalyst.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Task/Catalyst/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Task/Catalyst 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Task 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Task 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Task/Catalyst +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Task +@dirrmtry %%SITE_PERL%%/Task diff --git a/www/p5-Template-Multilingual/pkg-plist b/www/p5-Template-Multilingual/pkg-plist index a916f9d76242..fbbadd79979c 100644 --- a/www/p5-Template-Multilingual/pkg-plist +++ b/www/p5-Template-Multilingual/pkg-plist @@ -3,4 +3,4 @@ %%SITE_PERL%%/Template/Multilingual.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Multilingual @dirrm %%SITE_PERL%%/Template/Multilingual -@unexec rmdir %D/%%SITE_PERL%%/Template 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Template diff --git a/www/p5-Template-Plugin-Class/pkg-plist b/www/p5-Template-Plugin-Class/pkg-plist index bc53ab2142f4..418a5ff47809 100644 --- a/www/p5-Template-Plugin-Class/pkg-plist +++ b/www/p5-Template-Plugin-Class/pkg-plist @@ -1,3 +1,3 @@ %%SITE_PERL%%/Template/Plugin/Class.pm -@unexec rmdir %D/%%SITE_PERL%%/Template/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Template 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Template/Plugin +@dirrmtry %%SITE_PERL%%/Template diff --git a/www/p5-Template-Plugin-Comma/pkg-plist b/www/p5-Template-Plugin-Comma/pkg-plist index 945251f50a1f..3c2cd9a5916d 100644 --- a/www/p5-Template-Plugin-Comma/pkg-plist +++ b/www/p5-Template-Plugin-Comma/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Comma/.packlist %%SITE_PERL%%/Template/Plugin/Comma.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Comma -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Template/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Template 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin +@dirrmtry %%SITE_PERL%%/Template/Plugin +@dirrmtry %%SITE_PERL%%/Template diff --git a/www/p5-Template-Plugin-MP3/pkg-plist b/www/p5-Template-Plugin-MP3/pkg-plist index 1f9aa9d58b8e..6968f74b74b9 100644 --- a/www/p5-Template-Plugin-MP3/pkg-plist +++ b/www/p5-Template-Plugin-MP3/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/MP3/.packlist %%SITE_PERL%%/Template/Plugin/MP3.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/MP3 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Template/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Template 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin +@dirrmtry %%SITE_PERL%%/Template/Plugin +@dirrmtry %%SITE_PERL%%/Template diff --git a/www/p5-Template-Plugin-Monta/pkg-plist b/www/p5-Template-Plugin-Monta/pkg-plist index 840c59aa1c4f..d2e12a80cf80 100644 --- a/www/p5-Template-Plugin-Monta/pkg-plist +++ b/www/p5-Template-Plugin-Monta/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Monta/.packlist %%SITE_PERL%%/Template/Plugin/Monta.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin/Monta -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Template/Plugin 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Template 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Plugin +@dirrmtry %%SITE_PERL%%/Template/Plugin +@dirrmtry %%SITE_PERL%%/Template diff --git a/www/p5-Template-Timer/pkg-plist b/www/p5-Template-Timer/pkg-plist index 5a3fd280b1cf..a0a5df2940c8 100644 --- a/www/p5-Template-Timer/pkg-plist +++ b/www/p5-Template-Timer/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Template/Timer.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Timer/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template/Timer -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Template 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Template 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Template +@dirrmtry %%SITE_PERL%%/Template diff --git a/www/p5-Test-HTTP-Server-Simple/pkg-plist b/www/p5-Test-HTTP-Server-Simple/pkg-plist index e6b786db84f6..d245078d0ef3 100644 --- a/www/p5-Test-HTTP-Server-Simple/pkg-plist +++ b/www/p5-Test-HTTP-Server-Simple/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/Test/HTTP/Server/Simple.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HTTP/Server/Simple/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HTTP/Server/Simple 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HTTP/Server 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HTTP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Test/HTTP/Server 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Test 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Test/HTTP 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Test 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HTTP/Server/Simple +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HTTP/Server +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test/HTTP +@dirrmtry %%SITE_PERL%%/Test/HTTP/Server +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Test +@dirrmtry %%SITE_PERL%%/Test/HTTP +@dirrmtry %%SITE_PERL%%/Test diff --git a/www/p5-URI-Fetch/pkg-plist b/www/p5-URI-Fetch/pkg-plist index 42f801222858..b75be7d96f3f 100644 --- a/www/p5-URI-Fetch/pkg-plist +++ b/www/p5-URI-Fetch/pkg-plist @@ -1,4 +1,4 @@ %%SITE_PERL%%/URI/Fetch.pm %%SITE_PERL%%/URI/Fetch/Response.pm @dirrm %%SITE_PERL%%/URI/Fetch -@unexec rmdir %D/%%SITE_PERL%%/URI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/URI diff --git a/www/p5-URI-Sequin/pkg-plist b/www/p5-URI-Sequin/pkg-plist index dbfc90a04ba0..02844d18e112 100644 --- a/www/p5-URI-Sequin/pkg-plist +++ b/www/p5-URI-Sequin/pkg-plist @@ -6,5 +6,5 @@ %%PORTDOCS%%@dirrm %%SITE_PERL%%/URI/Sequin/examples %%PORTDOCS%%@dirrm %%SITE_PERL%%/URI/Sequin @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI/Sequin -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/URI 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/URI 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/URI +@dirrmtry %%SITE_PERL%%/URI diff --git a/www/p5-W3C-LinkChecker/pkg-plist b/www/p5-W3C-LinkChecker/pkg-plist index 25fae7260113..b2c8fa5033d5 100644 --- a/www/p5-W3C-LinkChecker/pkg-plist +++ b/www/p5-W3C-LinkChecker/pkg-plist @@ -1,4 +1,4 @@ bin/checklink %%SITE_PERL%%/%%PERL_ARCH%%/auto/W3C/LinkChecker/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/W3C/LinkChecker -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/W3C 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/W3C diff --git a/www/p5-W3C-LogValidator/pkg-plist b/www/p5-W3C-LogValidator/pkg-plist index 168854deef1b..9cc543a61141 100644 --- a/www/p5-W3C-LogValidator/pkg-plist +++ b/www/p5-W3C-LogValidator/pkg-plist @@ -15,7 +15,7 @@ bin/logprocess.pl %%EXAMPLESDIR%%/logprocess.conf @dirrm %%EXAMPLESDIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/W3C/LogValidator -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/W3C 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/W3C @dirrm %%SITE_PERL%%/W3C/LogValidator/Output @dirrm %%SITE_PERL%%/W3C/LogValidator -@unexec rmdir %D/%%SITE_PERL%%/W3C 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/W3C diff --git a/www/p5-WWW-Babelfish/pkg-plist b/www/p5-WWW-Babelfish/pkg-plist index 5c8ab6ee2eff..53c1d7ab9bcf 100644 --- a/www/p5-WWW-Babelfish/pkg-plist +++ b/www/p5-WWW-Babelfish/pkg-plist @@ -3,6 +3,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Babelfish/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Babelfish @dirrm %%SITE_PERL%%/auto/WWW/Babelfish -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/auto/WWW 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW +@dirrmtry %%SITE_PERL%%/auto/WWW +@dirrmtry %%SITE_PERL%%/WWW diff --git a/www/p5-WWW-Curl/pkg-plist b/www/p5-WWW-Curl/pkg-plist index 6b725296d180..8d0e60f133d1 100644 --- a/www/p5-WWW-Curl/pkg-plist +++ b/www/p5-WWW-Curl/pkg-plist @@ -8,7 +8,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Curl/easy/autosplit.ix @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Curl/easy @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Curl -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/WWW/Curl -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/WWW @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Curl diff --git a/www/p5-WWW-Dilbert/pkg-plist b/www/p5-WWW-Dilbert/pkg-plist index fe10555a54e9..7830cbcbea1e 100644 --- a/www/p5-WWW-Dilbert/pkg-plist +++ b/www/p5-WWW-Dilbert/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/WWW/Dilbert.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Dilbert/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Dilbert -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW +@dirrmtry %%SITE_PERL%%/WWW diff --git a/www/p5-WWW-Link/pkg-plist b/www/p5-WWW-Link/pkg-plist index f41f7305cfa2..ca964af46633 100644 --- a/www/p5-WWW-Link/pkg-plist +++ b/www/p5-WWW-Link/pkg-plist @@ -29,4 +29,4 @@ @dirrm %%SITE_PERL%%/WWW/Link/Reporter @dirrm %%SITE_PERL%%/WWW/Link/Repair @dirrm %%SITE_PERL%%/WWW/Link -@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/WWW diff --git a/www/p5-WWW-Mechanize-FormFiller/pkg-plist b/www/p5-WWW-Mechanize-FormFiller/pkg-plist index c1a81f1c098f..41f0d78869a5 100644 --- a/www/p5-WWW-Mechanize-FormFiller/pkg-plist +++ b/www/p5-WWW-Mechanize-FormFiller/pkg-plist @@ -14,7 +14,7 @@ @dirrm %%SITE_PERL%%/WWW/Mechanize/FormFiller/Value/Random @dirrm %%SITE_PERL%%/WWW/Mechanize/FormFiller/Value @dirrm %%SITE_PERL%%/WWW/Mechanize/FormFiller -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WWW/Mechanize 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW +@dirrmtry %%SITE_PERL%%/WWW/Mechanize +@dirrmtry %%SITE_PERL%%/WWW diff --git a/www/p5-WWW-Mechanize-Shell/pkg-plist b/www/p5-WWW-Mechanize-Shell/pkg-plist index c9600774a880..aefde63b5534 100644 --- a/www/p5-WWW-Mechanize-Shell/pkg-plist +++ b/www/p5-WWW-Mechanize-Shell/pkg-plist @@ -20,11 +20,11 @@ %%PORTDOCS%%%%EXAMPLESDIR%%/wwwshell.pl %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/Shell -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WWW/Mechanize 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML/Display/Win32 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML/Display/OSX 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML/Display 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW +@dirrmtry %%SITE_PERL%%/WWW/Mechanize +@dirrmtry %%SITE_PERL%%/WWW +@dirrmtry %%SITE_PERL%%/HTML/Display/Win32 +@dirrmtry %%SITE_PERL%%/HTML/Display/OSX +@dirrmtry %%SITE_PERL%%/HTML/Display +@dirrmtry %%SITE_PERL%%/HTML diff --git a/www/p5-WWW-Mechanize/pkg-plist b/www/p5-WWW-Mechanize/pkg-plist index 79e6a10e889a..a36feb749a9d 100644 --- a/www/p5-WWW-Mechanize/pkg-plist +++ b/www/p5-WWW-Mechanize/pkg-plist @@ -8,6 +8,6 @@ bin/mech-dump %%SITE_PERL%%/WWW/Mechanize/Link.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mechanize -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW @dirrm %%SITE_PERL%%/WWW/Mechanize -@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/WWW diff --git a/www/p5-WWW-Mixi/pkg-plist b/www/p5-WWW-Mixi/pkg-plist index 830855717f4d..2e95565f3de1 100644 --- a/www/p5-WWW-Mixi/pkg-plist +++ b/www/p5-WWW-Mixi/pkg-plist @@ -4,6 +4,6 @@ %%SITE_PERL%%/WWW/Mixi/Cookbook.pod %%SITE_PERL%%/WWW/Mixi/Mixi.pod @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Mixi -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW @dirrm %%SITE_PERL%%/WWW/Mixi -@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/WWW diff --git a/www/p5-WWW-Robot/pkg-plist b/www/p5-WWW-Robot/pkg-plist index 8830191ca0ed..874078566a84 100644 --- a/www/p5-WWW-Robot/pkg-plist +++ b/www/p5-WWW-Robot/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/WWW/Robot.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Robot/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Robot -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW +@dirrmtry %%SITE_PERL%%/WWW diff --git a/www/p5-WWW-Scraper-ISBN-Amazon_Driver/pkg-plist b/www/p5-WWW-Scraper-ISBN-Amazon_Driver/pkg-plist index f843f1ab11df..f74a8627094c 100644 --- a/www/p5-WWW-Scraper-ISBN-Amazon_Driver/pkg-plist +++ b/www/p5-WWW-Scraper-ISBN-Amazon_Driver/pkg-plist @@ -1,10 +1,10 @@ %%SITE_PERL%%/WWW/Scraper/ISBN/AmazonUK_Driver.pm %%SITE_PERL%%/WWW/Scraper/ISBN/AmazonUS_Driver.pm -@unexec rmdir %D/%%SITE_PERL%%/WWW/Scraper/ISBN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WWW/Scraper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/WWW/Scraper/ISBN +@dirrmtry %%SITE_PERL%%/WWW/Scraper +@dirrmtry %%SITE_PERL%%/WWW %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/Amazon_Driver/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/Amazon_Driver -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW diff --git a/www/p5-WWW-Scraper-ISBN-Driver/pkg-plist b/www/p5-WWW-Scraper-ISBN-Driver/pkg-plist index 966650c8350c..294abc7c9dea 100644 --- a/www/p5-WWW-Scraper-ISBN-Driver/pkg-plist +++ b/www/p5-WWW-Scraper-ISBN-Driver/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/WWW/Scraper/ISBN/Driver.pm -@unexec rmdir %D/%%SITE_PERL%%/WWW/Scraper/ISBN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WWW/Scraper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/WWW/Scraper/ISBN +@dirrmtry %%SITE_PERL%%/WWW/Scraper +@dirrmtry %%SITE_PERL%%/WWW %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/Driver/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/Driver 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/Driver +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW diff --git a/www/p5-WWW-Scraper-ISBN-ORA_Driver/pkg-plist b/www/p5-WWW-Scraper-ISBN-ORA_Driver/pkg-plist index 2a0ba4d249e7..785b1933a6ca 100644 --- a/www/p5-WWW-Scraper-ISBN-ORA_Driver/pkg-plist +++ b/www/p5-WWW-Scraper-ISBN-ORA_Driver/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/WWW/Scraper/ISBN/ORA_Driver.pm -@unexec rmdir %D/%%SITE_PERL%%/WWW/Scraper/ISBN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WWW/Scraper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/WWW/Scraper/ISBN +@dirrmtry %%SITE_PERL%%/WWW/Scraper +@dirrmtry %%SITE_PERL%%/WWW %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/ORA_Driver/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/ORA_Driver -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW diff --git a/www/p5-WWW-Scraper-ISBN-Record/pkg-plist b/www/p5-WWW-Scraper-ISBN-Record/pkg-plist index 9269eaa70b8d..a38e9f7f934e 100644 --- a/www/p5-WWW-Scraper-ISBN-Record/pkg-plist +++ b/www/p5-WWW-Scraper-ISBN-Record/pkg-plist @@ -1,9 +1,9 @@ %%SITE_PERL%%/WWW/Scraper/ISBN/Record.pm -@unexec rmdir %D/%%SITE_PERL%%/WWW/Scraper/ISBN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WWW/Scraper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/WWW/Scraper/ISBN +@dirrmtry %%SITE_PERL%%/WWW/Scraper +@dirrmtry %%SITE_PERL%%/WWW %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/Record/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/Record -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW diff --git a/www/p5-WWW-Scraper-ISBN/pkg-plist b/www/p5-WWW-Scraper-ISBN/pkg-plist index 58ee4b827beb..e59fdf656faf 100644 --- a/www/p5-WWW-Scraper-ISBN/pkg-plist +++ b/www/p5-WWW-Scraper-ISBN/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/WWW/Scraper/ISBN.pm -@unexec rmdir %D/%%SITE_PERL%%/WWW/Scraper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/WWW/Scraper +@dirrmtry %%SITE_PERL%%/WWW %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper/ISBN +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Scraper +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW diff --git a/www/p5-WWW-Search-AltaVista/pkg-plist b/www/p5-WWW-Search-AltaVista/pkg-plist index dc34034a0a79..f7bd2292a14d 100644 --- a/www/p5-WWW-Search-AltaVista/pkg-plist +++ b/www/p5-WWW-Search-AltaVista/pkg-plist @@ -10,8 +10,8 @@ %%SITE_PERL%%/WWW/Search/AltaVista/Web.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/AltaVista/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/AltaVista -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW @dirrm %%SITE_PERL%%/WWW/Search/AltaVista -@unexec rmdir %D/%%SITE_PERL%%/WWW/Search 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/WWW/Search +@dirrmtry %%SITE_PERL%%/WWW diff --git a/www/p5-WWW-Search-Google/pkg-plist b/www/p5-WWW-Search-Google/pkg-plist index 9204ac8ccaff..2c731151d1f1 100644 --- a/www/p5-WWW-Search-Google/pkg-plist +++ b/www/p5-WWW-Search-Google/pkg-plist @@ -1,7 +1,7 @@ %%SITE_PERL%%/WWW/Search/Google.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/Google/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/Google -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WWW/Search 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW +@dirrmtry %%SITE_PERL%%/WWW/Search +@dirrmtry %%SITE_PERL%%/WWW diff --git a/www/p5-WWW-Search/pkg-plist b/www/p5-WWW-Search/pkg-plist index 4ab3eb179118..82deb182e62f 100644 --- a/www/p5-WWW-Search/pkg-plist +++ b/www/p5-WWW-Search/pkg-plist @@ -11,8 +11,8 @@ bin/WebSearch %%SITE_PERL%%/WWW/Search/Test.pm %%SITE_PERL%%/WWW/SearchResult.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW @dirrm %%SITE_PERL%%/WWW/Search/Null -@unexec rmdir %D/%%SITE_PERL%%/WWW/Search 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/WWW/Search +@dirrmtry %%SITE_PERL%%/WWW diff --git a/www/p5-WWW-Shorten/pkg-plist b/www/p5-WWW-Shorten/pkg-plist index 433c466e375e..d329beabd9a5 100644 --- a/www/p5-WWW-Shorten/pkg-plist +++ b/www/p5-WWW-Shorten/pkg-plist @@ -37,6 +37,6 @@ %%PORTDOCS%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Shorten -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW @dirrm %%SITE_PERL%%/WWW/Shorten -@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/WWW diff --git a/www/p5-WWW-SourceForge/pkg-plist b/www/p5-WWW-SourceForge/pkg-plist index 3b93a9d6b341..1374d299c816 100644 --- a/www/p5-WWW-SourceForge/pkg-plist +++ b/www/p5-WWW-SourceForge/pkg-plist @@ -2,7 +2,7 @@ %%SITE_PERL%%/WWW/SourceForge/Project.pm %%SITE_PERL%%/WWW/SourceForge/User.pm @dirrm %%SITE_PERL%%/WWW/SourceForge -@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/WWW %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/SourceForge/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/SourceForge -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW diff --git a/www/p5-WebService-Bloglines/pkg-plist b/www/p5-WebService-Bloglines/pkg-plist index d66a4bda0686..d56ac168a9f6 100644 --- a/www/p5-WebService-Bloglines/pkg-plist +++ b/www/p5-WebService-Bloglines/pkg-plist @@ -3,6 +3,6 @@ %%SITE_PERL%%/WebService/Bloglines/Subscriptions.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Bloglines/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Bloglines -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService @dirrm %%SITE_PERL%%/WebService/Bloglines -@unexec rmdir %D/%%SITE_PERL%%/WebService 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/WebService diff --git a/www/p5-WebService-NoPaste/pkg-plist b/www/p5-WebService-NoPaste/pkg-plist index 0ec404555065..b9355c93fc9a 100644 --- a/www/p5-WebService-NoPaste/pkg-plist +++ b/www/p5-WebService-NoPaste/pkg-plist @@ -1,6 +1,6 @@ bin/nopaste %%SITE_PERL%%/WebService/NoPaste.pm -@unexec rmdir %D/%%SITE_PERL%%/WebService 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/WebService %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/NoPaste/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/NoPaste -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService diff --git a/www/p5-WebService-Technorati/pkg-plist b/www/p5-WebService-Technorati/pkg-plist index 3a48aeeafbc4..067ee7f57b55 100644 --- a/www/p5-WebService-Technorati/pkg-plist +++ b/www/p5-WebService-Technorati/pkg-plist @@ -15,11 +15,11 @@ %%SITE_PERL%%/WebService/Technorati/SearchTerm.pm @dirrm %%SITE_PERL%%/WebService/Technorati %%SITE_PERL%%/WebService/pod2html.pl -@unexec rmdir %D/%%SITE_PERL%%/WebService 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/WebService %%SITE_PERL%%/auto/WebService/Technorati/BaseTechnoratiObject/autosplit.ix @dirrm %%SITE_PERL%%/auto/WebService/Technorati/BaseTechnoratiObject @dirrm %%SITE_PERL%%/auto/WebService/Technorati -@unexec rmdir %D/%%SITE_PERL%%/auto/WebService 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/auto/WebService %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Technorati/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Technorati -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService diff --git a/www/p5-libwww/pkg-plist b/www/p5-libwww/pkg-plist index c4f6f5c1912c..4bcdcccd4e62 100644 --- a/www/p5-libwww/pkg-plist +++ b/www/p5-libwww/pkg-plist @@ -61,17 +61,17 @@ bin/lwp-rget %%SITE_PERL%%/lwptut.pod %%SITE_PERL%%/%%PERL_ARCH%%/auto/libwww-perl/.packlist @dirrm %%SITE_PERL%%/WWW/RobotRules -@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/WWW @dirrm %%SITE_PERL%%/Net/HTTP -@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Net @dirrm %%SITE_PERL%%/LWP/Authen @dirrm %%SITE_PERL%%/LWP/Protocol -@unexec rmdir %D/%%SITE_PERL%%/LWP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/LWP @dirrm %%SITE_PERL%%/HTTP/Cookies @dirrm %%SITE_PERL%%/HTTP/Headers @dirrm %%SITE_PERL%%/HTTP/Request @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libwww-perl -@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Bundle +@dirrmtry %%SITE_PERL%%/File +@dirrmtry %%SITE_PERL%%/HTML +@dirrmtry %%SITE_PERL%%/HTTP diff --git a/www/p5-webservice-validator-css-w3c/pkg-plist b/www/p5-webservice-validator-css-w3c/pkg-plist index 145d4b6714e4..cb17030e06d0 100644 --- a/www/p5-webservice-validator-css-w3c/pkg-plist +++ b/www/p5-webservice-validator-css-w3c/pkg-plist @@ -4,7 +4,7 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Validator/CSS @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Validator @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService -@unexec rmdir %D/%%SITE_PERL%%/WebService/Validator/CSS/W3C 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WebService/Validator/CSS 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WebService/Validator 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WebService 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/WebService/Validator/CSS/W3C +@dirrmtry %%SITE_PERL%%/WebService/Validator/CSS +@dirrmtry %%SITE_PERL%%/WebService/Validator +@dirrmtry %%SITE_PERL%%/WebService diff --git a/www/p5-webservice-validator-html-w3c/pkg-plist b/www/p5-webservice-validator-html-w3c/pkg-plist index 61440d0a33c8..c28bdf6383cc 100644 --- a/www/p5-webservice-validator-html-w3c/pkg-plist +++ b/www/p5-webservice-validator-html-w3c/pkg-plist @@ -5,7 +5,7 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Validator/HTML @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService/Validator @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WebService -@unexec rmdir %D/%%SITE_PERL%%/WebService/Validator/HTML/W3C 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WebService/Validator/HTML 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WebService/Validator 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/WebService 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/WebService/Validator/HTML/W3C +@dirrmtry %%SITE_PERL%%/WebService/Validator/HTML +@dirrmtry %%SITE_PERL%%/WebService/Validator +@dirrmtry %%SITE_PERL%%/WebService diff --git a/www/php-dyn/pkg-plist b/www/php-dyn/pkg-plist index e91d40926b0b..8b4c4a576dea 100644 --- a/www/php-dyn/pkg-plist +++ b/www/php-dyn/pkg-plist @@ -1,4 +1,4 @@ lib/php/%%PHP_EXT_DIR%%/php_dyn.so %%PORTDOCS%%share/doc/php-dyn/README -@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2> /dev/null || true +@dirrmtry lib/php/%%PHP_EXT_DIR%% %%PORTDOCS%%@dirrm share/doc/php-dyn diff --git a/www/php-screw/pkg-plist b/www/php-screw/pkg-plist index ce6f88ba39f2..3470bccaa8c1 100644 --- a/www/php-screw/pkg-plist +++ b/www/php-screw/pkg-plist @@ -1,3 +1,3 @@ bin/screw lib/php/%%PHP_EXT_DIR%%/php_screw.so -@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2>/dev/null || true +@dirrmtry lib/php/%%PHP_EXT_DIR%% diff --git a/www/php-templates/pkg-plist b/www/php-templates/pkg-plist index 8fedeead348c..3bb91bbfa8c0 100644 --- a/www/php-templates/pkg-plist +++ b/www/php-templates/pkg-plist @@ -2,5 +2,5 @@ lib/php/%%PHP_EXT_DIR%%/templates.so %%PORTDOCS%%share/doc/php-templates/CHANGELOG %%PORTDOCS%%share/doc/php-templates/php_templates-eng.html %%PORTDOCS%%share/doc/php-templates/php_templates.css -@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2> /dev/null || true +@dirrmtry lib/php/%%PHP_EXT_DIR%% %%PORTDOCS%%@dirrm share/doc/php-templates diff --git a/www/phpbb/pkg-plist b/www/phpbb/pkg-plist index f8e4aa1bbc01..5aa36aa36f1d 100644 --- a/www/phpbb/pkg-plist +++ b/www/phpbb/pkg-plist @@ -304,26 +304,26 @@ @exec touch %B/config.php @exec chown -R %%WWWOWN%%:%%WWWGRP%% %B %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/share/doc 2>/dev/null || true +@dirrmtry share/doc @dirrm %%DATADIR%%/contrib @dirrm %%DATADIR%% @dirrm %%PHPBBDIR%%/admin @dirrm %%PHPBBDIR%%/cache @dirrm %%PHPBBDIR%%/db @dirrm %%PHPBBDIR%%/images/smiles -@unexec rmdir %D/%%PHPBBDIR%%/images/avatars/gallery 2>/dev/null || true -@unexec rmdir %D/%%PHPBBDIR%%/images/avatars/upload 2>/dev/null || true -@unexec rmdir %D/%%PHPBBDIR%%/images/avatars 2>/dev/null || true -@unexec rmdir %D/%%PHPBBDIR%%/images 2>/dev/null || true +@dirrmtry %%PHPBBDIR%%/images/avatars/gallery +@dirrmtry %%PHPBBDIR%%/images/avatars/upload +@dirrmtry %%PHPBBDIR%%/images/avatars +@dirrmtry %%PHPBBDIR%%/images @dirrm %%PHPBBDIR%%/includes @dirrm %%PHPBBDIR%%/install/schemas @dirrm %%PHPBBDIR%%/install @dirrm %%PHPBBDIR%%/language/lang_english/email @dirrm %%PHPBBDIR%%/language/lang_english -@unexec rmdir %D/%%PHPBBDIR%%/language 2>/dev/null || true +@dirrmtry %%PHPBBDIR%%/language @dirrm %%PHPBBDIR%%/templates/subSilver/admin @dirrm %%PHPBBDIR%%/templates/subSilver/images/lang_english -@unexec rmdir %D/%%PHPBBDIR%%/templates/subSilver/images 2>/dev/null || true -@unexec rmdir %D/%%PHPBBDIR%%/templates/subSilver 2>/dev/null || true -@unexec rmdir %D/%%PHPBBDIR%%/templates 2>/dev/null || true +@dirrmtry %%PHPBBDIR%%/templates/subSilver/images +@dirrmtry %%PHPBBDIR%%/templates/subSilver +@dirrmtry %%PHPBBDIR%%/templates @unexec rmdir %D/%%PHPBBDIR%% 2>/dev/null || echo "Note: %D/%%PHPBBDIR%% not empty -- not deleted!" diff --git a/www/plugger/pkg-plist b/www/plugger/pkg-plist index 50d5d4e89a99..2974fb3c4e8c 100644 --- a/www/plugger/pkg-plist +++ b/www/plugger/pkg-plist @@ -4,4 +4,4 @@ bin/plugger-oohelper @unexec if cmp %D/etc/pluggerrc-5.1.3.sample %D/etc/pluggerrc-5.1.3 2>/dev/null; then rm -f %D/etc/pluggerrc-5.1.3; fi etc/pluggerrc-5.1.3.sample lib/browser_plugins/npplugger.so -@unexec rmdir %D/lib/browser_plugins 2>/dev/null || true +@dirrmtry lib/browser_plugins diff --git a/www/polipo/pkg-plist b/www/polipo/pkg-plist index 9a446ee0b531..035298d82c98 100644 --- a/www/polipo/pkg-plist +++ b/www/polipo/pkg-plist @@ -3,5 +3,5 @@ etc/polipo/config.sample etc/polipo/forbidden.sample etc/periodic/daily/400.polipo %%PORTDOCS%%%%DATADIR%%/www/index.html -@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true -@unexec rmdir %D/etc/periodic 2>/dev/null || true +@dirrmtry etc/periodic/daily +@dirrmtry etc/periodic diff --git a/www/privoxy+ipv6/pkg-plist b/www/privoxy+ipv6/pkg-plist index 29f851b0332d..97c8485fbfa2 100644 --- a/www/privoxy+ipv6/pkg-plist +++ b/www/privoxy+ipv6/pkg-plist @@ -87,7 +87,7 @@ sbin/privoxy %%DOCSDIR%%/user-manual/templates.html %%DOCSDIR%%/user-manual/upgradersnote.html @dirrm etc/privoxy/templates -@unexec rmdir %D/etc/privoxy 2>/dev/null || true +@dirrmtry etc/privoxy @dirrm %%DOCSDIR%%/developer-manual @dirrm %%DOCSDIR%%/faq @dirrm %%DOCSDIR%%/images diff --git a/www/py-formencode/pkg-plist b/www/py-formencode/pkg-plist index aa4a03e60572..443436abbf2b 100644 --- a/www/py-formencode/pkg-plist +++ b/www/py-formencode/pkg-plist @@ -72,8 +72,8 @@ %%PORTDOCS%%%%EXAMPLESDIR%%/WebwareExamples/__init__.py %%PORTDOCS%%%%EXAMPLESDIR%%/WebwareExamples/index.py %%PORTDOCS%%%%EXAMPLESDIR%%/webware_example.ini -@unexec rmdir %D/%%PORTDOCS%%%%EXAMPLESDIR%%/WebwareExamples 2>/dev/null || true -@unexec rmdir %D/%%PORTDOCS%%%%EXAMPLESDIR%% 2>/dev/null || true -@unexec rmdir %D/%%PYTHON_SITELIBDIR%%/formencode/util 2>/dev/null || true -@unexec rmdir %D/%%PYTHON_SITELIBDIR%%/formencode/javascript 2>/dev/null || true -@unexec rmdir %D/%%PYTHON_SITELIBDIR%%/formencode 2>/dev/null || true +@dirrmtry %%PORTDOCS%%%%EXAMPLESDIR%%/WebwareExamples +@dirrmtry %%PORTDOCS%%%%EXAMPLESDIR%% +@dirrmtry %%PYTHON_SITELIBDIR%%/formencode/util +@dirrmtry %%PYTHON_SITELIBDIR%%/formencode/javascript +@dirrmtry %%PYTHON_SITELIBDIR%%/formencode diff --git a/www/py-webware/pkg-plist b/www/py-webware/pkg-plist index 562193a1bd12..6b3814ddcf69 100644 --- a/www/py-webware/pkg-plist +++ b/www/py-webware/pkg-plist @@ -1577,153 +1577,153 @@ www/webkit/Launch.py www/webkit/WebKit.cgi www/webkit/MyContext/Main.py www/webkit/MyContext/__init__.py -@unexec rmdir %D/share/webware/bin 2>/dev/null || true -@unexec rmdir %D/share/webware/WebUtils/Tests 2>/dev/null || true -@unexec rmdir %D/share/webware/WebUtils/Docs/Source/Summaries 2>/dev/null || true -@unexec rmdir %D/share/webware/WebUtils/Docs/Source/Files 2>/dev/null || true -@unexec rmdir %D/share/webware/WebUtils/Docs/Source/Docs 2>/dev/null || true -@unexec rmdir %D/share/webware/WebUtils/Docs/Source 2>/dev/null || true -@unexec rmdir %D/share/webware/WebUtils/Docs 2>/dev/null || true -@unexec rmdir %D/share/webware/WebUtils 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Tests/Basic/TestContext 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Tests/Basic/Configs 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Tests/Basic/Cache 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Tests/Basic 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Tests 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Testing/URL/vhosts 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Testing/URL/test5join2 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Testing/URL/test5join1 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Testing/URL/test5 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Testing/URL/test4 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Testing/URL/test3 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Testing/URL/test2 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Testing/URL/test1 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Testing/URL 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Testing/Dir 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Testing 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Tasks 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/StartScripts 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Sessions 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Research 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Logs 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Experimental 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Examples 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/ErrorMsgs 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Docs/Source/Summaries 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Docs/Source/Files 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Docs/Source/Docs 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Docs/Source 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Docs 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Configs 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Cache 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Admin 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Adapters/wkcgi 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Adapters/wkISAPI 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Adapters/mod_webkit2 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Adapters/mod_webkit 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Adapters/common 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit/Adapters 2>/dev/null || true -@unexec rmdir %D/share/webware/WebKit 2>/dev/null || true -@unexec rmdir %D/share/webware/UserKit/Tests/UserManagerTest.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/UserKit/Tests 2>/dev/null || true -@unexec rmdir %D/share/webware/UserKit/Docs/Source/Summaries 2>/dev/null || true -@unexec rmdir %D/share/webware/UserKit/Docs/Source/Files 2>/dev/null || true -@unexec rmdir %D/share/webware/UserKit/Docs/Source/Docs 2>/dev/null || true -@unexec rmdir %D/share/webware/UserKit/Docs/Source 2>/dev/null || true -@unexec rmdir %D/share/webware/UserKit/Docs 2>/dev/null || true -@unexec rmdir %D/share/webware/UserKit 2>/dev/null || true -@unexec rmdir %D/share/webware/TaskKit/Tests 2>/dev/null || true -@unexec rmdir %D/share/webware/TaskKit/Docs/Source/Summaries 2>/dev/null || true -@unexec rmdir %D/share/webware/TaskKit/Docs/Source/Files 2>/dev/null || true -@unexec rmdir %D/share/webware/TaskKit/Docs/Source/Docs 2>/dev/null || true -@unexec rmdir %D/share/webware/TaskKit/Docs/Source 2>/dev/null || true -@unexec rmdir %D/share/webware/TaskKit/Docs 2>/dev/null || true -@unexec rmdir %D/share/webware/TaskKit 2>/dev/null || true -@unexec rmdir %D/share/webware/PSP/Tests 2>/dev/null || true -@unexec rmdir %D/share/webware/PSP/Examples 2>/dev/null || true -@unexec rmdir %D/share/webware/PSP/Docs/Source/Summaries 2>/dev/null || true -@unexec rmdir %D/share/webware/PSP/Docs/Source/Files 2>/dev/null || true -@unexec rmdir %D/share/webware/PSP/Docs/Source/Docs 2>/dev/null || true -@unexec rmdir %D/share/webware/PSP/Docs/Source 2>/dev/null || true -@unexec rmdir %D/share/webware/PSP/Docs 2>/dev/null || true -@unexec rmdir %D/share/webware/PSP 2>/dev/null || true -@unexec rmdir %D/share/webware/MiscUtils/Testing 2>/dev/null || true -@unexec rmdir %D/share/webware/MiscUtils/Docs/Source/Summaries 2>/dev/null || true -@unexec rmdir %D/share/webware/MiscUtils/Docs/Source/Files 2>/dev/null || true -@unexec rmdir %D/share/webware/MiscUtils/Docs/Source/Docs 2>/dev/null || true -@unexec rmdir %D/share/webware/MiscUtils/Docs/Source 2>/dev/null || true -@unexec rmdir %D/share/webware/MiscUtils/Docs 2>/dev/null || true -@unexec rmdir %D/share/webware/MiscUtils 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/WebBrowser/Help 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/WebBrowser 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKTypeValueChecking.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKString.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKRefresh.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKObjRefReuse.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKObjRef.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKNone.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKMultipleThreads.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKMultipleStores.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKModelInh3.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKModelInh2.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKModelInh1.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKList.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKInheritanceAbstract.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKInheritance.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKExcel.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKEnums.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKDump.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKDeleteMark.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKDelete.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKDefaultMinMax.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKDateTime.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKClone.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKBasic.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests/MKBackRef.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Tests 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Run 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Resources/Template.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Resources 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Docs/Videos/Middle/Videos.mkmodel 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Docs/Videos/Middle 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Docs/Videos/Command 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Docs/Videos 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Docs/Source/Summaries 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Docs/Source/Files 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Docs/Source/Docs 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Docs/Source 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Docs 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Design 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit/Core 2>/dev/null || true -@unexec rmdir %D/share/webware/MiddleKit 2>/dev/null || true -@unexec rmdir %D/share/webware/KidKit/Examples 2>/dev/null || true -@unexec rmdir %D/share/webware/KidKit/Docs/Source/Summaries 2>/dev/null || true -@unexec rmdir %D/share/webware/KidKit/Docs/Source/Files 2>/dev/null || true -@unexec rmdir %D/share/webware/KidKit/Docs/Source/Docs 2>/dev/null || true -@unexec rmdir %D/share/webware/KidKit/Docs/Source 2>/dev/null || true -@unexec rmdir %D/share/webware/KidKit/Docs 2>/dev/null || true -@unexec rmdir %D/share/webware/KidKit 2>/dev/null || true -@unexec rmdir %D/share/webware/Docs 2>/dev/null || true -@unexec rmdir %D/share/webware/DocSupport 2>/dev/null || true -@unexec rmdir %D/share/webware/COMKit/Examples 2>/dev/null || true -@unexec rmdir %D/share/webware/COMKit/Docs/Source/Summaries 2>/dev/null || true -@unexec rmdir %D/share/webware/COMKit/Docs/Source/Files 2>/dev/null || true -@unexec rmdir %D/share/webware/COMKit/Docs/Source/Docs 2>/dev/null || true -@unexec rmdir %D/share/webware/COMKit/Docs/Source 2>/dev/null || true -@unexec rmdir %D/share/webware/COMKit/Docs 2>/dev/null || true -@unexec rmdir %D/share/webware/COMKit 2>/dev/null || true -@unexec rmdir %D/share/webware/CGIWrapper/Examples 2>/dev/null || true -@unexec rmdir %D/share/webware/CGIWrapper/Docs/Source/Summaries 2>/dev/null || true -@unexec rmdir %D/share/webware/CGIWrapper/Docs/Source/Files 2>/dev/null || true -@unexec rmdir %D/share/webware/CGIWrapper/Docs/Source/Docs 2>/dev/null || true -@unexec rmdir %D/share/webware/CGIWrapper/Docs/Source 2>/dev/null || true -@unexec rmdir %D/share/webware/CGIWrapper/Docs 2>/dev/null || true -@unexec rmdir %D/share/webware/CGIWrapper 2>/dev/null || true -@unexec rmdir %D/share/webware 2>/dev/null || true -@unexec rmdir %D/www/webkit/Sessions 2>/dev/null || true -@unexec rmdir %D/www/webkit/MyContext 2>/dev/null || true -@unexec rmdir %D/www/webkit/Logs 2>/dev/null || true -@unexec rmdir %D/www/webkit/ErrorMsgs 2>/dev/null || true -@unexec rmdir %D/www/webkit/Configs 2>/dev/null || true -@unexec rmdir %D/www/webkit/Cache 2>/dev/null || true -@unexec rmdir %D/www/webkit 2>/dev/null || true +@dirrmtry share/webware/bin +@dirrmtry share/webware/WebUtils/Tests +@dirrmtry share/webware/WebUtils/Docs/Source/Summaries +@dirrmtry share/webware/WebUtils/Docs/Source/Files +@dirrmtry share/webware/WebUtils/Docs/Source/Docs +@dirrmtry share/webware/WebUtils/Docs/Source +@dirrmtry share/webware/WebUtils/Docs +@dirrmtry share/webware/WebUtils +@dirrmtry share/webware/WebKit/Tests/Basic/TestContext +@dirrmtry share/webware/WebKit/Tests/Basic/Configs +@dirrmtry share/webware/WebKit/Tests/Basic/Cache +@dirrmtry share/webware/WebKit/Tests/Basic +@dirrmtry share/webware/WebKit/Tests +@dirrmtry share/webware/WebKit/Testing/URL/vhosts +@dirrmtry share/webware/WebKit/Testing/URL/test5join2 +@dirrmtry share/webware/WebKit/Testing/URL/test5join1 +@dirrmtry share/webware/WebKit/Testing/URL/test5 +@dirrmtry share/webware/WebKit/Testing/URL/test4 +@dirrmtry share/webware/WebKit/Testing/URL/test3 +@dirrmtry share/webware/WebKit/Testing/URL/test2 +@dirrmtry share/webware/WebKit/Testing/URL/test1 +@dirrmtry share/webware/WebKit/Testing/URL +@dirrmtry share/webware/WebKit/Testing/Dir +@dirrmtry share/webware/WebKit/Testing +@dirrmtry share/webware/WebKit/Tasks +@dirrmtry share/webware/WebKit/StartScripts +@dirrmtry share/webware/WebKit/Sessions +@dirrmtry share/webware/WebKit/Research +@dirrmtry share/webware/WebKit/Logs +@dirrmtry share/webware/WebKit/Experimental +@dirrmtry share/webware/WebKit/Examples +@dirrmtry share/webware/WebKit/ErrorMsgs +@dirrmtry share/webware/WebKit/Docs/Source/Summaries +@dirrmtry share/webware/WebKit/Docs/Source/Files +@dirrmtry share/webware/WebKit/Docs/Source/Docs +@dirrmtry share/webware/WebKit/Docs/Source +@dirrmtry share/webware/WebKit/Docs +@dirrmtry share/webware/WebKit/Configs +@dirrmtry share/webware/WebKit/Cache +@dirrmtry share/webware/WebKit/Admin +@dirrmtry share/webware/WebKit/Adapters/wkcgi +@dirrmtry share/webware/WebKit/Adapters/wkISAPI +@dirrmtry share/webware/WebKit/Adapters/mod_webkit2 +@dirrmtry share/webware/WebKit/Adapters/mod_webkit +@dirrmtry share/webware/WebKit/Adapters/common +@dirrmtry share/webware/WebKit/Adapters +@dirrmtry share/webware/WebKit +@dirrmtry share/webware/UserKit/Tests/UserManagerTest.mkmodel +@dirrmtry share/webware/UserKit/Tests +@dirrmtry share/webware/UserKit/Docs/Source/Summaries +@dirrmtry share/webware/UserKit/Docs/Source/Files +@dirrmtry share/webware/UserKit/Docs/Source/Docs +@dirrmtry share/webware/UserKit/Docs/Source +@dirrmtry share/webware/UserKit/Docs +@dirrmtry share/webware/UserKit +@dirrmtry share/webware/TaskKit/Tests +@dirrmtry share/webware/TaskKit/Docs/Source/Summaries +@dirrmtry share/webware/TaskKit/Docs/Source/Files +@dirrmtry share/webware/TaskKit/Docs/Source/Docs +@dirrmtry share/webware/TaskKit/Docs/Source +@dirrmtry share/webware/TaskKit/Docs +@dirrmtry share/webware/TaskKit +@dirrmtry share/webware/PSP/Tests +@dirrmtry share/webware/PSP/Examples +@dirrmtry share/webware/PSP/Docs/Source/Summaries +@dirrmtry share/webware/PSP/Docs/Source/Files +@dirrmtry share/webware/PSP/Docs/Source/Docs +@dirrmtry share/webware/PSP/Docs/Source +@dirrmtry share/webware/PSP/Docs +@dirrmtry share/webware/PSP +@dirrmtry share/webware/MiscUtils/Testing +@dirrmtry share/webware/MiscUtils/Docs/Source/Summaries +@dirrmtry share/webware/MiscUtils/Docs/Source/Files +@dirrmtry share/webware/MiscUtils/Docs/Source/Docs +@dirrmtry share/webware/MiscUtils/Docs/Source +@dirrmtry share/webware/MiscUtils/Docs +@dirrmtry share/webware/MiscUtils +@dirrmtry share/webware/MiddleKit/WebBrowser/Help +@dirrmtry share/webware/MiddleKit/WebBrowser +@dirrmtry share/webware/MiddleKit/Tests/MKTypeValueChecking.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKString.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKRefresh.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKObjRefReuse.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKObjRef.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKNone.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKMultipleThreads.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKMultipleStores.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKModelInh3.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKModelInh2.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKModelInh1.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKList.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKInheritanceAbstract.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKInheritance.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKExcel.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKEnums.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKDump.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKDeleteMark.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKDelete.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKDefaultMinMax.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKDateTime.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKClone.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKBasic.mkmodel +@dirrmtry share/webware/MiddleKit/Tests/MKBackRef.mkmodel +@dirrmtry share/webware/MiddleKit/Tests +@dirrmtry share/webware/MiddleKit/Run +@dirrmtry share/webware/MiddleKit/Resources/Template.mkmodel +@dirrmtry share/webware/MiddleKit/Resources +@dirrmtry share/webware/MiddleKit/Docs/Videos/Middle/Videos.mkmodel +@dirrmtry share/webware/MiddleKit/Docs/Videos/Middle +@dirrmtry share/webware/MiddleKit/Docs/Videos/Command +@dirrmtry share/webware/MiddleKit/Docs/Videos +@dirrmtry share/webware/MiddleKit/Docs/Source/Summaries +@dirrmtry share/webware/MiddleKit/Docs/Source/Files +@dirrmtry share/webware/MiddleKit/Docs/Source/Docs +@dirrmtry share/webware/MiddleKit/Docs/Source +@dirrmtry share/webware/MiddleKit/Docs +@dirrmtry share/webware/MiddleKit/Design +@dirrmtry share/webware/MiddleKit/Core +@dirrmtry share/webware/MiddleKit +@dirrmtry share/webware/KidKit/Examples +@dirrmtry share/webware/KidKit/Docs/Source/Summaries +@dirrmtry share/webware/KidKit/Docs/Source/Files +@dirrmtry share/webware/KidKit/Docs/Source/Docs +@dirrmtry share/webware/KidKit/Docs/Source +@dirrmtry share/webware/KidKit/Docs +@dirrmtry share/webware/KidKit +@dirrmtry share/webware/Docs +@dirrmtry share/webware/DocSupport +@dirrmtry share/webware/COMKit/Examples +@dirrmtry share/webware/COMKit/Docs/Source/Summaries +@dirrmtry share/webware/COMKit/Docs/Source/Files +@dirrmtry share/webware/COMKit/Docs/Source/Docs +@dirrmtry share/webware/COMKit/Docs/Source +@dirrmtry share/webware/COMKit/Docs +@dirrmtry share/webware/COMKit +@dirrmtry share/webware/CGIWrapper/Examples +@dirrmtry share/webware/CGIWrapper/Docs/Source/Summaries +@dirrmtry share/webware/CGIWrapper/Docs/Source/Files +@dirrmtry share/webware/CGIWrapper/Docs/Source/Docs +@dirrmtry share/webware/CGIWrapper/Docs/Source +@dirrmtry share/webware/CGIWrapper/Docs +@dirrmtry share/webware/CGIWrapper +@dirrmtry share/webware +@dirrmtry www/webkit/Sessions +@dirrmtry www/webkit/MyContext +@dirrmtry www/webkit/Logs +@dirrmtry www/webkit/ErrorMsgs +@dirrmtry www/webkit/Configs +@dirrmtry www/webkit/Cache +@dirrmtry www/webkit diff --git a/www/roundup/pkg-plist b/www/roundup/pkg-plist index 2833fc6380f0..00d7dbe78848 100644 --- a/www/roundup/pkg-plist +++ b/www/roundup/pkg-plist @@ -303,5 +303,5 @@ share/locale/zh_TW/LC_MESSAGES/roundup.mo @dirrm %%PYTHON_SITELIBDIR%%/roundup/cgi @dirrm %%PYTHON_SITELIBDIR%%/roundup/backends @dirrm %%PYTHON_SITELIBDIR%%/roundup -@unexec rmdir %D/share/locale/es_AR/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/es_AR 2>/dev/null || true +@dirrmtry share/locale/es_AR/LC_MESSAGES +@dirrmtry share/locale/es_AR diff --git a/www/rt2/pkg-plist b/www/rt2/pkg-plist index 2447c26c7025..d996c905e573 100644 --- a/www/rt2/pkg-plist +++ b/www/rt2/pkg-plist @@ -362,4 +362,4 @@ rt2/README @dirrm rt2/WebRT/html @dirrm rt2/WebRT/data @dirrm rt2/WebRT -@unexec rmdir %D/rt2 2>/dev/null || true +@dirrmtry rt2 diff --git a/www/sidplug/pkg-plist b/www/sidplug/pkg-plist index e916a6e48c54..099e3f49c611 100644 --- a/www/sidplug/pkg-plist +++ b/www/sidplug/pkg-plist @@ -4,4 +4,4 @@ lib/browser_plugins/npsidplug.so %%PORTDOCS%%share/examples/sidplug/README.html %%PORTDOCS%%share/examples/sidplug/sidplug.png %%PORTDOCS%%@dirrm share/examples/sidplug -@unexec rmdir %D/lib/browser_plugins/ 2> /dev/null || true +@dirrmtry lib/browser_plugins/ diff --git a/www/simplog/pkg-plist b/www/simplog/pkg-plist index 305218482a75..88d60d85a51c 100644 --- a/www/simplog/pkg-plist +++ b/www/simplog/pkg-plist @@ -351,4 +351,4 @@ www/simplog/xmlrpcs.inc @dirrm www/simplog/adodb/contrib @dirrm www/simplog/adodb/xsl @dirrm www/simplog/adodb -@unexec rmdir %D/www/simplog 2>/dev/null || true +@dirrmtry www/simplog diff --git a/www/slash/pkg-plist b/www/slash/pkg-plist index 433220bdbe88..3eed6f8e7ede 100644 --- a/www/slash/pkg-plist +++ b/www/slash/pkg-plist @@ -460,4 +460,4 @@ slash/slash.sites @dirrm slash/plugins @dirrm slash/httpd @dirrm slash/bin -@unexec rmdir %D/slash 2>/dev/null || true +@dirrmtry slash diff --git a/www/snownews/pkg-plist b/www/snownews/pkg-plist index e8dcfdb58a73..5f55bcbcd923 100644 --- a/www/snownews/pkg-plist +++ b/www/snownews/pkg-plist @@ -14,13 +14,13 @@ bin/snowsync %%NLS%%share/locale/sl/LC_MESSAGES/snownews.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/snownews.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/snownews.mo -@unexec rmdir %D/man/fr/man1 2>/dev/null || true -@unexec rmdir %D/man/fr 2>/dev/null || true -@unexec rmdir %D/man/de/man1 2>/dev/null || true -@unexec rmdir %D/man/de 2>/dev/null || true -@unexec rmdir %D/man/nl/man1 2>/dev/null || true -@unexec rmdir %D/man/nl 2>/dev/null || true -@unexec rmdir %D/man/it/man1 2>/dev/null || true -@unexec rmdir %D/man/it 2>/dev/null || true -@unexec rmdir %D/man/ru_RU.KOI8-R/man1 2>/dev/null || true -@unexec rmdir %D/man/ru_RU.KOI8-R 2>/dev/null || true +@dirrmtry man/fr/man1 +@dirrmtry man/fr +@dirrmtry man/de/man1 +@dirrmtry man/de +@dirrmtry man/nl/man1 +@dirrmtry man/nl +@dirrmtry man/it/man1 +@dirrmtry man/it +@dirrmtry man/ru_RU.KOI8-R/man1 +@dirrmtry man/ru_RU.KOI8-R diff --git a/www/squid_radius_auth/pkg-plist b/www/squid_radius_auth/pkg-plist index 5ee41599bd37..3b5295773ba2 100644 --- a/www/squid_radius_auth/pkg-plist +++ b/www/squid_radius_auth/pkg-plist @@ -1,5 +1,5 @@ etc/squid/squid_radius_auth.conf etc/squid/squid_radius_auth.conf.default libexec/squid/squid_radius_auth -@unexec rmdir %D/libexec/squid/ 2>/dev/null || true -@unexec rmdir %D/etc/squid/ 2>/dev/null || true +@dirrmtry libexec/squid/ +@dirrmtry etc/squid/ diff --git a/www/ssserver/pkg-plist b/www/ssserver/pkg-plist index f5d258dd359e..341605036a96 100644 --- a/www/ssserver/pkg-plist +++ b/www/ssserver/pkg-plist @@ -62,4 +62,4 @@ www/cgi-bin/ssserverdata/template7.txt www/cgi-bin/ssserverdata/template8.txt @mode @unexec rm -fR %B>/dev/null || true -@unexec rmdir %D/www/cgi-bin 2> /dev/null || true +@dirrmtry www/cgi-bin diff --git a/www/syndigator/pkg-plist b/www/syndigator/pkg-plist index 1fc4d7f70dd8..447333940db7 100644 --- a/www/syndigator/pkg-plist +++ b/www/syndigator/pkg-plist @@ -85,6 +85,6 @@ share/gnome/pixmaps/syndigator/trayicon.gif @dirrm %%SITE_PERL%%/syndigator/RSSReader/Exporter @dirrm %%SITE_PERL%%/syndigator/RSSReader @dirrm %%SITE_PERL%%/syndigator -@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true -@unexec rmdir %D/lib/perl5/site_perl 2>/dev/null || true -@unexec rmdir %D/lib/perl5 2>/dev/null || true +@dirrmtry %%SITE_PERL%% +@dirrmtry lib/perl5/site_perl +@dirrmtry lib/perl5 diff --git a/www/thttpd/pkg-plist b/www/thttpd/pkg-plist index 983dc3a173f8..60661d0b4c83 100644 --- a/www/thttpd/pkg-plist +++ b/www/thttpd/pkg-plist @@ -6,5 +6,5 @@ sbin/thttpd www/cgi-bin/phf www/cgi-bin/redirect www/cgi-bin/ssi -@unexec rmdir %D/www/cgi-bin 2> /dev/null || true -@unexec rmdir %D/www/data 2> /dev/null || true +@dirrmtry www/cgi-bin +@dirrmtry www/data diff --git a/www/ump/pkg-plist b/www/ump/pkg-plist index 6f9891af5f7b..fd50f1c0a322 100644 --- a/www/ump/pkg-plist +++ b/www/ump/pkg-plist @@ -1,2 +1,2 @@ lib/browser_plugins/ump.so -@unexec rmdir %D/lib/browser_plugins 2>/dev/null || true +@dirrmtry lib/browser_plugins diff --git a/www/urchin5/pkg-plist b/www/urchin5/pkg-plist index 08d1daa3d068..a2b3a6cdb856 100644 --- a/www/urchin5/pkg-plist +++ b/www/urchin5/pkg-plist @@ -627,12 +627,12 @@ urchin/var/server.key.sample urchin/var/urchinwebd.conf @unexec rm -rf %D/urchin/var/urchinwebd.conf.template.dist 2>/dev/null || true @dirrm urchin/bin -@unexec rmdir %D/urchin/data/admin 2>/dev/null || true +@dirrmtry urchin/data/admin @unexec rm -rf %D/urchin/data/cache 2>/dev/null -@unexec rmdir %D/urchin/data/history 2>/dev/null || true -@unexec rmdir %D/urchin/data/logs 2>/dev/null || true -@unexec rmdir %D/urchin/data/reports 2>/dev/null || true -@unexec rmdir %D/urchin/data/session 2>/dev/null || true +@dirrmtry urchin/data/history +@dirrmtry urchin/data/logs +@dirrmtry urchin/data/reports +@dirrmtry urchin/data/session @dirrm urchin/doc @dirrm urchin/htdocs/ucss @dirrm urchin/htdocs/uicons/default/ee/images @@ -647,16 +647,16 @@ urchin/var/urchinwebd.conf @dirrm urchin/lib/admin/templates @dirrm urchin/lib/admin/views @dirrm urchin/lib/admin -@unexec rmdir %D/urchin/lib/custom/cobrands 2>/dev/null || true -@unexec rmdir %D/urchin/lib/custom/languages 2>/dev/null || true -@unexec rmdir %D/urchin/lib/custom/logformats 2>/dev/null || true -@unexec rmdir %D/urchin/lib/custom/lookuptables 2>/dev/null || true -@unexec rmdir %D/urchin/lib/custom/profiletypes/Campaign_Website 2>/dev/null || true -@unexec rmdir %D/urchin/lib/custom/profiletypes/Campaign_with_E-Commerce_Website 2>/dev/null || true -@unexec rmdir %D/urchin/lib/custom/profiletypes/E-Commerce_Website 2>/dev/null || true -@unexec rmdir %D/urchin/lib/custom/profiletypes/Standard_Website 2>/dev/null || true -@unexec rmdir %D/urchin/lib/custom/profiletypes 2>/dev/null || true -@unexec rmdir %D/urchin/lib/custom 2>/dev/null || true +@dirrmtry urchin/lib/custom/cobrands +@dirrmtry urchin/lib/custom/languages +@dirrmtry urchin/lib/custom/logformats +@dirrmtry urchin/lib/custom/lookuptables +@dirrmtry urchin/lib/custom/profiletypes/Campaign_Website +@dirrmtry urchin/lib/custom/profiletypes/Campaign_with_E-Commerce_Website +@dirrmtry urchin/lib/custom/profiletypes/E-Commerce_Website +@dirrmtry urchin/lib/custom/profiletypes/Standard_Website +@dirrmtry urchin/lib/custom/profiletypes +@dirrmtry urchin/lib/custom @dirrm urchin/lib/reporting/languages @dirrm urchin/lib/reporting/logformats @dirrm urchin/lib/reporting/lookuptables @@ -670,6 +670,6 @@ urchin/var/urchinwebd.conf @dirrm urchin/lib/session/languages @dirrm urchin/lib/session/templates @dirrm urchin/lib/session -@unexec rmdir %D/urchin/lib 2>/dev/null || true +@dirrmtry urchin/lib @dirrm urchin/util/utm -@unexec rmdir %D/urchin/util 2>/dev/null || true +@dirrmtry urchin/util diff --git a/www/wiliki/pkg-plist b/www/wiliki/pkg-plist index 135b51e015ba..ab458510feef 100644 --- a/www/wiliki/pkg-plist +++ b/www/wiliki/pkg-plist @@ -1,9 +1,9 @@ www/cgi-bin/wiliki.cgi.dist www/cgi-bin/wiliki2.cgi.dist -@unexec rmdir %D/www/cgi-bin 2>/dev/null || true +@dirrmtry www/cgi-bin www/data/wiliki.css www/data/wiliki2.css -@unexec rmdir %D/www/data 2>/dev/null || true +@dirrmtry www/data share/gauche/site/lib/.packages/WiLiKi.gpd share/gauche/site/lib/wiliki.scm share/gauche/site/lib/wiliki/db.scm diff --git a/www/winhelpcgi/pkg-plist b/www/winhelpcgi/pkg-plist index 055c8979bb81..330c792f4d17 100644 --- a/www/winhelpcgi/pkg-plist +++ b/www/winhelpcgi/pkg-plist @@ -1,2 +1,2 @@ www/winhelpcgi/winhelpcgi.cgi -@unexec rmdir %D/www/winhelpcgi 2>/dev/null || true +@dirrmtry www/winhelpcgi diff --git a/www/xitami/pkg-plist b/www/xitami/pkg-plist index 6a9bc78ad372..e7021f96ceae 100644 --- a/www/xitami/pkg-plist +++ b/www/xitami/pkg-plist @@ -25,6 +25,6 @@ xitami/xitami.aut xitami/xitami.cfg @dirrm share/doc/xitami/html @dirrm share/doc/xitami -@unexec rmdir %D/xitami/webpages 2>/dev/null || true -@unexec rmdir %D/xitami/cgi-bin 2>/dev/null || true -@unexec rmdir %D/xitami 2>/dev/null || true +@dirrmtry xitami/webpages +@dirrmtry xitami/cgi-bin +@dirrmtry xitami diff --git a/www/xshttpd-devel/pkg-plist b/www/xshttpd-devel/pkg-plist index 587a3c2b6b75..3c719061d98f 100644 --- a/www/xshttpd-devel/pkg-plist +++ b/www/xshttpd-devel/pkg-plist @@ -66,6 +66,6 @@ bin/xspasswd @dirrm %%DATADIR%%/gfxcount @dirrm %%DATADIR%%/icons @cwd %%WWWDIR%% -@unexec rmdir %D/cgi-bin 2>/dev/null || true -@unexec rmdir %D/htdocs 2>/dev/null || true -@unexec rmdir %D/logs 2>/dev/null || true +@dirrmtry cgi-bin +@dirrmtry htdocs +@dirrmtry logs diff --git a/www/xshttpd/pkg-plist b/www/xshttpd/pkg-plist index 587a3c2b6b75..3c719061d98f 100644 --- a/www/xshttpd/pkg-plist +++ b/www/xshttpd/pkg-plist @@ -66,6 +66,6 @@ bin/xspasswd @dirrm %%DATADIR%%/gfxcount @dirrm %%DATADIR%%/icons @cwd %%WWWDIR%% -@unexec rmdir %D/cgi-bin 2>/dev/null || true -@unexec rmdir %D/htdocs 2>/dev/null || true -@unexec rmdir %D/logs 2>/dev/null || true +@dirrmtry cgi-bin +@dirrmtry htdocs +@dirrmtry logs diff --git a/www/yabb/pkg-plist b/www/yabb/pkg-plist index eaf3221d6357..aa76b3770788 100644 --- a/www/yabb/pkg-plist +++ b/www/yabb/pkg-plist @@ -144,32 +144,32 @@ %%YABBCGI%%/Variables/index.html %%YABBCGI%%/YaBB.pl %%YABBCGI%%/index.html -@unexec rmdir %D/%%YABBCGI%%/Variables 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Templates/default 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Templates 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Sources 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Modules/Upload/CGI 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Modules/Upload 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Modules/Time 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Modules/Digest 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Modules 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Messages 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Members 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Languages/English 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Languages 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Help/English/User 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Help/English/Moderator 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Help/English/Gmod 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Help/English/Admin 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Help/English 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Help 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Convert/Variables 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Convert/Messages 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Convert/Members 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Convert/Boards 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Convert 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Boards 2>/dev/null || true -@unexec rmdir %D/%%YABBCGI%%/Admin 2>/dev/null || true +@dirrmtry %%YABBCGI%%/Variables +@dirrmtry %%YABBCGI%%/Templates/default +@dirrmtry %%YABBCGI%%/Templates +@dirrmtry %%YABBCGI%%/Sources +@dirrmtry %%YABBCGI%%/Modules/Upload/CGI +@dirrmtry %%YABBCGI%%/Modules/Upload +@dirrmtry %%YABBCGI%%/Modules/Time +@dirrmtry %%YABBCGI%%/Modules/Digest +@dirrmtry %%YABBCGI%%/Modules +@dirrmtry %%YABBCGI%%/Messages +@dirrmtry %%YABBCGI%%/Members +@dirrmtry %%YABBCGI%%/Languages/English +@dirrmtry %%YABBCGI%%/Languages +@dirrmtry %%YABBCGI%%/Help/English/User +@dirrmtry %%YABBCGI%%/Help/English/Moderator +@dirrmtry %%YABBCGI%%/Help/English/Gmod +@dirrmtry %%YABBCGI%%/Help/English/Admin +@dirrmtry %%YABBCGI%%/Help/English +@dirrmtry %%YABBCGI%%/Help +@dirrmtry %%YABBCGI%%/Convert/Variables +@dirrmtry %%YABBCGI%%/Convert/Messages +@dirrmtry %%YABBCGI%%/Convert/Members +@dirrmtry %%YABBCGI%%/Convert/Boards +@dirrmtry %%YABBCGI%%/Convert +@dirrmtry %%YABBCGI%%/Boards +@dirrmtry %%YABBCGI%%/Admin @unexec rmdir %D/%%YABBCGI%% 2>/dev/null || echo "Note: %D/%%YABBCGI%% not empty -- not deleted!" %%YABBFILES%%/Buttons/English/addfav.png %%YABBFILES%%/Buttons/English/admin.png diff --git a/x11-clocks/emiclock/pkg-plist b/x11-clocks/emiclock/pkg-plist index 0bbc65e81ece..571f1ddd7f90 100644 --- a/x11-clocks/emiclock/pkg-plist +++ b/x11-clocks/emiclock/pkg-plist @@ -3,8 +3,8 @@ bin/emiclock lib/X11/app-defaults/EmiClock lib/X11/ja_JP.EUC/app-defaults/EmiClock lib/X11/ja_JP.eucJP/app-defaults/EmiClock -@unexec rmdir %D/lib/X11/ja_JP.eucJP/app-defaults 2>/dev/null || true -@unexec rmdir %D/lib/X11/ja_JP.eucJP 2>/dev/null || true -@unexec rmdir %D/lib/X11/ja_JP.EUC/app-defaults 2>/dev/null || true -@unexec rmdir %D/lib/X11/ja_JP.EUC 2>/dev/null || true -@unexec rmdir %D/lib/X11/EmiClock 2>/dev/null || true +@dirrmtry lib/X11/ja_JP.eucJP/app-defaults +@dirrmtry lib/X11/ja_JP.eucJP +@dirrmtry lib/X11/ja_JP.EUC/app-defaults +@dirrmtry lib/X11/ja_JP.EUC +@dirrmtry lib/X11/EmiClock diff --git a/x11-clocks/xfce4-datetime-plugin/pkg-plist b/x11-clocks/xfce4-datetime-plugin/pkg-plist index b5dc26105752..af30f70e36f7 100644 --- a/x11-clocks/xfce4-datetime-plugin/pkg-plist +++ b/x11-clocks/xfce4-datetime-plugin/pkg-plist @@ -1,2 +1,2 @@ lib/xfce4/panel-plugins/libdatetime.so -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins diff --git a/x11-fm/asfiles/pkg-plist b/x11-fm/asfiles/pkg-plist index eb83e0c90062..8350ac4a850e 100644 --- a/x11-fm/asfiles/pkg-plist +++ b/x11-fm/asfiles/pkg-plist @@ -225,4 +225,4 @@ lib/X11/app-defaults/Files.ad share/OffiX/FilesMagic share/OffiX/Filesrc @dirrm share/OffiX -@unexec rmdir %D/include/bitmaps 2>/dev/null || true +@dirrmtry include/bitmaps diff --git a/x11-fm/binder/pkg-plist b/x11-fm/binder/pkg-plist index 4b0c564a9c3c..23aaf09a89fb 100644 --- a/x11-fm/binder/pkg-plist +++ b/x11-fm/binder/pkg-plist @@ -183,4 +183,4 @@ bin/Processes.app @dirrm JDE/Binder/modules @dirrm JDE/Binder/tools @dirrm JDE/Binder -@unexec rmdir %D/JDE 2>/dev/null || true +@dirrmtry JDE diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist index 2e738f0a6fbe..60edb891ab2a 100644 --- a/x11-fm/nautilus2/pkg-plist +++ b/x11-fm/nautilus2/pkg-plist @@ -156,10 +156,10 @@ share/locale/yi/LC_MESSAGES/nautilus.mo share/locale/zh_CN/LC_MESSAGES/nautilus.mo share/locale/zh_TW/LC_MESSAGES/nautilus.mo share/locale/zu/LC_MESSAGES/nautilus.mo -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/xh 2> /dev/null || true -@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/rw 2> /dev/null || true +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw @dirrm share/gnome/pixmaps/nautilus @dirrm share/gnome/nautilus/ui @dirrm share/gnome/nautilus/patterns diff --git a/x11-fm/offix-files/pkg-plist b/x11-fm/offix-files/pkg-plist index addf7df17062..35c95f4f8c9d 100644 --- a/x11-fm/offix-files/pkg-plist +++ b/x11-fm/offix-files/pkg-plist @@ -273,4 +273,4 @@ include/bitmaps/zoo.xbm share/OffiX/Files.ad share/OffiX/FilesMagic share/OffiX/Filesrc -@unexec rmdir %D/include/bitmaps 2>/dev/null || true +@dirrmtry include/bitmaps diff --git a/x11-fm/rox-filer/pkg-plist b/x11-fm/rox-filer/pkg-plist index 4e9ca0f95492..4e7c0841002c 100644 --- a/x11-fm/rox-filer/pkg-plist +++ b/x11-fm/rox-filer/pkg-plist @@ -147,6 +147,6 @@ share/mime/packages/rox.xml @dirrm apps/ROX-Filer/Messages @dirrm apps/ROX-Filer/Help @dirrm apps/ROX-Filer -@unexec rmdir %D/apps 2>/dev/null || true +@dirrmtry apps @exec %%LOCALBASE%%/bin/update-mime-database %%LOCALBASE%%/share/mime @unexec %%LOCALBASE%%/bin/update-mime-database %%LOCALBASE%%/share/mime diff --git a/x11-fm/rox-mime-editor/pkg-plist b/x11-fm/rox-mime-editor/pkg-plist index 499f9270877c..12ebd3591f68 100644 --- a/x11-fm/rox-mime-editor/pkg-plist +++ b/x11-fm/rox-mime-editor/pkg-plist @@ -29,4 +29,4 @@ apps/MIME-Editor/type.pyo @dirrm apps/MIME-Editor/Messages @dirrm apps/MIME-Editor/Help @dirrm apps/MIME-Editor -@unexec rmdir %D/apps 2>/dev/null || true +@dirrmtry apps diff --git a/x11-fm/rox-session/pkg-plist b/x11-fm/rox-session/pkg-plist index d3392909f853..3ebdee1b662f 100644 --- a/x11-fm/rox-session/pkg-plist +++ b/x11-fm/rox-session/pkg-plist @@ -74,4 +74,4 @@ bin/rox-session @dirrm apps/ROX-Session/Help @dirrm apps/ROX-Session/%%BINARIES%% @dirrm apps/ROX-Session -@unexec rmdir %D/apps 2>/dev/null || true +@dirrmtry apps diff --git a/x11-fm/worker/pkg-plist b/x11-fm/worker/pkg-plist index e51b62606717..31905f2c5b3f 100644 --- a/x11-fm/worker/pkg-plist +++ b/x11-fm/worker/pkg-plist @@ -31,7 +31,7 @@ share/pixmaps/WorkerIcon.xpm share/pixmaps/WorkerIcon16.xpm share/pixmaps/WorkerIcon32.xpm share/pixmaps/WorkerIcon48.xpm -@unexec rmdir %D/share/pixmaps 2>/dev/null || true +@dirrmtry share/pixmaps @dirrm share/worker/catalogs @dirrm share/worker/scripts @dirrm share/worker diff --git a/x11-fm/workplace/pkg-plist b/x11-fm/workplace/pkg-plist index befc7fd2f6fd..94ce8f7001d3 100644 --- a/x11-fm/workplace/pkg-plist +++ b/x11-fm/workplace/pkg-plist @@ -69,4 +69,4 @@ share/examples/workplace/WPPref share/examples/workplace/WPSuffix @dirrm share/doc/workplace @dirrm share/examples/workplace -@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true +@dirrmtry include/X11/pixmaps diff --git a/x11-fm/x-files/pkg-plist b/x11-fm/x-files/pkg-plist index bd07baf74971..a32fd52c2fe6 100644 --- a/x11-fm/x-files/pkg-plist +++ b/x11-fm/x-files/pkg-plist @@ -23,4 +23,4 @@ lib/X11/X-Files/xfiles.user_pophelp lib/X11/X-Files/xfilesrc lib/X11/X-Files/xflogo.gif @dirrm lib/X11/X-Files -@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true +@dirrmtry include/X11/pixmaps diff --git a/x11-fm/xfce4-fm/pkg-plist b/x11-fm/xfce4-fm/pkg-plist index 69b066870766..cedf356029b6 100644 --- a/x11-fm/xfce4-fm/pkg-plist +++ b/x11-fm/xfce4-fm/pkg-plist @@ -313,29 +313,29 @@ share/xfce4/xffm/AUTHORS.vi share/xfce4/xffm/xffm.spec share/xfce4/xffm/xffm.spec.in @dirrm lib/xfce4/xffm -@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true -@unexec rmdir %D/lib/xfce4 2>/dev/null || true -@unexec rmdir %D/share/applications 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48/stock/generic 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48/stock 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true -@unexec rmdir %D/share/icons 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 -@unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true -@unexec rmdir %D/share/xfce4/mime 2>/dev/null || true +@dirrmtry lib/xfce4/mcs-plugins +@dirrmtry lib/xfce4 +@dirrmtry share/applications +@dirrmtry share/icons/hicolor/48x48/stock/generic +@dirrmtry share/icons/hicolor/48x48/stock +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons +@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 +@dirrmtry share/xfce4/doc/C/images +@dirrmtry share/xfce4/doc/C +@dirrmtry share/xfce4/doc/fr/images +@dirrmtry share/xfce4/doc/fr +@dirrmtry share/xfce4/doc/he/images +@dirrmtry share/xfce4/doc/he +@dirrmtry share/xfce4/doc +@dirrmtry share/xfce4/mime @dirrm share/xfce4/xffm -@unexec rmdir %D/share/xfce4 2>/dev/null || true +@dirrmtry share/xfce4 @dirrm share/xffm/pixmaps @dirrm share/xffm diff --git a/x11-fm/xfe/pkg-plist b/x11-fm/xfe/pkg-plist index d25651ddb5cd..f63364721382 100644 --- a/x11-fm/xfe/pkg-plist +++ b/x11-fm/xfe/pkg-plist @@ -165,6 +165,6 @@ share/pixmaps/xfv.png @dirrm lib/foxicons @dirrm lib/foxrc @dirrm share/pixmaps -@unexec rmdir %D/share/locale/es_AR/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/es_AR 2> /dev/null || true -@unexec rmdir %D/share/locale/pt_PT 2> /dev/null || true +@dirrmtry share/locale/es_AR/LC_MESSAGES +@dirrmtry share/locale/es_AR +@dirrmtry share/locale/pt_PT diff --git a/x11-fm/xnc/pkg-plist b/x11-fm/xnc/pkg-plist index ee79f3be41c6..075323292851 100644 --- a/x11-fm/xnc/pkg-plist +++ b/x11-fm/xnc/pkg-plist @@ -43,14 +43,14 @@ share/doc/xnc/doc6.html share/doc/xnc/doc7.html share/doc/xnc/doc8.html share/doc/xnc/index.html -@unexec rmdir %D/share/locale/sp/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/sp 2> /dev/null || true -@unexec rmdir %D/share/gnome/apps/Applications 2> /dev/null || true -@unexec rmdir %D/share/gnome/apps 2> /dev/null || true -@unexec rmdir %D/share/gnome 2> /dev/null || true -@unexec rmdir %D/share/applnk/System 2> /dev/null || true -@unexec rmdir %D/share/applnk 2> /dev/null || true -@unexec rmdir %D/share/applications 2> /dev/null || true +@dirrmtry share/locale/sp/LC_MESSAGES +@dirrmtry share/locale/sp +@dirrmtry share/gnome/apps/Applications +@dirrmtry share/gnome/apps +@dirrmtry share/gnome +@dirrmtry share/applnk/System +@dirrmtry share/applnk +@dirrmtry share/applications @dirrm share/pixmaps @dirrm share/doc/xnc @dirrm lib/xnc diff --git a/x11-fonts/XFree86-4-font100dpi/pkg-plist b/x11-fonts/XFree86-4-font100dpi/pkg-plist index ce6bdbade4c1..27093bbdb16a 100644 --- a/x11-fonts/XFree86-4-font100dpi/pkg-plist +++ b/x11-fonts/XFree86-4-font100dpi/pkg-plist @@ -1896,4 +1896,4 @@ lib/X11/fonts/100dpi/timR24-ISO8859-3.pcf.gz lib/X11/fonts/100dpi/timR24-ISO8859-4.pcf.gz lib/X11/fonts/100dpi/timR24-ISO8859-9.pcf.gz lib/X11/fonts/100dpi/timR24.pcf.gz -@unexec rmdir %D/lib/X11/fonts/100dpi 2>/dev/null || true +@dirrmtry lib/X11/fonts/100dpi diff --git a/x11-fonts/XFree86-4-font75dpi/pkg-plist b/x11-fonts/XFree86-4-font75dpi/pkg-plist index e1d7affdc256..e7bb739efb25 100644 --- a/x11-fonts/XFree86-4-font75dpi/pkg-plist +++ b/x11-fonts/XFree86-4-font75dpi/pkg-plist @@ -1896,4 +1896,4 @@ lib/X11/fonts/75dpi/timR24-ISO8859-3.pcf.gz lib/X11/fonts/75dpi/timR24-ISO8859-4.pcf.gz lib/X11/fonts/75dpi/timR24-ISO8859-9.pcf.gz lib/X11/fonts/75dpi/timR24.pcf.gz -@unexec rmdir %D/lib/X11/fonts/75dpi 2>/dev/null || true +@dirrmtry lib/X11/fonts/75dpi diff --git a/x11-fonts/XFree86-4-fontCyrillic/pkg-plist b/x11-fonts/XFree86-4-fontCyrillic/pkg-plist index fc2472baa0e6..b76ad7fdb128 100644 --- a/x11-fonts/XFree86-4-fontCyrillic/pkg-plist +++ b/x11-fonts/XFree86-4-fontCyrillic/pkg-plist @@ -84,4 +84,4 @@ lib/X11/fonts/cyrillic/koinil2.pcf.gz lib/X11/fonts/cyrillic/proof9x16.pcf.gz lib/X11/fonts/cyrillic/screen8x16.pcf.gz lib/X11/fonts/cyrillic/screen8x16b.pcf.gz -@unexec rmdir %D/lib/X11/fonts/cyrillic 2>/dev/null || true +@dirrmtry lib/X11/fonts/cyrillic diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist b/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist index e058c34eb29f..6469a26932f3 100644 --- a/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist +++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist @@ -411,4 +411,4 @@ lib/X11/fonts/misc/olgl10.pcf.gz lib/X11/fonts/misc/olgl12.pcf.gz lib/X11/fonts/misc/olgl14.pcf.gz lib/X11/fonts/misc/olgl19.pcf.gz -@unexec rmdir %D/lib/X11/fonts/misc 2>/dev/null || true +@dirrmtry lib/X11/fonts/misc diff --git a/x11-fonts/XFree86-4-fontScalable/pkg-plist b/x11-fonts/XFree86-4-fontScalable/pkg-plist index fd858ea49042..da9701ec49ac 100644 --- a/x11-fonts/XFree86-4-fontScalable/pkg-plist +++ b/x11-fonts/XFree86-4-fontScalable/pkg-plist @@ -89,7 +89,7 @@ @unexec if [ `wc -c %D/lib/X11/fonts/local/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi @unexec rm %D/lib/X11/fonts/TTF/fonts.cache-1 2>/dev/null || true @unexec rm %D/lib/X11/fonts/Type1/fonts.cache-1 2>/dev/null || true -@unexec rmdir %D/lib/X11/fonts/Speedo 2>/dev/null || true -@unexec rmdir %D/lib/X11/fonts/Type1 2>/dev/null || true -@unexec rmdir %D/lib/X11/fonts/CID 2>/dev/null || true -@unexec rmdir %D/lib/X11/fonts/TTF 2>/dev/null || true +@dirrmtry lib/X11/fonts/Speedo +@dirrmtry lib/X11/fonts/Type1 +@dirrmtry lib/X11/fonts/CID +@dirrmtry lib/X11/fonts/TTF diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist index 9787a747ec40..3a117143f845 100644 --- a/x11-fonts/fontconfig/pkg-plist +++ b/x11-fonts/fontconfig/pkg-plist @@ -158,5 +158,5 @@ libdata/pkgconfig/fontconfig.pc %%PORTDOCS%%@dirrm %%DOCSDIR%%/fontconfig-devel %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm include/fontconfig -@unexec rmdir %D/etc/fonts/conf.d 2> /dev/null || true -@unexec rmdir %D/etc/fonts 2> /dev/null || true +@dirrmtry etc/fonts/conf.d +@dirrmtry etc/fonts diff --git a/x11-fonts/nexfontsel/pkg-plist b/x11-fonts/nexfontsel/pkg-plist index 8b4fec482a52..510e43298726 100644 --- a/x11-fonts/nexfontsel/pkg-plist +++ b/x11-fonts/nexfontsel/pkg-plist @@ -1,5 +1,5 @@ bin/nexfontsel lib/X11/app-defaults/NeXFontSel lib/X11/ja_JP.eucJP/app-defaults/NeXFontSel -@unexec rmdir %D/lib/X11/ja_JP.eucJP/app-defaults 2>/dev/null || true -@unexec rmdir %D/lib/X11/ja_JP.eucJP 2>/dev/null || true +@dirrmtry lib/X11/ja_JP.eucJP/app-defaults +@dirrmtry lib/X11/ja_JP.eucJP diff --git a/x11-fonts/p5-Font-AFM/pkg-plist b/x11-fonts/p5-Font-AFM/pkg-plist index 9e5cea97f473..7b35087017d3 100644 --- a/x11-fonts/p5-Font-AFM/pkg-plist +++ b/x11-fonts/p5-Font-AFM/pkg-plist @@ -13,6 +13,6 @@ %%SITE_PERL%%/Font/Metrics/TimesRoman.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Font/AFM/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Font/AFM -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Font 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Font @dirrm %%SITE_PERL%%/Font/Metrics -@unexec rmdir %D/%%SITE_PERL%%/Font 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Font diff --git a/x11-fonts/p5-Font-TTF/pkg-plist b/x11-fonts/p5-Font-TTF/pkg-plist index c921c844b582..fea616f2dd95 100644 --- a/x11-fonts/p5-Font-TTF/pkg-plist +++ b/x11-fonts/p5-Font-TTF/pkg-plist @@ -61,8 +61,8 @@ %%SITE_PERL%%/Font/TTF/Ttc.pm %%SITE_PERL%%/ttfmod.pl @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Font/TTF -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Font 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Font @dirrm %%SITE_PERL%%/Font/TTF/Mort @dirrm %%SITE_PERL%%/Font/TTF/Kern -@unexec rmdir %D/%%SITE_PERL%%/Font/TTF 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Font 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Font/TTF +@dirrmtry %%SITE_PERL%%/Font diff --git a/x11-fonts/tv-fonts/pkg-plist b/x11-fonts/tv-fonts/pkg-plist index 0a80a7c40aa4..12604d8a9041 100644 --- a/x11-fonts/tv-fonts/pkg-plist +++ b/x11-fonts/tv-fonts/pkg-plist @@ -23,4 +23,4 @@ lib/X11/fonts/misc/teletext4i.pcf.gz @unexec rm %D/lib/X11/fonts/misc/fonts.cache-1 || true @unexec fc-cache -f -v %D/lib/X11/fonts/misc || true @unexec if [ ! -s %D/lib/X11/fonts/misc/fonts.cache-1 ]; then rm %D/lib/X11/fonts/misc/fonts.cache-1; fi -@unexec rmdir %D/lib/X11/fonts/misc 2>/dev/null || true +@dirrmtry lib/X11/fonts/misc diff --git a/x11-fonts/xfs/pkg-plist b/x11-fonts/xfs/pkg-plist index 7d070d3c6d79..02128e26eb2a 100644 --- a/x11-fonts/xfs/pkg-plist +++ b/x11-fonts/xfs/pkg-plist @@ -2,4 +2,4 @@ bin/xfs etc/rc.d/xfs.sh @unexec if cmp -s %D/lib/X11/fs/config.default %D/lib/X11/fs/config; then rm -f %D/lib/X11/fs/config; fi lib/X11/fs/config.default -@unexec rmdir %D/lib/X11/fs 2>/dev/null || true +@dirrmtry lib/X11/fs diff --git a/x11-fonts/xorg-fonts-100dpi/pkg-plist b/x11-fonts/xorg-fonts-100dpi/pkg-plist index ce6bdbade4c1..27093bbdb16a 100644 --- a/x11-fonts/xorg-fonts-100dpi/pkg-plist +++ b/x11-fonts/xorg-fonts-100dpi/pkg-plist @@ -1896,4 +1896,4 @@ lib/X11/fonts/100dpi/timR24-ISO8859-3.pcf.gz lib/X11/fonts/100dpi/timR24-ISO8859-4.pcf.gz lib/X11/fonts/100dpi/timR24-ISO8859-9.pcf.gz lib/X11/fonts/100dpi/timR24.pcf.gz -@unexec rmdir %D/lib/X11/fonts/100dpi 2>/dev/null || true +@dirrmtry lib/X11/fonts/100dpi diff --git a/x11-fonts/xorg-fonts-75dpi/pkg-plist b/x11-fonts/xorg-fonts-75dpi/pkg-plist index e1d7affdc256..e7bb739efb25 100644 --- a/x11-fonts/xorg-fonts-75dpi/pkg-plist +++ b/x11-fonts/xorg-fonts-75dpi/pkg-plist @@ -1896,4 +1896,4 @@ lib/X11/fonts/75dpi/timR24-ISO8859-3.pcf.gz lib/X11/fonts/75dpi/timR24-ISO8859-4.pcf.gz lib/X11/fonts/75dpi/timR24-ISO8859-9.pcf.gz lib/X11/fonts/75dpi/timR24.pcf.gz -@unexec rmdir %D/lib/X11/fonts/75dpi 2>/dev/null || true +@dirrmtry lib/X11/fonts/75dpi diff --git a/x11-fonts/xorg-fonts-cyrillic/pkg-plist b/x11-fonts/xorg-fonts-cyrillic/pkg-plist index fc2472baa0e6..b76ad7fdb128 100644 --- a/x11-fonts/xorg-fonts-cyrillic/pkg-plist +++ b/x11-fonts/xorg-fonts-cyrillic/pkg-plist @@ -84,4 +84,4 @@ lib/X11/fonts/cyrillic/koinil2.pcf.gz lib/X11/fonts/cyrillic/proof9x16.pcf.gz lib/X11/fonts/cyrillic/screen8x16.pcf.gz lib/X11/fonts/cyrillic/screen8x16b.pcf.gz -@unexec rmdir %D/lib/X11/fonts/cyrillic 2>/dev/null || true +@dirrmtry lib/X11/fonts/cyrillic diff --git a/x11-fonts/xorg-fonts-encodings/pkg-plist b/x11-fonts/xorg-fonts-encodings/pkg-plist index 99214d6d508d..89c3fd363270 100644 --- a/x11-fonts/xorg-fonts-encodings/pkg-plist +++ b/x11-fonts/xorg-fonts-encodings/pkg-plist @@ -50,5 +50,5 @@ lib/X11/fonts/encodings/suneu-greek.enc.gz lib/X11/fonts/encodings/tcvn-0.enc.gz lib/X11/fonts/encodings/tis620-2.enc.gz lib/X11/fonts/encodings/viscii1.1-1.enc.gz -@unexec rmdir %D/lib/X11/fonts/encodings/large 2>/dev/null || true -@unexec rmdir %D/lib/X11/fonts/encodings 2>/dev/null || true +@dirrmtry lib/X11/fonts/encodings/large +@dirrmtry lib/X11/fonts/encodings diff --git a/x11-fonts/xorg-fonts-miscbitmaps/pkg-plist b/x11-fonts/xorg-fonts-miscbitmaps/pkg-plist index e058c34eb29f..6469a26932f3 100644 --- a/x11-fonts/xorg-fonts-miscbitmaps/pkg-plist +++ b/x11-fonts/xorg-fonts-miscbitmaps/pkg-plist @@ -411,4 +411,4 @@ lib/X11/fonts/misc/olgl10.pcf.gz lib/X11/fonts/misc/olgl12.pcf.gz lib/X11/fonts/misc/olgl14.pcf.gz lib/X11/fonts/misc/olgl19.pcf.gz -@unexec rmdir %D/lib/X11/fonts/misc 2>/dev/null || true +@dirrmtry lib/X11/fonts/misc diff --git a/x11-fonts/xorg-fonts-truetype/pkg-plist b/x11-fonts/xorg-fonts-truetype/pkg-plist index 06c742ea9b1a..e9c1f5ba7814 100644 --- a/x11-fonts/xorg-fonts-truetype/pkg-plist +++ b/x11-fonts/xorg-fonts-truetype/pkg-plist @@ -14,4 +14,4 @@ lib/X11/fonts/TTF/luxisbi.ttf lib/X11/fonts/TTF/luxisr.ttf lib/X11/fonts/TTF/luxisri.ttf @unexec rm %D/lib/X11/fonts/TTF/fonts.cache-1 2>/dev/null || /usr/bin/true -@unexec rmdir %D/lib/X11/fonts/TTF 2>/dev/null || true +@dirrmtry lib/X11/fonts/TTF diff --git a/x11-fonts/xorg-fonts-type1/pkg-plist b/x11-fonts/xorg-fonts-type1/pkg-plist index f0bf3f2f6cd5..a961d728d9da 100644 --- a/x11-fonts/xorg-fonts-type1/pkg-plist +++ b/x11-fonts/xorg-fonts-type1/pkg-plist @@ -59,4 +59,4 @@ lib/X11/fonts/Type1/l049033t.pfa lib/X11/fonts/Type1/l049036t.afm lib/X11/fonts/Type1/l049036t.pfa @unexec rm %D/lib/X11/fonts/Type1/fonts.cache-1 2>/dev/null || /usr/bin/true -@unexec rmdir %D/lib/X11/fonts/Type1 2>/dev/null || true +@dirrmtry lib/X11/fonts/Type1 diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist index f519e7233fba..8db4e4324834 100644 --- a/x11-servers/XFree86-4-Server/pkg-plist +++ b/x11-servers/XFree86-4-Server/pkg-plist @@ -176,7 +176,7 @@ lib/modules/libxf8_32bpp.a @dirrm lib/modules/fonts @dirrm lib/modules/freebsd @dirrm lib/modules/input -@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true -@unexec rmdir %D/lib/modules 2>/dev/null || true -@unexec rmdir %D/share/doc/XFree86/Japanese 2>/dev/null || true -@unexec rmdir %D/share/doc/XFree86 2>/dev/null || true +@dirrmtry include/X11/pixmaps +@dirrmtry lib/modules +@dirrmtry share/doc/XFree86/Japanese +@dirrmtry share/doc/XFree86 diff --git a/x11-servers/Xfstt/pkg-plist b/x11-servers/Xfstt/pkg-plist index 7f6789ea02c4..f4233ee3f538 100644 --- a/x11-servers/Xfstt/pkg-plist +++ b/x11-servers/Xfstt/pkg-plist @@ -8,4 +8,4 @@ etc/rc.d/xfstt.sh @exec mkdir -p %D/lib/X11/fonts/TrueType @unexec rm -f %D/lib/X11/fonts/TrueType/ttname.dir @unexec rm -f %D/lib/X11/fonts/TrueType/ttinfo.dir -@unexec rmdir %D/lib/X11/fonts/TrueType 2>/dev/null || true +@dirrmtry lib/X11/fonts/TrueType diff --git a/x11-servers/xorg-fontserver/pkg-plist b/x11-servers/xorg-fontserver/pkg-plist index 7d070d3c6d79..02128e26eb2a 100644 --- a/x11-servers/xorg-fontserver/pkg-plist +++ b/x11-servers/xorg-fontserver/pkg-plist @@ -2,4 +2,4 @@ bin/xfs etc/rc.d/xfs.sh @unexec if cmp -s %D/lib/X11/fs/config.default %D/lib/X11/fs/config; then rm -f %D/lib/X11/fs/config; fi lib/X11/fs/config.default -@unexec rmdir %D/lib/X11/fs 2>/dev/null || true +@dirrmtry lib/X11/fs diff --git a/x11-servers/xorg-printserver/pkg-plist b/x11-servers/xorg-printserver/pkg-plist index cc697f7b6d54..db513f54d616 100644 --- a/x11-servers/xorg-printserver/pkg-plist +++ b/x11-servers/xorg-printserver/pkg-plist @@ -957,4 +957,4 @@ lib/X11/xserver/zulu @dirrm lib/X11/xserver/en_US/print/attributes @dirrm lib/X11/xserver/en_US/print @dirrm lib/X11/xserver/en_US -@unexec rmdir %D/lib/X11/xserver 2>/dev/null || true +@dirrmtry lib/X11/xserver diff --git a/x11-servers/xorg-server-snap/pkg-plist b/x11-servers/xorg-server-snap/pkg-plist index 1b3331588efb..4e743e9bada4 100644 --- a/x11-servers/xorg-server-snap/pkg-plist +++ b/x11-servers/xorg-server-snap/pkg-plist @@ -205,8 +205,8 @@ lib/modules/multimedia/uda1380_drv.so @dirrm lib/modules/extensions @dirrm lib/modules/drivers @dirrm lib/X11/getconfig -@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true -@unexec rmdir %D/lib/X11/doc 2>/dev/null || true -@unexec rmdir %D/lib/X11/etc 2>/dev/null || true -@unexec rmdir %D/lib/X11/xserver 2>/dev/null || true -@unexec rmdir %D/lib/modules 2>/dev/null || true +@dirrmtry include/X11/pixmaps +@dirrmtry lib/X11/doc +@dirrmtry lib/X11/etc +@dirrmtry lib/X11/xserver +@dirrmtry lib/modules diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist index bd3bcb02577e..cadb9a395ce4 100644 --- a/x11-servers/xorg-server/pkg-plist +++ b/x11-servers/xorg-server/pkg-plist @@ -200,8 +200,8 @@ lib/modules/multimedia/uda1380_drv.so @dirrm lib/modules/input @dirrm lib/modules/internal @dirrm lib/modules/multimedia -@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true -@unexec rmdir %D/lib/X11/doc 2>/dev/null || true -@unexec rmdir %D/lib/X11/etc 2>/dev/null || true -@unexec rmdir %D/lib/X11/xserver 2>/dev/null || true -@unexec rmdir %D/lib/modules 2>/dev/null || true +@dirrmtry include/X11/pixmaps +@dirrmtry lib/X11/doc +@dirrmtry lib/X11/etc +@dirrmtry lib/X11/xserver +@dirrmtry lib/modules diff --git a/x11-themes/cursor-jimmac-theme/pkg-plist b/x11-themes/cursor-jimmac-theme/pkg-plist index 948f20842ded..d2378aa37d23 100644 --- a/x11-themes/cursor-jimmac-theme/pkg-plist +++ b/x11-themes/cursor-jimmac-theme/pkg-plist @@ -53,4 +53,4 @@ lib/X11/icons/Jimmac/cursors/watch lib/X11/icons/Jimmac/cursors/xterm @dirrm lib/X11/icons/Jimmac/cursors @dirrm lib/X11/icons/Jimmac -@unexec rmdir %D/lib/X11/icons 2>/dev/null || true +@dirrmtry lib/X11/icons diff --git a/x11-themes/cursor-polar-theme/pkg-plist b/x11-themes/cursor-polar-theme/pkg-plist index 7a0136e7e834..004ec3b92595 100644 --- a/x11-themes/cursor-polar-theme/pkg-plist +++ b/x11-themes/cursor-polar-theme/pkg-plist @@ -75,4 +75,4 @@ lib/X11/icons/PolarCursorTheme/cursors/watch lib/X11/icons/PolarCursorTheme/cursors/xterm @dirrm lib/X11/icons/PolarCursorTheme/cursors @dirrm lib/X11/icons/PolarCursorTheme -@unexec rmdir %D/lib/X11/icons 2>/dev/null || true +@dirrmtry lib/X11/icons diff --git a/x11-themes/fvwm-themes/pkg-plist b/x11-themes/fvwm-themes/pkg-plist index f2369c823660..393fe68d2a32 100644 --- a/x11-themes/fvwm-themes/pkg-plist +++ b/x11-themes/fvwm-themes/pkg-plist @@ -1615,4 +1615,4 @@ share/fvwm/themes/unsafe/menustyle.cfg @dirrm share/fvwm/images/32x32 @dirrm share/fvwm/images/16x16-kde @dirrm share/fvwm/images -@unexec rmdir %D/share/fvwm 2>/dev/null || true +@dirrmtry share/fvwm diff --git a/x11-themes/gnome-art/pkg-plist b/x11-themes/gnome-art/pkg-plist index d786436d145b..8d22fa4d1ae3 100644 --- a/x11-themes/gnome-art/pkg-plist +++ b/x11-themes/gnome-art/pkg-plist @@ -16,4 +16,4 @@ bin/gnome-art @dirrm %%DATADIR%%/glade @dirrm %%DATADIR%%/images @dirrm %%DATADIR%% -@unexec rmdir %D/share/applications 2>/dev/null || true +@dirrmtry share/applications diff --git a/x11-themes/gnome-backgrounds/pkg-plist b/x11-themes/gnome-backgrounds/pkg-plist index 35e7a111788f..c2f18532fd34 100644 --- a/x11-themes/gnome-backgrounds/pkg-plist +++ b/x11-themes/gnome-backgrounds/pkg-plist @@ -63,16 +63,16 @@ share/locale/uk/LC_MESSAGES/gnome-backgrounds.mo share/locale/vi/LC_MESSAGES/gnome-backgrounds.mo share/locale/zh_CN/LC_MESSAGES/gnome-backgrounds.mo share/locale/zh_TW/LC_MESSAGES/gnome-backgrounds.mo -@unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/te 2> /dev/null || true -@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/rw 2> /dev/null || true -@unexec rmdir %D/share/locale/ky/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ky 2> /dev/null || true -@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ku 2> /dev/null || true -@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/hy 2> /dev/null || true +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy @dirrm share/gnome/pixmaps/backgrounds/gnome/translucent @dirrm share/gnome/pixmaps/backgrounds/gnome/tiles @dirrm share/gnome/pixmaps/backgrounds/gnome/branded diff --git a/x11-themes/gnome-industrial-theme/pkg-plist b/x11-themes/gnome-industrial-theme/pkg-plist index a3632beb6172..d74125d850e5 100644 --- a/x11-themes/gnome-industrial-theme/pkg-plist +++ b/x11-themes/gnome-industrial-theme/pkg-plist @@ -217,5 +217,5 @@ share/themes/Industrial/index.theme @dirrm share/icons/Industrial @dirrm share/gnome/themes/Industrial/metacity-1 @dirrm share/gnome/themes/Industrial -@unexec rmdir %D/share/themes/Industrial 2>/dev/null || true +@dirrmtry share/themes/Industrial %%XMMS%%@dirrm share/xmms/Skins/Industrial diff --git a/x11-themes/gnome-splashscreen-manager/pkg-plist b/x11-themes/gnome-splashscreen-manager/pkg-plist index 812ea627450c..929a2d5703a2 100644 --- a/x11-themes/gnome-splashscreen-manager/pkg-plist +++ b/x11-themes/gnome-splashscreen-manager/pkg-plist @@ -11,4 +11,4 @@ share/applications/gnome-splashscreen-manager.desktop @dirrm %%RUBY_SITELIBDIR%%/gnome-splashscreen-manager @dirrm %%DATADIR%%/glade @dirrm %%DATADIR%% -@unexec rmdir %D/share/applications 2>/dev/null || true +@dirrmtry share/applications diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist index 1a1c5e2ce58c..53ba911792ae 100644 --- a/x11-themes/gnome-themes/pkg-plist +++ b/x11-themes/gnome-themes/pkg-plist @@ -1933,8 +1933,8 @@ share/themes/Traditional/index.theme @dirrm share/themes/Glider @dirrm share/themes/Crux @dirrm share/themes/Clearlooks -@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ug 2> /dev/null || true +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug @dirrm share/icons/Smokey-Red/96x96/filesystems @dirrm share/icons/Smokey-Red/96x96 @dirrm share/icons/Smokey-Red/72x72/filesystems diff --git a/x11-themes/gtk-industrial-theme/pkg-plist b/x11-themes/gtk-industrial-theme/pkg-plist index 909aed8c0bff..7be8930d3113 100644 --- a/x11-themes/gtk-industrial-theme/pkg-plist +++ b/x11-themes/gtk-industrial-theme/pkg-plist @@ -1,4 +1,4 @@ lib/gtk/themes/engines/libindustrial.so share/themes/Industrial/gtk/gtkrc @dirrm share/themes/Industrial/gtk -@unexec rmdir %D/share/themes/Industrial 2>/dev/null || true +@dirrmtry share/themes/Industrial diff --git a/x11-themes/gtk-qnxtheme/pkg-plist b/x11-themes/gtk-qnxtheme/pkg-plist index bb02d9b74b75..8a1ddff05bc3 100644 --- a/x11-themes/gtk-qnxtheme/pkg-plist +++ b/x11-themes/gtk-qnxtheme/pkg-plist @@ -75,4 +75,4 @@ share/themes/qnxtheme/gtk/vbuttonbar.png %%GTK2%%@dirrm share/themes/qnxtheme/gtk-2.0 @dirrm share/themes/qnxtheme/gtk @dirrm share/themes/qnxtheme -@unexec rmdir %D/share/themes 2>/dev/null || true +@dirrmtry share/themes diff --git a/x11-themes/gtk-xfce-engine/pkg-plist b/x11-themes/gtk-xfce-engine/pkg-plist index b32b6ebbef7a..2153e8bd0f6b 100644 --- a/x11-themes/gtk-xfce-engine/pkg-plist +++ b/x11-themes/gtk-xfce-engine/pkg-plist @@ -50,7 +50,7 @@ share/themes/Xfce/gtk-2.0/gtkrc @dirrm share/themes/Xfce-4.0/gtk-2.0 @dirrm share/themes/Xfce-4.0 @dirrm share/themes/Xfce/gtk-2.0 -@unexec rmdir %D/share/themes/Xfce 2>/dev/null || true +@dirrmtry share/themes/Xfce @dirrm share/themes/Xfce-cadmium/gtk-2.0 @dirrm share/themes/Xfce-cadmium @dirrm share/themes/Xfce-dawn/gtk-2.0 diff --git a/x11-themes/kde-icons-lime-rade8/pkg-plist b/x11-themes/kde-icons-lime-rade8/pkg-plist index 12a965db78b7..4c0f5796b5a6 100644 --- a/x11-themes/kde-icons-lime-rade8/pkg-plist +++ b/x11-themes/kde-icons-lime-rade8/pkg-plist @@ -3936,4 +3936,4 @@ share/icons/%%DIRNAME%%/index.desktop.bak @dirrm share/icons/%%DIRNAME%%/128x128/apps @dirrm share/icons/%%DIRNAME%%/128x128 @dirrm share/icons/%%DIRNAME%% -@unexec rmdir %D/share/icons 2>/dev/null || true +@dirrmtry share/icons diff --git a/x11-themes/kde-icons-realistic/pkg-plist b/x11-themes/kde-icons-realistic/pkg-plist index 71f264915859..a5182020f647 100644 --- a/x11-themes/kde-icons-realistic/pkg-plist +++ b/x11-themes/kde-icons-realistic/pkg-plist @@ -2003,4 +2003,4 @@ share/icons/%%DIRNAME%%/index.desktop.bak @dirrm share/icons/%%DIRNAME%%/128x128/actions @dirrm share/icons/%%DIRNAME%%/128x128 @dirrm share/icons/%%DIRNAME%% -@unexec rmdir %D/share/icons 2>/dev/null || true +@dirrmtry share/icons diff --git a/x11-themes/lila-xfwm4/pkg-plist b/x11-themes/lila-xfwm4/pkg-plist index bd56a17fe87b..b536136647c9 100644 --- a/x11-themes/lila-xfwm4/pkg-plist +++ b/x11-themes/lila-xfwm4/pkg-plist @@ -75,4 +75,4 @@ share/themes/Lila-light/xfwm4/title-2-active.xpm @dirrm share/themes/Lila/xfwm4 @dirrm share/themes/Lila-light @dirrm share/themes/Lila -@unexec rmdir %D/share/themes 2>/dev/null || true +@dirrmtry share/themes diff --git a/x11-themes/qt-bluecurve-theme/pkg-plist b/x11-themes/qt-bluecurve-theme/pkg-plist index 32bdf57828be..d8409f19dbc9 100644 --- a/x11-themes/qt-bluecurve-theme/pkg-plist +++ b/x11-themes/qt-bluecurve-theme/pkg-plist @@ -2,5 +2,5 @@ etc/settings/qtrc.bluecurve @exec [ -f %B/qtrc ] || cp %B/qtrc.bluecurve %B/qtrc lib/plugins/styles/bluecurve.so -@unexec rmdir %D/etc/settings 2>/dev/null || true -@unexec rmdir %D/lib/plugins/styles 2>/dev/null || true +@dirrmtry etc/settings +@dirrmtry lib/plugins/styles diff --git a/x11-themes/xfce4-icon-theme/pkg-plist b/x11-themes/xfce4-icon-theme/pkg-plist index 0a5bf91cd328..14eb17887774 100644 --- a/x11-themes/xfce4-icon-theme/pkg-plist +++ b/x11-themes/xfce4-icon-theme/pkg-plist @@ -1231,6 +1231,6 @@ share/xfce4/mime/Rodent.mime.xml @dirrm share/icons/Rodent/scalable/stock @dirrm share/icons/Rodent/scalable @dirrm share/icons/Rodent -@unexec rmdir %D/share/icons 2>/dev/null || true -@unexec rmdir %D/share/xfce4/mime 2>/dev/null || true -@unexec rmdir %D/share/xfce4 2>/dev/null || true +@dirrmtry share/icons +@dirrmtry share/xfce4/mime +@dirrmtry share/xfce4 diff --git a/x11-toolkits/bakery/pkg-plist b/x11-toolkits/bakery/pkg-plist index 01e7b0b9ed7c..a0595dd6da26 100644 --- a/x11-toolkits/bakery/pkg-plist +++ b/x11-toolkits/bakery/pkg-plist @@ -41,8 +41,8 @@ share/locale/sv/LC_MESSAGES/bakery.mo share/locale/uk/LC_MESSAGES/bakery.mo share/locale/zh_CN/LC_MESSAGES/bakery.mo share/locale/zh_TW/LC_MESSAGES/bakery.mo -@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 @dirrm include/bakery-%%API_VERSION%%/bakery/View @dirrm include/bakery-%%API_VERSION%%/bakery/Utilities @dirrm include/bakery-%%API_VERSION%%/bakery/Document diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist index 901b8bff6687..135bed40338f 100644 --- a/x11-toolkits/eel/pkg-plist +++ b/x11-toolkits/eel/pkg-plist @@ -121,13 +121,13 @@ share/locale/wa/LC_MESSAGES/eel-2.0.mo share/locale/xh/LC_MESSAGES/eel-2.0.mo share/locale/zh_CN/LC_MESSAGES/eel-2.0.mo share/locale/zh_TW/LC_MESSAGES/eel-2.0.mo -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/xh 2> /dev/null || true -@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ug 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/ang/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ang 2> /dev/null || true +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ang/LC_MESSAGES +@dirrmtry share/locale/ang @dirrm include/eel-2/eel @dirrm include/eel-2 diff --git a/x11-toolkits/gtk-sharp10/pkg-plist b/x11-toolkits/gtk-sharp10/pkg-plist index 76e10555e0c1..a9ee5b4a1fc0 100644 --- a/x11-toolkits/gtk-sharp10/pkg-plist +++ b/x11-toolkits/gtk-sharp10/pkg-plist @@ -75,33 +75,33 @@ share/gapi/gtkhtml-api.xml share/gapi/pango-api.xml share/gapi/rsvg-api.xml share/gapi/vte-api.xml -@unexec rmdir %D/share/gapi 2> /dev/null || true +@dirrmtry share/gapi @dirrm lib/mono/gtk-sharp @dirrm lib/mono/gac/vte-sharp/1.0.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/vte-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/vte-sharp @dirrm lib/mono/gac/rsvg-sharp/1.0.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/rsvg-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/rsvg-sharp @dirrm lib/mono/gac/pango-sharp/1.0.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/pango-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/pango-sharp @dirrm lib/mono/gac/gtkhtml-sharp/1.0.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/gtkhtml-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/gtkhtml-sharp @dirrm lib/mono/gac/gtk-sharp/1.0.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/gtk-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/gtk-sharp @dirrm lib/mono/gac/gnome-sharp/1.0.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/gnome-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/gnome-sharp @dirrm lib/mono/gac/glib-sharp/1.0.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/glib-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/glib-sharp @dirrm lib/mono/gac/glade-sharp/1.0.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/glade-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/glade-sharp @dirrm lib/mono/gac/gdk-sharp/1.0.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/gdk-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/gdk-sharp @dirrm lib/mono/gac/gconf-sharp/1.0.0.0__35e10195dab3c99f @dirrm lib/mono/gac/gconf-sharp-peditors/1.0.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/gconf-sharp-peditors 2> /dev/null || true -@unexec rmdir %D/lib/mono/gac/gconf-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/gconf-sharp-peditors +@dirrmtry lib/mono/gac/gconf-sharp @dirrm lib/mono/gac/atk-sharp/1.0.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/atk-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/atk-sharp @dirrm lib/mono/gac/art-sharp/1.0.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/art-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/art-sharp @exec mkdir -p %%LOCALBASE%%/share/gapi @unexec rmdir %%LOCALBASE%%/share/gapi 2>/dev/null || true diff --git a/x11-toolkits/gtk-sharp20/pkg-plist b/x11-toolkits/gtk-sharp20/pkg-plist index b8ffdbbdd670..02feba0b8ae3 100644 --- a/x11-toolkits/gtk-sharp20/pkg-plist +++ b/x11-toolkits/gtk-sharp20/pkg-plist @@ -85,38 +85,38 @@ share/gapi-2.0/gtkhtml-api.xml share/gapi-2.0/pango-api.xml share/gapi-2.0/rsvg-api.xml share/gapi-2.0/vte-api.xml -@unexec rmdir %D/share/gapi-2.0 2> /dev/null || true -@unexec rmdir %D/lib/gtk-sharp-2.0 2> /dev/null || true +@dirrmtry share/gapi-2.0 +@dirrmtry lib/gtk-sharp-2.0 @dirrm lib/mono/gtk-sharp-2.0 @dirrm lib/mono/gac/vte-sharp/2.4.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/vte-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/vte-sharp @dirrm lib/mono/gac/rsvg-sharp/2.4.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/rsvg-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/rsvg-sharp @dirrm lib/mono/gac/pango-sharp/2.4.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/pango-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/pango-sharp @dirrm lib/mono/gac/gtkhtml-sharp/2.4.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/gtkhtml-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/gtkhtml-sharp @dirrm lib/mono/gac/gtk-sharp/2.4.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/gtk-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/gtk-sharp @dirrm lib/mono/gac/gtk-dotnet/2.4.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/gtk-dotnet 2> /dev/null || true +@dirrmtry lib/mono/gac/gtk-dotnet @dirrm lib/mono/gac/gnome-vfs-sharp/2.4.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/gnome-vfs-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/gnome-vfs-sharp @dirrm lib/mono/gac/gnome-sharp/2.4.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/gnome-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/gnome-sharp @dirrm lib/mono/gac/glib-sharp/2.4.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/glib-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/glib-sharp @dirrm lib/mono/gac/glade-sharp/2.4.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/glade-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/glade-sharp @dirrm lib/mono/gac/gdk-sharp/2.4.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/gdk-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/gdk-sharp @dirrm lib/mono/gac/gconf-sharp/2.4.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/gconf-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/gconf-sharp @dirrm lib/mono/gac/gconf-sharp-peditors/2.4.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/gconf-sharp-peditors 2> /dev/null || true +@dirrmtry lib/mono/gac/gconf-sharp-peditors @dirrm lib/mono/gac/atk-sharp/2.4.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/atk-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/atk-sharp @dirrm lib/mono/gac/art-sharp/2.4.0.0__35e10195dab3c99f -@unexec rmdir %D/lib/mono/gac/art-sharp 2> /dev/null || true +@dirrmtry lib/mono/gac/art-sharp @exec mkdir -p %%LOCALBASE%%/share/gapi-2.0 @unexec rmdir %%LOCALBASE%%/share/gapi-2.0 2>/dev/null || true diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 3bfdce0aa244..3a77b08247cb 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -498,34 +498,34 @@ share/themes/Raleigh/gtk-2.0/gtkrc @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines @unexec /bin/rmdir %D/share/themes/Default 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true -@unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/yi 2> /dev/null || true -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/xh 2> /dev/null || true -@unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/te 2> /dev/null || true -@unexec rmdir %D/share/locale/uz@Latn/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/uz@Latn 2> /dev/null || true -@unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/sr@ije 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/nso/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/nso 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/mi/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/mi 2> /dev/null || true -@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ku 2> /dev/null || true -@unexec rmdir %D/share/locale/ia/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ia 2> /dev/null || true -@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/hy 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/az_IR/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/az_IR 2> /dev/null || true +@dirrmtry share/locale/yi/LC_MESSAGES +@dirrmtry share/locale/yi +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/uz@Latn/LC_MESSAGES +@dirrmtry share/locale/uz@Latn +@dirrmtry share/locale/sr@ije/LC_MESSAGES +@dirrmtry share/locale/sr@ije +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/nso/LC_MESSAGES +@dirrmtry share/locale/nso +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/mi/LC_MESSAGES +@dirrmtry share/locale/mi +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/ia/LC_MESSAGES +@dirrmtry share/locale/ia +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy +@dirrmtry share/locale/br/LC_MESSAGES +@dirrmtry share/locale/br +@dirrmtry share/locale/az_IR/LC_MESSAGES +@dirrmtry share/locale/az_IR @unexec /bin/rmdir %D/lib/gtk-2.0/modules 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/loaders 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/immodules 2>/dev/null || /usr/bin/true diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 3bfdce0aa244..3a77b08247cb 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -498,34 +498,34 @@ share/themes/Raleigh/gtk-2.0/gtkrc @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines @unexec /bin/rmdir %D/share/themes/Default 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true -@unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/yi 2> /dev/null || true -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/xh 2> /dev/null || true -@unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/te 2> /dev/null || true -@unexec rmdir %D/share/locale/uz@Latn/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/uz@Latn 2> /dev/null || true -@unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/sr@ije 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/nso/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/nso 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/mi/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/mi 2> /dev/null || true -@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ku 2> /dev/null || true -@unexec rmdir %D/share/locale/ia/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ia 2> /dev/null || true -@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/hy 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/az_IR/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/az_IR 2> /dev/null || true +@dirrmtry share/locale/yi/LC_MESSAGES +@dirrmtry share/locale/yi +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/uz@Latn/LC_MESSAGES +@dirrmtry share/locale/uz@Latn +@dirrmtry share/locale/sr@ije/LC_MESSAGES +@dirrmtry share/locale/sr@ije +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/nso/LC_MESSAGES +@dirrmtry share/locale/nso +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/mi/LC_MESSAGES +@dirrmtry share/locale/mi +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/ia/LC_MESSAGES +@dirrmtry share/locale/ia +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy +@dirrmtry share/locale/br/LC_MESSAGES +@dirrmtry share/locale/br +@dirrmtry share/locale/az_IR/LC_MESSAGES +@dirrmtry share/locale/az_IR @unexec /bin/rmdir %D/lib/gtk-2.0/modules 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/loaders 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/lib/gtk-2.0/%%GTK_VERSION%%/immodules 2>/dev/null || /usr/bin/true diff --git a/x11-toolkits/gtksourceview/pkg-plist b/x11-toolkits/gtksourceview/pkg-plist index 185f1673872d..815a45a678ed 100644 --- a/x11-toolkits/gtksourceview/pkg-plist +++ b/x11-toolkits/gtksourceview/pkg-plist @@ -130,10 +130,10 @@ share/locale/vi/LC_MESSAGES/gtksourceview-1.0.mo share/locale/xh/LC_MESSAGES/gtksourceview-1.0.mo share/locale/zh_CN/LC_MESSAGES/gtksourceview-1.0.mo share/locale/zh_TW/LC_MESSAGES/gtksourceview-1.0.mo -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/xh 2> /dev/null || true -@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/rw 2> /dev/null || true +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw @dirrm share/gnome/gtksourceview-1.0/language-specs @dirrm share/gnome/gtksourceview-1.0 @dirrm %%DOCSDIR%% diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist index 2851e8a93faa..fd8a93b24494 100644 --- a/x11-toolkits/libbonoboui/pkg-plist +++ b/x11-toolkits/libbonoboui/pkg-plist @@ -152,8 +152,8 @@ share/locale/yi/LC_MESSAGES/libbonoboui-2.0.mo share/locale/zh_CN/LC_MESSAGES/libbonoboui-2.0.mo share/locale/zh_TW/LC_MESSAGES/libbonoboui-2.0.mo share/locale/zu/LC_MESSAGES/libbonoboui-2.0.mo -@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zu 2> /dev/null || true +@dirrmtry share/locale/zu/LC_MESSAGES +@dirrmtry share/locale/zu @dirrm lib/bonobo-2.0/samples @dirrm lib/bonobo-2.0 @dirrm include/libbonoboui-2.0/bonobo diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist index 0ee38ebceff8..75d9aeeec306 100644 --- a/x11-toolkits/libgnomeui/pkg-plist +++ b/x11-toolkits/libgnomeui/pkg-plist @@ -230,10 +230,10 @@ share/locale/yi/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo -@unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/te 2> /dev/null || true -@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ku 2> /dev/null || true +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku @dirrm %%DOCSDIR%% @dirrm include/libgnomeui-2.0/libgnomeui @dirrm include/libgnomeui-2.0 diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist index 56fa9ac859fa..c621d488d3c1 100644 --- a/x11-toolkits/libwnck/pkg-plist +++ b/x11-toolkits/libwnck/pkg-plist @@ -115,10 +115,10 @@ share/locale/wa/LC_MESSAGES/libwnck.mo share/locale/xh/LC_MESSAGES/libwnck.mo share/locale/zh_CN/LC_MESSAGES/libwnck.mo share/locale/zh_TW/LC_MESSAGES/libwnck.mo -@unexec rmdir %D/share/locale/ky/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ky 2> /dev/null || true -@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ku 2> /dev/null || true +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku @dirrm %%DOCSDIR%% @dirrm include/libwnck-1.0/libwnck @dirrm include/libwnck-1.0 diff --git a/x11-toolkits/libxfce4gui/pkg-plist b/x11-toolkits/libxfce4gui/pkg-plist index f7f98e943c48..e0a959c6a830 100644 --- a/x11-toolkits/libxfce4gui/pkg-plist +++ b/x11-toolkits/libxfce4gui/pkg-plist @@ -86,12 +86,12 @@ share/gtk-doc/html/libxfcegui4/right.png share/gtk-doc/html/libxfcegui4/up.png share/xfce4/hicolor-index.theme @dirrm include/xfce4/libxfcegui4 -@unexec rmdir %D/include/xfce4/xfce4-modules 2>/dev/null || true -@unexec rmdir %D/include/xfce4 2>/dev/null || true -@unexec rmdir %D/lib/xfce4/modules 2>/dev/null || true -@unexec rmdir %D/lib/xfce4 2>/dev/null || true -@unexec rmdir %D/share/xfce4/mime 2>/dev/null || true -@unexec rmdir %D/share/xfce4 2>/dev/null || true +@dirrmtry include/xfce4/xfce4-modules +@dirrmtry include/xfce4 +@dirrmtry lib/xfce4/modules +@dirrmtry lib/xfce4 +@dirrmtry share/xfce4/mime +@dirrmtry share/xfce4 @dirrm share/gtk-doc/html/libxfcegui4 -@unexec rmdir %D/share/gtk-doc/html 2>/dev/null || true -@unexec rmdir %D/share/gtk-doc 2>/dev/null || true +@dirrmtry share/gtk-doc/html +@dirrmtry share/gtk-doc diff --git a/x11-toolkits/ocaml-lablgtk2/pkg-plist b/x11-toolkits/ocaml-lablgtk2/pkg-plist index 320e6e630d33..6aa097ea11de 100644 --- a/x11-toolkits/ocaml-lablgtk2/pkg-plist +++ b/x11-toolkits/ocaml-lablgtk2/pkg-plist @@ -396,7 +396,7 @@ lib/ocaml/stublibs/dlllablgtkgl2.so %%GNOMECANVAS%%@dirrm %%EXAMPLESDIR%%/canvas @dirrm %%EXAMPLESDIR%%/GL @dirrm %%EXAMPLESDIR%% -@unexec rmdir %D/share/examples/ocaml 2>/dev/null || true -@unexec rmdir %D/lib/ocaml/stublibs 2>/dev/null || true +@dirrmtry share/examples/ocaml +@dirrmtry lib/ocaml/stublibs @dirrm lib/ocaml/lablgtk2 -@unexec rmdir %D/lib/ocaml 2>/dev/null || true +@dirrmtry lib/ocaml diff --git a/x11-toolkits/p5-GdkImlib/pkg-plist b/x11-toolkits/p5-GdkImlib/pkg-plist index 6a82bac6790d..d9dae9e5e7b0 100644 --- a/x11-toolkits/p5-GdkImlib/pkg-plist +++ b/x11-toolkits/p5-GdkImlib/pkg-plist @@ -7,8 +7,8 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk/ImlibImage/ImlibImage.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/ImlibImage/Install @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/ImlibImage -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk/ImlibImage -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk diff --git a/x11-toolkits/p5-GdkPixbuf/pkg-plist b/x11-toolkits/p5-GdkPixbuf/pkg-plist index 0c9cd916f5ef..c18f0a77e960 100644 --- a/x11-toolkits/p5-GdkPixbuf/pkg-plist +++ b/x11-toolkits/p5-GdkPixbuf/pkg-plist @@ -10,8 +10,8 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk/Pixbuf/Pixbuf.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf/Install @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk/Pixbuf -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/Gdk +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk/Pixbuf -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/Gdk +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk diff --git a/x11-toolkits/p5-Gnome2-Canvas/pkg-plist b/x11-toolkits/p5-Gnome2-Canvas/pkg-plist index 619804b9b3e4..2451e5346606 100644 --- a/x11-toolkits/p5-Gnome2-Canvas/pkg-plist +++ b/x11-toolkits/p5-Gnome2-Canvas/pkg-plist @@ -26,5 +26,5 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas/Install @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Canvas @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2/Canvas -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2 +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2 diff --git a/x11-toolkits/p5-Gnome2-VFS/pkg-plist b/x11-toolkits/p5-Gnome2-VFS/pkg-plist index 924262ed32cb..fc4f2017af3e 100644 --- a/x11-toolkits/p5-Gnome2-VFS/pkg-plist +++ b/x11-toolkits/p5-Gnome2-VFS/pkg-plist @@ -35,5 +35,5 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS/Monitor @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/VFS @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2/VFS -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2 +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2 diff --git a/x11-toolkits/p5-Gnome2/pkg-plist b/x11-toolkits/p5-Gnome2/pkg-plist index 7efc59ea7107..af82444bd65d 100644 --- a/x11-toolkits/p5-Gnome2/pkg-plist +++ b/x11-toolkits/p5-Gnome2/pkg-plist @@ -58,5 +58,5 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Bonobo @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Config @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2/Install -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gnome2 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gnome2 +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gnome2 diff --git a/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-plist b/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-plist index 2f50bd143ab7..290ca302d721 100644 --- a/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-plist +++ b/x11-toolkits/p5-Gtk2-Ex-PodViewer/pkg-plist @@ -4,4 +4,4 @@ bin/podviewer %%SITE_PERL%%/Gtk2/PodViewer/Parser.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/PodViewer @dirrm %%SITE_PERL%%/Gtk2/PodViewer -@unexec rmdir %D/%%SITE_PERL%%/Gtk2 2> /dev/null || true +@dirrmtry %%SITE_PERL%%/Gtk2 diff --git a/x11-toolkits/p5-Gtk2-PodViewer/pkg-plist b/x11-toolkits/p5-Gtk2-PodViewer/pkg-plist index 2f50bd143ab7..290ca302d721 100644 --- a/x11-toolkits/p5-Gtk2-PodViewer/pkg-plist +++ b/x11-toolkits/p5-Gtk2-PodViewer/pkg-plist @@ -4,4 +4,4 @@ bin/podviewer %%SITE_PERL%%/Gtk2/PodViewer/Parser.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/PodViewer @dirrm %%SITE_PERL%%/Gtk2/PodViewer -@unexec rmdir %D/%%SITE_PERL%%/Gtk2 2> /dev/null || true +@dirrmtry %%SITE_PERL%%/Gtk2 diff --git a/x11-toolkits/p5-Gtk2-TrayIcon/pkg-plist b/x11-toolkits/p5-Gtk2-TrayIcon/pkg-plist index d70b3855757d..019ee762534d 100644 --- a/x11-toolkits/p5-Gtk2-TrayIcon/pkg-plist +++ b/x11-toolkits/p5-Gtk2-TrayIcon/pkg-plist @@ -6,7 +6,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TrayIcon/Install/trayicon.typemap %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TrayIcon.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2/TrayIcon -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2 2> /dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk2 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TrayIcon/Install @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TrayIcon -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2 2> /dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2 diff --git a/x11-toolkits/p5-Gtk2/pkg-plist b/x11-toolkits/p5-Gtk2/pkg-plist index 4ce20ded3996..6b016ec3ddfb 100644 --- a/x11-toolkits/p5-Gtk2/pkg-plist +++ b/x11-toolkits/p5-Gtk2/pkg-plist @@ -261,6 +261,6 @@ @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Pango @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk/Event @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/TreeSortable -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk2 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Install +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2/Gdk +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk2 diff --git a/x11-toolkits/p5-GtkXmHTML/pkg-plist b/x11-toolkits/p5-GtkXmHTML/pkg-plist index dcb497a57285..d1115d76ab04 100644 --- a/x11-toolkits/p5-GtkXmHTML/pkg-plist +++ b/x11-toolkits/p5-GtkXmHTML/pkg-plist @@ -11,6 +11,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/XmHTML/XmHTML.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/XmHTML/Install @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Gtk/XmHTML -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Gtk 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Gtk @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk/XmHTML -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Gtk diff --git a/x11-toolkits/p5-Tcl-Tk/pkg-plist b/x11-toolkits/p5-Tcl-Tk/pkg-plist index cea0dd9d11da..29720d211be3 100644 --- a/x11-toolkits/p5-Tcl-Tk/pkg-plist +++ b/x11-toolkits/p5-Tcl-Tk/pkg-plist @@ -3,4 +3,4 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk/Tk.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tcl 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tcl diff --git a/x11-toolkits/p5-TclTk/pkg-plist b/x11-toolkits/p5-TclTk/pkg-plist index cea0dd9d11da..29720d211be3 100644 --- a/x11-toolkits/p5-TclTk/pkg-plist +++ b/x11-toolkits/p5-TclTk/pkg-plist @@ -3,4 +3,4 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk/Tk.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tcl/Tk -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tcl 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tcl diff --git a/x11-toolkits/p5-Tk-Autoscroll/pkg-plist b/x11-toolkits/p5-Tk-Autoscroll/pkg-plist index 68758a4310f0..0334362f3c13 100644 --- a/x11-toolkits/p5-Tk-Autoscroll/pkg-plist +++ b/x11-toolkits/p5-Tk-Autoscroll/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Tk/Autoscroll.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Autoscroll/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Autoscroll -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk +@dirrmtry %%SITE_PERL%%/Tk diff --git a/x11-toolkits/p5-Tk-ColourChooser/pkg-plist b/x11-toolkits/p5-Tk-ColourChooser/pkg-plist index 776aa7758a92..d453ca6403cd 100644 --- a/x11-toolkits/p5-Tk-ColourChooser/pkg-plist +++ b/x11-toolkits/p5-Tk-ColourChooser/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Tk/ColourChooser.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ColourChooser/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ColourChooser -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk +@dirrmtry %%SITE_PERL%%/Tk diff --git a/x11-toolkits/p5-Tk-Date/pkg-plist b/x11-toolkits/p5-Tk-Date/pkg-plist index a1ac370c536f..3b5b0aadebcd 100644 --- a/x11-toolkits/p5-Tk-Date/pkg-plist +++ b/x11-toolkits/p5-Tk-Date/pkg-plist @@ -1,8 +1,8 @@ %%SITE_PERL%%/%%PERL_ARCH%%/Tk/Date.pm %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/date.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Date/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Date -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk diff --git a/x11-toolkits/p5-Tk-Enscript/pkg-plist b/x11-toolkits/p5-Tk-Enscript/pkg-plist index c3c30122d792..fca4f5355664 100644 --- a/x11-toolkits/p5-Tk-Enscript/pkg-plist +++ b/x11-toolkits/p5-Tk-Enscript/pkg-plist @@ -2,5 +2,5 @@ %%SITE_PERL%%/Tk/enscript.cfg %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Enscript/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Enscript -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk +@dirrmtry %%SITE_PERL%%/Tk diff --git a/x11-toolkits/p5-Tk-FileDialog/pkg-plist b/x11-toolkits/p5-Tk-FileDialog/pkg-plist index 1d1691894e83..11e0037b35af 100644 --- a/x11-toolkits/p5-Tk-FileDialog/pkg-plist +++ b/x11-toolkits/p5-Tk-FileDialog/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/FileDialog/.packlist %%SITE_PERL%%/Tk/FileDialog.pm @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/FileDialog -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk +@dirrmtry %%SITE_PERL%%/Tk diff --git a/x11-toolkits/p5-Tk-GBARR/pkg-plist b/x11-toolkits/p5-Tk-GBARR/pkg-plist index 392bdc6e6faf..d7edf91662e2 100644 --- a/x11-toolkits/p5-Tk-GBARR/pkg-plist +++ b/x11-toolkits/p5-Tk-GBARR/pkg-plist @@ -10,7 +10,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib/tframe.pl %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/GBARR/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/GBARR -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos/widtrib +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/demos +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk diff --git a/x11-toolkits/p5-Tk-Getopt/pkg-plist b/x11-toolkits/p5-Tk-Getopt/pkg-plist index 0648f843ccf3..1fc3c40e349a 100644 --- a/x11-toolkits/p5-Tk-Getopt/pkg-plist +++ b/x11-toolkits/p5-Tk-Getopt/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Tk/Getopt.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Getopt/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Getopt -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Getopt 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Getopt +@dirrmtry %%SITE_PERL%%/Tk diff --git a/x11-toolkits/p5-Tk-HistEntry/pkg-plist b/x11-toolkits/p5-Tk-HistEntry/pkg-plist index b2b7ff69f8de..7b38876e0772 100644 --- a/x11-toolkits/p5-Tk-HistEntry/pkg-plist +++ b/x11-toolkits/p5-Tk-HistEntry/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Tk/HistEntry.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/HistEntry/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/HistEntry -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk +@dirrmtry %%SITE_PERL%%/Tk diff --git a/x11-toolkits/p5-Tk-ResizeButton/pkg-plist b/x11-toolkits/p5-Tk-ResizeButton/pkg-plist index 2ad841f84cb8..eacce4402d5b 100644 --- a/x11-toolkits/p5-Tk-ResizeButton/pkg-plist +++ b/x11-toolkits/p5-Tk-ResizeButton/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Tk/ResizeButton.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ResizeButton/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/ResizeButton -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk +@dirrmtry %%SITE_PERL%%/Tk diff --git a/x11-toolkits/p5-Tk-Splashscreen/pkg-plist b/x11-toolkits/p5-Tk-Splashscreen/pkg-plist index f2a8d72b2cb5..d239745450dd 100644 --- a/x11-toolkits/p5-Tk-Splashscreen/pkg-plist +++ b/x11-toolkits/p5-Tk-Splashscreen/pkg-plist @@ -1,6 +1,6 @@ %%SITE_PERL%%/Tk/Splashscreen.pm %%SITE_PERL%%/Tk/waitVariableX.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Splashscreen/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Splashscreen 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Splashscreen +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk +@dirrmtry %%SITE_PERL%%/Tk diff --git a/x11-toolkits/p5-Tk-TableMatrix/pkg-plist b/x11-toolkits/p5-Tk-TableMatrix/pkg-plist index d76279eae714..fbe1b74825fd 100644 --- a/x11-toolkits/p5-Tk-TableMatrix/pkg-plist +++ b/x11-toolkits/p5-Tk-TableMatrix/pkg-plist @@ -11,10 +11,10 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TableMatrix/TableMatrix.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TableMatrix/autosplit.ix @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/TableMatrix -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk/pTk @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Tk/TableMatrix -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%% 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%% 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%% +@dirrmtry %%SITE_PERL%% diff --git a/x11-toolkits/p5-Tk/pkg-plist b/x11-toolkits/p5-Tk/pkg-plist index cbd9b8903048..bc03153dc984 100644 --- a/x11-toolkits/p5-Tk/pkg-plist +++ b/x11-toolkits/p5-Tk/pkg-plist @@ -682,4 +682,4 @@ bin/widget @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/Xlib @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk/pTk @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Tk -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tie 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tie diff --git a/x11-toolkits/py-wxPython26-common/pkg-plist b/x11-toolkits/py-wxPython26-common/pkg-plist index bec4e5ccf74f..e552fae8b5cf 100644 --- a/x11-toolkits/py-wxPython26-common/pkg-plist +++ b/x11-toolkits/py-wxPython26-common/pkg-plist @@ -755,9 +755,9 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo -@unexec rmdir %D/%%PYTHON_SITELIBDIR%%/wxPython 2>/dev/null || true -@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true +@dirrmtry %%PYTHON_SITELIBDIR%%/wxPython +@dirrmtry %%PYTHON_SITELIBDIR%% @dirrm include/wx-%%WX_VERSION%%/wx/wxPython/i_files @dirrm include/wx-%%WX_VERSION%%/wx/wxPython -@unexec rmdir %D/include/wx-%%WX_VERSION%%/wx 2>/dev/null || true -@unexec rmdir %D/include/wx-%%WX_VERSION%% 2>/dev/null || true +@dirrmtry include/wx-%%WX_VERSION%%/wx +@dirrmtry include/wx-%%WX_VERSION%% diff --git a/x11-toolkits/py-wxPython28-common/pkg-plist b/x11-toolkits/py-wxPython28-common/pkg-plist index bec4e5ccf74f..e552fae8b5cf 100644 --- a/x11-toolkits/py-wxPython28-common/pkg-plist +++ b/x11-toolkits/py-wxPython28-common/pkg-plist @@ -755,9 +755,9 @@ include/wx-%%WX_VERSION%%/wx/wxPython/wxPython_int.h @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/bmp_source @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo/bitmaps @dirrm %%PYTHON_SITELIBDIR%%/wxPython/demo -@unexec rmdir %D/%%PYTHON_SITELIBDIR%%/wxPython 2>/dev/null || true -@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true +@dirrmtry %%PYTHON_SITELIBDIR%%/wxPython +@dirrmtry %%PYTHON_SITELIBDIR%% @dirrm include/wx-%%WX_VERSION%%/wx/wxPython/i_files @dirrm include/wx-%%WX_VERSION%%/wx/wxPython -@unexec rmdir %D/include/wx-%%WX_VERSION%%/wx 2>/dev/null || true -@unexec rmdir %D/include/wx-%%WX_VERSION%% 2>/dev/null || true +@dirrmtry include/wx-%%WX_VERSION%%/wx +@dirrmtry include/wx-%%WX_VERSION%% diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist index 5ece57b57460..4e703c1c95be 100644 --- a/x11-toolkits/vte/pkg-plist +++ b/x11-toolkits/vte/pkg-plist @@ -97,12 +97,12 @@ share/locale/wa/LC_MESSAGES/vte.mo share/locale/xh/LC_MESSAGES/vte.mo share/locale/zh_CN/LC_MESSAGES/vte.mo share/locale/zh_TW/LC_MESSAGES/vte.mo -@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ug 2> /dev/null || true -@unexec rmdir %D/share/locale/ky/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ky 2> /dev/null || true -@unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ang 2> /dev/null || true +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug +@dirrmtry share/locale/ky/LC_MESSAGES +@dirrmtry share/locale/ky +@dirrmtry share/locale/ang/LC_MESSAGES +@dirrmtry share/locale/ang @dirrm share/gnome/vte/termcap @dirrm share/gnome/vte @dirrm %%DOCSDIR%% diff --git a/x11-toolkits/xview/pkg-plist b/x11-toolkits/xview/pkg-plist index 481436e10b27..879263b73688 100644 --- a/x11-toolkits/xview/pkg-plist +++ b/x11-toolkits/xview/pkg-plist @@ -510,7 +510,7 @@ include/xview_private/xv_color.h include/xview_private/xv_debug.h include/xview_private/xv_list.h include/xview_private/xv_path_util.h -@unexec rmdir %D/include/bitmaps 2>/dev/null || true +@dirrmtry include/bitmaps @dirrm include/images @dirrm include/olgx @dirrm include/olgx_private diff --git a/x11-wm/afterstep-i18n/pkg-plist b/x11-wm/afterstep-i18n/pkg-plist index 9bcdadd227c6..1b9970f9de8e 100644 --- a/x11-wm/afterstep-i18n/pkg-plist +++ b/x11-wm/afterstep-i18n/pkg-plist @@ -66,4 +66,4 @@ share/doc/afterstep/CHANGES.I18N share/doc/afterstep/README.I18N share/doc/afterstep/README.I18N.jis @dirrm share/doc/afterstep -@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true +@dirrmtry include/X11/pixmaps diff --git a/x11-wm/afterstep/pkg-plist b/x11-wm/afterstep/pkg-plist index 6ccad541f2ba..c009455c097e 100644 --- a/x11-wm/afterstep/pkg-plist +++ b/x11-wm/afterstep/pkg-plist @@ -59,4 +59,4 @@ lib/X11/afterstep/system.steprc @dirrm lib/X11/afterstep/doc @dirrm lib/X11/afterstep/sounds @dirrm lib/X11/afterstep -@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true +@dirrmtry include/X11/pixmaps diff --git a/x11-wm/amaterus/pkg-plist b/x11-wm/amaterus/pkg-plist index 0a65dfbd3a4b..0ff48f771b6d 100644 --- a/x11-wm/amaterus/pkg-plist +++ b/x11-wm/amaterus/pkg-plist @@ -1,4 +1,4 @@ bin/amaterus share/gnome/wm-properties/Amaterus.desktop -@unexec rmdir %D/share/gnome/wm-properties 2>/dev/null || true -@unexec rmdir %D/share/gnome 2>/dev/null || true +@dirrmtry share/gnome/wm-properties +@dirrmtry share/gnome diff --git a/x11-wm/ctwm/pkg-plist b/x11-wm/ctwm/pkg-plist index f62dc85b4772..846e107b978a 100644 --- a/x11-wm/ctwm/pkg-plist +++ b/x11-wm/ctwm/pkg-plist @@ -91,4 +91,4 @@ lib/X11/twm/images/xrn.xpm lib/X11/twm/images/xterm.xpm lib/X11/twm/system.ctwmrc @dirrm lib/X11/twm/images -@unexec rmdir %D/lib/X11/twm 2>/dev/null || true +@dirrmtry lib/X11/twm diff --git a/x11-wm/e16/pkg-plist b/x11-wm/e16/pkg-plist index 05c6883ed42e..fcc86fd7510b 100644 --- a/x11-wm/e16/pkg-plist +++ b/x11-wm/e16/pkg-plist @@ -491,8 +491,8 @@ share/locale/tr/LC_MESSAGES/enlightenment.mo @dirrm %%DATADIR%%/config/pix @dirrm %%DATADIR%%/config @dirrm %%DATADIR%% -@unexec rmdir %D/etc/X11/dm/Sessions 2> /dev/null || true -@unexec rmdir %D/etc/X11/dm 2> /dev/null || true -@unexec rmdir %D/etc/X11 2> /dev/null || true -@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/en_US 2> /dev/null || true +@dirrmtry etc/X11/dm/Sessions +@dirrmtry etc/X11/dm +@dirrmtry etc/X11 +@dirrmtry share/locale/en_US/LC_MESSAGES +@dirrmtry share/locale/en_US diff --git a/x11-wm/enlightenment/pkg-plist b/x11-wm/enlightenment/pkg-plist index 05c6883ed42e..fcc86fd7510b 100644 --- a/x11-wm/enlightenment/pkg-plist +++ b/x11-wm/enlightenment/pkg-plist @@ -491,8 +491,8 @@ share/locale/tr/LC_MESSAGES/enlightenment.mo @dirrm %%DATADIR%%/config/pix @dirrm %%DATADIR%%/config @dirrm %%DATADIR%% -@unexec rmdir %D/etc/X11/dm/Sessions 2> /dev/null || true -@unexec rmdir %D/etc/X11/dm 2> /dev/null || true -@unexec rmdir %D/etc/X11 2> /dev/null || true -@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/en_US 2> /dev/null || true +@dirrmtry etc/X11/dm/Sessions +@dirrmtry etc/X11/dm +@dirrmtry etc/X11 +@dirrmtry share/locale/en_US/LC_MESSAGES +@dirrmtry share/locale/en_US diff --git a/x11-wm/fvwm/pkg-plist b/x11-wm/fvwm/pkg-plist index 3c7c2913a09b..68c4bd57574f 100644 --- a/x11-wm/fvwm/pkg-plist +++ b/x11-wm/fvwm/pkg-plist @@ -59,4 +59,4 @@ include/X11/pixmaps/xterm-sol.xpm include/X11/pixmaps/xterm-sun.xpm include/X11/pixmaps/xterm.xpm @dirrm lib/X11/fvwm -@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true +@dirrmtry include/X11/pixmaps diff --git a/x11-wm/fvwm2-devel/pkg-plist b/x11-wm/fvwm2-devel/pkg-plist index 497845a25a00..b3db39a6df65 100644 --- a/x11-wm/fvwm2-devel/pkg-plist +++ b/x11-wm/fvwm2-devel/pkg-plist @@ -446,8 +446,8 @@ man/man1/xpmroot.1.gz %%NLS%%share/locale/sv_SE/LC_MESSAGES/fvwm.mo %%NLS%%share/locale/sv_SE/LC_MESSAGES/FvwmTaskBar.mo %%NLS%%share/locale/sv_SE/LC_MESSAGES/FvwmScript.mo -@unexec rmdir %D/share/locale/sv_SE/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/sv_SE 2>/dev/null || true +@dirrmtry share/locale/sv_SE/LC_MESSAGES +@dirrmtry share/locale/sv_SE @dirrm %%DATADIR%%/perllib/General @dirrm %%DATADIR%%/perllib/FVWM/Tracker @dirrm %%DATADIR%%/perllib/FVWM/Module diff --git a/x11-wm/ion-2/pkg-plist b/x11-wm/ion-2/pkg-plist index f024e5ddc4ea..79117a851eec 100644 --- a/x11-wm/ion-2/pkg-plist +++ b/x11-wm/ion-2/pkg-plist @@ -60,4 +60,4 @@ share/doc/ion/ChangeLog @dirrm lib/ion @dirrm share/ion @dirrm share/doc/ion -@unexec rmdir %D/etc/ion 2>/dev/null || true +@dirrmtry etc/ion diff --git a/x11-wm/ion-3/pkg-plist b/x11-wm/ion-3/pkg-plist index faede5257b43..f0e5f4b8647c 100644 --- a/x11-wm/ion-3/pkg-plist +++ b/x11-wm/ion-3/pkg-plist @@ -82,4 +82,4 @@ share/locale/fi/LC_MESSAGES/ion3.mo @dirrm lib/ion3 @dirrm share/ion3 @dirrm %%DOCSDIR%% -@unexec rmdir %D/etc/ion3 2>/dev/null || true +@dirrmtry etc/ion3 diff --git a/x11-wm/ion-3ds/pkg-plist b/x11-wm/ion-3ds/pkg-plist index faede5257b43..f0e5f4b8647c 100644 --- a/x11-wm/ion-3ds/pkg-plist +++ b/x11-wm/ion-3ds/pkg-plist @@ -82,4 +82,4 @@ share/locale/fi/LC_MESSAGES/ion3.mo @dirrm lib/ion3 @dirrm share/ion3 @dirrm %%DOCSDIR%% -@unexec rmdir %D/etc/ion3 2>/dev/null || true +@dirrmtry etc/ion3 diff --git a/x11-wm/ion/pkg-plist b/x11-wm/ion/pkg-plist index d9650d5ab706..f7f2ea378150 100644 --- a/x11-wm/ion/pkg-plist +++ b/x11-wm/ion/pkg-plist @@ -20,4 +20,4 @@ etc/ion/sample.conf %%PORTDOCS%%share/doc/ion/config.txt %%PORTDOCS%%share/doc/ion/functions.txt %%PORTDOCS%%@dirrm share/doc/ion -@unexec rmdir %D/etc/ion 2>/dev/null || true +@dirrmtry etc/ion diff --git a/x11-wm/ion3/pkg-plist b/x11-wm/ion3/pkg-plist index f024e5ddc4ea..79117a851eec 100644 --- a/x11-wm/ion3/pkg-plist +++ b/x11-wm/ion3/pkg-plist @@ -60,4 +60,4 @@ share/doc/ion/ChangeLog @dirrm lib/ion @dirrm share/ion @dirrm share/doc/ion -@unexec rmdir %D/etc/ion 2>/dev/null || true +@dirrmtry etc/ion diff --git a/x11-wm/vtwm/pkg-plist b/x11-wm/vtwm/pkg-plist index 86318680eff8..f4e76dc5d55a 100644 --- a/x11-wm/vtwm/pkg-plist +++ b/x11-wm/vtwm/pkg-plist @@ -1,3 +1,3 @@ bin/vtwm lib/X11/twm/system.vtwmrc -@unexec rmdir %D/lib/X11/twm 2>/dev/null || true +@dirrmtry lib/X11/twm diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist index 4acf128fa655..f236d1f40ad2 100644 --- a/x11-wm/xfce4-desktop/pkg-plist +++ b/x11-wm/xfce4-desktop/pkg-plist @@ -139,24 +139,24 @@ share/xfce4/doc/he/images/xfdesktop-menu-tab.png share/xfce4/doc/he/images/xfdesktop-list.png share/xfce4/doc/he/xfdesktop.html @dirrm etc/xdg/xfce4/desktop -@unexec rmdir %D/share/applications 2>/dev/null || true -@unexec rmdir %D/etc/xdg/xfce4 2>/dev/null || true -@unexec rmdir %D/etc/xdg 2>/dev/null || true -@unexec rmdir %D/etc/xfce4 2>/dev/null || true -@unexec rmdir %D/lib/xfce4/mcs-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 +@dirrmtry share/applications +@dirrmtry etc/xdg/xfce4 +@dirrmtry etc/xdg +@dirrmtry etc/xfce4 +@dirrmtry lib/xfce4/mcs-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 @dirrm share/xfce4/backdrops -@unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true -@unexec rmdir %D/share/xfce4 2>/dev/null || true -@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 share/xfce4/doc/C/images +@dirrmtry share/xfce4/doc/C +@dirrmtry share/xfce4/doc/fr/images +@dirrmtry share/xfce4/doc/fr +@dirrmtry share/xfce4/doc/he/images +@dirrmtry share/xfce4/doc/he +@dirrmtry share/xfce4/doc +@dirrmtry share/xfce4 +@dirrmtry share/locale/nb_NO/LC_MESSAGES +@dirrmtry share/locale/nb_NO diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist index 182e4776f82a..861f1f309caa 100644 --- a/x11-wm/xfce4-panel/pkg-plist +++ b/x11-wm/xfce4-panel/pkg-plist @@ -153,26 +153,26 @@ share/xfce4/doc/he/images/panel-settings.png share/xfce4/doc/he/images/systembuttons-properties.png share/xfce4/doc/he/xfce4-panel.html @dirrm etc/xdg/xfce4/panel -@unexec rmdir %D/etc/xdg/xfce4 2>/dev/null || true -@unexec rmdir %D/etc/xdg 2>/dev/null || true -@unexec rmdir %D/etc/xfce4 2>/dev/null || true +@dirrmtry etc/xdg/xfce4 +@dirrmtry etc/xdg +@dirrmtry etc/xfce4 @dirrm include/xfce4/panel -@unexec rmdir %D/include/xfce4 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/applications 2>/dev/null || true -@unexec rmdir %D/share/locale/bn_IN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/bn_IN 2>/dev/null || true -@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/mr 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true -@unexec rmdir %D/share/xfce4 2>/dev/null || true -@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 include/xfce4 +@dirrmtry lib/xfce4/mcs-plugins +@dirrmtry lib/xfce4/panel-plugins +@dirrmtry lib/xfce4 +@dirrmtry share/applications +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/xfce4/doc/C/images +@dirrmtry share/xfce4/doc/C +@dirrmtry share/xfce4/doc/fr/images +@dirrmtry share/xfce4/doc/fr +@dirrmtry share/xfce4/doc/he/images +@dirrmtry share/xfce4/doc/he +@dirrmtry share/xfce4/doc +@dirrmtry share/xfce4 +@dirrmtry share/locale/nb_NO/LC_MESSAGES +@dirrmtry share/locale/nb_NO diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist index bca50ea42720..bba889fbb209 100644 --- a/x11-wm/xfce4-session/pkg-plist +++ b/x11-wm/xfce4-session/pkg-plist @@ -88,28 +88,28 @@ share/xfce4/doc/he/images/xfsm-general.png share/xfce4/doc/he/images/xfsm-splash.png share/xfce4/doc/he/xfce4-session.html @dirrm etc/xdg/xfce4-session -@unexec rmdir %D/etc/xdg 2>/dev/null || true +@dirrmtry etc/xdg @dirrm include/xfce4/xfce4-session-4.2/libxfsm @dirrm include/xfce4/xfce4-session-4.2 -@unexec rmdir %D/include/xfce4 2>/dev/null || true -@unexec rmdir %D/share/applications 2>/dev/null || true -@unexec rmdir %D/share/locale/bn_IN/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/bn_IN 2>/dev/null || true -@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/mr 2>/dev/null || true +@dirrmtry include/xfce4 +@dirrmtry share/applications +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr @dirrm share/themes/Default/balou -@unexec rmdir %D/share/themes/Default 2>/dev/null || true -@unexec rmdir %D/share/themes 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true -@unexec rmdir %D/share/xfce4 2>/dev/null || true -@unexec rmdir %D/lib/xfce4/splash/engines 2>/dev/null || true -@unexec rmdir %D/lib/xfce4/splash 2>/dev/null || true -@unexec rmdir %D/lib/xfce4/mcs-plugins 2>/dev/null || true -@unexec rmdir %D/lib/xfce4 2>/dev/null || true -@unexec rmdir %D/lib/pkgconfig 2>/dev/null || true +@dirrmtry share/themes/Default +@dirrmtry share/themes +@dirrmtry share/xfce4/doc/C/images +@dirrmtry share/xfce4/doc/C +@dirrmtry share/xfce4/doc/fr/images +@dirrmtry share/xfce4/doc/fr +@dirrmtry share/xfce4/doc/he/images +@dirrmtry share/xfce4/doc/he +@dirrmtry share/xfce4/doc +@dirrmtry share/xfce4 +@dirrmtry lib/xfce4/splash/engines +@dirrmtry lib/xfce4/splash +@dirrmtry lib/xfce4/mcs-plugins +@dirrmtry lib/xfce4 +@dirrmtry lib/pkgconfig diff --git a/x11-wm/xfce4-systray/pkg-plist b/x11-wm/xfce4-systray/pkg-plist index 81178f037518..476a11784d06 100644 --- a/x11-wm/xfce4-systray/pkg-plist +++ b/x11-wm/xfce4-systray/pkg-plist @@ -1,3 +1,3 @@ lib/xfce4/panel-plugins/libsystray.so -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true -@unexec rmdir %D/lib/xfce4 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins +@dirrmtry lib/xfce4 diff --git a/x11-wm/xfce4-wm/pkg-plist b/x11-wm/xfce4-wm/pkg-plist index 8909d7e8581d..a2ee360efb1d 100644 --- a/x11-wm/xfce4-wm/pkg-plist +++ b/x11-wm/xfce4-wm/pkg-plist @@ -721,37 +721,37 @@ share/xfce4/doc/he/images/workspace_margins.png share/xfce4/doc/he/images/xfwm_workspaces.png share/xfce4/doc/he/xfwm4.html share/xfwm4/defaults -@unexec rmdir %D/lib/xfce4/mcs-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 -@unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he/images 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc/he 2>/dev/null || true -@unexec rmdir %D/share/xfce4/doc 2>/dev/null || true -@unexec rmdir %D/share/xfce4 2>/dev/null || true +@dirrmtry lib/xfce4/mcs-plugins +@dirrmtry lib/xfce4 +@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 +@dirrmtry share/xfce4/doc/C/images +@dirrmtry share/xfce4/doc/C +@dirrmtry share/xfce4/doc/fr/images +@dirrmtry share/xfce4/doc/fr +@dirrmtry share/xfce4/doc/he/images +@dirrmtry share/xfce4/doc/he +@dirrmtry share/xfce4/doc +@dirrmtry share/xfce4 @dirrm share/themes/Default/xfwm4 -@unexec rmdir %D/share/themes/Default 2>/dev/null || true +@dirrmtry share/themes/Default @dirrm share/themes/Default-4.0/xfwm4 -@unexec rmdir %D/share/themes/Default-4.0 2>/dev/null || true +@dirrmtry share/themes/Default-4.0 @dirrm share/themes/Opta/xfwm4 -@unexec rmdir %D/share/themes/Opta 2>/dev/null || true +@dirrmtry share/themes/Opta @dirrm share/themes/Symphony/xfwm4 -@unexec rmdir %D/share/themes/Symphony 2>/dev/null || true +@dirrmtry share/themes/Symphony @dirrm share/themes/Therapy/xfwm4 -@unexec rmdir %D/share/themes/Therapy 2>/dev/null || true +@dirrmtry share/themes/Therapy @dirrm share/themes/Tyrex/xfwm4 -@unexec rmdir %D/share/themes/Tyrex 2>/dev/null || true +@dirrmtry share/themes/Tyrex @dirrm share/themes/Waza/xfwm4 -@unexec rmdir %D/share/themes/Waza 2>/dev/null || true +@dirrmtry share/themes/Waza @dirrm share/themes/Wildbush/xfwm4 -@unexec rmdir %D/share/themes/Wildbush 2>/dev/null || true -@unexec rmdir %D/share/xfwm4/themes 2>/dev/null || true -@unexec rmdir %D/share/xfwm4 2>/dev/null || true +@dirrmtry share/themes/Wildbush +@dirrmtry share/xfwm4/themes +@dirrmtry share/xfwm4 diff --git a/x11/Terminal/pkg-plist b/x11/Terminal/pkg-plist index 261b0336fba7..b81391d11a4e 100644 --- a/x11/Terminal/pkg-plist +++ b/x11/Terminal/pkg-plist @@ -47,13 +47,13 @@ share/applications/Terminal.desktop share/icons/hicolor/48x48/apps/Terminal.png share/icons/hicolor/scalable/apps/Terminal.svg share/pixmaps/terminal.xpm -@unexec rmdir %D/share/icons/hicolor/scalable 2> /dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48 2> /dev/null || true -@unexec rmdir %D/share/icons/hicolor 2> /dev/null || true -@unexec rmdir %D/icons 2> /dev/null || true +@dirrmtry share/icons/hicolor/scalable +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor +@dirrmtry icons %%PORTDOCS%%@dirrm %%DOCSDIR%%/C/images %%PORTDOCS%%@dirrm %%DOCSDIR%%/C %%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/share/applications 2> /dev/null || true +@dirrmtry share/applications @dirrm share/Terminal/apps @dirrm share/Terminal diff --git a/x11/XFree86-4-documents/pkg-plist b/x11/XFree86-4-documents/pkg-plist index 5a8207d610df..3d0b84c8d657 100644 --- a/x11/XFree86-4-documents/pkg-plist +++ b/x11/XFree86-4-documents/pkg-plist @@ -90,7 +90,7 @@ share/doc/XFree86/xsmp.txt share/doc/XFree86/xtest.txt share/doc/XFree86/xtestlib.txt share/doc/XFree86/xv-protocol-v2.txt -@unexec rmdir %D/share/doc/XFree86/PDF 2>/dev/null || true -@unexec rmdir %D/share/doc/XFree86/PostScript 2>/dev/null || true -@unexec rmdir %D/share/doc/XFree86/html 2>/dev/null || true -@unexec rmdir %D/share/doc/XFree86 2>/dev/null || true +@dirrmtry share/doc/XFree86/PDF +@dirrmtry share/doc/XFree86/PostScript +@dirrmtry share/doc/XFree86/html +@dirrmtry share/doc/XFree86 diff --git a/x11/XFree86-4-libraries/pkg-plist b/x11/XFree86-4-libraries/pkg-plist index ade849504555..5793ed0886e1 100644 --- a/x11/XFree86-4-libraries/pkg-plist +++ b/x11/XFree86-4-libraries/pkg-plist @@ -721,5 +721,5 @@ libdata/pkgconfig/xcursor.pc @dirrm lib/X11/locale/zh_TW.big5 @dirrm lib/X11/locale @exec if [ ! -f %D/lib/X11/xserver/SecurityPolicy ]; then cp %D/lib/X11/xserver/SecurityPolicy.default %D/lib/X11/xserver/SecurityPolicy; fi -@unexec rmdir %D/include/X11/bitmaps 2>/dev/null || true -@unexec rmdir %D/lib/X11/xserver 2>/dev/null || true +@dirrmtry include/X11/bitmaps +@dirrmtry lib/X11/xserver diff --git a/x11/alltray/pkg-plist b/x11/alltray/pkg-plist index 66a57580bb93..6daa5f1f275f 100644 --- a/x11/alltray/pkg-plist +++ b/x11/alltray/pkg-plist @@ -3,4 +3,4 @@ lib/liballtray.so lib/liballtray.so.0 share/applications/alltray.desktop share/pixmaps/alltray.png -@unexec rmdir %D/share/applications 2>/dev/null || true +@dirrmtry share/applications diff --git a/x11/bbuname/pkg-plist b/x11/bbuname/pkg-plist index f95af28d2203..d0204a302f15 100644 --- a/x11/bbuname/pkg-plist +++ b/x11/bbuname/pkg-plist @@ -2,4 +2,4 @@ bin/bbuname share/bbtools/bbuname.conf share/bbtools/bbuname.nobb share/bbtools/README.bbuname -@unexec rmdir %D/share/bbtools 2>/dev/null || true +@dirrmtry share/bbtools diff --git a/x11/bricons/pkg-plist b/x11/bricons/pkg-plist index 239f1a11077f..a45768d1bc73 100644 --- a/x11/bricons/pkg-plist +++ b/x11/bricons/pkg-plist @@ -8,5 +8,5 @@ include/X11/pixmaps/clock.xpm include/X11/pixmaps/editor.xpm include/X11/pixmaps/mail.xpm include/X11/pixmaps/news.xpm -@unexec rmdir %D/include/X11/bitmaps 2>/dev/null || true -@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true +@dirrmtry include/X11/bitmaps +@dirrmtry include/X11/pixmaps diff --git a/x11/efancylauncher/pkg-plist b/x11/efancylauncher/pkg-plist index 77838de52772..484c7883c51d 100644 --- a/x11/efancylauncher/pkg-plist +++ b/x11/efancylauncher/pkg-plist @@ -12,8 +12,8 @@ share/enlightenment/epplet_data/E-FancyLauncher/E-FancyLauncher.ABOUT/bg.jpg share/enlightenment/epplet_data/E-FancyLauncher/E-FancyLauncher.ABOUT/config_window.png share/enlightenment/epplet_data/E-FancyLauncher/E-FancyLauncher.ABOUT/verdana.ttf share/enlightenment/epplet_icons/E-FancyLauncher.icon -@unexec rmdir %D/share/enlightenment/epplet_icons 2>/dev/null || true +@dirrmtry share/enlightenment/epplet_icons @dirrm share/enlightenment/epplet_data/E-FancyLauncher/E-FancyLauncher.ABOUT @dirrm share/enlightenment/epplet_data/E-FancyLauncher -@unexec rmdir %D/share/enlightenment/epplet_data 2>/dev/null || true -@unexec rmdir %D/share/enlightenment 2>/dev/null || true +@dirrmtry share/enlightenment/epplet_data +@dirrmtry share/enlightenment diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist index 3a2c3a2b34d9..7fcb2af46815 100644 --- a/x11/gdm/pkg-plist +++ b/x11/gdm/pkg-plist @@ -217,8 +217,8 @@ share/locale/xh/LC_MESSAGES/gdm.mo share/locale/zh_CN/LC_MESSAGES/gdm.mo share/locale/zh_TW/LC_MESSAGES/gdm.mo share/locale/zu/LC_MESSAGES/gdm.mo -@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ku 2> /dev/null || true +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku @dirrm share/gnome/xsessions @dirrm share/gnome/omf/gdm @dirrm share/gnome/help/gdm/zh_TW/figures diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist index cf05af1ec158..c9ee63e9ceed 100644 --- a/x11/gnome-desktop/pkg-plist +++ b/x11/gnome-desktop/pkg-plist @@ -195,14 +195,14 @@ share/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo -@unexec rmdir %D/share/locale/yo/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/yo 2> /dev/null || true -@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ug 2> /dev/null || true -@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ku 2> /dev/null || true -@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/hy 2> /dev/null || true +@dirrmtry share/locale/yo/LC_MESSAGES +@dirrmtry share/locale/yo +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy @dirrm share/gnome/omf/lgpl @dirrm share/gnome/omf/gpl @dirrm share/gnome/omf/gnome-feedback diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist index 82b691c297f3..95d7413ad42a 100644 --- a/x11/gnome-menus/pkg-plist +++ b/x11/gnome-menus/pkg-plist @@ -80,17 +80,17 @@ share/locale/vi/LC_MESSAGES/gnome-menus.mo share/locale/xh/LC_MESSAGES/gnome-menus.mo share/locale/zh_CN/LC_MESSAGES/gnome-menus.mo share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/xh 2> /dev/null || true -@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/rw 2> /dev/null || true -@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/mr 2> /dev/null || true -@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/hy 2> /dev/null || true +@dirrmtry share/locale/xh/LC_MESSAGES +@dirrmtry share/locale/xh +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy @dirrm share/gnome/desktop-directories @dirrm include/gnome-menus @dirrm etc/xdg/menus @dirrm etc/xdg -@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2> /dev/null || true -@unexec rmdir %D/%%PYTHON_LIBDIR%% 2> /dev/null || true +@dirrmtry %%PYTHON_SITELIBDIR%% +@dirrmtry %%PYTHON_LIBDIR%% diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist index cf05af1ec158..c9ee63e9ceed 100644 --- a/x11/gnomedesktop/pkg-plist +++ b/x11/gnomedesktop/pkg-plist @@ -195,14 +195,14 @@ share/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo -@unexec rmdir %D/share/locale/yo/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/yo 2> /dev/null || true -@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ug 2> /dev/null || true -@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ku 2> /dev/null || true -@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/hy 2> /dev/null || true +@dirrmtry share/locale/yo/LC_MESSAGES +@dirrmtry share/locale/yo +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku +@dirrmtry share/locale/hy/LC_MESSAGES +@dirrmtry share/locale/hy @dirrm share/gnome/omf/lgpl @dirrm share/gnome/omf/gpl @dirrm share/gnome/omf/gnome-feedback diff --git a/x11/libexo/pkg-plist b/x11/libexo/pkg-plist index 81a801d49353..912e3d51434a 100644 --- a/x11/libexo/pkg-plist +++ b/x11/libexo/pkg-plist @@ -60,13 +60,13 @@ share/gtk-doc/html/exo/style.css share/gtk-doc/html/exo/up.png %%PYTHON%%share/pygtk/2.0/defs/exo-0.3/exo.defs %%PYTHON%%@dirrm share/pygtk/2.0/defs/exo-0.3 -@unexec rmdir %D/share/gtk-doc/html 2>/dev/null || true +@dirrmtry share/gtk-doc/html %%PYTHON%%@unexec rmdir %D/share/pygtk/2.0/defs 2> /dev/null || true %%PYTHON%%@unexec rmdir %D/share/pygtk/2.0 2> /dev/null || true %%PYTHON%%@unexec rmdir %D/share/pygtk 2> /dev/null || true @dirrm share/gtk-doc/html/exo -@unexec rmdir %D/share/gtk-doc/html 2> /dev/null || true -@unexec rmdir %D/share/gtk-doc 2> /dev/null || true +@dirrmtry share/gtk-doc/html +@dirrmtry share/gtk-doc %%PYTHON%%@dirrm lib/python2.4/site-packages/exo-0.3/exo %%PYTHON%%@dirrm lib/python2.4/site-packages/exo-0.3 %%PYTHON%%@unexec rmdir %D/lib/python2.4/site-packages 2> /dev/null || true diff --git a/x11/libxfce4mcs/pkg-plist b/x11/libxfce4mcs/pkg-plist index da9d08710e55..44c1784345b6 100644 --- a/x11/libxfce4mcs/pkg-plist +++ b/x11/libxfce4mcs/pkg-plist @@ -23,6 +23,6 @@ share/gtk-doc/html/libxfce4mcs/right.png share/gtk-doc/html/libxfce4mcs/up.png @dirrm include/xfce4/libxfce4mcs @dirrm share/gtk-doc/html/libxfce4mcs -@unexec rmdir %D/share/gtk-doc/html 2>/dev/null || true -@unexec rmdir %D/share/gtk-doc 2>/dev/null || true -@unexec rmdir %D/include/xfce4 2>/dev/null || true +@dirrmtry share/gtk-doc/html +@dirrmtry share/gtk-doc +@dirrmtry include/xfce4 diff --git a/x11/libxfce4util/pkg-plist b/x11/libxfce4util/pkg-plist index 48db0d3da859..cbd755b3f734 100644 --- a/x11/libxfce4util/pkg-plist +++ b/x11/libxfce4util/pkg-plist @@ -44,10 +44,10 @@ share/xfce4/m4/debug.m4 share/xfce4/m4/depends.m4 share/xfce4/m4/i18n.m4 @dirrm include/xfce4/libxfce4util -@unexec rmdir %D/include/xfce4 2>/dev/null || true +@dirrmtry include/xfce4 @dirrm share/gtk-doc/html/libxfce4util -@unexec rmdir %D/share/gtk-doc/html 2>/dev/null || true -@unexec rmdir %D/share/gtk-doc 2>/dev/null || true +@dirrmtry share/gtk-doc/html +@dirrmtry share/gtk-doc @dirrm share/xfce4/m4 -@unexec rmdir %D/share/xfce4 2>/dev/null || true -@unexec rmdir %D/sbin 2>/dev/null || true +@dirrmtry share/xfce4 +@dirrmtry sbin diff --git a/x11/oooqs/pkg-plist b/x11/oooqs/pkg-plist index 67679d9e18d5..9f3df5b9ae56 100644 --- a/x11/oooqs/pkg-plist +++ b/x11/oooqs/pkg-plist @@ -14,8 +14,8 @@ share/locale/it/LC_MESSAGES/oooqs.mo share/locale/nl/LC_MESSAGES/oooqs.mo share/locale/ru/LC_MESSAGES/oooqs.mo share/locale/sk/LC_MESSAGES/oooqs.mo -@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true -@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor/64x64 +@dirrmtry share/applnk/Utilities diff --git a/x11/oooqs2/pkg-plist b/x11/oooqs2/pkg-plist index 67679d9e18d5..9f3df5b9ae56 100644 --- a/x11/oooqs2/pkg-plist +++ b/x11/oooqs2/pkg-plist @@ -14,8 +14,8 @@ share/locale/it/LC_MESSAGES/oooqs.mo share/locale/nl/LC_MESSAGES/oooqs.mo share/locale/ru/LC_MESSAGES/oooqs.mo share/locale/sk/LC_MESSAGES/oooqs.mo -@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true -@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true -@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor/64x64 +@dirrmtry share/applnk/Utilities diff --git a/x11/p5-Clipboard/pkg-plist b/x11/p5-Clipboard/pkg-plist index fb69b3c9f26d..5e5e2746d76b 100644 --- a/x11/p5-Clipboard/pkg-plist +++ b/x11/p5-Clipboard/pkg-plist @@ -8,5 +8,5 @@ bin/clipjoin %%SITE_PERL%%/Clipboard/Win32.pm %%SITE_PERL%%/Clipboard/Xclip.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Clipboard/.packlist -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Clipboard 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Clipboard 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Clipboard +@dirrmtry %%SITE_PERL%%/Clipboard diff --git a/x11/p5-X11-IdleTime/pkg-plist b/x11/p5-X11-IdleTime/pkg-plist index f7686974ed84..ddecc9beb110 100644 --- a/x11/p5-X11-IdleTime/pkg-plist +++ b/x11/p5-X11-IdleTime/pkg-plist @@ -3,5 +3,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/IdleTime/IdleTime.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/IdleTime/IdleTime.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11/IdleTime -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/X11 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/X11 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11 +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/X11 diff --git a/x11/p5-X11-Protocol/pkg-plist b/x11/p5-X11-Protocol/pkg-plist index afb3a08329a3..912026402ca3 100644 --- a/x11/p5-X11-Protocol/pkg-plist +++ b/x11/p5-X11-Protocol/pkg-plist @@ -19,5 +19,5 @@ @dirrm %%SITE_PERL%%/X11/Protocol/Ext @dirrm %%SITE_PERL%%/X11/Protocol/Connection @dirrm %%SITE_PERL%%/X11/Protocol -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/X11 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/X11 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/X11 +@dirrmtry %%SITE_PERL%%/X11 diff --git a/x11/panoramixext/pkg-plist b/x11/panoramixext/pkg-plist index 1192f167d8e7..a47d4890dfa7 100644 --- a/x11/panoramixext/pkg-plist +++ b/x11/panoramixext/pkg-plist @@ -1,4 +1,4 @@ include/X11/extensions/panoramiXext.h include/X11/extensions/panoramiXproto.h libdata/pkgconfig/panoramixext.pc -@unexec rmdir %D/include/X11/extensions 2>/dev/null || true +@dirrmtry include/X11/extensions diff --git a/x11/printext/pkg-plist b/x11/printext/pkg-plist index e1463b7ea562..9560bfb3d112 100644 --- a/x11/printext/pkg-plist +++ b/x11/printext/pkg-plist @@ -1,3 +1,3 @@ include/X11/extensions/Print.h include/X11/extensions/Printstr.h -@unexec rmdir %D/include/X11/extensions 2>/dev/null || true +@dirrmtry include/X11/extensions diff --git a/x11/randrext/pkg-plist b/x11/randrext/pkg-plist index 18ab2f63a4c5..77704f6ebae5 100644 --- a/x11/randrext/pkg-plist +++ b/x11/randrext/pkg-plist @@ -3,4 +3,4 @@ include/X11/extensions/randrproto.h libdata/pkgconfig/randr.pc %%DOCSDIR%%/protocol @dirrm %%DOCSDIR%% -@unexec rmdir %D/include/X11/extensions 2>/dev/null || true +@dirrmtry include/X11/extensions diff --git a/x11/renderext/pkg-plist b/x11/renderext/pkg-plist index f751a38b9f0d..7ac163ca5b57 100644 --- a/x11/renderext/pkg-plist +++ b/x11/renderext/pkg-plist @@ -4,4 +4,4 @@ libdata/pkgconfig/render.pc %%DOCSDIR%%/library %%DOCSDIR%%/protocol @dirrm %%DOCSDIR%% -@unexec rmdir %D/include/X11/extensions 2>/dev/null || true +@dirrmtry include/X11/extensions diff --git a/x11/resourceext/pkg-plist b/x11/resourceext/pkg-plist index 2fe2fddaa2de..75a86fee0e30 100644 --- a/x11/resourceext/pkg-plist +++ b/x11/resourceext/pkg-plist @@ -1,3 +1,3 @@ include/X11/extensions/XResproto.h libdata/pkgconfig/resourceext.pc -@unexec rmdir %D/include/X11/extensions 2>/dev/null || true +@dirrmtry include/X11/extensions diff --git a/x11/rox-wallpaper/pkg-plist b/x11/rox-wallpaper/pkg-plist index 3c5e5f4c19d5..cf9acdb6529c 100644 --- a/x11/rox-wallpaper/pkg-plist +++ b/x11/rox-wallpaper/pkg-plist @@ -18,4 +18,4 @@ apps/Wallpaper/options.pyc apps/Wallpaper/options.pyo @dirrm apps/Wallpaper/Help @dirrm apps/Wallpaper -@unexec rmdir %D/apps 2>/dev/null || true +@dirrmtry apps diff --git a/x11/wdm/pkg-plist b/x11/wdm/pkg-plist index bbdd4b0668a7..6cba7f746a79 100644 --- a/x11/wdm/pkg-plist +++ b/x11/wdm/pkg-plist @@ -37,10 +37,10 @@ share/locale/es/LC_MESSAGES/wdm.mo share/locale/fr_FR/LC_MESSAGES/wdm.mo share/locale/ja/LC_MESSAGES/wdm.mo share/locale/ru/LC_MESSAGES/wdm.mo -@unexec rmdir %D/lib/X11/wdm/pixmaps 2>/dev/null || true +@dirrmtry lib/X11/wdm/pixmaps @exec mkdir -p %D/lib/X11/wdm/authdir -@unexec rmdir %D/lib/X11/wdm/authdir/authfiles 2>/dev/null || true -@unexec rmdir %D/lib/X11/wdm/authdir 2>/dev/null || true -@unexec rmdir %D/lib/X11/wdm 2>/dev/null || true +@dirrmtry lib/X11/wdm/authdir/authfiles +@dirrmtry lib/X11/wdm/authdir +@dirrmtry lib/X11/wdm %%PAM%%@cwd %%LOCALBASE%% %%PAM%%etc/pam.d/wdm diff --git a/x11/xextensions/pkg-plist b/x11/xextensions/pkg-plist index 37714321fd51..c3e54e3a3ffa 100644 --- a/x11/xextensions/pkg-plist +++ b/x11/xextensions/pkg-plist @@ -52,4 +52,4 @@ include/X11/extensions/xtestext1.h include/X11/extensions/xteststr.h libdata/pkgconfig/xextensions.pc @dirrm share/doc/xextensions -@unexec rmdir %D/include/X11/extensions 2>/dev/null || true +@dirrmtry include/X11/extensions diff --git a/x11/xfce4-clipman-plugin/pkg-plist b/x11/xfce4-clipman-plugin/pkg-plist index 791cb41022cb..975b92cfb504 100644 --- a/x11/xfce4-clipman-plugin/pkg-plist +++ b/x11/xfce4-clipman-plugin/pkg-plist @@ -1,3 +1,3 @@ @comment $FreeBSD$ lib/xfce4/panel-plugins/libclipman.so -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins diff --git a/x11/xfce4-trigger-launcher/pkg-plist b/x11/xfce4-trigger-launcher/pkg-plist index 87439d6d4a89..d6c8e54d6088 100644 --- a/x11/xfce4-trigger-launcher/pkg-plist +++ b/x11/xfce4-trigger-launcher/pkg-plist @@ -1,3 +1,3 @@ lib/xfce4/panel-plugins/libtriggerlauncher.so -@unexec rmdir %D/lib/xfce4/panel-plugins 2>/dev/null || true -@unexec rmdir %D/lib/xfce4 2>/dev/null || true +@dirrmtry lib/xfce4/panel-plugins +@dirrmtry lib/xfce4 diff --git a/x11/xfree86_xkb_xml/pkg-plist b/x11/xfree86_xkb_xml/pkg-plist index 78ef562c8655..8b0179a792f6 100644 --- a/x11/xfree86_xkb_xml/pkg-plist +++ b/x11/xfree86_xkb_xml/pkg-plist @@ -2,5 +2,5 @@ lib/X11/xkb/rules/xfree86.xml lib/X11/xkb/rules/xkb.dtd share/locale/bg/LC_MESSAGES/xfree86_xkb_xml.mo share/locale/ru/LC_MESSAGES/xfree86_xkb_xml.mo -@unexec rmdir %D/lib/X11/xkb/rules 2>/dev/null || true -@unexec rmdir %D/lib/X11/xkb 2>/dev/null || true +@dirrmtry lib/X11/xkb/rules +@dirrmtry lib/X11/xkb diff --git a/x11/xmascot/pkg-plist b/x11/xmascot/pkg-plist index 6eede9e67f10..cbdd902b1f27 100644 --- a/x11/xmascot/pkg-plist +++ b/x11/xmascot/pkg-plist @@ -44,7 +44,7 @@ lib/X11/xmascot/virgo.gif lib/X11/xmascot/yubi.xbm lib/X11/xmascot/yubi.xbmmsk @dirrm lib/X11/xmascot -@unexec rmdir %D/lib/X11/ja_JP.EUC/app-defaults 2>/dev/null || true -@unexec rmdir %D/lib/X11/ja_JP.EUC 2>/dev/null || true -@unexec rmdir %D/lib/X11/ja_JP.eucJP/app-defaults 2>/dev/null || true -@unexec rmdir %D/lib/X11/ja_JP.eucJP 2>/dev/null || true +@dirrmtry lib/X11/ja_JP.EUC/app-defaults +@dirrmtry lib/X11/ja_JP.EUC +@dirrmtry lib/X11/ja_JP.eucJP/app-defaults +@dirrmtry lib/X11/ja_JP.eucJP diff --git a/x11/xorg-clients/pkg-plist b/x11/xorg-clients/pkg-plist index dc3ad36b362a..123c207d1782 100644 --- a/x11/xorg-clients/pkg-plist +++ b/x11/xorg-clients/pkg-plist @@ -808,4 +808,4 @@ lib/X11/xsm/system.xsm @dirrm lib/X11/icons/handhelds @dirrm lib/X11/icons @dirrm lib/X11/xinit -@unexec rmdir %D/lib/X11/fonts/util 2>/dev/null || true +@dirrmtry lib/X11/fonts/util diff --git a/x11/xorg-documents/pkg-plist b/x11/xorg-documents/pkg-plist index 0d875b15c9f7..fd9e180a96bf 100644 --- a/x11/xorg-documents/pkg-plist +++ b/x11/xorg-documents/pkg-plist @@ -91,7 +91,7 @@ share/doc/X11/xsmp.txt share/doc/X11/xtest.txt share/doc/X11/xtestlib.txt share/doc/X11/xv-protocol-v2.txt -@unexec rmdir %D/share/doc/X11/PDF 2>/dev/null || true -@unexec rmdir %D/share/doc/X11/PostScript 2>/dev/null || true -@unexec rmdir %D/share/doc/X11/html 2>/dev/null || true -@unexec rmdir %D/share/doc/X11 2>/dev/null || true +@dirrmtry share/doc/X11/PDF +@dirrmtry share/doc/X11/PostScript +@dirrmtry share/doc/X11/html +@dirrmtry share/doc/X11 diff --git a/x11/xorg-libraries/pkg-plist b/x11/xorg-libraries/pkg-plist index df1e52d5323d..367766260eff 100644 --- a/x11/xorg-libraries/pkg-plist +++ b/x11/xorg-libraries/pkg-plist @@ -778,6 +778,6 @@ libdata/pkgconfig/xrender.pc @dirrm lib/X11/locale/zh_TW.big5 @dirrm lib/X11/locale/zh_TW.UTF-8 @dirrm lib/X11/locale/el_GR.UTF-8 -@unexec rmdir %D/include/X11/bitmaps 2>/dev/null || true -@unexec rmdir %D/include/X11/fonts 2>/dev/null || true -@unexec rmdir %D/lib/X11/locale 2>/dev/null || true +@dirrmtry include/X11/bitmaps +@dirrmtry include/X11/fonts +@dirrmtry lib/X11/locale diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist index df1c3025c35e..6bf7535b9df2 100644 --- a/x11/yelp/pkg-plist +++ b/x11/yelp/pkg-plist @@ -104,16 +104,16 @@ share/locale/xh/LC_MESSAGES/yelp.mo share/locale/zh_CN/LC_MESSAGES/yelp.mo share/locale/zh_TW/LC_MESSAGES/yelp.mo share/locale/zu/LC_MESSAGES/yelp.mo -@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zu 2> /dev/null || true -@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ug 2> /dev/null || true -@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/nso 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/ku/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ku 2> /dev/null || true +@dirrmtry share/locale/zu/LC_MESSAGES +@dirrmtry share/locale/zu +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug +@dirrmtry share/locale/nso/LC_MESSAGES +@dirrmtry share/locale/nso +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku @dirrm share/gnome/yelp/xslt @dirrm share/gnome/yelp/ui @dirrm share/gnome/yelp/icons diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist index d2276349c61b..c29da1612040 100644 --- a/x11/zenity/pkg-plist +++ b/x11/zenity/pkg-plist @@ -134,8 +134,8 @@ share/locale/vi/LC_MESSAGES/zenity-0.1.mo share/locale/xh/LC_MESSAGES/zenity-0.1.mo share/locale/zh_CN/LC_MESSAGES/zenity-0.1.mo share/locale/zh_TW/LC_MESSAGES/zenity-0.1.mo -@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ug 2> /dev/null || true +@dirrmtry share/locale/ug/LC_MESSAGES +@dirrmtry share/locale/ug @dirrm share/gnome/zenity/clothes @dirrm share/gnome/zenity @dirrm share/gnome/omf/zenity |