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

"${LOCALBASE}".

3 files changed, 34 insertions, 34 deletions

diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index a9240764bc0..e5ce61a46da 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/12/14 20:00:35 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/13 11:47:07 tron Exp $
 #
 
 PKGNAME=		sawfish-${SF_VERS}
@@ -7,22 +7,22 @@ DEPENDS+=		sawfish-replibs-${SF_VERS}:../../wm/sawfish-replibs
 
 USE_X11BASE=		# defined
 
-CONFIGURE_ENV+=		LOCALEBASE=${LOCALEBASE}
-MAKE_ENV+=		LOCALEBASE=${LOCALEBASE}
+CONFIGURE_ENV+=		LOCALEDIR=${LOCALEDIR}
+MAKE_ENV+=		LOCALEDIR=${LOCALEDIR}
 
 PLIST_SUBST+=		SF_VERS=${SF_VERS}
-PLIST_SUBST+=		LOCALEBASE=${LOCALEBASE}
+PLIST_SUBST+=		LOCALEDIR=${LOCALEDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
 # 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
 
 post-install:
diff --git a/wm/sawfish/patches/patch-aa b/wm/sawfish/patches/patch-aa
index c43f8e3db09..0f8dfee6e2f 100644
--- a/wm/sawfish/patches/patch-aa
+++ b/wm/sawfish/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2001/02/13 11:47:07 tron Exp $
 
 --- configure.orig	Thu Oct 19 17:48:32 2000
 +++ configure
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
  sawfishdir='${datadir}/sawfish'
  lispdir='${sawfishdir}/${version}/lisp'
 -localedir='${sawfishdir}/${version}/locale'
-+localedir='${prefix}/${LOCALEBASE}/locale'
++localedir='${prefix}/${LOCALEDIR}/locale'
  sawfishexecdir='${libexecdir}/sawfish/${version}/${host_type}'
  
  # Extract the first word of "gcc", so it can be a program name with args.
diff --git a/wm/sawfish/pkg/PLIST b/wm/sawfish/pkg/PLIST
index cf9886072a9..10d18a186e4 100644
--- a/wm/sawfish/pkg/PLIST
+++ b/wm/sawfish/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/12 02:03:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/02/13 11:47:07 tron Exp $
 bin/sawfish
 bin/sawfish-capplet
 bin/sawfish-client
@@ -67,30 +67,30 @@ share/gnome/apps/Settings/Sawfish/placement-properties.desktop
 share/gnome/apps/Settings/Sawfish/sound-properties.desktop
 share/gnome/apps/Settings/Sawfish/workspace-properties.desktop
 share/gnome/wm-properties/Sawfish.desktop
-${LOCALEBASE}/locale/da/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/de/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/el/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/en_GB/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/es/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/fi/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/fr/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/ga/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/gl/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/hu/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/it/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/ja/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/ko/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/nl/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/no/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/pl/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/pt_BR/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/pt_PT/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/ru/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/sl/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/sv/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/tr/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/uk/LC_MESSAGES/sawfish.mo
-${LOCALEBASE}/locale/zh_CN.GB2312/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/da/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/de/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/el/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/en_GB/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/es/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/fi/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/fr/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/ga/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/gl/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/hu/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/it/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/ja/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/ko/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/nl/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/no/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/pl/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/pt_BR/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/pt_PT/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/ru/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/sl/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/sv/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/tr/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/uk/LC_MESSAGES/sawfish.mo
+${LOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/sawfish.mo
 share/pixmaps/sawfish-appearance.png
 share/pixmaps/sawfish-edgeflip.png
 share/pixmaps/sawfish-focus.png