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

"${LOCALBASE}".

5 files changed, 45 insertions, 45 deletions

diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 518d42fd1ac..bd26d9f0193 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2001/01/14 05:31:12 tron Exp $
+# $NetBSD: Makefile,v 1.26 2001/02/13 11:47:00 tron Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
 #
 
@@ -18,7 +18,7 @@ CONFIGURE_ENV+=		LIBS="-L${LOCALBASE}/lib" \
 			CPPFLAGS="-I${LOCALBASE}/include"
 
 INFO_FILES=		gettext.info
-PLIST_SUBST+=		LOCALEBASE=${LOCALEBASE}
+PLIST_SUBST+=		LOCALEDIR=${LOCALEDIR}
 post-patch:
 	${RM} -f ${WRKSRC}/intl/libgettext.h
 	${RM} -f ${WRKSRC}/intl/libintl.h
diff --git a/devel/gettext/pkg/PLIST b/devel/gettext/pkg/PLIST
index 5d774645fa8..af48d7de31c 100644
--- a/devel/gettext/pkg/PLIST
+++ b/devel/gettext/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2001/01/14 05:31:13 tron Exp $
+@comment $NetBSD: PLIST,v 1.14 2001/02/13 11:47:00 tron Exp $
 bin/gettext
 bin/gettextize
 bin/msgcmp
@@ -44,18 +44,18 @@ share/gettext/intl/textdomain.c
 share/gettext/intl/xopen-msg.sed
 share/gettext/po/Makefile.in.in
 share/locale/locale.alias
-${LOCALEBASE}/locale/da/LC_MESSAGES/gettext.mo
-${LOCALEBASE}/locale/de/LC_MESSAGES/gettext.mo
-${LOCALEBASE}/locale/es/LC_MESSAGES/gettext.mo
-${LOCALEBASE}/locale/fr/LC_MESSAGES/gettext.mo
-${LOCALEBASE}/locale/ko/LC_MESSAGES/gettext.mo
-${LOCALEBASE}/locale/nl/LC_MESSAGES/gettext.mo
-${LOCALEBASE}/locale/no/LC_MESSAGES/gettext.mo
-${LOCALEBASE}/locale/no@nynorsk/LC_MESSAGES/gettext.mo
-${LOCALEBASE}/locale/pl/LC_MESSAGES/gettext.mo
-${LOCALEBASE}/locale/pt/LC_MESSAGES/gettext.mo
-${LOCALEBASE}/locale/sl/LC_MESSAGES/gettext.mo
-${LOCALEBASE}/locale/sv/LC_MESSAGES/gettext.mo
+${LOCALEDIR}/locale/da/LC_MESSAGES/gettext.mo
+${LOCALEDIR}/locale/de/LC_MESSAGES/gettext.mo
+${LOCALEDIR}/locale/es/LC_MESSAGES/gettext.mo
+${LOCALEDIR}/locale/fr/LC_MESSAGES/gettext.mo
+${LOCALEDIR}/locale/ko/LC_MESSAGES/gettext.mo
+${LOCALEDIR}/locale/nl/LC_MESSAGES/gettext.mo
+${LOCALEDIR}/locale/no/LC_MESSAGES/gettext.mo
+${LOCALEDIR}/locale/no@nynorsk/LC_MESSAGES/gettext.mo
+${LOCALEDIR}/locale/pl/LC_MESSAGES/gettext.mo
+${LOCALEDIR}/locale/pt/LC_MESSAGES/gettext.mo
+${LOCALEDIR}/locale/sl/LC_MESSAGES/gettext.mo
+${LOCALEDIR}/locale/sv/LC_MESSAGES/gettext.mo
 @dirrm share/gettext/po
 @dirrm share/gettext/intl
 @dirrm share/gettext
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 99e186d26bd..ba75034ad5d 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/11/09 17:59:51 mycroft Exp $
+# $NetBSD: Makefile,v 1.19 2001/02/13 11:47:00 tron Exp $
 # FreeBSD Id: Makefile,v 1.10 1998/11/18 17:35:16 vanilla Exp
 #
 
@@ -16,9 +16,9 @@ GNU_CONFIGURE=	yes
 USE_X11BASE=	yes
 
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
-CONFIGURE_ENV+=	LOCALEBASE=${LOCALEBASE}
+CONFIGURE_ENV+=	LOCALEDIR=${LOCALEDIR}
 
-PLIST_SUBST+=	LOCALEBASE=${LOCALEBASE}
+PLIST_SUBST+=	LOCALEDIR=${LOCALEDIR}
 
 post-install:
 	${MKDIR} ${PREFIX}/share/doc/glade
@@ -36,12 +36,12 @@ post-install:
 
 # 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/devel/glade/patches/patch-aa b/devel/glade/patches/patch-aa
