Use "PKGLOCALEDIR" instead of "LOCALEDIR".

5 files changed, 81 insertions, 85 deletions

diff --git a/sysutils/gmc/pkg/PLIST b/sysutils/gmc/pkg/PLIST
index 09ce6263984..5305b5bfa82 100644
--- a/sysutils/gmc/pkg/PLIST
+++ b/sysutils/gmc/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2001/02/13 11:47:05 tron Exp $
+@comment $NetBSD: PLIST,v 1.13 2001/02/26 20:19:48 tron Exp $
 bin/gmc
 bin/gmc-client
 bin/mc
@@ -83,33 +83,33 @@ man/man8/mcserv.8
 share/gnome/help/gmc/C/topic.dat
 share/idl/FileManager.idl
 share/idl/Makefile.in
-${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
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/es_ES/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/mc.mo
 share/mime-info/mc.keys
 share/pixmaps/mc/directory.xpm
 share/pixmaps/mc/gnome-application-encapsulated_postscript.png
diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile
index 190bc699d49..c6941120a60 100644
--- a/sysutils/gtop/Makefile
+++ b/sysutils/gtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/02/17 17:42:14 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2001/02/26 20:19:48 tron Exp $
 
 DISTNAME=		gtop-1.0.9
 CATEGORIES=		sysutils gnome
@@ -25,8 +25,6 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 CONFIGURE_ENV+=		LOCALEDIR=${LOCALEDIR}
 CFLAGS+=		-I${LOCALBASE}/include
 
-PLIST_SUBST+=		LOCALEDIR=${LOCALEDIR}
-
 AUTOGEN_ENV=		NOCONFIGURE=1
 AUTOGEN_ENV+=		srcdir=${WRKSRC}
 
diff --git a/sysutils/gtop/pkg/PLIST b/sysutils/gtop/pkg/PLIST
index dd056e8ec1c..d25a5580968 100644
--- a/sysutils/gtop/pkg/PLIST
+++ b/sysutils/gtop/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2001/02/13 11:47:06 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/02/26 20:19:48 tron Exp $
 bin/gtop
 share/gnome/apps/System/gtop.desktop
 share/gtoprc
@@ -21,28 +21,28 @@ share/gnome/help/gtop/C/memory.html
 share/gnome/help/gtop/C/more-info.html
 share/gnome/help/gtop/C/preferences.html
 share/gnome/help/gtop/C/processes.html
-${LOCALEDIR}/locale/ca/LC_MESSAGES/gtop.mo
-${LOCALEDIR}/locale/cs/LC_MESSAGES/gtop.mo
-${LOCALEDIR}/locale/da/LC_MESSAGES/gtop.mo
-${LOCALEDIR}/locale/de/LC_MESSAGES/gtop.mo
-${LOCALEDIR}/locale/el/LC_MESSAGES/gtop.mo
-${LOCALEDIR}/locale/es/LC_MESSAGES/gtop.mo
-${LOCALEDIR}/locale/fr/LC_MESSAGES/gtop.mo
-${LOCALEDIR}/locale/ga/LC_MESSAGES/gtop.mo
-${LOCALEDIR}/locale/gl/LC_MESSAGES/gtop.mo
-${LOCALEDIR}/locale/hu/LC_MESSAGES/gtop.mo
-${LOCALEDIR}/locale/it/LC_MESSAGES/gtop.mo
-${LOCALEDIR}/locale/ja/LC_MESSAGES/gtop.mo
-${LOCALEDIR}/locale/ko/LC_MESSAGES/gtop.mo
-${LOCALEDIR}/locale/lt/LC_MESSAGES/gtop.mo
-${LOCALEDIR}/locale/no/LC_MESSAGES/gtop.mo
-${LOCALEDIR}/locale/pt/LC_MESSAGES/gtop.mo
-${LOCALEDIR}/locale/ru/LC_MESSAGES/gtop.mo
-${LOCALEDIR}/locale/sv/LC_MESSAGES/gtop.mo
-${LOCALEDIR}/locale/pl/LC_MESSAGES/gtop.mo
-${LOCALEDIR}/locale/uk/LC_MESSAGES/gtop.mo
-${LOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gtop.mo
-${LOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gtop.mo
+${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gtop.mo
 share/pixmaps/gnome-gtop.png
 @dirrm share/gnome/help/gtop/C/figs
 @dirrm share/gnome/help/gtop/C
diff --git a/sysutils/mc/Makefile.common b/sysutils/mc/Makefile.common
index 00267f2b34f..2c1ff67df45 100644
--- a/sysutils/mc/Makefile.common
+++ b/sysutils/mc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2001/02/26 17:01:59 jlam Exp $
+# $NetBSD: Makefile.common,v 1.7 2001/02/26 20:19:49 tron Exp $
 
 DISTNAME=		mc-4.5.51
 CATEGORIES+=		sysutils
@@ -17,8 +17,6 @@ CONFLICTS+=		mc-* gmc-*
 FILESDIR=		${.CURDIR}/../../sysutils/mc/files
 PATCHDIR=		${.CURDIR}/../../sysutils/mc/patches
 
-PLIST_SUBST+=		LOCALEDIR=${LOCALEDIR}
-
 USE_GMAKE=		yes
 USE_LIBINTL=		yes
 
diff --git a/sysutils/mc/pkg/PLIST b/sysutils/mc/pkg/PLIST
index 70d56aad610..6d55c07474c 100644
--- a/sysutils/mc/pkg/PLIST
+++ b/sysutils/mc/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2001/02/13 11:47:06 tron Exp $
+@comment $NetBSD: PLIST,v 1.18 2001/02/26 20:19:49 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
-${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
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/es_ES/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/mc.mo
+${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/mc.mo
 @dirrm lib/mc/term
 @dirrm lib/mc/syntax
 @dirrm lib/mc/extfs