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

accessibility/atk/pkg-plist

@@ -128,6 +128,12 @@ share/locale/wa/LC_MESSAGES/atk10.mo
 share/locale/yi/LC_MESSAGES/atk10.mo
 share/locale/zh_CN/LC_MESSAGES/atk10.mo
 share/locale/zh_TW/LC_MESSAGES/atk10.mo
+@unexec rmdir %D/share/locale/li/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/li 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/tk/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/tk 2> /dev/null || true
 @dirrm %%DOCSDIR%%
 @dirrm include/atk-1.0/atk
 @dirrm include/atk-1.0

archivers/rpm4/pkg-plist

@@ -159,3 +159,5 @@ share/locale/zh_CN.GB2312/LC_MESSAGES/rpm.mo
 @unexec rmdir %D/src/portbld/RPMS 2>/dev/null || true
 @unexec rmdir %D/src/portbld/BUILD 2>/dev/null || true
 @unexec rmdir %D/src/portbld 2>/dev/null || true
+@unexec rmdir %D/share/locale/en_RN/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_RN 2> /dev/null || true

archivers/rpm5/pkg-plist

@@ -159,3 +159,5 @@ share/locale/zh_CN.GB2312/LC_MESSAGES/rpm.mo
 @unexec rmdir %D/src/portbld/RPMS 2>/dev/null || true
 @unexec rmdir %D/src/portbld/BUILD 2>/dev/null || true
 @unexec rmdir %D/src/portbld 2>/dev/null || true
+@unexec rmdir %D/share/locale/en_RN/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_RN 2> /dev/null || true

astro/glunarclock/pkg-plist

@@ -32,6 +32,8 @@ share/locale/sr/LC_MESSAGES/glunarclock-0.30.mo
 share/locale/sv/LC_MESSAGES/glunarclock-0.30.mo
 share/locale/vi/LC_MESSAGES/glunarclock-0.30.mo
 share/locale/wa/LC_MESSAGES/glunarclock-0.30.mo
+@unexec rmdir %D/share/locale/ast_ES/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ast_ES 2> /dev/null || true
 @dirrm share/gnome/pixmaps/glunarclock
 @dirrm share/gnome/help/glunarclock-applet-2/C/figures
 @dirrm share/gnome/help/glunarclock-applet-2/C

astro/gpsdrive/pkg-plist

@@ -59,4 +59,6 @@ share/locale/sk/LC_MESSAGES/gpsdrive.mo
 share/locale/sv/LC_MESSAGES/gpsdrive.mo
 share/locale/tr/LC_MESSAGES/gpsdrive.mo
 share/pixmaps/gpsicon.png
+@unexec rmdir %D/share/locale/gr/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/gr 2> /dev/null || true
 @dirrm share/gpsdrive

audio/gtick/pkg-plist

@@ -11,3 +11,7 @@ share/locale/ga/LC_MESSAGES/gtick.mo
 share/locale/nl/LC_MESSAGES/gtick.mo
 share/locale/ro/LC_MESSAGES/gtick.mo
 share/locale/ru/LC_MESSAGES/gtick.mo
+@unexec rmdir %D/share/locale/en@boldquot/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en@boldquot 2> /dev/null || true
+@unexec rmdir %D/share/locale/en@quot/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en@quot 2> /dev/null || true

audio/mp3c/pkg-plist

@@ -5,3 +5,7 @@ share/locale/es/LC_MESSAGES/mp3c.mo
 share/locale/it/LC_MESSAGES/mp3c.mo
 share/locale/pl/LC_MESSAGES/mp3c.mo
 share/locale/pt/LC_MESSAGES/mp3c.mo
+@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/pl 2> /dev/null || true
+@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/pt 2> /dev/null || true

audio/zinf/pkg-plist

@@ -40,3 +40,5 @@ share/zinf/themes/ZinfClassic.fat
 @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

cad/geda-gschem/pkg-plist

@@ -33,3 +33,9 @@ share/locale/ru/LC_MESSAGES/geda-gschem.mo
 @unexec rmdir %D/share/doc/geda-doc/man 2>/dev/null || true
 @unexec rmdir %D/share/gEDA/scheme 2>/dev/null || true
 @dirrm share/gEDA/bitmap
+@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true
+@unexec rmdir %D/share/locale/nl_NL/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/nl_NL 2> /dev/null || true
+@unexec rmdir %D/share/locale/ja_JP/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ja_JP 2> /dev/null || true

cad/gschem/pkg-plist

@@ -33,3 +33,9 @@ share/locale/ru/LC_MESSAGES/geda-gschem.mo
 @unexec rmdir %D/share/doc/geda-doc/man 2>/dev/null || true
 @unexec rmdir %D/share/gEDA/scheme 2>/dev/null || true
 @dirrm share/gEDA/bitmap
+@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true
+@unexec rmdir %D/share/locale/nl_NL/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/nl_NL 2> /dev/null || true
+@unexec rmdir %D/share/locale/ja_JP/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ja_JP 2> /dev/null || true

chinese/zhcon/pkg-plist

@@ -40,13 +40,10 @@ lib/zhcon/input/winzm.mb
 %%NLS%%share/locale/zh_CN.GB2312/LC_MESSAGES/zhcon.mo
 %%NLS%%share/locale/zh_CN.GBK/LC_MESSAGES/zhcon.mo
 %%NLS%%share/locale/zh_TW.Big5/LC_MESSAGES/zhcon.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_CN.GBK/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/zh_CN.GBK 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/zh_CN.EUC/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/zh_CN.EUC 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/zh_TW.Big5/LC_MESSAGES 2>/dev/null || true
 @dirrm lib/zhcon/input
 @dirrm lib/zhcon/font
 @dirrm lib/zhcon

