summaryrefslogtreecommitdiff
path: root/x11-fonts
diff options
context:
space:
mode:
authorEdwin Groothuis <edwin@FreeBSD.org>2006-01-22 03:01:03 +0000
committerEdwin Groothuis <edwin@FreeBSD.org>2006-01-22 03:01:03 +0000
commit508b8d82f4fdfc6889fe17931ef30f047501dfd6 (patch)
treef7810d4887e5297c7b7788225e906b99c81d709b /x11-fonts
parentFix pkg-plist. (diff)
Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry
Approved by: krion@ PR: ports/88711 (related)
Diffstat (limited to 'x11-fonts')
-rw-r--r--x11-fonts/XFree86-4-font100dpi/pkg-plist2
-rw-r--r--x11-fonts/XFree86-4-font75dpi/pkg-plist2
-rw-r--r--x11-fonts/XFree86-4-fontCyrillic/pkg-plist2
-rw-r--r--x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist2
-rw-r--r--x11-fonts/XFree86-4-fontScalable/pkg-plist8
-rw-r--r--x11-fonts/fontconfig/pkg-plist4
-rw-r--r--x11-fonts/nexfontsel/pkg-plist4
-rw-r--r--x11-fonts/p5-Font-AFM/pkg-plist4
-rw-r--r--x11-fonts/p5-Font-TTF/pkg-plist6
-rw-r--r--x11-fonts/tv-fonts/pkg-plist2
-rw-r--r--x11-fonts/xfs/pkg-plist2
-rw-r--r--x11-fonts/xorg-fonts-100dpi/pkg-plist2
-rw-r--r--x11-fonts/xorg-fonts-75dpi/pkg-plist2
-rw-r--r--x11-fonts/xorg-fonts-cyrillic/pkg-plist2
-rw-r--r--x11-fonts/xorg-fonts-encodings/pkg-plist4
-rw-r--r--x11-fonts/xorg-fonts-miscbitmaps/pkg-plist2
-rw-r--r--x11-fonts/xorg-fonts-truetype/pkg-plist2
-rw-r--r--x11-fonts/xorg-fonts-type1/pkg-plist2
18 files changed, 27 insertions, 27 deletions
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 10:33:47 +0000