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

"${LOCALBASE}".

6 files changed, 80 insertions, 80 deletions

diff --git a/misc/gnome-pim/Makefile b/misc/gnome-pim/Makefile
index 4589cf62290..f6cfc8099b0 100644
--- a/misc/gnome-pim/Makefile
+++ b/misc/gnome-pim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/02/06 03:16:58 fredb Exp $
+# $NetBSD: Makefile,v 1.23 2001/02/13 11:47:03 tron Exp $
 #
 
 DISTNAME=		gnome-pim-1.2.0
@@ -19,9 +19,9 @@ USE_X11BASE=		# defined
 
 GNU_CONFIGURE=		# defined
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LOCALEBASE=${LOCALEBASE}
+			LOCALEDIR=${LOCALEDIR}
 
-PLIST_SUBST+=		LOCALEBASE=${LOCALEBASE}
+PLIST_SUBST+=		LOCALEDIR=${LOCALEDIR}
 
 AUTOGEN_ENV=		NOCONFIGURE=1
 AUTOGEN_ENV+=		srcdir=${WRKSRC}
@@ -33,12 +33,12 @@ pre-configure:
 
 # 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/misc/gnome-pim/patches/patch-ab b/misc/gnome-pim/patches/patch-ab
index 50c7a171e39..7a8b41c4d46 100644
--- a/misc/gnome-pim/patches/patch-ab
+++ b/misc/gnome-pim/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2000/11/09 20:14:48 mycroft Exp $
+$NetBSD: patch-ab,v 1.5 2001/02/13 11:47:03 tron Exp $
 
 --- aclocal.m4.orig	Sun May 21 01:50:15 2000
 +++ aclocal.m4	Thu Nov  9 19:49:00 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.4 2000/11/09 20:14:48 mycroft Exp $
  		   DATADIRNAME=share],
  		  [CATOBJEXT=.mo
 -		   DATADIRNAME=lib])
-+		   DATADIRNAME=${LOCALEBASE}])
++		   DATADIRNAME=${LOCALEDIR}])
  		INSTOBJEXT=.mo
  	      fi
  	    fi
diff --git a/misc/gnome-pim/pkg/PLIST b/misc/gnome-pim/pkg/PLIST
index b26c301f212..45b1a26b5a7 100644
--- a/misc/gnome-pim/pkg/PLIST
+++ b/misc/gnome-pim/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2000/10/23 17:06:57 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/02/13 11:47:03 tron Exp $
 bin/gnomecal
 bin/gnomecard
 etc/CORBA/servers/gnomecal.gnorba
@@ -25,38 +25,38 @@ share/gnome/help/gnomecal/C/gcal.html
 share/gnome/help/gnomecal/C/ln20.html
 share/gnome/help/gnomecal/C/tech.html.html
 share/gnome/help/gnomecal/C/docbook.css
