summaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
authorEdwin Groothuis <edwin@FreeBSD.org>2006-01-22 01:29:46 +0000
committerEdwin Groothuis <edwin@FreeBSD.org>2006-01-22 01:29:46 +0000
commit913a5a5cbae4d0f429ae82617b4e1fca51867d49 (patch)
treef99bd9b91ec272158b0ee070a9ec0871177d6ea8 /converters
parentReplace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry (diff)
Replace ugly "@unexec rmdir %D... 2>/dev/null || true" with @dirrmtry
Approved by: krion@ PR: ports/88711 (related)
Notes
Notes: svn path=/head/; revision=154109
Diffstat (limited to 'converters')
-rw-r--r--converters/konwert/pkg-plist4
-rw-r--r--converters/ktextdecode/pkg-plist4
-rw-r--r--converters/p5-Convert-ASCII-Armour/pkg-plist10
-rw-r--r--converters/p5-Convert-ASN1/pkg-plist4
-rw-r--r--converters/p5-Convert-BER/pkg-plist4
-rw-r--r--converters/p5-Convert-BinHex/pkg-plist6
-rw-r--r--converters/p5-Convert-Binary-C/pkg-plist8
-rw-r--r--converters/p5-Convert-IBM390/pkg-plist4
-rw-r--r--converters/p5-Convert-UUlib/pkg-plist4
-rw-r--r--converters/p5-Cstools/pkg-plist4
-rw-r--r--converters/p5-JSON/pkg-plist2
-rw-r--r--converters/p5-JSON1/pkg-plist2
-rw-r--r--converters/p5-MIME-Base32/pkg-plist4
-rw-r--r--converters/p5-MIME-Base64/pkg-plist4
-rw-r--r--converters/p5-Text-Iconv/pkg-plist4
-rw-r--r--converters/p5-Text-Unidecode/pkg-plist8
-rw-r--r--converters/p5-Unicode-RecursiveDowngrade/pkg-plist4
-rw-r--r--converters/p5-Unicode-String/pkg-plist4
-rw-r--r--converters/p5-Unicode-UTF8simple/pkg-plist4
19 files changed, 44 insertions, 44 deletions
diff --git a/converters/konwert/pkg-plist b/converters/konwert/pkg-plist
index 661535a323c3..54481cf70af5 100644
--- a/converters/konwert/pkg-plist
+++ b/converters/konwert/pkg-plist
@@ -985,8 +985,8 @@ lib/konwert/aux/512bold1
%%DATADIR%%/filters/winwest-macroman
%%DATADIR%%/filters/xjp-UTF8
%%DATADIR%%/filters/xmetodo-UTF8
-@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 lib/konwert/aux
@dirrm lib/konwert/devel
@dirrm lib/konwert
diff --git a/converters/ktextdecode/pkg-plist b/converters/ktextdecode/pkg-plist
index 53490564cf97..f7548962955e 100644
--- a/converters/ktextdecode/pkg-plist
+++ b/converters/ktextdecode/pkg-plist
@@ -4,5 +4,5 @@ share/icons/hicolor/16x16/apps/ktextdecode.png
share/icons/hicolor/32x32/apps/ktextdecode.png
share/icons/locolor/16x16/apps/ktextdecode.png
share/icons/locolor/32x32/apps/ktextdecode.png
-@unexec rmdir %D/share/applnk/Applications/ 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrmtry share/applnk/Applications/
+@dirrmtry share/applnk
diff --git a/converters/p5-Convert-ASCII-Armour/pkg-plist b/converters/p5-Convert-ASCII-Armour/pkg-plist
index 2b76d5da9256..9b71419e8dac 100644
--- a/converters/p5-Convert-ASCII-Armour/pkg-plist
+++ b/converters/p5-Convert-ASCII-Armour/pkg-plist
@@ -1,8 +1,8 @@
%%SITE_PERL%%/Convert/ASCII/Armor.pm
%%SITE_PERL%%/Convert/ASCII/Armour.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII/Armour/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII/Armour 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Convert/ASCII 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Convert 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII/Armour
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASCII
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
+@dirrmtry %%SITE_PERL%%/Convert/ASCII
+@dirrmtry %%SITE_PERL%%/Convert
diff --git a/converters/p5-Convert-ASN1/pkg-plist b/converters/p5-Convert-ASN1/pkg-plist
index e2099131d07d..e11dadb63f9e 100644
--- a/converters/p5-Convert-ASN1/pkg-plist
+++ b/converters/p5-Convert-ASN1/pkg-plist
@@ -8,5 +8,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASN1/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/ASN1
@dirrm %%SITE_PERL%%/Convert/ASN1
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Convert 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
+@dirrmtry %%SITE_PERL%%/Convert
diff --git a/converters/p5-Convert-BER/pkg-plist b/converters/p5-Convert-BER/pkg-plist
index b6460f2ac7b9..04bdf85996b7 100644
--- a/converters/p5-Convert-BER/pkg-plist
+++ b/converters/p5-Convert-BER/pkg-plist
@@ -2,5 +2,5 @@
%%SITE_PERL%%/Convert/BER.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/BER/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/BER
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Convert 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
+@dirrmtry %%SITE_PERL%%/Convert
diff --git a/converters/p5-Convert-BinHex/pkg-plist b/converters/p5-Convert-BinHex/pkg-plist
index f1037fccfba7..3e29c1d855b3 100644
--- a/converters/p5-Convert-BinHex/pkg-plist
+++ b/converters/p5-Convert-BinHex/pkg-plist
@@ -2,6 +2,6 @@
%%SITE_PERL%%/Convert/BinHex.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/BinHex/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/BinHex
-@unexec rmdir %D/%%SITE_PERL%%/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/auto/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Convert
+@dirrmtry %%SITE_PERL%%/auto/Convert
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
diff --git a/converters/p5-Convert-Binary-C/pkg-plist b/converters/p5-Convert-Binary-C/pkg-plist
index 7f4006b8c485..57805048b5cc 100644
--- a/converters/p5-Convert-Binary-C/pkg-plist
+++ b/converters/p5-Convert-Binary-C/pkg-plist
@@ -6,7 +6,7 @@ bin/ccconfig
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Binary/C/C.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Convert/Binary/C
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Binary/C
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Convert/Binary 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Binary 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Convert/Binary
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Convert
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/Binary
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
diff --git a/converters/p5-Convert-IBM390/pkg-plist b/converters/p5-Convert-IBM390/pkg-plist
index 01f605bc6577..9da67050b140 100644
--- a/converters/p5-Convert-IBM390/pkg-plist
+++ b/converters/p5-Convert-IBM390/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/IBM390/autosplit.ix
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/IBM390/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/IBM390
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Convert 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Convert
diff --git a/converters/p5-Convert-UUlib/pkg-plist b/converters/p5-Convert-UUlib/pkg-plist
index ef7cce22d80c..13ad94957684 100644
--- a/converters/p5-Convert-UUlib/pkg-plist
+++ b/converters/p5-Convert-UUlib/pkg-plist
@@ -3,5 +3,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/UUlib/UUlib.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/UUlib/UUlib.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert/UUlib
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Convert 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Convert
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Convert
diff --git a/converters/p5-Cstools/pkg-plist b/converters/p5-Cstools/pkg-plist
index deb282af80a8..3a5be7a06eda 100644
--- a/converters/p5-Cstools/pkg-plist
+++ b/converters/p5-Cstools/pkg-plist
@@ -25,5 +25,5 @@ bin/dbfcstocs
%%SITE_PERL%%/Cz/Time.pm
@dirrm %%SITE_PERL%%/Cz/Cstocs/enc
@dirrm %%SITE_PERL%%/Cz/Cstocs
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cz 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Cz 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cz
+@dirrmtry %%SITE_PERL%%/Cz
diff --git a/converters/p5-JSON/pkg-plist b/converters/p5-JSON/pkg-plist
index d987bb6e320e..98eae60d8619 100644
--- a/converters/p5-JSON/pkg-plist
+++ b/converters/p5-JSON/pkg-plist
@@ -9,4 +9,4 @@
@dirrm %%SITE_PERL%%/JSONRPC/Transport
@dirrm %%SITE_PERL%%/JSONRPC
@dirrm %%SITE_PERL%%/JSON
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/converters/p5-JSON1/pkg-plist b/converters/p5-JSON1/pkg-plist
index d987bb6e320e..98eae60d8619 100644
--- a/converters/p5-JSON1/pkg-plist
+++ b/converters/p5-JSON1/pkg-plist
@@ -9,4 +9,4 @@
@dirrm %%SITE_PERL%%/JSONRPC/Transport
@dirrm %%SITE_PERL%%/JSONRPC
@dirrm %%SITE_PERL%%/JSON
-@unexec rmdir %D/%%SITE_PERL%%/Apache 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Apache
diff --git a/converters/p5-MIME-Base32/pkg-plist b/converters/p5-MIME-Base32/pkg-plist
index 8d39e7dd7ffc..0fd817019ab6 100644
--- a/converters/p5-MIME-Base32/pkg-plist
+++ b/converters/p5-MIME-Base32/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/MIME/Base32.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Base32/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Base32
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/MIME 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
+@dirrmtry %%SITE_PERL%%/MIME
diff --git a/converters/p5-MIME-Base64/pkg-plist b/converters/p5-MIME-Base64/pkg-plist
index bcac9f94a3d8..b05f9c28a6cf 100644
--- a/converters/p5-MIME-Base64/pkg-plist
+++ b/converters/p5-MIME-Base64/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/MIME/Base64.pm
%%SITE_PERL%%/%%PERL_ARCH%%/MIME/QuotedPrint.pm
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME/Base64
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/MIME 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MIME
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/MIME
diff --git a/converters/p5-Text-Iconv/pkg-plist b/converters/p5-Text-Iconv/pkg-plist
index 1fd71d9c3969..d7c708afb917 100644
--- a/converters/p5-Text-Iconv/pkg-plist
+++ b/converters/p5-Text-Iconv/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Iconv/Iconv.so
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Iconv/autosplit.ix
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Iconv
-@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/converters/p5-Text-Unidecode/pkg-plist b/converters/p5-Text-Unidecode/pkg-plist
index 07f3dacec726..83baafde3875 100644
--- a/converters/p5-Text-Unidecode/pkg-plist
+++ b/converters/p5-Text-Unidecode/pkg-plist
@@ -180,7 +180,7 @@
%%SITE_PERL%%/Text/Unidecode/xfe.pm
%%SITE_PERL%%/Text/Unidecode/xff.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Unidecode/.packlist
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Unidecode 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Text 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text/Unidecode 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Text 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/Unidecode
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
+@dirrmtry %%SITE_PERL%%/Text/Unidecode
+@dirrmtry %%SITE_PERL%%/Text
diff --git a/converters/p5-Unicode-RecursiveDowngrade/pkg-plist b/converters/p5-Unicode-RecursiveDowngrade/pkg-plist
index 9745f8afddb3..4f4b81f7e97f 100644
--- a/converters/p5-Unicode-RecursiveDowngrade/pkg-plist
+++ b/converters/p5-Unicode-RecursiveDowngrade/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Unicode/RecursiveDowngrade.pm
-@unexec rmdir %D/%%SITE_PERL%%/Unicode 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/Unicode
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/RecursiveDowngrade/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/RecursiveDowngrade
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode
diff --git a/converters/p5-Unicode-String/pkg-plist b/converters/p5-Unicode-String/pkg-plist
index 7e271d3f1277..1e5ed9fe970b 100644
--- a/converters/p5-Unicode-String/pkg-plist
+++ b/converters/p5-Unicode-String/pkg-plist
@@ -4,5 +4,5 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/String/String.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/String/String.so
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/String
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Unicode 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Unicode
diff --git a/converters/p5-Unicode-UTF8simple/pkg-plist b/converters/p5-Unicode-UTF8simple/pkg-plist
index d6fcd3670644..776d994d4f26 100644
--- a/converters/p5-Unicode-UTF8simple/pkg-plist
+++ b/converters/p5-Unicode-UTF8simple/pkg-plist
@@ -1,5 +1,5 @@
%%SITE_PERL%%/Unicode/UTF8simple.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/UTF8simple/.packlist
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode/UTF8simple
-@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode 2>/dev/null || true
-@unexec rmdir %D/%%SITE_PERL%%/Unicode 2>/dev/null || true
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Unicode
+@dirrmtry %%SITE_PERL%%/Unicode