Do not hardcode locale directory to "share/locale", use "${PKGLOCALEDIR}"

instead.

5 files changed, 42 insertions, 41 deletions

diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 919f78e11e9..2784be9f476 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2001/02/17 17:06:26 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2001/02/26 21:42:57 tron Exp $
 
 DISTNAME=		gtk+-1.2.8
 CATEGORIES=		x11
@@ -29,6 +29,7 @@ INFO_FILES=		gdk.info gtk.info
 
 CPPFLAGS=		-I${LOCALBASE}/include			   # libintl.h
 LDFLAGS=		-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib  # -lintl
+MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
 # The following ensures that `gtk-config --libs' includes the correct linker
diff --git a/x11/gtk/files/patch-sum b/x11/gtk/files/patch-sum
index 29087e9726a..c655ec0fd83 100644
--- a/x11/gtk/files/patch-sum
+++ b/x11/gtk/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.9 2000/06/05 01:12:41 wiz Exp $
+$NetBSD: patch-sum,v 1.10 2001/02/26 21:42:57 tron Exp $
 
-MD5 (patch-aa) = 4d0a23379967d6227812b77c8b6d8b8d
+MD5 (patch-aa) = bdb83b1289edcc89b1310822a0ab7cb3
 MD5 (patch-ab) = 884c71416aaaaee6dd2d410cb5a9cade
 MD5 (patch-ac) = 76bcc7c03a39f3562d365a8c57270189
-MD5 (patch-ad) = dec2132522595c59687fa3af05b75462
+MD5 (patch-ad) = 0a23ff30c6e52b0a3ba5edc698d8fe03
 MD5 (patch-ae) = 6ea976db6fcdc0143dd048024f044894
 MD5 (patch-af) = c3ac2a236275341e06d6a6566b876759
diff --git a/x11/gtk/patches/patch-aa b/x11/gtk/patches/patch-aa
index 68833c19f51..7b2ed45535c 100644
--- a/x11/gtk/patches/patch-aa
+++ b/x11/gtk/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.19 2000/06/05 01:12:43 wiz Exp $
+$NetBSD: patch-aa,v 1.20 2001/02/26 21:42:57 tron Exp $
 
 --- configure.orig	Thu May 25 02:31:48 2000
 +++ configure	Thu May 25 18:53:46 2000
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.19 2000/06/05 01:12:43 wiz Exp $
  # AM_GTK_GNU_GETTEXT above substs $DATADIRNAME
  # this is the directory where the *.{mo,gmo} files are installed
 -gtklocaledir='${prefix}/${DATADIRNAME}/locale'
-+gtklocaledir='${prefix}/share/locale'
++gtklocaledir='${prefix}/${PKGLOCALEDIR}/locale'
  
  
  echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6
diff --git a/x11/gtk/patches/patch-ad b/x11/gtk/patches/patch-ad
index d5040b1dd2c..2ea0a76c594 100644
--- a/x11/gtk/patches/patch-ad
+++ b/x11/gtk/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.5 1999/03/04 08:55:35 tron Exp $
+$NetBSD: patch-ad,v 1.6 2001/02/26 21:42:57 tron Exp $
 
 --- po/Makefile.in.in.orig	Thu Feb 25 12:02:20 1999
 +++ po/Makefile.in.in	Thu Mar  4 00:14:56 1999
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.5 1999/03/04 08:55:35 tron Exp $
  exec_prefix = @exec_prefix@
  datadir = $(prefix)/@DATADIRNAME@
 -localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
++localedir = $(prefix)/${PKGLOCALEDIR}/locale
  gnulocaledir = $(prefix)/share/locale
  gettextsrcdir = $(prefix)/share/gettext/po
  subdir = po
diff --git a/x11/gtk/pkg/PLIST b/x11/gtk/pkg/PLIST
index 6a8742e311d..80850cac00e 100644
--- a/x11/gtk/pkg/PLIST
+++ b/x11/gtk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2001/01/04 15:11:01 agc Exp $
+@comment $NetBSD: PLIST,v 1.29 2001/02/26 21:42:57 tron Exp $
 bin/gtk-config
 etc/gtk/gtkrc.cs
 etc/gtk/gtkrc.hr
@@ -192,38 +192,38 @@ info/gtk.info-6
 @exec install-info %D/info/gdk.info %D/info/dir
 @exec install-info %D/info/gtk.info %D/info/dir
 share/aclocal/gtk.m4
-share/locale/nn/LC_MESSAGES/gtk+.mo
-share/locale/gl/LC_MESSAGES/gtk+.mo
-share/locale/lt/LC_MESSAGES/gtk+.mo
-share/locale/nl/LC_MESSAGES/gtk+.mo
-share/locale/da/LC_MESSAGES/gtk+.mo
-share/locale/pt_BR/LC_MESSAGES/gtk+.mo
-share/locale/ro/LC_MESSAGES/gtk+.mo
-share/locale/el/LC_MESSAGES/gtk+.mo
-share/locale/eu/LC_MESSAGES/gtk+.mo
-share/locale/ga/LC_MESSAGES/gtk+.mo
-share/locale/et/LC_MESSAGES/gtk+.mo
-share/locale/uk/LC_MESSAGES/gtk+.mo
-share/locale/ko/LC_MESSAGES/gtk+.mo
-share/locale/fr/LC_MESSAGES/gtk+.mo
-share/locale/de/LC_MESSAGES/gtk+.mo
-share/locale/no/LC_MESSAGES/gtk+.mo
-share/locale/sv/LC_MESSAGES/gtk+.mo
-share/locale/pt/LC_MESSAGES/gtk+.mo
-share/locale/ja/LC_MESSAGES/gtk+.mo
-share/locale/pl/LC_MESSAGES/gtk+.mo
-share/locale/cs/LC_MESSAGES/gtk+.mo
-share/locale/es/LC_MESSAGES/gtk+.mo
-share/locale/ru/LC_MESSAGES/gtk+.mo
-share/locale/hu/LC_MESSAGES/gtk+.mo
-share/locale/it/LC_MESSAGES/gtk+.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
-share/locale/ca/LC_MESSAGES/gtk+.mo
-share/locale/fi/LC_MESSAGES/gtk+.mo
-share/locale/sk/LC_MESSAGES/gtk+.mo
-share/locale/wa/LC_MESSAGES/gtk+.mo
-share/locale/hr/LC_MESSAGES/gtk+.mo
-share/locale/sl/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gtk+.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gtk+.mo
 share/themes/Default/gtk/gtkrc
 @exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/gtk.m4 ${LOCALBASE}/share/aclocal/gtk.m4
 @unexec test %D = ${LOCALBASE} || rm ${LOCALBASE}/share/aclocal/gtk.m4