Use "share/locale" not "lib/locale" for ".mo" files.

3 files changed, 48 insertions, 44 deletions

diff --git a/x11/gnome-libs/patches/patch-aa b/x11/gnome-libs/patches/patch-aa
index 324dfd443f3..380aef24066 100644
--- a/x11/gnome-libs/patches/patch-aa
+++ b/x11/gnome-libs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 1998/12/29 14:23:04 tron Exp $
+$NetBSD: patch-aa,v 1.4 1999/03/07 12:52:40 tron Exp $
 
---- configure.orig	Wed Dec 16 10:52:23 1998
-+++ configure	Tue Dec 29 12:43:37 1998
-@@ -1674,6 +1674,7 @@
+--- configure.orig	Mon Mar  1 20:51:08 1999
++++ configure	Sun Mar  7 12:49:50 1999
+@@ -2082,6 +2082,7 @@
  fi
  
  # Always use our own libtool.
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.3 1998/12/29 14:23:04 tron Exp $
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
  # Check for any special flags to pass to ltconfig.
-@@ -1718,6 +1719,7 @@
+@@ -2313,6 +2314,7 @@
  ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
  $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
  || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
@@ -18,7 +18,16 @@ $NetBSD: patch-aa,v 1.3 1998/12/29 14:23:04 tron Exp $
  
  # Redirect the config.log output again, so that the ltconfig log is not
  # clobbered by the next message.
-@@ -9515,10 +9517,10 @@
+@@ -5523,7 +5525,7 @@
+   
+ # AM_GNOME_GETTEXT above substs $DATADIRNAME
+ # this is the directory where the *.{mo,gmo} files are installed
+-gnomelocaledir='${prefix}/${DATADIRNAME}/locale'
++gnomelocaledir='${prefix}/share/locale'
+ 
+ 
+ echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
+@@ -11275,10 +11277,10 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
@@ -33,7 +42,7 @@ $NetBSD: patch-aa,v 1.3 1998/12/29 14:23:04 tron Exp $
  
    echo creating "$ac_file"
    rm -f "$ac_file"
-@@ -9788,10 +9790,10 @@
+@@ -11548,10 +11550,10 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/x11/gnome-libs/patches/patch-ab b/x11/gnome-libs/patches/patch-ab
new file mode 100644
index 00000000000..96e2781e7f3
--- /dev/null
+++ b/x11/gnome-libs/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 1999/03/07 12:53:25 tron Exp $
+
+--- po/Makefile.in.in.orig	Mon Mar  1 20:50:23 1999
++++ po/Makefile.in.in	Sun Mar  7 13:25:37 1999
+@@ -19,7 +19,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = @gnomelocaledir@
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
diff --git a/x11/gnome-libs/pkg/PLIST b/x11/gnome-libs/pkg/PLIST
index 830a6cda3fe..079e5d6b0ae 100644
--- a/x11/gnome-libs/pkg/PLIST
+++ b/x11/gnome-libs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 1999/03/07 11:31:47 tron Exp $
+@comment $NetBSD: PLIST,v 1.8 1999/03/07 12:52:40 tron Exp $
 bin/dns-helper
 bin/gconfigger
 bin/gnome-bug
@@ -178,24 +178,24 @@ lib/libgtkxmhtml.a
 lib/libgtkxmhtml.so.1.1
 lib/libzvt.a
 lib/libzvt.so.3.2
-lib/locale/de/LC_MESSAGES/gnome-libs.mo
-lib/locale/fr/LC_MESSAGES/gnome-libs.mo
-lib/locale/nl/LC_MESSAGES/gnome-libs.mo
-lib/locale/pt/LC_MESSAGES/gnome-libs.mo
-lib/locale/ja/LC_MESSAGES/gnome-libs.mo
-lib/locale/sv/LC_MESSAGES/gnome-libs.mo
-lib/locale/pl/LC_MESSAGES/gnome-libs.mo
-lib/locale/no/LC_MESSAGES/gnome-libs.mo
-lib/locale/ko/LC_MESSAGES/gnome-libs.mo
-lib/locale/ca/LC_MESSAGES/gnome-libs.mo
-lib/locale/cs/LC_MESSAGES/gnome-libs.mo
-lib/locale/da/LC_MESSAGES/gnome-libs.mo
-lib/locale/es/LC_MESSAGES/gnome-libs.mo
-lib/locale/fi/LC_MESSAGES/gnome-libs.mo
-lib/locale/ga/LC_MESSAGES/gnome-libs.mo
-lib/locale/it/LC_MESSAGES/gnome-libs.mo
-lib/locale/ru/LC_MESSAGES/gnome-libs.mo
-lib/locale/hu/LC_MESSAGES/gnome-libs.mo
+share/locale/de/LC_MESSAGES/gnome-libs.mo
+share/locale/fr/LC_MESSAGES/gnome-libs.mo
+share/locale/nl/LC_MESSAGES/gnome-libs.mo
+share/locale/pt/LC_MESSAGES/gnome-libs.mo
+share/locale/ja/LC_MESSAGES/gnome-libs.mo
+share/locale/sv/LC_MESSAGES/gnome-libs.mo
+share/locale/pl/LC_MESSAGES/gnome-libs.mo
+share/locale/no/LC_MESSAGES/gnome-libs.mo
+share/locale/ko/LC_MESSAGES/gnome-libs.mo
+share/locale/ca/LC_MESSAGES/gnome-libs.mo
+share/locale/cs/LC_MESSAGES/gnome-libs.mo
+share/locale/da/LC_MESSAGES/gnome-libs.mo
+share/locale/es/LC_MESSAGES/gnome-libs.mo
+share/locale/fi/LC_MESSAGES/gnome-libs.mo
+share/locale/ga/LC_MESSAGES/gnome-libs.mo
+share/locale/it/LC_MESSAGES/gnome-libs.mo
+share/locale/ru/LC_MESSAGES/gnome-libs.mo
+share/locale/hu/LC_MESSAGES/gnome-libs.mo
 sbin/gnome-pty-helper
 share/aclocal/libart.m4
 share/doc/gnome-libs/adding-file-manager-new-items.txt
@@ -249,21 +249,3 @@ share/type-convert/postscript.convert
 @dirrm share/type-convert
 @exec mkdir -p @@LOCALSTATEDIR@@
 @unexec rm -rf @@LOCALSTATEDIR@@
-@dirrm lib/locale/ca/LC_MESSAGES
-@dirrm lib/locale/ca
-@dirrm lib/locale/cs/LC_MESSAGES
-@dirrm lib/locale/cs
-@dirrm lib/locale/da/LC_MESSAGES
-@dirrm lib/locale/da
-@dirrm lib/locale/es/LC_MESSAGES
-@dirrm lib/locale/es
-@dirrm lib/locale/fi/LC_MESSAGES
-@dirrm lib/locale/fi
-@dirrm lib/locale/ga/LC_MESSAGES
-@dirrm lib/locale/ga
-@dirrm lib/locale/it/LC_MESSAGES
-@dirrm lib/locale/it
-@dirrm lib/locale/ru/LC_MESSAGES
-@dirrm lib/locale/ru
-@dirrm lib/locale/hu/LC_MESSAGES
-@dirrm lib/locale/hu