index 3c6e42c60ed..70b2d8ae48e 100644
--- a/devel/glade/patches/patch-aa
+++ b/devel/glade/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2000/11/09 17:59:52 mycroft Exp $
+$NetBSD: patch-aa,v 1.2 2001/02/13 11:47:00 tron Exp $
 
 --- configure.orig	Sun Oct  1 12:40:47 2000
 +++ configure	Thu Nov  9 17:52:48 2000
@@ -6,8 +6,8 @@ $NetBSD: patch-aa,v 1.1 2000/11/09 17:59:52 mycroft Exp $
  
  
  
-+# Set DATADIRNAME to "${LOCALEBASE}"
-+DATADIRNAME="${LOCALEBASE}"
++# Set DATADIRNAME to "${LOCALEDIR}"
++DATADIRNAME="${LOCALEDIR}"
 +INTLDEPS=
 +INTLLIBS="-lintl"
  
diff --git a/devel/glade/pkg/PLIST b/devel/glade/pkg/PLIST
index 7a1cf7a769e..d7e00bfab40 100644
--- a/devel/glade/pkg/PLIST
+++ b/devel/glade/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2000/11/09 17:59:53 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.8 2001/02/13 11:47:00 tron Exp $
 bin/glade
 share/doc/glade/README
 share/doc/glade/TODO
@@ -9,26 +9,26 @@ share/doc/glade/manual.txt
 share/doc/glade/notes.txt
 share/doc/glade/portability.txt
 share/doc/glade/source_code.txt
-${LOCALEBASE}/locale/da/LC_MESSAGES/glade.mo
-${LOCALEBASE}/locale/de/LC_MESSAGES/glade.mo
-${LOCALEBASE}/locale/en_GB/LC_MESSAGES/glade.mo
-${LOCALEBASE}/locale/es/LC_MESSAGES/glade.mo
-${LOCALEBASE}/locale/fr/LC_MESSAGES/glade.mo
-${LOCALEBASE}/locale/it/LC_MESSAGES/glade.mo
-${LOCALEBASE}/locale/ja/LC_MESSAGES/glade.mo
-${LOCALEBASE}/locale/ko/LC_MESSAGES/glade.mo
-${LOCALEBASE}/locale/no/LC_MESSAGES/glade.mo
-${LOCALEBASE}/locale/pl/LC_MESSAGES/glade.mo
-${LOCALEBASE}/locale/ru/LC_MESSAGES/glade.mo
-${LOCALEBASE}/locale/ca/LC_MESSAGES/glade.mo
-${LOCALEBASE}/locale/cs/LC_MESSAGES/glade.mo
-${LOCALEBASE}/locale/el/LC_MESSAGES/glade.mo
-${LOCALEBASE}/locale/ga/LC_MESSAGES/glade.mo
-${LOCALEBASE}/locale/sv/LC_MESSAGES/glade.mo
-${LOCALEBASE}/locale/uk/LC_MESSAGES/glade.mo
-${LOCALEBASE}/locale/gl/LC_MESSAGES/glade.mo
-${LOCALEBASE}/locale/pt_BR/LC_MESSAGES/glade.mo
-${LOCALEBASE}/locale/tr/LC_MESSAGES/glade.mo
+${LOCALEDIR}/locale/da/LC_MESSAGES/glade.mo
+${LOCALEDIR}/locale/de/LC_MESSAGES/glade.mo
+${LOCALEDIR}/locale/en_GB/LC_MESSAGES/glade.mo
+${LOCALEDIR}/locale/es/LC_MESSAGES/glade.mo
+${LOCALEDIR}/locale/fr/LC_MESSAGES/glade.mo
+${LOCALEDIR}/locale/it/LC_MESSAGES/glade.mo
+${LOCALEDIR}/locale/ja/LC_MESSAGES/glade.mo
+${LOCALEDIR}/locale/ko/LC_MESSAGES/glade.mo
+${LOCALEDIR}/locale/no/LC_MESSAGES/glade.mo
+${LOCALEDIR}/locale/pl/LC_MESSAGES/glade.mo
+${LOCALEDIR}/locale/ru/LC_MESSAGES/glade.mo
+${LOCALEDIR}/locale/ca/LC_MESSAGES/glade.mo
+${LOCALEDIR}/locale/cs/LC_MESSAGES/glade.mo
+${LOCALEDIR}/locale/el/LC_MESSAGES/glade.mo
+${LOCALEDIR}/locale/ga/LC_MESSAGES/glade.mo
+${LOCALEDIR}/locale/sv/LC_MESSAGES/glade.mo
+${LOCALEDIR}/locale/uk/LC_MESSAGES/glade.mo
+${LOCALEDIR}/locale/gl/LC_MESSAGES/glade.mo
+${LOCALEDIR}/locale/pt_BR/LC_MESSAGES/glade.mo
+${LOCALEDIR}/locale/tr/LC_MESSAGES/glade.mo
 share/gnome/apps/Development/glade.desktop
 share/gnome/help/glade/C/topic.dat
 share/gnome/help/glade/C/user-guide/user-guide-images/edit-menu.png