Clean up handling of locale directories at deinstall-time:

* Don't remove "system directories" (which were created by BSD.*.dist)
* Silently try to remove locale directories which we might have created

10 files changed, 12 insertions, 36 deletions

diff --git a/devel/bison/pkg-plist b/devel/bison/pkg-plist
index 455500c02571..f1d3f5a225f8 100644
--- a/devel/bison/pkg-plist
+++ b/devel/bison/pkg-plist
@@ -19,6 +19,5 @@ bin/bison
 %%NLS%%share/locale/ru/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/bison.mo
-%%NLS%%@unexec rmdir %D/share/locale/hr/LC_MESSAGES 2> /dev/null || true
 @dirrm %%DATADIR%%/m4sugar
 @dirrm %%DATADIR%%
diff --git a/devel/bison175/pkg-plist b/devel/bison175/pkg-plist
index 455500c02571..f1d3f5a225f8 100644
--- a/devel/bison175/pkg-plist
+++ b/devel/bison175/pkg-plist
@@ -19,6 +19,5 @@ bin/bison
 %%NLS%%share/locale/ru/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/bison.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/bison.mo
-%%NLS%%@unexec rmdir %D/share/locale/hr/LC_MESSAGES 2> /dev/null || true
 @dirrm %%DATADIR%%/m4sugar
 @dirrm %%DATADIR%%
diff --git a/devel/gettext/pkg-plist b/devel/gettext/pkg-plist
index a1b9759aee8e..5561138f9b18 100644
--- a/devel/gettext/pkg-plist
+++ b/devel/gettext/pkg-plist
@@ -291,7 +291,6 @@ share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo
 @unexec rmdir %%LOCALBASE%%/share/locale/fi/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %%LOCALBASE%%/share/locale/gl/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %%LOCALBASE%%/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/nl/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %%LOCALBASE%%/share/locale/nn/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %%LOCALBASE%%/share/locale/no/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %%LOCALBASE%%/share/locale/pl/LC_MESSAGES 2>/dev/null || true
@@ -312,7 +311,6 @@ share/locale/zh_TW/LC_MESSAGES/gettext-tools.mo
 @unexec rmdir %%LOCALBASE%%/share/locale/fi 2>/dev/null || true
 @unexec rmdir %%LOCALBASE%%/share/locale/gl 2>/dev/null || true
 @unexec rmdir %%LOCALBASE%%/share/locale/ko 2>/dev/null || true
-@unexec rmdir %%LOCALBASE%%/share/locale/nl 2>/dev/null || true
 @unexec rmdir %%LOCALBASE%%/share/locale/nn 2>/dev/null || true
 @unexec rmdir %%LOCALBASE%%/share/locale/no 2>/dev/null || true
 @unexec rmdir %%LOCALBASE%%/share/locale/pl 2>/dev/null || true
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 3b3abdb960c0..5a7533881bfe 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -155,6 +155,12 @@ share/locale/wa/LC_MESSAGES/glib20.mo
 share/locale/yi/LC_MESSAGES/glib20.mo
 share/locale/zh_CN/LC_MESSAGES/glib20.mo
 share/locale/zh_TW/LC_MESSAGES/glib20.mo
+@unexec rmdir %D/share/locale/ne/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ne 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/yi/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/yi 2> /dev/null || true
 @dirrm share/glib-2.0/gettext/po
 @dirrm share/glib-2.0/gettext
 @dirrm share/glib-2.0
diff --git a/devel/gmake/pkg-plist b/devel/gmake/pkg-plist
index e27e6c91198e..c446cc3fb5b8 100644
--- a/devel/gmake/pkg-plist
+++ b/devel/gmake/pkg-plist
@@ -15,7 +15,3 @@ bin/gmake
 %%NLS%%share/locale/sv/LC_MESSAGES/make.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/make.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/make.mo
-%%NLS%%@unexec rmdir %D/share/locale/he/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/hr/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/he 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/hr 2>/dev/null || true
diff --git a/devel/gmake381/pkg-plist b/devel/gmake381/pkg-plist
index e27e6c91198e..c446cc3fb5b8 100644
--- a/devel/gmake381/pkg-plist
+++ b/devel/gmake381/pkg-plist
@@ -15,7 +15,3 @@ bin/gmake
 %%NLS%%share/locale/sv/LC_MESSAGES/make.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/make.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/make.mo
-%%NLS%%@unexec rmdir %D/share/locale/he/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/hr/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/he 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/hr 2>/dev/null || true
diff --git a/devel/kdbg/pkg-plist b/devel/kdbg/pkg-plist
index 44b253844d99..3656760ae6c2 100644
--- a/devel/kdbg/pkg-plist
+++ b/devel/kdbg/pkg-plist
@@ -102,10 +102,8 @@ share/locale/sr/LC_MESSAGES/kdbg.mo
 share/locale/sv/LC_MESSAGES/kdbg.mo
 share/locale/tr/LC_MESSAGES/kdbg.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/kdbg.mo
-@dirrm share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrm share/locale/zh_CN.GB2312
-@dirrm share/locale/no_NY/LC_MESSAGES
-@dirrm share/locale/no_NY
+@unexec rmdir %D/share/locale/no_NY/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/no_NY 2> /dev/null || true
 @dirrm share/doc/HTML/ru/kdbg
 @dirrm share/doc/HTML/en/kdbg
 @dirrm share/doc/HTML/de/kdbg
diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist
index a3d113f0d6fc..17b01ff27ec7 100644
--- a/devel/libbonobo/pkg-plist
+++ b/devel/libbonobo/pkg-plist
@@ -257,3 +257,5 @@ share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
 @dirrm etc/bonobo-activation
 @unexec /bin/rmdir %D/lib/bonobo/monikers 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/lib/bonobo 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/li/LC_MESSAGES 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/li 2>/dev/null || /usr/bin/true
diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist
index cc1d2ecda163..8bc83937eb9c 100644
--- a/devel/libgtop2/pkg-plist
+++ b/devel/libgtop2/pkg-plist
@@ -111,3 +111,5 @@ share/locale/zh_CN/LC_MESSAGES/libgtop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
 @dirrm include/libgtop-2.0/glibtop
 @dirrm include/libgtop-2.0
+@unexec rmdir %D/share/locale/mi/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/mi 2> /dev/null || true
diff --git a/devel/popt/pkg-plist b/devel/popt/pkg-plist
index 25609007112d..d94139fbb789 100644
--- a/devel/popt/pkg-plist
+++ b/devel/popt/pkg-plist
@@ -31,26 +31,16 @@ lib/libpopt.so.0
 %%NLS%%share/locale/wa/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/zh/LC_MESSAGES/popt.mo
 %%NLS%%share/locale/zh_CN.GB2312/LC_MESSAGES/popt.mo
-%%NLS%%@unexec rmdir %D/share/locale/zh_CN.GB2312/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh_CN.GB2312 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/wa/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/wa 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/uk 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/sr 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/sl 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/pt 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
@@ -59,21 +49,11 @@ lib/libpopt.so.0
 %%NLS%%@unexec rmdir %D/share/locale/no 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/ko 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/is/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/is 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/id/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/gl 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/fi 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/eu_ES/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/eu_ES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true