-${LOCALEBASE}/locale/ca/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/cs/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/cy/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/da/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/de/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/el/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/en_GB/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/es/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/et/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/fi/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/fr/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/ga/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/gd/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/gl/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/gv/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/hu/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/it/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/ja/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/ko/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/kw/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/lt/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/nl/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/no/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/pl/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/pt/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/pt_BR/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/ru/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/sv/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/uk/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/wa/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/zh_TW.Big5/LC_MESSAGES/gnome-pim.mo
-${LOCALEBASE}/locale/zh_CN.GB2312/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/ca/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/cs/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/cy/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/da/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/de/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/el/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/es/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/et/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/fi/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/fr/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/ga/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/gd/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/gl/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/gv/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/hu/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/it/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/ja/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/ko/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/kw/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/lt/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/nl/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/no/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/pl/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/pt/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/ru/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/sv/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/uk/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/wa/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gnome-pim.mo
+${LOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gnome-pim.mo
 @dirrm share/gnome/help/gnomecal/C/images
 @dirrm share/gnome/help/gnomecal/C
 @dirrm share/gnome/help/gnomecal
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index f31a7b61a79..fbd96019c8e 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile,v 1.28 2001/02/06 03:16:58 fredb Exp $
+## $NetBSD: Makefile,v 1.29 2001/02/13 11:47:03 tron Exp $
 
 DISTNAME=		gnome-utils-1.2.0
 CATEGORIES=		misc x11 gnome
@@ -20,9 +20,9 @@ USE_LIBINTL=		# defined
 USE_X11BASE=		# defined
 
 GNU_CONFIGURE=		# defined
-CONFIGURE_ENV+=		LOCALEBASE=${LOCALEBASE}
+CONFIGURE_ENV+=		LOCALEDIR=${LOCALEDIR}
 
-PLIST_SUBST+=		LOCALEBASE=${LOCALEBASE}
+PLIST_SUBST+=		LOCALEDIR=${LOCALEDIR}
 
 AUTOGEN_ENV=		NOCONFIGURE=1
 AUTOGEN_ENV+=		srcdir=${WRKSRC}
@@ -34,12 +34,12 @@ pre-configure:
 
 # 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
 
 .if ${NEED_NCURSES} == "YES"
diff --git a/misc/gnome-utils/patches/patch-ad b/misc/gnome-utils/patches/patch-ad
index 29c36dcec62..b8448e507eb 100644
--- a/misc/gnome-utils/patches/patch-ad
+++ b/misc/gnome-utils/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2000/11/09 21:09:44 mycroft Exp $
+$NetBSD: patch-ad,v 1.2 2001/02/13 11:47:03 tron Exp $
 
 --- aclocal.m4.orig	Fri May 19 19:48:53 2000
 +++ aclocal.m4	Thu Nov  9 20:56:05 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.1 2000/11/09 21:09:44 mycroft Exp $
  		   DATADIRNAME=share],
  		  [CATOBJEXT=.mo
 -		   DATADIRNAME=lib])
-+		   DATADIRNAME=${LOCALEBASE}])
++		   DATADIRNAME=${LOCALEDIR}])
  		INSTOBJEXT=.mo
  	      fi
  	    fi
diff --git a/misc/gnome-utils/pkg/PLIST b/misc/gnome-utils/pkg/PLIST
index 4d795e9dfd6..cb50c1772a5 100644
--- a/misc/gnome-utils/pkg/PLIST
+++ b/misc/gnome-utils/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2000/11/09 21:09:44 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/02/13 11:47:04 tron Exp $
 bin/gcalc
 bin/gcharmap
 bin/gcolorsel
@@ -184,36 +184,36 @@ share/gcolorsel/glade/view-color-grid-properties.glade.h
 share/gcolorsel/glade/view-color-list-properties.glade
 share/gcolorsel/glade/view-color-list-properties.glade.h
 share/idl/gsu.idl
-${LOCALEBASE}/locale/ca/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/cs/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/da/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/de/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/el/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/en_GB/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/es/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/et/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/fi/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/fr/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/ga/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/gl/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/hu/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/it/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/ja/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/ko/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/lt/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/nl/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/no/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/pl/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/pt/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/pt_BR/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/ro/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/ru/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/sv/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/tr/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/uk/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/wa/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/zh_TW.Big5/LC_MESSAGES/gnome-utils.mo
-${LOCALEBASE}/locale/zh_CN.GB2312/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/ca/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/cs/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/da/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/de/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/el/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/es/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/et/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/fi/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/fr/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/ga/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/gl/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/hu/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/it/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/ja/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/ko/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/lt/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/nl/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/no/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/pl/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/pt/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/ro/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/ru/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/sv/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/tr/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/uk/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/wa/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gnome-utils.mo
+${LOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gnome-utils.mo
 share/pixmaps/logview/logview.xpm
 share/pixmaps/gdict.png
 share/pixmaps/gnome-fontsel.png