diff options
| author | edwin <edwin@FreeBSD.org> | 2006-01-22 11:01:03 +0800 |
|---|---|---|
| committer | edwin <edwin@FreeBSD.org> | 2006-01-22 11:01:03 +0800 |
| commit | e31bed690b2fba4714686b691a351a51b98d80e8 (patch) | |
| tree | fb869b3f76a5b4c5a0d4932490adea12d65abd80 /x11 | |
| parent | 176655f0a1e9745862db36b0cbfab399d74d1339 (diff) | |
| download | freebsd-ports-gnome-e31bed690b2fba4714686b691a351a51b98d80e8.tar.gz freebsd-ports-gnome-e31bed690b2fba4714686b691a351a51b98d80e8.tar.zst freebsd-ports-gnome-e31bed690b2fba4714686b691a351a51b98d80e8.zip | |
Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry
Approved by: krion@
PR: ports/88711 (related)
Diffstat (limited to 'x11')
36 files changed, 113 insertions, 113 deletions
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 |