comms/minicom/pkg-plist

@@ -13,14 +13,8 @@ share/locale/pl/LC_MESSAGES/minicom.mo
 share/locale/pt_BR/LC_MESSAGES/minicom.mo
 share/locale/ru/LC_MESSAGES/minicom.mo
 @unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/cs 2>/dev/null || true
 @unexec rmdir %D/share/locale/fi 2>/dev/null || true
 @unexec rmdir %D/share/locale/pl 2>/dev/null || true

databases/postgresql7/pkg-plist

@@ -194,9 +194,12 @@ share/postgresql/post-install-notes
 %%SERVER%%%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
 %%SERVER%%%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
 %%SERVER%%%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/* 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
 %%SERVER%%@unexec if cmp -s ~pgsql/.profile %D/share/postgresql/dot.profile.dist; then rm -f ~pgsql/.profile; fi
 %%SERVER%%@unexec if cmp -s ~pgsql/.cshrc %D/share/postgresql/dot.cshrc.dist; then rm -f ~pgsql/.cshrc; fi
 %%SERVER%%@unexec [ -f ~pgsql/dot.profile.dist ] && rm ~pgsql/dot.profile.dist

databases/postgresql73/pkg-plist

@@ -133,9 +133,12 @@ share/postgresql/post-install-notes
 %%SERVER%%%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
 %%SERVER%%%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
 %%SERVER%%%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
-%%GETTEXT%%@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale/* 2>/dev/null || true
-%%GETTEXT%%@unexec rmdir %D/share/locale 2>/dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2> /dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/cs 2> /dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2> /dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_CN 2> /dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2> /dev/null || true
+%%GETTEXT%%@unexec rmdir %D/share/locale/zh_TW 2> /dev/null || true
 %%SERVER%%@unexec if cmp -s ~pgsql/.profile %D/share/postgresql/dot.profile.dist; then rm -f ~pgsql/.profile; fi
 %%SERVER%%@unexec if cmp -s ~pgsql/.cshrc %D/share/postgresql/dot.cshrc.dist; then rm -f ~pgsql/.cshrc; fi
 %%SERVER%%@unexec [ -f ~pgsql/dot.profile.dist ] && rm ~pgsql/dot.profile.dist

deskutils/gnochm/pkg-plist

@@ -25,3 +25,7 @@ share/mime/packages/gnochm.xml
 @dirrm share/gnome/gnochm
 @exec update-mime-database %D/share/mime
 @unexec update-mime-database %D/share/mime
+@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true
+@unexec rmdir %D/share/locale/tr_TR/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/tr_TR 2> /dev/null || true

deskutils/gnome-pim/pkg-plist

@@ -69,6 +69,12 @@ share/locale/vi/LC_MESSAGES/gnome-pim.mo
 share/locale/wa/LC_MESSAGES/gnome-pim.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-pim.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pim.mo
+@unexec rmdir %D/share/locale/gd/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/gd 2> /dev/null || true
+@unexec rmdir %D/share/locale/gv/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/gv 2> /dev/null || true
+@unexec rmdir %D/share/locale/kw/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/kw 2> /dev/null || true
 @dirrm share/gnome/help/gnomecard/eu
 @dirrm share/gnome/help/gnomecard/C
 @dirrm share/gnome/help/gnomecard

deskutils/gnomepim/pkg-plist

@@ -69,6 +69,12 @@ share/locale/vi/LC_MESSAGES/gnome-pim.mo
 share/locale/wa/LC_MESSAGES/gnome-pim.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-pim.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-pim.mo
+@unexec rmdir %D/share/locale/gd/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/gd 2> /dev/null || true
+@unexec rmdir %D/share/locale/gv/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/gv 2> /dev/null || true
+@unexec rmdir %D/share/locale/kw/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/kw 2> /dev/null || true
 @dirrm share/gnome/help/gnomecard/eu
 @dirrm share/gnome/help/gnomecard/C
 @dirrm share/gnome/help/gnomecard

deskutils/logjam/pkg-plist

@@ -10,3 +10,9 @@ share/locale/es/LC_MESSAGES/logjam.mo
 share/locale/he/LC_MESSAGES/logjam.mo
 share/locale/ru_RU/LC_MESSAGES/logjam.mo
 share/locale/uk_UA/LC_MESSAGES/logjam.mo
+@unexec rmdir %D/share/locale/en_US.UTF-8/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US.UTF-8 2> /dev/null || true
+@unexec rmdir %D/share/locale/ru_RU/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ru_RU 2> /dev/null || true
+@unexec rmdir %D/share/locale/uk_UA/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/uk_UA 2> /dev/null || true

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%%

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%%

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

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

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

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

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

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

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

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

editors/poedit/pkg-plist

@@ -50,3 +50,13 @@ share/locale/zh_TW/LC_MESSAGES/poedit.mo
 %%DATADIR%%/help.zip
 %%DATADIR%%/resources.zip
 @dirrm %%DATADIR%%
+@unexec rmdir %D/share/locale/af_ZA/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/af_ZA 2> /dev/null || true
+@unexec rmdir %D/share/locale/am_ET/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/am_ET 2> /dev/null || true
+@unexec rmdir %D/share/locale/pa_IN/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/pa_IN 2> /dev/null || true
+@unexec rmdir %D/share/locale/sq_AL/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/sq_AL 2> /dev/null || true
+@unexec rmdir %D/share/locale/sv_SE/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/sv_SE 2> /dev/null || true

finance/gnucash-devel/pkg-plist

@@ -708,6 +708,8 @@ share/locale/tr/LC_MESSAGES/gnucash.mo
 share/locale/uk/LC_MESSAGES/gnucash.mo
 share/locale/zh_CN/LC_MESSAGES/gnucash.mo
 share/locale/zh_TW/LC_MESSAGES/gnucash.mo
+@unexec rmdir %D/share/locale/es_NI/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/es_NI 2> /dev/null || true
 @dirrm share/gnome/pixmaps/gnucash
 @dirrm share/gnome/gnucash/scm/qif-import
 @dirrm share/gnome/gnucash/scm/printing

finance/gnucash/pkg-plist

@@ -708,6 +708,8 @@ share/locale/tr/LC_MESSAGES/gnucash.mo
 share/locale/uk/LC_MESSAGES/gnucash.mo
 share/locale/zh_CN/LC_MESSAGES/gnucash.mo
 share/locale/zh_TW/LC_MESSAGES/gnucash.mo
+@unexec rmdir %D/share/locale/es_NI/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/es_NI 2> /dev/null || true
 @dirrm share/gnome/pixmaps/gnucash
 @dirrm share/gnome/gnucash/scm/qif-import
 @dirrm share/gnome/gnucash/scm/printing

ftp/kftpgrabber/pkg-plist

@@ -17,6 +17,7 @@ share/icons/hicolor/32x32/apps/kftpgrabber.png
 share/icons/hicolor/48x48/apps/kftpgrabber.png
 share/locale/de/LC_MESSAGES/kftpgrabber.mo
 share/locale/es/LC_MESSAGES/kftpgrabber.mo
+share/locale/hu/LC_MESSAGES/kftpgrabber.mo
 share/services/kftpimportplugin_gftp.desktop
 share/servicetypes/kftpbookmarkimportplugin.desktop
 @unexec rmdir %D/share/servicetypes 2>/dev/null || true

games/freeciv/pkg-plist

@@ -165,42 +165,16 @@ share/locale/ro/LC_MESSAGES/freeciv.mo
 share/locale/ru/LC_MESSAGES/freeciv.mo
 share/locale/sv/LC_MESSAGES/freeciv.mo
 share/locale/uk/LC_MESSAGES/freeciv.mo
-@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/da 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale/en_GB/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/en_GB 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/share/locale/et/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/et 2>/dev/null || true
 @unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl 2>/dev/null || true
 @unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/no 2>/dev/null || true
 @unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/pl 2>/dev/null || true
 @unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
 @unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv 2>/dev/null || true
 @unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/sk 2>/dev/null || true
 @dirrm %%DATADIR%%/trident

games/gnubg/pkg-plist

@@ -45,3 +45,5 @@ share/locale/is/LC_MESSAGES/gnubg.mo
 share/locale/it/LC_MESSAGES/gnubg.mo
 share/locale/ja/LC_MESSAGES/gnubg.mo
 share/locale/tr/LC_MESSAGES/gnubg.mo
+@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US 2> /dev/null || true

games/gturing/pkg-plist

@@ -41,8 +41,6 @@ share/gnome/help/gturing/C/gturing.xml
 share/gnome/help/gturing/C/figures/mainwin.png
 share/gnome/applications/gturing.desktop
 bin/gturing
-@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/* 2>/dev/null || true
 %%PORTDOCS%%share/examples/gturing/subst.tur
 %%PORTDOCS%%share/examples/gturing/sort.tur
 %%PORTDOCS%%share/examples/gturing/dec2bin_shift.tur

games/wesnoth-devel/pkg-plist

@@ -2771,6 +2771,8 @@ share/wesnoth/sounds/wolf-attack.wav
 share/wesnoth/sounds/wolf-cry.wav
 share/wesnoth/sounds/zombie-attack.wav
 share/wesnoth/sounds/zombie-hit.wav
+@unexec rmdir %D/share/locale/el_GR/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/el_GR 2> /dev/null || true
 @dirrm share/wesnoth/sounds
 %%LITE:%%@dirrm share/wesnoth/music
 @dirrm share/wesnoth/images/tools/exploder

games/wesnoth/pkg-plist

@@ -2771,6 +2771,8 @@ share/wesnoth/sounds/wolf-attack.wav
 share/wesnoth/sounds/wolf-cry.wav
 share/wesnoth/sounds/zombie-attack.wav
 share/wesnoth/sounds/zombie-hit.wav
+@unexec rmdir %D/share/locale/el_GR/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/el_GR 2> /dev/null || true
 @dirrm share/wesnoth/sounds
 %%LITE:%%@dirrm share/wesnoth/music
 @dirrm share/wesnoth/images/tools/exploder

graphics/eog2/pkg-plist

@@ -156,4 +156,6 @@ share/locale/zu/LC_MESSAGES/eog.mo
 @dirrm share/gnome/help/eog
 @dirrm share/gnome/eog/glade
 @dirrm share/gnome/eog
+@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zu 2> /dev/null || true
 @unexec update-desktop-database > /dev/null || /usr/bin/true

graphics/gtksee/pkg-plist

@@ -6,3 +6,7 @@ bin/gtksee
 %%NLS%%share/locale/ru/LC_MESSAGES/gtksee.mo
 %%NLS%%share/locale/ru_UA/LC_MESSAGES/gtksee.mo
 %%NLS%%share/locale/zh_CN.EUC/LC_MESSAGES/gtksee.mo
+%%NLS%%@unexec rmdir %D/share/locale/zh_CN.EUC/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/zh_CN.EUC 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_UA/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_UA 2> /dev/null || true

graphics/gwenview-kde4/pkg-plist

@@ -89,6 +89,16 @@ share/locale/xh/LC_MESSAGES/gwenview.mo
 share/locale/zh_CN/LC_MESSAGES/gwenview.mo
 share/locale/zh_TW/LC_MESSAGES/gwenview.mo
 share/locale/zu/LC_MESSAGES/gwenview.mo
+@unexec rmdir %D/share/locale/fo/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/fo 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/ven/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ven 2> /dev/null || true
+@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/zu/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zu 2> /dev/null || true
 @unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
 @unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true

graphics/gwenview/pkg-plist

@@ -89,6 +89,16 @@ share/locale/xh/LC_MESSAGES/gwenview.mo
 share/locale/zh_CN/LC_MESSAGES/gwenview.mo
 share/locale/zh_TW/LC_MESSAGES/gwenview.mo
 share/locale/zu/LC_MESSAGES/gwenview.mo
+@unexec rmdir %D/share/locale/fo/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/fo 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/ven/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ven 2> /dev/null || true
+@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/zu/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zu 2> /dev/null || true
 @unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
 @unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true

graphics/zphoto/pkg-plist

@@ -32,6 +32,8 @@ share/zphoto/doc/images/wxzphoto.png
 share/zphoto/fonts/EfontSerifB.fdb
 share/locale/ja/LC_MESSAGES/zphoto.mo
 share/locale/ja_JP.SJIS/LC_MESSAGES/zphoto.mo
+@unexec rmdir %D/share/locale/ja_JP.SJIS/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ja_JP.SJIS 2> /dev/null || true
 @dirrm share/zphoto/templates/default/en
 @dirrm share/zphoto/templates/default/ja
 @dirrm share/zphoto/templates/default/all

japanese/lyx/pkg-plist

@@ -235,37 +235,15 @@ share/lyx/textclass.lst
 @dirrm share/lyx/doc
 @dirrm share/lyx/clipart
 @dirrm share/lyx/bind
-@dirrm share/locale/wa/LC_MESSAGES
-@dirrm share/locale/wa
-@dirrm share/locale/tr/LC_MESSAGES
-@dirrm share/locale/tr
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
 @dirrm share/locale/sl/LC_MESSAGES
 @dirrm share/locale/sl
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
 @dirrm share/locale/pt/LC_MESSAGES
 @dirrm share/locale/pt
 @dirrm share/locale/pl/LC_MESSAGES
 @dirrm share/locale/pl
 @dirrm share/locale/no/LC_MESSAGES
 @dirrm share/locale/no
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
 @dirrm share/locale/fi/LC_MESSAGES
 @dirrm share/locale/fi
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/locale/da
 @dirrm share/locale/cs/LC_MESSAGES
 @dirrm share/locale/cs

japanese/texinfo/pkg-plist

@@ -53,9 +53,20 @@ share/locale/sv/LC_MESSAGES/texinfo.mo
 share/locale/tr/LC_MESSAGES/texinfo.mo
 share/locale/zh_CN/LC_MESSAGES/texinfo.mo
 share/locale/zh_TW/LC_MESSAGES/texinfo.mo
-@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/* 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
+@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/cs 2>/dev/null || true
+@unexec rmdir %D/share/locale/de_AT/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/de_AT 2>/dev/null || true
+@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/no 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl 2>/dev/null || true
+@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ro 2>/dev/null || true
+@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/no 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
 @unexec rmdir %D/%%TEXMFLOCAL%%/tex/generic/dvips 2>/dev/null || true
 @unexec rmdir %D/%%TEXMFLOCAL%%/pdftex/plain/misc 2>/dev/null || true
 @unexec rmdir %D/%%TEXMFLOCAL%%/pdftex/plain 2>/dev/null || true

lang/clisp/pkg-plist

@@ -67,8 +67,6 @@ share/locale/ru/LC_MESSAGES/clisplow.mo
 @dirrm lib/clisp
 @unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale/en/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/en 2>/dev/null || true
 @unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/es 2>/dev/null || true
 @unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true

mail/gnubiff/pkg-plist

@@ -30,4 +30,6 @@ share/locale/sv/LC_MESSAGES/gnubiff.mo
 %%SHAREDIR%%/pixmaps/gnubiff.png
 %%WITH_GNOME%%libdata/bonobo/servers/GNOME_gnubiffApplet.server
 %%WITH_GNOME%%%%SHAREDIR%%/gnome-2.0/ui/GNOME_gnubiffApplet.xml
+@unexec rmdir %D/share/locale/fr_CA/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/fr_CA 2> /dev/null || true@
 @dirrm %%SHAREDIR%%/gnubiff

mail/kbiff/pkg-plist

@@ -60,6 +60,8 @@ share/locale/sv/LC_MESSAGES/kbiff.mo
 share/locale/tr/LC_MESSAGES/kbiff.mo
 share/locale/uk/LC_MESSAGES/kbiff.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/kbiff.mo
+@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/fr/kbiff
 @dirrm share/doc/HTML/es/kbiff
 @dirrm share/doc/HTML/en/kbiff

mail/spruce/pkg-plist

@@ -12,3 +12,5 @@ bin/spruce
 %%NLS%%share/locale/sk/LC_MESSAGES/spruce.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/spruce.mo
 %%NLS%%share/locale/zh_TW.Big5/LC_MESSAGES/spruce.mo
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU 2> /dev/null || true

misc/gnome-mime-data/pkg-plist

@@ -73,3 +73,7 @@ share/locale/wa/LC_MESSAGES/gnome-mime-data.mo
 share/locale/yi/LC_MESSAGES/gnome-mime-data.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-mime-data.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-mime-data.mo
+@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

misc/gnomemimedata/pkg-plist

@@ -73,3 +73,7 @@ share/locale/wa/LC_MESSAGES/gnome-mime-data.mo
 share/locale/yi/LC_MESSAGES/gnome-mime-data.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-mime-data.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-mime-data.mo
+@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

misc/hello/pkg-plist

@@ -33,3 +33,5 @@ info/hello.info
 %%NLS%%share/locale/sv/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/hello.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/hello.mo
+%%NLS%%@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true

misc/kcd-devel/pkg-plist

@@ -9,3 +9,7 @@ share/locale/en_US.UTF-8/LC_MESSAGES/kcd.mo
 %%PORTDOCS%%share/examples/kcd/kcd.sh.init
 %%PORTDOCS%%@dirrm share/examples/kcd
 %%PORTDOCS%%@dirrm share/doc/kcd
+@unexec rmdir %D/share/locale/en_GB.UTF-8/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_GB.UTF-8 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US.UTF-8/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US.UTF-8 2> /dev/null || true

misc/kcd/pkg-plist

@@ -9,3 +9,7 @@ share/locale/en_US.UTF-8/LC_MESSAGES/kcd.mo
 %%PORTDOCS%%share/examples/kcd/kcd.sh.init
 %%PORTDOCS%%@dirrm share/examples/kcd
 %%PORTDOCS%%@dirrm share/doc/kcd
+@unexec rmdir %D/share/locale/en_GB.UTF-8/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_GB.UTF-8 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US.UTF-8/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US.UTF-8 2> /dev/null || true

misc/mc/pkg-plist

@@ -137,8 +137,6 @@ share/mc/term/xterm.ti
 @dirrm share/mc
 @unexec rmdir %D/share/locale/wa/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/wa 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu 2>/dev/null || true
 @unexec rmdir %D/man/es/man1 2>/dev/null || true
 @unexec rmdir %D/man/es/cat1 2>/dev/null || true
 @unexec rmdir %D/man/es 2>/dev/null || true

net-im/kmerlin/pkg-plist

@@ -83,6 +83,10 @@ share/locale/zh-TW/LC_MESSAGES/kmerlin.mo
 share/icons/locolor/32x32/apps/kmerlin.png
 share/icons/locolor/16x16/apps/kmerlin.png
 share/applnk/Internet/kmerlin.desktop
+@unexec rmdir %D/share/locale/zh-CN/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zh-CN 2> /dev/null || true
+@unexec rmdir %D/share/locale/zh-TW/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zh-TW 2> /dev/null || true
 @dirrm share/doc/HTML/en/kmerlin
 @dirrm share/apps/kmerlin/icons/hicolor/16x16/actions
 @dirrm share/apps/kmerlin/icons/hicolor/16x16

net-im/kmess-kde4/pkg-plist

@@ -112,6 +112,8 @@ share/sounds/kmess_chat.ogg
 share/sounds/kmess_logoff.ogg
 share/sounds/kmess_logon.ogg
 share/sounds/kmess_msg.ogg
+@unexec rmdir %D/share/locale/zh_CN.GB18030/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zh_CN.GB18030 2> /dev/null || true
 @dirrm share/doc/HTML/en/kmess
 @dirrm share/apps/kmess/pics
 @dirrm share/apps/kmess/icons/hicolor/16x16/apps

net-im/kmess/pkg-plist

@@ -112,6 +112,8 @@ share/sounds/kmess_chat.ogg
 share/sounds/kmess_logoff.ogg
 share/sounds/kmess_logon.ogg
 share/sounds/kmess_msg.ogg
+@unexec rmdir %D/share/locale/zh_CN.GB18030/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zh_CN.GB18030 2> /dev/null || true
 @dirrm share/doc/HTML/en/kmess
 @dirrm share/apps/kmess/pics
 @dirrm share/apps/kmess/icons/hicolor/16x16/apps

net-im/sim-im/pkg-plist

@@ -129,6 +129,8 @@ share/services/simctrl.desktop
 @unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
 @unexec rmdir %D/share/icons 2>/dev/null || true
+@unexec rmdir %D/share/locale/sw/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/sw 2> /dev/null || true
 @dirrm share/apps/sim/styles
 @dirrm share/apps/sim/sounds
 @dirrm share/apps/sim/pict

net-im/simicq/pkg-plist

@@ -129,6 +129,8 @@ share/services/simctrl.desktop
 @unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
 @unexec rmdir %D/share/icons 2>/dev/null || true
+@unexec rmdir %D/share/locale/sw/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/sw 2> /dev/null || true
 @dirrm share/apps/sim/styles
 @dirrm share/apps/sim/sounds
 @dirrm share/apps/sim/pict

net-p2p/amule1/pkg-plist

@@ -76,3 +76,5 @@ share/gnome/amuleweb/webserver/yellow.gif
 share/gnome/amuleweb/aMule.tmpl
 @dirrm share/gnome/amuleweb/webserver
 @dirrm share/gnome/amuleweb
+@unexec rmdir %D/share/locale/ee/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ee 2> /dev/null || true

net/amule/pkg-plist

@@ -76,3 +76,5 @@ share/gnome/amuleweb/webserver/yellow.gif
 share/gnome/amuleweb/aMule.tmpl
 @dirrm share/gnome/amuleweb/webserver
 @dirrm share/gnome/amuleweb
+@unexec rmdir %D/share/locale/ee/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ee 2> /dev/null || true

net/amule1/pkg-plist

@@ -76,3 +76,5 @@ share/gnome/amuleweb/webserver/yellow.gif
 share/gnome/amuleweb/aMule.tmpl
 @dirrm share/gnome/amuleweb/webserver
 @dirrm share/gnome/amuleweb
+@unexec rmdir %D/share/locale/ee/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ee 2> /dev/null || true

net/kmerlin/pkg-plist

@@ -83,6 +83,10 @@ share/locale/zh-TW/LC_MESSAGES/kmerlin.mo
 share/icons/locolor/32x32/apps/kmerlin.png
 share/icons/locolor/16x16/apps/kmerlin.png
 share/applnk/Internet/kmerlin.desktop
+@unexec rmdir %D/share/locale/zh-CN/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zh-CN 2> /dev/null || true
+@unexec rmdir %D/share/locale/zh-TW/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zh-TW 2> /dev/null || true
 @dirrm share/doc/HTML/en/kmerlin
 @dirrm share/apps/kmerlin/icons/hicolor/16x16/actions
 @dirrm share/apps/kmerlin/icons/hicolor/16x16

net/kmess/pkg-plist

@@ -112,6 +112,8 @@ share/sounds/kmess_chat.ogg
 share/sounds/kmess_logoff.ogg
 share/sounds/kmess_logon.ogg
 share/sounds/kmess_msg.ogg
+@unexec rmdir %D/share/locale/zh_CN.GB18030/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/zh_CN.GB18030 2> /dev/null || true
 @dirrm share/doc/HTML/en/kmess
 @dirrm share/apps/kmess/pics
 @dirrm share/apps/kmess/icons/hicolor/16x16/apps

net/simicq/pkg-plist

@@ -129,6 +129,8 @@ share/services/simctrl.desktop
 @unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
 @unexec rmdir %D/share/icons 2>/dev/null || true
+@unexec rmdir %D/share/locale/sw/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/sw 2> /dev/null || true
 @dirrm share/apps/sim/styles
 @dirrm share/apps/sim/sounds
 @dirrm share/apps/sim/pict

net/tsclient/pkg-plist

@@ -41,42 +41,16 @@ share/locale/ru/LC_MESSAGES/tsclient.mo
 share/locale/se/LC_MESSAGES/tsclient.mo
 share/locale/zh_CN/LC_MESSAGES/tsclient.mo
 share/locale/zh_TW/LC_MESSAGES/tsclient.mo
-@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
 @unexec rmdir %D/share/locale/se/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/se 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_PT/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_PT 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
 @unexec rmdir %D/share/locale/pl_PL/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/pl_PL 2>/dev/null || true
-@unexec rmdir %D/share/locale/no_bb/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/no_bb 2>/dev/null || true
+@unexec rmdir %D/share/locale/no_nb/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/no_nb 2>/dev/null || true
 @unexec rmdir %D/share/locale/nl_NL/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/nl_NL 2>/dev/null || true
-@unexec rmdir %D/share/locale/ms/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ms 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu 2>/dev/null || true
 @unexec rmdir %D/share/locale/gr/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/gr 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es 2>/dev/null || true
 @unexec rmdir %D/share/locale/da_DK/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/da_DK 2>/dev/null || true
-@unexec rmdir %D/share/locale/ar/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ar 2>/dev/null || true
-@unexec rmdir %D/share/nls/POSIX 2>/dev/null || true
-@unexec rmdir %D/share/nls/en_US.US-ASCII 2>/dev/null || true
 @dirrm share/gnome/pixmaps/tsclient

print/gtklp/pkg-plist

@@ -13,3 +13,7 @@ share/locale/nl/LC_MESSAGES/gtklp.mo
 share/locale/pl/LC_MESSAGES/gtklp.mo
 share/locale/pt_BR/LC_MESSAGES/gtklp.mo
 share/locale/ru/LC_MESSAGES/gtklp.mo
+@unexec rmdir %D/share/locale/cht/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/cht 2> /dev/null || true
+@unexec rmdir %D/share/locale/cz/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/cz 2> /dev/null || true

security/gnupg/pkg-plist

@@ -58,35 +58,20 @@ info/gpgv.info
 @unexec rmdir %D/share/locale/ca 2>/dev/null || true
 @unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/eo/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/et/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/gl 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/id/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/pl 2>/dev/null || true
 @unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
 @dirrm %%DOCSDIR%%

security/gnupg1/pkg-plist

@@ -58,35 +58,20 @@ info/gpgv.info
 @unexec rmdir %D/share/locale/ca 2>/dev/null || true
 @unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/eo/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/et/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/gl 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/id/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/pl 2>/dev/null || true
 @unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
 @dirrm %%DOCSDIR%%

security/gringotts/pkg-plist

@@ -3,7 +3,6 @@ share/pixmaps/gringotts.xpm
 share/locale/de/LC_MESSAGES/gringotts.mo
 share/locale/fr/LC_MESSAGES/gringotts.mo
 share/locale/it/LC_MESSAGES/gringotts.mo
-@unexec rmdir -p %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
 %%GNOMEHIER%%share/gnome/apps/Utilities/gringotts.desktop
 %%GNOMEHIER%%@unexec rmdir -p %D/share/gnome/apps/Utilities 2>/dev/null || true
 %%PORTDOCS%%share/doc/gringotts/AUTHORS

sysutils/bubblemon2/pkg-plist

@@ -28,3 +28,5 @@ share/locale/ru/LC_MESSAGES/bubblemon.mo
 %%PORTDOCS%%share/doc/bubblemon2/TODO
 %%PORTDOCS%%share/doc/bubblemon2/TRANSLATIONS
 %%PORTDOCS%%@dirrm share/doc/bubblemon2
+@unexec rmdir %D/share/locale/sh/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/sh 2> /dev/null || true

sysutils/coreutils/pkg-plist

@@ -165,9 +165,7 @@ bin/gyes
 %%NLS%%@unexec rmdir %D/share/locale/no/LC_TIME 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/nl/LC_TIME 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/nb/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/nb/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/ms/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ms/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/lg/LC_TIME 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/lg/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/lg 2>/dev/null || true
@@ -177,8 +175,6 @@ bin/gyes
 %%NLS%%@unexec rmdir %D/share/locale/hu/LC_TIME 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/gl/LC_TIME 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/ga/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ga/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ga 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/fr/LC_TIME 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/fi/LC_TIME 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/et/LC_TIME 2>/dev/null || true
@@ -190,5 +186,3 @@ bin/gyes
 %%NLS%%@unexec rmdir %D/share/locale/ca/LC_TIME 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/be/LC_TIME 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/af/LC_TIME 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/af/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/af 2>/dev/null || true

sysutils/di/pkg-plist

@@ -2,3 +2,7 @@ bin/di
 bin/mi
 share/locale/de_DE/LC_MESSAGES/di.mo
 share/locale/en_US/LC_MESSAGES/di.mo
+@unexec rmdir %D/share/locale/de_DE/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/de_DE 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US 2> /dev/null || true

sysutils/libgksu/pkg-plist

@@ -14,3 +14,5 @@ share/locale/pt_BR/LC_MESSAGES/libgksu1.2.mo
 share/locale/ru/LC_MESSAGES/libgksu1.2.mo
 @dirrm lib/libgksu1.2
 @dirrm include/libgksu1.2
+@unexec rmdir %D/share/locale/no_NB/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/no_NB 2> /dev/null || true

sysutils/libgksuui/pkg-plist

@@ -13,5 +13,7 @@ share/locale/es/LC_MESSAGES/libgksuui1.0.mo
 share/locale/no_NB/LC_MESSAGES/libgksuui1.0.mo
 share/locale/pt_BR/LC_MESSAGES/libgksuui1.0.mo
 share/locale/ru/LC_MESSAGES/libgksuui1.0.mo
+@unexec rmdir %D/share/locale/no_NB/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/no_NB 2> /dev/null || true
 @dirrm share/libgksuui1.0
 @dirrm include/libgksuui1.0

sysutils/xcdroast/pkg-plist

@@ -50,3 +50,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/xcdroast.mo
 @dirrm lib/xcdroast-0.98/sound
 @dirrm lib/xcdroast-0.98
 @unexec if pw groupshow -n xcdwrite 2>/dev/null 1>&2; then pw groupdel -n xcdwrite; fi
+@unexec rmdir %D/share/locale/el_GR/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/el_GR 2> /dev/null || true
+@unexec rmdir %D/share/locale/sq_AL/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/sq_AL 2> /dev/null || true

textproc/aspell/pkg-plist

@@ -107,21 +107,14 @@ lib/libpspell.so.16
 %%NLS%%@unexec rmdir %D/share/locale/be 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
-%%NLS%%@unexec rmdir %D/share/locale/da/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/en_GB/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/ga/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/ga 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/mn/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/mn 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/nl/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/ro/LC_MESSAGES 2>/dev/null || true
 %%NLS%%@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-%%NLS%%@unexec rmdir %D/share/locale/ru/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/tg/LC_MESSAGES 2>/dev/null || true

www/elinks/pkg-plist

@@ -31,59 +31,29 @@ share/locale/tr/LC_MESSAGES/elinks.mo
 share/locale/uk/LC_MESSAGES/elinks.mo
 @unexec rmdir %D/share/locale/be/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/be 2>/dev/null || true
-@unexec rmdir %D/share/locale/bg/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/bg 2>/dev/null || true
 @unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/ca 2>/dev/null || true
 @unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/da 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
 @unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es 2>/dev/null || true
 @unexec rmdir %D/share/locale/et/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/et 2>/dev/null || true
 @unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
 @unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/gl 2>/dev/null || true
-@unexec rmdir %D/share/locale/hr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu 2>/dev/null || true
-@unexec rmdir %D/share/locale/id/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/id 2>/dev/null || true
-@unexec rmdir %D/share/locale/is/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/is 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it 2>/dev/null || true
 @unexec rmdir %D/share/locale/leet/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/leet 2>/dev/null || true
-@unexec rmdir %D/share/locale/lt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/lt 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl 2>/dev/null || true
 @unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/no 2>/dev/null || true
 @unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/pl 2>/dev/null || true
 @unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
 @unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru 2>/dev/null || true
 @unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr 2>/dev/null || true
 @unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/uk 2>/dev/null || true

x11-fm/gentoo/pkg-plist

@@ -229,3 +229,15 @@ etc/gentoorc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/config
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.cp1251/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.cp1251 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.CP1251/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.CP1251 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.KOI8-R/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.KOI8-R 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.koi8r/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.koi8r 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.UTF-8/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.UTF-8 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.utf8/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/ru_RU.utf8 2> /dev/null || true

x11-fm/xfe/pkg-plist

@@ -153,3 +153,5 @@ share/pixmaps/xfe.png
 @dirrm lib/foxicons
 @dirrm lib/foxrc
 @dirrm share/pixmaps
+@unexec rmdir %D/share/locale/es_AR/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/es_AR 2> /dev/null || true

x11-fm/xnc/pkg-plist

@@ -40,5 +40,7 @@ share/doc/xnc/doc6.html
 share/doc/xnc/doc7.html
 share/doc/xnc/doc8.html
 share/doc/xnc/index.html
+@unexec rmdir %D/share/locale/sp/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/sp 2> /dev/null || true
 @dirrm share/doc/xnc
 @dirrm lib/xnc

x11-toolkits/gtk12/pkg-plist

@@ -227,6 +227,8 @@ share/themes/Default/gtk/gtkrc.zh_CN
 share/themes/Default/gtk/gtkrc.zh_TW.Big5
 @exec mkdir -p %D/lib/gtk/themes/engines
 @unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/sp/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/sp 2> /dev/null || true
 @dirrm lib/gtk/themes/engines
 @dirrm lib/gtk/themes
 @dirrm lib/gtk

x11-toolkits/gtk20/pkg-plist

@@ -468,3 +468,23 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
 @exec /bin/mkdir -p %D/lib/gtk-2.0/modules
 @unexec /bin/rmdir %D/share/themes/Default 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true
+@unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ang 2> /dev/null || true
+@unexec rmdir %D/share/locale/az_IR/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/az_IR 2> /dev/null || true
+@unexec rmdir %D/share/locale/br/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/br 2> /dev/null || true
+@unexec rmdir %D/share/locale/ia/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ia 2> /dev/null || true
+@unexec rmdir %D/share/locale/mi/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/mi 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/nso/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/nso 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/uz@Latn/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/uz@Latn 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

x11-toolkits/gtk30/pkg-plist

@@ -468,3 +468,23 @@ share/themes/Emacs/gtk-2.0-key/gtkrc
 @exec /bin/mkdir -p %D/lib/gtk-2.0/modules
 @unexec /bin/rmdir %D/share/themes/Default 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true
+@unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ang 2> /dev/null || true
+@unexec rmdir %D/share/locale/az_IR/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/az_IR 2> /dev/null || true
+@unexec rmdir %D/share/locale/br/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/br 2> /dev/null || true
+@unexec rmdir %D/share/locale/ia/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ia 2> /dev/null || true
+@unexec rmdir %D/share/locale/mi/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/mi 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/nso/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/nso 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/uz@Latn/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/uz@Latn 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

x11-wm/e16/pkg-plist

@@ -494,3 +494,5 @@ share/locale/tr/LC_MESSAGES/enlightenment.mo
 @dirrm %%DATADIR%%/config/pix
 @dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%
+@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US 2> /dev/null || true

x11-wm/enlightenment-devel/pkg-plist

@@ -494,3 +494,5 @@ share/locale/tr/LC_MESSAGES/enlightenment.mo
 @dirrm %%DATADIR%%/config/pix
 @dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%
+@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US 2> /dev/null || true

x11-wm/enlightenment/pkg-plist

@@ -494,3 +494,5 @@ share/locale/tr/LC_MESSAGES/enlightenment.mo
 @dirrm %%DATADIR%%/config/pix
 @dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%
+@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/en_US 2> /dev/null || true

x11/gnome-desktop/pkg-plist

@@ -203,6 +203,8 @@ share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
 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
+@unexec rmdir %D/share/locale/yo/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/yo 2> /dev/null || true
 @dirrm share/gnome/omf/gnome-desktop
 @dirrm share/gnome/help/lgpl/eu
 @dirrm share/gnome/help/lgpl/C

x11/gnomedesktop/pkg-plist

@@ -203,6 +203,8 @@ share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
 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
+@unexec rmdir %D/share/locale/yo/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/yo 2> /dev/null || true
 @dirrm share/gnome/omf/gnome-desktop
 @dirrm share/gnome/help/lgpl/eu
 @dirrm share/gnome/help/lgpl/C

x11/xdialog/pkg-plist

@@ -65,3 +65,7 @@ bin/Xdialog
 %%PORTDOCS%%%%DOCSDIR%%/yesno-wizard.png
 %%PORTDOCS%%%%DOCSDIR%%/yesno.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%NLS%%@unexec rmdir %D/share/locale/no_NO/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/no_NO 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/sv_SE/LC_MESSAGES 2> /dev/null || true
+%%NLS%%@unexec rmdir %D/share/locale/sv_SE 2> /dev/null || true

x11/yelp/pkg-plist

@@ -118,6 +118,8 @@ share/locale/wa/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
 @dirrm share/gnome/yelp/ui
 @dirrm share/gnome/yelp/icons
 @dirrm share/gnome/yelp