Rename "${LOCALEBASE}" variable to "${LOCALEDIR}" to avoid mix-ups with

"${LOCALBASE}".

4 files changed, 79 insertions, 77 deletions

diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index 03d818b2aa7..5ce3af28d3e 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2000/11/29 17:25:40 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2001/02/13 11:47:07 tron Exp $
 
 DISTNAME=		gnome-core-1.2.4
 CATEGORIES=		x11 gnome
@@ -28,6 +28,7 @@ CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 
 USE_PERL5=		YES
 PERL_SCRIPTS=		help-browser/gnome-convert help-browser/gnome-download
+PLIST_SUBST+=		LOCALEDIR=${LOCALEDIR}
 
 post-patch:
 	cd ${WRKSRC}; \
diff --git a/x11/gnome-core/pkg/PLIST b/x11/gnome-core/pkg/PLIST
index c1d01ffd4f0..292941a7a19 100644
--- a/x11/gnome-core/pkg/PLIST
+++ b/x11/gnome-core/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2001/01/04 15:11:00 agc Exp $
+@comment $NetBSD: PLIST,v 1.23 2001/02/13 11:47:08 tron Exp $
 bin/deskguide_applet
 bin/gmenu
 bin/gnome-about
@@ -622,43 +622,43 @@ share/gnome/html/panel/x95.html
 share/idl/Terminal.idl
 share/idl/gnome-panel.idl
 share/idl/help-browser.idl
-share/locale/bg_BG.cp1251/LC_MESSAGES/gnome-core.mo
-share/locale/ca/LC_MESSAGES/gnome-core.mo
-share/locale/cs/LC_MESSAGES/gnome-core.mo
-share/locale/da/LC_MESSAGES/gnome-core.mo
-share/locale/de/LC_MESSAGES/gnome-core.mo
-share/locale/el/LC_MESSAGES/gnome-core.mo
-share/locale/en_GB/LC_MESSAGES/gnome-core.mo
-share/locale/es/LC_MESSAGES/gnome-core.mo
-share/locale/et/LC_MESSAGES/gnome-core.mo
-share/locale/eu/LC_MESSAGES/gnome-core.mo
-share/locale/fi/LC_MESSAGES/gnome-core.mo
-share/locale/fr/LC_MESSAGES/gnome-core.mo
-share/locale/ga/LC_MESSAGES/gnome-core.mo
-share/locale/gl/LC_MESSAGES/gnome-core.mo
-share/locale/hu/LC_MESSAGES/gnome-core.mo
-share/locale/it/LC_MESSAGES/gnome-core.mo
-share/locale/ja/LC_MESSAGES/gnome-core.mo
-share/locale/ko/LC_MESSAGES/gnome-core.mo
-share/locale/lt/LC_MESSAGES/gnome-core.mo
-share/locale/nl/LC_MESSAGES/gnome-core.mo
-share/locale/nn/LC_MESSAGES/gnome-core.mo
-share/locale/no/LC_MESSAGES/gnome-core.mo
-share/locale/pl/LC_MESSAGES/gnome-core.mo
-share/locale/pt/LC_MESSAGES/gnome-core.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-core.mo
-share/locale/ru/LC_MESSAGES/gnome-core.mo
-share/locale/sk/LC_MESSAGES/gnome-core.mo
-share/locale/sl/LC_MESSAGES/gnome-core.mo
-share/locale/sp/LC_MESSAGES/gnome-core.mo
-share/locale/sr/LC_MESSAGES/gnome-core.mo
-share/locale/sv/LC_MESSAGES/gnome-core.mo
-share/locale/ta/LC_MESSAGES/gnome-core.mo
-share/locale/tr/LC_MESSAGES/gnome-core.mo
-share/locale/uk/LC_MESSAGES/gnome-core.mo
-share/locale/wa/LC_MESSAGES/gnome-core.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-core.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/bg_BG.cp1251/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/ca/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/cs/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/da/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/de/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/el/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/es/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/et/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/eu/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/fi/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/fr/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/ga/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/gl/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/hu/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/it/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/ja/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/ko/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/lt/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/nl/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/nn/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/no/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/pl/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/pt/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/ru/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/sk/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/sl/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/sp/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/sr/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/sv/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/ta/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/tr/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/uk/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/wa/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gnome-core.mo
 share/mc/templates/GIMP.desktop
 share/pixmaps/apple-green.png
 share/pixmaps/apple-red.png
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index e224451d7a2..2205eff2b0e 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2000/11/29 02:37:43 mycroft Exp $
+# $NetBSD: Makefile,v 1.56 2001/02/13 11:47:08 tron Exp $
 
 DISTNAME=		gnome-libs-1.2.8
 CATEGORIES=		x11 gnome
