diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist index 61dad2114c70..4095779d3663 100644 --- a/archivers/file-roller/pkg-plist +++ b/archivers/file-roller/pkg-plist @@ -175,16 +175,16 @@ share/locale/vi/LC_MESSAGES/file-roller.mo share/locale/xh/LC_MESSAGES/file-roller.mo share/locale/zh_CN/LC_MESSAGES/file-roller.mo share/locale/zh_TW/LC_MESSAGES/file-roller.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/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/ku/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ku 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/sr@ije/LC_MESSAGES +@dirrmtry share/locale/sr@ije +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku @dirrm share/gnome/omf/file-roller @dirrm share/gnome/help/file-roller/zh_TW/figures @dirrm share/gnome/help/file-roller/zh_TW diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist index 61dad2114c70..4095779d3663 100644 --- a/archivers/fileroller/pkg-plist +++ b/archivers/fileroller/pkg-plist @@ -175,16 +175,16 @@ share/locale/vi/LC_MESSAGES/file-roller.mo share/locale/xh/LC_MESSAGES/file-roller.mo share/locale/zh_CN/LC_MESSAGES/file-roller.mo share/locale/zh_TW/LC_MESSAGES/file-roller.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/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/ku/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ku 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/sr@ije/LC_MESSAGES +@dirrmtry share/locale/sr@ije +@dirrmtry share/locale/rw/LC_MESSAGES +@dirrmtry share/locale/rw +@dirrmtry share/locale/ku/LC_MESSAGES +@dirrmtry share/locale/ku @dirrm share/gnome/omf/file-roller @dirrm share/gnome/help/file-roller/zh_TW/figures @dirrm share/gnome/help/file-roller/zh_TW diff --git a/archivers/p5-Archive-Tar/pkg-plist b/archivers/p5-Archive-Tar/pkg-plist index 91651c191fbd..17191009add6 100644 --- a/archivers/p5-Archive-Tar/pkg-plist +++ b/archivers/p5-Archive-Tar/pkg-plist @@ -5,6 +5,6 @@ bin/ptardiff %%SITE_PERL%%/Archive/Tar/File.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Archive/Tar/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Archive/Tar -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Archive 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Archive @dirrm %%SITE_PERL%%/Archive/Tar -@unexec rmdir %D/%%SITE_PERL%%/Archive 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Archive diff --git a/archivers/p5-Archive-Zip/pkg-plist b/archivers/p5-Archive-Zip/pkg-plist index 1080d230ca4b..efc225e842bd 100644 --- a/archivers/p5-Archive-Zip/pkg-plist +++ b/archivers/p5-Archive-Zip/pkg-plist @@ -8,6 +8,6 @@ bin/crc32 %%SITE_PERL%%/Archive/Zip/Tree.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Archive/Zip/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Archive/Zip -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Archive 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Archive @dirrm %%SITE_PERL%%/Archive/Zip -@unexec rmdir %D/%%SITE_PERL%%/Archive 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/Archive diff --git a/archivers/p5-Compress-Bzip2/pkg-plist b/archivers/p5-Compress-Bzip2/pkg-plist index 96374e896e93..32817c121ef7 100644 --- a/archivers/p5-Compress-Bzip2/pkg-plist +++ b/archivers/p5-Compress-Bzip2/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/Bzip2/Bzip2.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/Bzip2/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/Bzip2 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Compress 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Compress diff --git a/archivers/p5-Compress-Zlib/pkg-plist b/archivers/p5-Compress-Zlib/pkg-plist index c953a94c8397..365090c188b5 100644 --- a/archivers/p5-Compress-Zlib/pkg-plist +++ b/archivers/p5-Compress-Zlib/pkg-plist @@ -4,5 +4,5 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/Zlib/Zlib.so %%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/Zlib/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress/Zlib -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Compress 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Compress +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Compress diff --git a/archivers/p5-IO-Zlib/pkg-plist b/archivers/p5-IO-Zlib/pkg-plist index 303474019a5c..f11b3ca00f8e 100644 --- a/archivers/p5-IO-Zlib/pkg-plist +++ b/archivers/p5-IO-Zlib/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/IO/Zlib.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Zlib/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Zlib -@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/archivers/p5-Mac-Macbinary/pkg-plist b/archivers/p5-Mac-Macbinary/pkg-plist index 45add263b9de..a94b1602bf6f 100644 --- a/archivers/p5-Mac-Macbinary/pkg-plist +++ b/archivers/p5-Mac-Macbinary/pkg-plist @@ -1,5 +1,5 @@ %%SITE_PERL%%/Mac/Macbinary.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mac/Macbinary/.packlist @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mac/Macbinary -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Mac 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/Mac 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mac +@dirrmtry %%SITE_PERL%%/Mac diff --git a/archivers/p5-PerlIO-gzip/pkg-plist b/archivers/p5-PerlIO-gzip/pkg-plist index 896039cf32d8..10efd7129fa7 100644 --- a/archivers/p5-PerlIO-gzip/pkg-plist +++ b/archivers/p5-PerlIO-gzip/pkg-plist @@ -2,6 +2,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/gzip/.packlist %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/gzip/gzip.bs %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/gzip/gzip.so -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/PerlIO 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/PerlIO @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO/gzip -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO 2>/dev/null || true +@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlIO diff --git a/archivers/rox-archive/pkg-plist b/archivers/rox-archive/pkg-plist index 2aa39dc8a37a..5b85bd60a2a5 100644 --- a/archivers/rox-archive/pkg-plist +++ b/archivers/rox-archive/pkg-plist @@ -36,4 +36,4 @@ apps/Archive/tests/testall.pyo @dirrm apps/Archive/Messages @dirrm apps/Archive/Help @dirrm apps/Archive -@unexec rmdir %D/apps 2>/dev/null || true +@dirrmtry apps diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist index e81fff8b4818..04dbc75f46eb 100644 --- a/archivers/rpm4/pkg-plist +++ b/archivers/rpm4/pkg-plist @@ -137,28 +137,28 @@ share/locale/zh/LC_MESSAGES/rpm.mo share/locale/zh_CN.GB2312/LC_MESSAGES/rpm.mo @dirrm lib/rpm @dirrm include/rpm -@unexec rmdir %D/src/portbld/SRPMS 2>/dev/null || true -@unexec rmdir %D/src/portbld/SPECS 2>/dev/null || true -@unexec rmdir %D/src/portbld/SOURCES 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/x86_64 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/sparcv9 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/sparc64 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/sparc 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/ppc64 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/ppc 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/noarch 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/ia64 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/i686 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/i586 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/i486 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/i386 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/athlon 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/amd64 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/alphaev6 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/alpha 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS 2>/dev/null || true -@unexec rmdir %D/src/portbld/BUILD 2>/dev/null || true -@unexec rmdir %D/src/portbld 2>/dev/null || true -@unexec rmdir %D/src 2>/dev/null || true -@unexec rmdir %D/share/locale/en_RN/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/en_RN 2> /dev/null || true +@dirrmtry src/portbld/SRPMS +@dirrmtry src/portbld/SPECS +@dirrmtry src/portbld/SOURCES +@dirrmtry src/portbld/RPMS/x86_64 +@dirrmtry src/portbld/RPMS/sparcv9 +@dirrmtry src/portbld/RPMS/sparc64 +@dirrmtry src/portbld/RPMS/sparc +@dirrmtry src/portbld/RPMS/ppc64 +@dirrmtry src/portbld/RPMS/ppc +@dirrmtry src/portbld/RPMS/noarch +@dirrmtry src/portbld/RPMS/ia64 +@dirrmtry src/portbld/RPMS/i686 +@dirrmtry src/portbld/RPMS/i586 +@dirrmtry src/portbld/RPMS/i486 +@dirrmtry src/portbld/RPMS/i386 +@dirrmtry src/portbld/RPMS/athlon +@dirrmtry src/portbld/RPMS/amd64 +@dirrmtry src/portbld/RPMS/alphaev6 +@dirrmtry src/portbld/RPMS/alpha +@dirrmtry src/portbld/RPMS +@dirrmtry src/portbld/BUILD +@dirrmtry src/portbld +@dirrmtry src +@dirrmtry share/locale/en_RN/LC_MESSAGES +@dirrmtry share/locale/en_RN diff --git a/archivers/rpm5/pkg-plist b/archivers/rpm5/pkg-plist index e81fff8b4818..04dbc75f46eb 100644 --- a/archivers/rpm5/pkg-plist +++ b/archivers/rpm5/pkg-plist @@ -137,28 +137,28 @@ share/locale/zh/LC_MESSAGES/rpm.mo share/locale/zh_CN.GB2312/LC_MESSAGES/rpm.mo @dirrm lib/rpm @dirrm include/rpm -@unexec rmdir %D/src/portbld/SRPMS 2>/dev/null || true -@unexec rmdir %D/src/portbld/SPECS 2>/dev/null || true -@unexec rmdir %D/src/portbld/SOURCES 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/x86_64 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/sparcv9 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/sparc64 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/sparc 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/ppc64 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/ppc 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/noarch 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/ia64 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/i686 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/i586 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/i486 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/i386 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/athlon 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/amd64 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/alphaev6 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS/alpha 2>/dev/null || true -@unexec rmdir %D/src/portbld/RPMS 2>/dev/null || true -@unexec rmdir %D/src/portbld/BUILD 2>/dev/null || true -@unexec rmdir %D/src/portbld 2>/dev/null || true -@unexec rmdir %D/src 2>/dev/null || true -@unexec rmdir %D/share/locale/en_RN/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/en_RN 2> /dev/null || true +@dirrmtry src/portbld/SRPMS +@dirrmtry src/portbld/SPECS +@dirrmtry src/portbld/SOURCES +@dirrmtry src/portbld/RPMS/x86_64 +@dirrmtry src/portbld/RPMS/sparcv9 +@dirrmtry src/portbld/RPMS/sparc64 +@dirrmtry src/portbld/RPMS/sparc +@dirrmtry src/portbld/RPMS/ppc64 +@dirrmtry src/portbld/RPMS/ppc +@dirrmtry src/portbld/RPMS/noarch +@dirrmtry src/portbld/RPMS/ia64 +@dirrmtry src/portbld/RPMS/i686 +@dirrmtry src/portbld/RPMS/i586 +@dirrmtry src/portbld/RPMS/i486 +@dirrmtry src/portbld/RPMS/i386 +@dirrmtry src/portbld/RPMS/athlon +@dirrmtry src/portbld/RPMS/amd64 +@dirrmtry src/portbld/RPMS/alphaev6 +@dirrmtry src/portbld/RPMS/alpha +@dirrmtry src/portbld/RPMS +@dirrmtry src/portbld/BUILD +@dirrmtry src/portbld +@dirrmtry src +@dirrmtry share/locale/en_RN/LC_MESSAGES +@dirrmtry share/locale/en_RN diff --git a/archivers/xarchive/pkg-plist b/archivers/xarchive/pkg-plist index ada61b3ea2e8..aef604434af3 100644 --- a/archivers/xarchive/pkg-plist +++ b/archivers/xarchive/pkg-plist @@ -12,6 +12,6 @@ share/doc/xarchive/xarchive.1.html share/doc/xarchive/xarchive.1.txt share/pixmaps/xarchive.xpm @dirrm share/doc/xarchive -@unexec rmdir %D/share/applications 2>/dev/null || true +@dirrmtry share/applications @dirrm lib/xarchive/wrappers @dirrm lib/xarchive