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

"${LOCALBASE}".

3 files changed, 37 insertions, 37 deletions

diff --git a/sysutils/mc/Makefile.common b/sysutils/mc/Makefile.common
index 06d9f96c04c..c9b6397343c 100644
--- a/sysutils/mc/Makefile.common
+++ b/sysutils/mc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2001/01/03 14:45:27 hubertf Exp $
+# $NetBSD: Makefile.common,v 1.5 2001/02/13 11:47:06 tron Exp $
 
 DISTNAME=		mc-4.5.51
 CATEGORIES+=		sysutils
@@ -17,7 +17,7 @@ CONFLICTS+=		mc-* gmc-*
 FILESDIR=		${.CURDIR}/../../sysutils/mc/files
 PATCHDIR=		${.CURDIR}/../../sysutils/mc/patches
 
-PLIST_SUBST+=		LOCALEBASE=${LOCALEBASE}
+PLIST_SUBST+=		LOCALEDIR=${LOCALEDIR}
 
 USE_GMAKE=		yes
 USE_LIBINTL=		yes
@@ -36,7 +36,7 @@ CONFIGURE_ENV+=		ac_cv_header_readline_history_h=no
 CONFIGURE_ENV+=		ac_cv_header_readline_readline_h=no
 
 CONFIGURE_ENV+=		LOCALBASE="${LOCALBASE}"
-CONFIGURE_ENV+=		LOCALEBASE="${LOCALEBASE}"
+CONFIGURE_ENV+=		LOCALEDIR="${LOCALEDIR}"
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 CONFIGURE_ENV+=		LIBS="${LIBS}"
 
@@ -49,12 +49,12 @@ CPPFLAGS+=		-Dunix
 
 # The directory in which locale files are found is:
 #
-# 	${PREFIX}/${LOCALEBASE}/locale/<lang>/LC_MESSAGES
+# 	${PREFIX}/${LOCALEDIR}/locale/<lang>/LC_MESSAGES
 #
 .if ${OPSYS} == "SunOS"
-LOCALEBASE=		lib
+LOCALEDIR=		lib
 .else
-LOCALEBASE=		share
+LOCALEDIR=		share
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mc/patches/patch-aa b/sysutils/mc/patches/patch-aa
index f3104db9d20..1ac6928533c 100644
--- a/sysutils/mc/patches/patch-aa
+++ b/sysutils/mc/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.9 2000/10/19 23:31:18 jlam Exp $
+$NetBSD: patch-aa,v 1.10 2001/02/13 11:47:06 tron Exp $
 
 --- configure.orig	Mon Jul  3 10:31:57 2000
 +++ configure
@@ -6,8 +6,8 @@ $NetBSD: patch-aa,v 1.9 2000/10/19 23:31:18 jlam Exp $
  
  
  
-+# Set DATADIRNAME to "${LOCALEBASE}"
-+DATADIRNAME="${LOCALEBASE}"
++# Set DATADIRNAME to "${LOCALEDIR}"
++DATADIRNAME="${LOCALEDIR}"
 +INTLDEPS=
 +INTLLIBS="-lintl"
 +
diff --git a/sysutils/mc/pkg/PLIST b/sysutils/mc/pkg/PLIST
index b743e8c221f..70d56aad610 100644
--- a/sysutils/mc/pkg/PLIST
+++ b/sysutils/mc/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2000/10/19 23:31:18 jlam Exp $
+@comment $NetBSD: PLIST,v 1.17 2001/02/13 11:47:06 tron Exp $
 bin/mc
 bin/mcedit
 bin/mcmfmt
@@ -75,33 +75,33 @@ lib/mc/term/xterm.ti
 man/man1/mc.1
 man/man1/mcedit.1
 man/man8/mcserv.8
-${LOCALEBASE}/locale/ca/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/cs/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/da/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/de/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/el/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/es/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/es_ES/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/fi/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/fr/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/hu/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/it/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/ja/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/ko/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/nl/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/no/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/pl/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/pt_BR/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/ro/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/ru/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/sk/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/sl/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/sv/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/tr/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/uk/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/wa/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/zh_CN.GB2312/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/zh_TW.Big5/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/ca/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/cs/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/da/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/de/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/el/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/es/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/es_ES/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/fi/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/fr/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/hu/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/it/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/ja/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/ko/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/nl/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/no/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/pl/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/pt_BR/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/ro/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/ru/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/sk/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/sl/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/sv/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/tr/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/uk/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/wa/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/mc.mo
+${LOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/mc.mo
 @dirrm lib/mc/term
 @dirrm lib/mc/syntax
 @dirrm lib/mc/extfs