Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry

This commit is contained in:
Edwin Groothuis 2006-01-22 00:17:42 +00:00
parent 5314674453
commit e8d3c8300f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=154104
24 changed files with 66 additions and 66 deletions

View file

@ -10,10 +10,10 @@ JDE/DeepForest/docs/Japanese/README.sjis
JDE/DeepForest/install.sh
bin/DeepForest.app
%%PIXMAP_PATH%%/DeepForest.xpm
@unexec rmdir %D/share/WindowMaker/Pixmaps 2>/dev/null || true
@unexec rmdir %D/share/WindowMaker 2>/dev/null || true
@dirrmtry share/WindowMaker/Pixmaps
@dirrmtry share/WindowMaker
@dirrm JDE/DeepForest/docs/English
@dirrm JDE/DeepForest/docs/Japanese
@dirrm JDE/DeepForest/docs
@dirrm JDE/DeepForest
@unexec rmdir %D/JDE 2>/dev/null || true
@dirrmtry JDE

View file

@ -32,7 +32,7 @@
%%INSTDIR%%/zutil.o
%%INSTDIR%%/zutil.ppu
@dirrm %%INSTDIR%%
@unexec rmdir %D/lib/fpc/%%PORTVERSION%%/units/freebsd 2>/dev/null || true
@unexec rmdir %D/lib/fpc/%%PORTVERSION%%/units 2>/dev/null || true
@unexec rmdir %D/lib/fpc/%%PORTVERSION%% 2>/dev/null || true
@unexec rmdir %D/lib/fpc 2>/dev/null || true
@dirrmtry lib/fpc/%%PORTVERSION%%/units/freebsd
@dirrmtry lib/fpc/%%PORTVERSION%%/units
@dirrmtry lib/fpc/%%PORTVERSION%%
@dirrmtry lib/fpc

View file

@ -69,20 +69,20 @@ share/locale/sv/LC_MESSAGES/rpm.mo
share/locale/tr/LC_MESSAGES/rpm.mo
@dirrm lib/rpm
@dirrm include/rpm
@unexec rmdir %D/src/redhat/SRPMS 2>/dev/null || true
@unexec rmdir %D/src/redhat/SPECS 2>/dev/null || true
@unexec rmdir %D/src/redhat/SOURCES 2>/dev/null || true
@unexec rmdir %D/src/redhat/RPMS/noarch 2>/dev/null || true
@unexec rmdir %D/src/redhat/RPMS/amd64 2>/dev/null || true
@unexec rmdir %D/src/redhat/RPMS/athlon 2>/dev/null || true
@unexec rmdir %D/src/redhat/RPMS/i686 2>/dev/null || true
@unexec rmdir %D/src/redhat/RPMS/i586 2>/dev/null || true
@unexec rmdir %D/src/redhat/RPMS/i486 2>/dev/null || true
@unexec rmdir %D/src/redhat/RPMS/i386 2>/dev/null || true
@unexec rmdir %D/src/redhat/RPMS 2>/dev/null || true
@unexec rmdir %D/src/redhat/BUILD 2>/dev/null || true
@unexec rmdir %D/src/redhat 2>/dev/null || true
@unexec rmdir %D/src 2>/dev/null || true
@dirrmtry src/redhat/SRPMS
@dirrmtry src/redhat/SPECS
@dirrmtry src/redhat/SOURCES
@dirrmtry src/redhat/RPMS/noarch
@dirrmtry src/redhat/RPMS/amd64
@dirrmtry src/redhat/RPMS/athlon
@dirrmtry src/redhat/RPMS/i686
@dirrmtry src/redhat/RPMS/i586
@dirrmtry src/redhat/RPMS/i486
@dirrmtry src/redhat/RPMS/i386
@dirrmtry src/redhat/RPMS
@dirrmtry src/redhat/BUILD
@dirrmtry src/redhat
@dirrmtry src
@unexec rmdir /var/lib/rpm 2>/dev/null || true
@unexec rmdir /var/lib 2>/dev/null || true
@exec mkdir -p /var/lib

View file

@ -20,4 +20,4 @@ bin/catbuilder
%%DATADIR%%/pixmaps/venus-small.xpm
%%DATADIR%%/pixmaps/nova_logo.png
@dirrm %%DATADIR%%/pixmaps
@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
@dirrmtry %%DATADIR%%

View file