@@ -33,6 +33,7 @@ LDFLAGS+=       	-L${LOCALBASE}/lib
 
 LOCALSTATEDIR=		/var/gnome
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE} \
+			LOCALEDIR=${LOCALEDIR} \
 			LOCALSTATEDIR=${LOCALSTATEDIR}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/gnome-libs/pkg/PLIST b/x11/gnome-libs/pkg/PLIST
index 06c5d2cdbd9..4d8e7a35bd5 100644
--- a/x11/gnome-libs/pkg/PLIST
+++ b/x11/gnome-libs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2001/01/04 15:11:01 agc Exp $
+@comment $NetBSD: PLIST,v 1.36 2001/02/13 11:47:08 tron Exp $
 bin/dns-helper
 bin/gconfigger
 bin/gnome-bug
@@ -548,42 +548,42 @@ share/idl/desktop-textviewer.idl
 share/idl/gnome-factory.idl
 share/idl/gnome-unknown.idl
 share/idl/name-service.idl
-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/de/LC_MESSAGES/gnome-libs.mo
-share/locale/el/LC_MESSAGES/gnome-libs.mo
-share/locale/en_GB/LC_MESSAGES/gnome-libs.mo
-share/locale/es/LC_MESSAGES/gnome-libs.mo
-share/locale/et/LC_MESSAGES/gnome-libs.mo
-share/locale/eu/LC_MESSAGES/gnome-libs.mo
-share/locale/fi/LC_MESSAGES/gnome-libs.mo
-share/locale/fr/LC_MESSAGES/gnome-libs.mo
-share/locale/ga/LC_MESSAGES/gnome-libs.mo
-share/locale/gl/LC_MESSAGES/gnome-libs.mo
-share/locale/hr/LC_MESSAGES/gnome-libs.mo
-share/locale/hu/LC_MESSAGES/gnome-libs.mo
-share/locale/it/LC_MESSAGES/gnome-libs.mo
-share/locale/ja/LC_MESSAGES/gnome-libs.mo
-share/locale/ko/LC_MESSAGES/gnome-libs.mo
-share/locale/lt/LC_MESSAGES/gnome-libs.mo
-share/locale/nl/LC_MESSAGES/gnome-libs.mo
-share/locale/nn/LC_MESSAGES/gnome-libs.mo
-share/locale/no/LC_MESSAGES/gnome-libs.mo
-share/locale/pl/LC_MESSAGES/gnome-libs.mo
-share/locale/pt/LC_MESSAGES/gnome-libs.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-libs.mo
-share/locale/ro/LC_MESSAGES/gnome-libs.mo
-share/locale/ru/LC_MESSAGES/gnome-libs.mo
-share/locale/sk/LC_MESSAGES/gnome-libs.mo
-share/locale/sl/LC_MESSAGES/gnome-libs.mo
-share/locale/sp/LC_MESSAGES/gnome-libs.mo
-share/locale/sr/LC_MESSAGES/gnome-libs.mo
-share/locale/sv/LC_MESSAGES/gnome-libs.mo
-share/locale/tr/LC_MESSAGES/gnome-libs.mo
-share/locale/wa/LC_MESSAGES/gnome-libs.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-libs.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/ca/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/cs/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/da/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/de/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/el/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/es/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/et/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/eu/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/fi/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/fr/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/ga/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/gl/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/hr/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/hu/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/it/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/ja/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/ko/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/lt/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/nl/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/nn/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/no/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/pl/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/pt/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/ro/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/ru/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/sk/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/sl/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/sp/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/sr/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/sv/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/tr/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/wa/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gnome-libs.mo
 share/mime-info/gnome.mime
 share/pixmaps/calculator-font.png
 share/pixmaps/gnome-default-dlg.png