10 files changed, 84 insertions, 417 deletions

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 78d103c31f24..83fdd84a816f 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,15 +3,15 @@
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glib20/Makefile,v 1.75 2006/04/13 07:57:40 bland Exp $
+#   $MCom: ports/devel/glib20/Makefile,v 1.91 2006/10/05 06:55:34 mezz Exp $
 #
 
 PORTNAME=	glib
-PORTVERSION=	2.10.3
+PORTVERSION=	2.12.4
 PORTREVISION?=	0
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/2.10,} \
-		ftp://ftp.gtk.org/pub/gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
+		ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -30,7 +30,7 @@ USE_BZIP2=	yes
 
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool:15
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig ltverhack
 USE_GMAKE=	yes
 USE_PERL5=	yes
@@ -42,20 +42,12 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
-OPTIONS=	COLLATION_FIX "fix string collation" off
-
 .include <bsd.port.pre.mk>
 
 .if ( ( ${OSVERSION} < 504101 ) || ( ${OSVERSION} >= 600000 && ${OSVERSION} < 600012 ) )
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-gthread_gthread-posix.c
 .endif
 
-.if defined(WITH_COLLATION_FIX)
-LIB_DEPENDS+=	icui18n:${PORTSDIR}/devel/icu
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-glib_Makefile.in \
-		${FILESDIR}/extra-patch-glib_gunicollate.c
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
 		s|%%X11BASE%%|${X11BASE}|g' \
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index e467aeb74ae5..9fda3523c122 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.10.3.tar.bz2) = 87206e721c12d185d17dd9ecd7e30369
-SHA256 (gnome2/glib-2.10.3.tar.bz2) = 1d3700e35ca7240a9ce28cf222429648ea50271d62524e008191ccd04a3f8f6f
-SIZE (gnome2/glib-2.10.3.tar.bz2) = 2774011
+MD5 (gnome2/glib-2.12.4.tar.bz2) = ef7b9595fa788e245a0f883bddba8a25
+SHA256 (gnome2/glib-2.12.4.tar.bz2) = 1b1a0dc746a07c67aad15e22e3d751c3e7068c889d171efb1ab45efbab87c75d
+SIZE (gnome2/glib-2.12.4.tar.bz2) = 2868828
diff --git a/devel/glib20/files/extra-patch-glib_Makefile.in b/devel/glib20/files/extra-patch-glib_Makefile.in
deleted file mode 100644
index 3c5676d2eb1e..000000000000
--- a/devel/glib20/files/extra-patch-glib_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- glib/Makefile.in.orig	Wed Jul 19 01:08:13 2006
-+++ glib/Makefile.in	Wed Jul 19 01:09:10 2006
-@@ -130,7 +130,7 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- INSTOBJEXT = @INSTOBJEXT@
- INTLLIBS = @INTLLIBS@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ -licui18n
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
diff --git a/devel/glib20/files/extra-patch-glib_gunicollate.c b/devel/glib20/files/extra-patch-glib_gunicollate.c
deleted file mode 100644
index 5d31cbd2ed72..000000000000
--- a/devel/glib20/files/extra-patch-glib_gunicollate.c
+++ /dev/null
@@ -1,116 +0,0 @@
---- glib/gunicollate.c.orig	Sun Nov 27 21:15:41 2005
-+++ glib/gunicollate.c	Thu Oct  5 17:11:44 2006
-@@ -26,10 +26,57 @@
- #include <wchar.h>
- #endif
- 
-+#include <unicode/umachine.h>
-+#include <unicode/ustring.h>
-+#include <unicode/ucol.h>
-+
- #include "glib.h"
- #include "gunicodeprivate.h"
- #include "galias.h"
- 
-+static gboolean icu_collator_initialized = FALSE;
-+static UCollator *icu_collator = NULL;
-+G_LOCK_DEFINE_STATIC(icu_collator);
-+
-+static void
-+init_icu_collator (void)
-+{
-+  G_LOCK(icu_collator);
-+  if (! icu_collator_initialized)
-+    {
-+      UErrorCode error = U_ZERO_ERROR;
-+
-+      icu_collator = ucol_open(NULL, &error);
-+      if (icu_collator == NULL)
-+	g_warning("unable to initialize the ICU collator (%s), FreeBSD collation routines will be used", u_errorName(error));
-+
-+      icu_collator_initialized = TRUE;
-+    }
-+  G_UNLOCK(icu_collator);
-+}
-+
-+static UChar *
-+utf8_to_uchar (const char *str, int32_t len, int32_t *result_len)
-+{
-+  UErrorCode error = U_ZERO_ERROR;
-+  UChar *result = NULL;
-+
-+  u_strFromUTF8(NULL, 0, result_len, str, len, &error);
-+  if (error <= U_ZERO_ERROR || error == U_BUFFER_OVERFLOW_ERROR)
-+    {
-+      error = U_ZERO_ERROR;
-+      result = g_new(UChar, *result_len);
-+      u_strFromUTF8(result, *result_len, NULL, str, len, &error);
-+      if (error > U_ZERO_ERROR)
-+	{
-+	  g_free(result);
-+	  result = NULL;
-+	}
-+    }
-+
-+  return result;
-+}
-+
- /**
-  * g_utf8_collate:
-  * @str1: a UTF-8 encoded string
-@@ -76,6 +123,28 @@
-   g_return_val_if_fail (str1 != NULL, 0);
-   g_return_val_if_fail (str2 != NULL, 0);
- 
-+  init_icu_collator();
-+  if (icu_collator != NULL)
-+    {
-+      int32_t wstr1_len;
-+      UChar *wstr1 = utf8_to_uchar(str1, -1, &wstr1_len);
-+      if (wstr1 != NULL)
-+	{
-+	  int32_t wstr2_len;
-+	  UChar *wstr2 = utf8_to_uchar(str2, -1, &wstr2_len);
-+	  if (wstr2 != NULL)
-+	    {
-+	      result = ucol_strcoll(icu_collator, wstr1, wstr1_len, wstr2, wstr2_len);
-+
-+	      g_free(wstr1);
-+	      g_free(wstr2);
-+
-+	      return result;
-+	    }
-+	  g_free(wstr1);
-+	}
-+    }
-+
-   str1_norm = g_utf8_normalize (str1, -1, G_NORMALIZE_ALL_COMPOSE);
-   str2_norm = g_utf8_normalize (str2, -1, G_NORMALIZE_ALL_COMPOSE);
- 
-@@ -217,6 +286,26 @@
-   gchar *str_norm;
- 
-   g_return_val_if_fail (str != NULL, NULL);
-+
-+  init_icu_collator();
-+  if (icu_collator != NULL)
-+    {
-+      int32_t wstr_len;
-+      UChar *wstr = utf8_to_uchar(str, len, &wstr_len);
-+      if (wstr != NULL)
-+	{
-+	  int32_t result_len;
-+
-+	  /* get size of result */
-+	  result_len = ucol_getSortKey(icu_collator, wstr, wstr_len, NULL, 0);
-+
-+	  result = g_new(char, result_len);
-+	  ucol_getSortKey(icu_collator, wstr, wstr_len, result, result_len);
-+	  g_free(wstr);
-+
-+	  return result;
-+	}
-+    }
- 
-   str_norm = g_utf8_normalize (str, len, G_NORMALIZE_ALL_COMPOSE);
- 
diff --git a/devel/glib20/files/patch-glib_gatomic.c b/devel/glib20/files/patch-glib_gatomic.c
deleted file mode 100644
index 93b29baddabe..000000000000
--- a/devel/glib20/files/patch-glib_gatomic.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- glib/gatomic.c.orig	Thu Jul  6 11:21:02 2006
-+++ glib/gatomic.c	Thu Jul  6 11:18:48 2006
-@@ -414,14 +414,14 @@
- g_atomic_int_exchange_and_add (volatile gint *atomic,
- 			       gint           val)
- {
--  return __sync_fetch_and_add (atomic, val);
-+  return __sync_fetch_and_add_si (atomic, val);
- }
-  
- void
- g_atomic_int_add (volatile gint *atomic, 
- 		  gint val)
- {
--  __sync_fetch_and_add (atomic, val);
-+  __sync_fetch_and_add_si (atomic, val);
- }
- 
- gboolean
-@@ -429,7 +429,7 @@
- 				   gint           oldval, 
- 				   gint           newval)
- {
--  return __sync_bool_compare_and_swap (atomic, oldval, newval);
-+  return __sync_bool_compare_and_swap_si (atomic, oldval, newval);
- }
- 
- gboolean
-@@ -437,7 +437,7 @@
- 				       gpointer           oldval, 
- 				       gpointer           newval)
- {
--  return __sync_bool_compare_and_swap ((long *)atomic, 
-+  return __sync_bool_compare_and_swap_di ((long *)atomic, 
- 				       (long)oldval, (long)newval);
- }
- 
diff --git a/devel/glib20/files/patch-glib_gthread.c b/devel/glib20/files/patch-glib_gthread.c
deleted file mode 100644
index 1dce08388674..000000000000
--- a/devel/glib20/files/patch-glib_gthread.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- glib/gthread.c.orig	Mon Mar 14 05:02:07 2005
-+++ glib/gthread.c	Wed Jul 20 19:44:08 2005
-@@ -42,24 +42,8 @@
- 
- #include "glib.h"
- #include "gthreadinit.h"
-+#include "gthreadprivate.h"
- #include "galias.h"
--
--#if GLIB_SIZEOF_SYSTEM_THREAD == SIZEOF_VOID_P
--# define g_system_thread_equal_simple(thread1, thread2)			\
--   ((thread1).dummy_pointer == (thread2).dummy_pointer)
--# define g_system_thread_assign(dest, src)				\
--   ((dest).dummy_pointer = (src).dummy_pointer)
--#else /* GLIB_SIZEOF_SYSTEM_THREAD != SIZEOF_VOID_P */
--# define g_system_thread_equal_simple(thread1, thread2)			\
--   (memcmp (&(thread1), &(thread2), GLIB_SIZEOF_SYSTEM_THREAD) == 0)
--# define g_system_thread_assign(dest, src)				\
--   (memcpy (&(dest), &(src), GLIB_SIZEOF_SYSTEM_THREAD))
--#endif /* GLIB_SIZEOF_SYSTEM_THREAD == SIZEOF_VOID_P */
--
--#define g_system_thread_equal(thread1, thread2)				\
--  (g_thread_functions_for_glib_use.thread_equal ? 			\
--   g_thread_functions_for_glib_use.thread_equal (&(thread1), &(thread2)) :\
--   g_system_thread_equal_simple((thread1), (thread2)))
- 
- GQuark 
- g_thread_error_quark (void)
diff --git a/devel/glib20/files/patch-glib_gtimer.c b/devel/glib20/files/patch-glib_gtimer.c
new file mode 100644
index 000000000000..a0661056559f
--- /dev/null
+++ b/devel/glib20/files/patch-glib_gtimer.c
@@ -0,0 +1,11 @@
+--- glib/gtimer.c.orig	Sun Oct  1 01:51:15 2006
++++ glib/gtimer.c	Tue Oct  3 17:00:39 2006
+@@ -257,7 +257,7 @@
+ 
+   if (microseconds)
+     *microseconds = (elapsed / 10) % 1000000;
+-#elif HAVE_CLOCK_GETTIME
++#elif USE_CLOCK_GETTIME
+   if (timer->active)
+     GETTIME (timer->end);
+ 
diff --git a/devel/glib20/files/patch-gmodule::gmodule-dl.c b/devel/glib20/files/patch-gmodule::gmodule-dl.c
index cf1338425a1c..47ca3e672044 100644
--- a/devel/glib20/files/patch-gmodule::gmodule-dl.c
+++ b/devel/glib20/files/patch-gmodule::gmodule-dl.c
@@ -1,6 +1,6 @@
 
 $FreeBSD$
-  $MCom: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.16 2005/12/15 00:18:44 marcus Exp $
+  $MCom: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.19 2006/10/10 20:22:06 mezz Exp $
 
 --- gmodule/gmodule-dl.c.orig	Sat Feb 17 08:28:07 2001
 +++ gmodule/gmodule-dl.c	Fri Jan 18 09:48:45 2002
diff --git a/devel/glib20/files/patch-gthread_gthread-impl.c b/devel/glib20/files/patch-gthread_gthread-impl.c
deleted file mode 100644
index 5f1b6dcbd7ec..000000000000
--- a/devel/glib20/files/patch-gthread_gthread-impl.c
+++ /dev/null
@@ -1,185 +0,0 @@
---- gthread/gthread-impl.c.orig	Fri Feb 14 16:08:46 2003
-+++ gthread/gthread-impl.c	Wed Jul 20 19:44:08 2005
-@@ -37,9 +37,11 @@
- 
- #include <glib.h>
- #include <gthreadinit.h>
-+#include "gthreadprivate.h"
- 
- #ifdef G_THREADS_ENABLED
- 
-+static GSystemThread zero_thread; /* This is initialized to all zero */
- static gboolean thread_system_already_initialized = FALSE;
- static gint g_thread_priority_map [G_THREAD_PRIORITY_URGENT + 1];
- 
-@@ -76,7 +78,7 @@
- struct _ErrorCheckInfo
- {
-   gchar *location;
--  GThread *owner;
-+  GSystemThread owner;
- };
- 
- static GMutex *
-@@ -94,7 +96,9 @@
- 			      gchar *location)
- {
-   ErrorCheckInfo *info;
--  GThread *self = g_thread_self ();
-+  GSystemThread self;
-+
-+  g_thread_functions_for_glib_use.thread_self (&self);
- 
-   if (magic != G_MUTEX_DEBUG_MAGIC)
-     location = "unknown";
-@@ -116,14 +120,14 @@
-     }
-   
-   info = G_MUTEX_DEBUG_INFO (mutex);
--  if (info->owner == self)
-+  if (g_system_thread_equal (info->owner, self))
-     g_error ("Trying to recursivly lock a mutex at '%s', "
- 	     "previously locked at '%s'", 
- 	     location, info->location);
- 
-   g_thread_functions_for_glib_use_default.mutex_lock (mutex);
- 
--  info->owner = self;
-+  g_system_thread_assign (info->owner, self);
-   info->location = location;
- }
- 
-@@ -133,7 +137,9 @@
- 				 gchar *location)
- {
-   ErrorCheckInfo *info = G_MUTEX_DEBUG_INFO (mutex);
--  GThread *self = g_thread_self ();
-+  GSystemThread self;
-+
-+  g_thread_functions_for_glib_use.thread_self (&self);
- 
-   if (magic != G_MUTEX_DEBUG_MAGIC)
-     location = "unknown";
-@@ -145,7 +151,7 @@
-       return TRUE;
-     }
- 
--  if (info->owner == self)
-+  if (g_system_thread_equal (info->owner, self))
-     g_error ("Trying to recursivly lock a mutex at '%s', "
- 	     "previously locked at '%s'", 
- 	     location, info->location);
-@@ -153,7 +159,7 @@
-   if (!g_thread_functions_for_glib_use_default.mutex_trylock (mutex))
-     return FALSE;
- 
--  info->owner = self;
-+  g_system_thread_assign (info->owner, self);
-   info->location = location;
- 
-   return TRUE;
-@@ -165,20 +171,22 @@
- 				gchar *location)
- {
-   ErrorCheckInfo *info = G_MUTEX_DEBUG_INFO (mutex);
--  GThread *self = g_thread_self ();
-+  GSystemThread self;
-+
-+  g_thread_functions_for_glib_use.thread_self (&self);
- 
-   if (magic != G_MUTEX_DEBUG_MAGIC)
-     location = "unknown";
- 
--  if (!info || info->owner == NULL)
-+  if (!info || g_system_thread_equal (info->owner, zero_thread))
-     g_error ("Trying to unlock an unlocked mutex at '%s'", location);
- 
--  if (info->owner != self)
-+  if (!g_system_thread_equal (info->owner, self))
-     g_warning ("Trying to unlock a mutex at '%s', "
- 	       "previously locked by a different thread at '%s'",
- 	       location, info->location);
- 
--  info->owner = NULL;
-+  g_system_thread_assign (info->owner, zero_thread);
-   info->location = NULL;
- 
-   g_thread_functions_for_glib_use_default.mutex_unlock (mutex);
-@@ -194,7 +202,7 @@
-   if (magic != G_MUTEX_DEBUG_MAGIC)
-     location = "unknown";
- 
--  if (info && info->owner != NULL)
-+  if (info && !g_system_thread_equal (info->owner, zero_thread))
-     g_error ("Trying to free a locked mutex at '%s', "
- 	     "which was previously locked at '%s'", 
- 	     location, info->location);
-@@ -211,25 +219,27 @@
- {
-   
-   ErrorCheckInfo *info = G_MUTEX_DEBUG_INFO (mutex);
--  GThread *self = g_thread_self ();
-+  GSystemThread self;
-+
-+  g_thread_functions_for_glib_use.thread_self (&self);
- 
-   if (magic != G_MUTEX_DEBUG_MAGIC)
-     location = "unknown";
- 
--  if (!info || info->owner == NULL)
-+  if (!info || g_system_thread_equal (info->owner, zero_thread))
-     g_error ("Trying to use an unlocked mutex in g_cond_wait() at '%s'",
- 	     location);
- 
--  if (info->owner != self)
-+  if (!g_system_thread_equal (info->owner, self))
-     g_error ("Trying to use a mutex locked by another thread in "
- 	     "g_cond_wait() at '%s'", location);
- 
--  info->owner = NULL;
-+  g_system_thread_assign (info->owner, zero_thread);
-   location = info->location;
- 
-   g_thread_functions_for_glib_use_default.cond_wait (cond, mutex);
- 
--  info->owner = self;
-+  g_system_thread_assign (info->owner, self);
-   info->location = location;
- }
-     
-@@ -242,28 +252,30 @@
- 				   gchar *location)
- {
-   ErrorCheckInfo *info = G_MUTEX_DEBUG_INFO (mutex);
--  GThread *self = g_thread_self ();
-+  GSystemThread self;
-   gboolean retval;
- 
-+  g_thread_functions_for_glib_use.thread_self (&self);
-+
-   if (magic != G_MUTEX_DEBUG_MAGIC)
-     location = "unknown";
- 
--  if (!info || info->owner == NULL)
-+  if (!info || g_system_thread_equal (info->owner, zero_thread))
-     g_error ("Trying to use an unlocked mutex in g_cond_timed_wait() at '%s'",
- 	     location);
- 
--  if (info->owner != self)
-+  if (!g_system_thread_equal (info->owner, self))
-     g_error ("Trying to use a mutex locked by another thread in "
- 	     "g_cond_timed_wait() at '%s'", location);
- 
--  info->owner = NULL;
-+  g_system_thread_assign (info->owner, zero_thread);
-   location = info->location;
-   
-   retval = g_thread_functions_for_glib_use_default.cond_timed_wait (cond, 
- 								    mutex, 
- 								    end_time);
- 
--  info->owner = self;
-+  g_system_thread_assign (info->owner, self);
-   info->location = location;
- 
-   return retval;
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index aa6628f4ee74..7820f1240885 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -9,6 +9,8 @@ include/glib-2.0/glib/garray.h
 include/glib-2.0/glib/gasyncqueue.h
 include/glib-2.0/glib/gatomic.h
 include/glib-2.0/glib/gbacktrace.h
+include/glib-2.0/glib/gbase64.h
+include/glib-2.0/glib/gbookmarkfile.h
 include/glib-2.0/glib/gcache.h
 include/glib-2.0/glib/gcompletion.h
 include/glib-2.0/glib/gconvert.h
@@ -107,6 +109,7 @@ share/locale/az/LC_MESSAGES/glib20.mo
 share/locale/be/LC_MESSAGES/glib20.mo
 share/locale/bg/LC_MESSAGES/glib20.mo
 share/locale/bn/LC_MESSAGES/glib20.mo
+share/locale/bn_IN/LC_MESSAGES/glib20.mo
 share/locale/bs/LC_MESSAGES/glib20.mo
 share/locale/ca/LC_MESSAGES/glib20.mo
 share/locale/cs/LC_MESSAGES/glib20.mo
@@ -131,6 +134,7 @@ share/locale/he/LC_MESSAGES/glib20.mo
 share/locale/hi/LC_MESSAGES/glib20.mo
 share/locale/hr/LC_MESSAGES/glib20.mo
 share/locale/hu/LC_MESSAGES/glib20.mo
+share/locale/hy/LC_MESSAGES/glib20.mo
 share/locale/id/LC_MESSAGES/glib20.mo
 share/locale/is/LC_MESSAGES/glib20.mo
 share/locale/it/LC_MESSAGES/glib20.mo
@@ -148,7 +152,6 @@ share/locale/nb/LC_MESSAGES/glib20.mo
 share/locale/ne/LC_MESSAGES/glib20.mo
 share/locale/nl/LC_MESSAGES/glib20.mo
 share/locale/nn/LC_MESSAGES/glib20.mo
-share/locale/no/LC_MESSAGES/glib20.mo
 share/locale/or/LC_MESSAGES/glib20.mo
 share/locale/pa/LC_MESSAGES/glib20.mo
 share/locale/pl/LC_MESSAGES/glib20.mo
@@ -178,31 +181,69 @@ share/locale/yi/LC_MESSAGES/glib20.mo
 share/locale/zh_CN/LC_MESSAGES/glib20.mo
 share/locale/zh_HK/LC_MESSAGES/glib20.mo
 share/locale/zh_TW/LC_MESSAGES/glib20.mo
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/sr@ije/LC_MESSAGES
-@dirrmtry share/locale/sr@ije
-@dirrmtry share/locale/tt/LC_MESSAGES
-@dirrmtry share/locale/tt
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/tl/LC_MESSAGES
-@dirrmtry share/locale/tl
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/yi/LC_MESSAGES
-@dirrmtry share/locale/yi
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
 @dirrm share/glib-2.0/gettext/po
 @dirrm share/glib-2.0/gettext
 @dirrm share/glib-2.0
 @dirrm include/glib-2.0/gobject
 @dirrm include/glib-2.0/glib
 @dirrm include/glib-2.0
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/yi/LC_MESSAGES
+@dirrmtry share/locale/yi
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tt/LC_MESSAGES
+@dirrmtry share/locale/tt
+@dirrmtry share/locale/tl/LC_MESSAGES
+@dirrmtry share/locale/tl
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be