@ -5,7 +5,7 @@ bin/adsquery
%%SITE_PERL%%/Astro/ADS/Result/Paper.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/ADS/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/ADS
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
@dirrm %%SITE_PERL%%/Astro/ADS/Result
@dirrm %%SITE_PERL%%/Astro/ADS
@unexec rmdir %D/%%SITE_PERL%%/Astro 2>/dev/null || true
@dirrmtry %%SITE_PERL%%/Astro

View file

@ -43,6 +43,6 @@ etc/skycat.cfg.default
@dirrm %%SITE_PERL%%/Astro/Catalog/Star
@dirrm %%SITE_PERL%%/Astro/Catalog/Transport
@dirrm %%SITE_PERL%%/Astro/Catalog
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
@unexec rmdir %D/%%SITE_PERL%%/Astro 2>/dev/null || true
@unexec rmdir %D/%%SITE_PERL%%/Tk 2>/dev/null || true
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
@dirrmtry %%SITE_PERL%%/Astro
@dirrmtry %%SITE_PERL%%/Tk

View file

@ -1,5 +1,5 @@
%%SITE_PERL%%/Astro/DSS.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/DSS/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/DSS
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
@unexec rmdir %D/%%SITE_PERL%%/Astro 2>/dev/null || true
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
@dirrmtry %%SITE_PERL%%/Astro

View file

@ -4,9 +4,9 @@
%%SITE_PERL%%/Astro/FITS/Header/Item.pm
%%SITE_PERL%%/Astro/FITS/Header/NDF.pm
@dirrm %%SITE_PERL%%/Astro/FITS/Header
@unexec rmdir %D/%%SITE_PERL%%/Astro/FITS 2>/dev/null || true
@unexec rmdir %D/%%SITE_PERL%%/Astro 2>/dev/null || true
@dirrmtry %%SITE_PERL%%/Astro/FITS
@dirrmtry %%SITE_PERL%%/Astro
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/FITS/Header/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/FITS/Header
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/FITS 2>/dev/null || true
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/FITS
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro

View file

@ -7,5 +7,5 @@
@dirrm %%SITE_PERL%%/Astro/SIMBAD
@dirrm %%SITE_PERL%%/Astro
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/SIMBAD
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
@unexec rmdir %D/%%SITE_PERL%%/Astro 2>/dev/null || true
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
@dirrmtry %%SITE_PERL%%/Astro

View file

@ -1,5 +1,5 @@
%%SITE_PERL%%/Astro/SunTime.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/SunTime/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro/SunTime
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro 2>/dev/null || true
@unexec rmdir %D/%%SITE_PERL%%/Astro 2>/dev/null || true
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Astro
@dirrmtry %%SITE_PERL%%/Astro

View file

@ -16,4 +16,4 @@
%%DATADIR%%/catalogs/sky2000.ncd
@dirrm %%DATADIR%%/catalogs/sky2000
@dirrm %%DATADIR%%/catalogs
@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true
@dirrmtry %%DATADIR%%

View file

@ -29,5 +29,5 @@ lib/ladspa/tracker_2025.so
lib/ladspa/triangle_1649.so
%%NLS%%share/locale/de/LC_MESSAGES/blop.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/blop.mo
@unexec rmdir %D/lib/ladspa 2>/dev/null || true
@dirrmtry lib/ladspa
@dirrm lib/ladspa/blop_files/

View file

@ -403,6 +403,6 @@ etc/gnump3d/mime.types
@dirrm %%SITE_PERL%%/gnump3d/plugins
@dirrm %%SITE_PERL%%/gnump3d/lang
@dirrm %%SITE_PERL%%/gnump3d
@unexec rmdir %D/etc/gnump3d 2>/dev/null || true
@dirrmtry etc/gnump3d
@unexec rmdir /var/log/gnump3d 2>/dev/null || true
@exec mkdir -p /var/log/gnump3d

View file

@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/CD/CD.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/CD/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/CD
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio 2>/dev/null || true
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Audio 2>/dev/null || true
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Audio

View file

@ -36,7 +36,7 @@ bin/tkscope
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Play
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio/Data
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Audio
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Tk 2>/dev/null || true
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Tk
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Audio/Play
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Audio/Data
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Audio

View file

@ -1,5 +1,5 @@
%%SITE_PERL%%/MP3/ID3v1Tag.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/ID3v1Tag/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/ID3v1Tag
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3 2>/dev/null || true
@unexec rmdir %D/%%SITE_PERL%%/MP3 2>/dev/null || true
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3
@dirrmtry %%SITE_PERL%%/MP3

View file

@ -4,6 +4,6 @@
%%SITE_PERL%%/MP3/Tag/ID3v2.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/Tag/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3/Tag
@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3 2>/dev/null || true
@unexec rmdir %D/%%SITE_PERL%%/MP3/Tag 2>/dev/null || true
@unexec rmdir %D/%%SITE_PERL%%/MP3 2>/dev/null || true
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MP3
@dirrmtry %%SITE_PERL%%/MP3/Tag
@dirrmtry %%SITE_PERL%%/MP3

View file

@ -1,5 +1,5 @@
bin/shout
etc/icecast/shout.conf.dist
@unexec rmdir %D/etc/icecast 2>/dev/null || true
@unexec rmdir %D/share/icecast/log 2>/dev/null || true
@unexec rmdir %D/share/icecast 2>/dev/null || true
@dirrmtry etc/icecast
@dirrmtry share/icecast/log
@dirrmtry share/icecast

View file

@ -97,6 +97,6 @@ share/ladspa/rdf/swh-aux.rdf
share/ladspa/rdf/swh-plugins.rdf
share/ladspa/rdf/swh-scales.rdf
%%NLS%%share/locale/en_GB/LC_MESSAGES/swh-plugins.mo
@unexec rmdir %D/share/ladspa/rdf 2>/dev/null || true
@unexec rmdir %D/share/ladspa 2>/dev/null || true
@unexec rmdir %D/lib/ladspa 2>/dev/null || true
@dirrmtry share/ladspa/rdf
@dirrmtry share/ladspa
@dirrmtry lib/ladspa

View file

@ -18,6 +18,6 @@ lib/ladspa/tap_tremolo.so
lib/ladspa/tap_tubewarmth.so
lib/ladspa/tap_vibrato.so
share/ladspa/rdf/tap-plugins.rdf
@unexec rmdir %D/share/ladspa/rdf 2>/dev/null || true
@unexec rmdir %D/share/ladspa 2>/dev/null || true
@unexec rmdir %D/lib/ladspa 2>/dev/null || true
@dirrmtry share/ladspa/rdf
@dirrmtry share/ladspa
@dirrmtry lib/ladspa

View file

@ -19,5 +19,5 @@ lib/timidity/interface_a.so
%%PORTDOCS%%share/doc/ja/timidity++/README.xaw
@dirrm lib/timidity/bitmaps
@cwd /usr/X11R6
@unexec rmdir %D/lib/X11/%%EUCJP_LOCALE%%/app-defaults 2>/dev/null || true
@unexec rmdir %D/lib/X11/%%EUCJP_LOCALE%% 2>/dev/null || true
@dirrmtry lib/X11/%%EUCJP_LOCALE%%/app-defaults
@dirrmtry lib/X11/%%EUCJP_LOCALE%%

View file

@ -96,5 +96,5 @@ share/locale/es/LC_MESSAGES/xmms-kde.mo
share/locale/fr/LC_MESSAGES/xmms-kde.mo
share/locale/nl/LC_MESSAGES/xmms-kde.mo
@dirrm share/apps/xmms-kde
@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
@dirrmtry share/doc/HTML/en
@dirrmtry share/doc/HTML

View file

@ -38,7 +38,7 @@ share/zinf/themes/ZinfClassic.fat
@dirrm share/zinf
@dirrm lib/zinf/plugins
@dirrm lib/zinf
@unexec rmdir %D/etc/sdr/plugins 2>/dev/null || true
@unexec rmdir %D/etc/sdr 2>/dev/null || true
@unexec rmdir %D/share/locale/ca_ES/LC_MESSAGES 2> /dev/null || true
@unexec rmdir %D/share/locale/ca_ES 2> /dev/null || true
@dirrmtry etc/sdr/plugins
@dirrmtry etc/sdr
@dirrmtry share/locale/ca_ES/LC_MESSAGES
@dirrmtry share/locale/ca_ES

View file

@ -23,6 +23,6 @@ distribfold/cpu0/toph19_eef1.inp
distribfold/cpu0/whatsnew.txt
distribfold/cpu0/zhangatm.txt
distribfold/cpu0/zhangeij.txt
@unexec rmdir %D/distribfold/cpu0 2>/dev/null || true
@dirrmtry distribfold/cpu0
etc/rc.d/distribfold.sh
@unexec rmdir %D/distribfold 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/distribfold`` to remove any binary, configuration and log files left." | fmt