summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2001-02-13 11:47:00 +0000
committertron <tron@pkgsrc.org>2001-02-13 11:47:00 +0000
commitdd09712ae5f454989237851b3f3c14c294de9b6a (patch)
tree529ea5f358321ad9dd36c1377bd4bf0b2da85f9b
parentda46920fea498765b156b8cef97c90f321cc35ad (diff)
downloadpkgsrc-dd09712ae5f454989237851b3f3c14c294de9b6a.tar.gz
Rename "${LOCALEBASE}" variable to "${LOCALEDIR}" to avoid mix-ups with
"${LOCALBASE}".
-rw-r--r--devel/gettext/Makefile4
-rw-r--r--devel/gettext/pkg/PLIST26
-rw-r--r--devel/glade/Makefile12
-rw-r--r--devel/glade/patches/patch-aa6
-rw-r--r--devel/glade/pkg/PLIST42
-rw-r--r--games/gnome-games/Makefile12
-rw-r--r--games/gnome-games/patches/patch-ad4
-rw-r--r--games/gnome-games/pkg/PLIST56
-rw-r--r--graphics/ee/Makefile12
-rw-r--r--graphics/ee/patches/patch-ab6
-rw-r--r--graphics/ee/pkg/PLIST56
-rw-r--r--mail/mutt-unstable/Makefile4
-rw-r--r--mail/mutt-unstable/pkg/PLIST46
-rw-r--r--mail/mutt/Makefile4
-rw-r--r--mail/mutt/pkg/PLIST40
-rw-r--r--misc/gnome-pim/Makefile12
-rw-r--r--misc/gnome-pim/patches/patch-ab4
-rw-r--r--misc/gnome-pim/pkg/PLIST66
-rw-r--r--misc/gnome-utils/Makefile12
-rw-r--r--misc/gnome-utils/patches/patch-ad4
-rw-r--r--misc/gnome-utils/pkg/PLIST62
-rw-r--r--mk/bsd.pkg.mk8
-rw-r--r--print/lyx/Makefile4
-rw-r--r--print/lyx/pkg/PLIST44
-rw-r--r--sysutils/fileutils/Makefile4
-rw-r--r--sysutils/fileutils/pkg/PLIST18
-rw-r--r--sysutils/gmc/pkg/PLIST56
-rw-r--r--sysutils/gtop/Makefile12
-rw-r--r--sysutils/gtop/patches/patch-aa4
-rw-r--r--sysutils/gtop/pkg/PLIST46
-rw-r--r--sysutils/mc/Makefile.common12
-rw-r--r--sysutils/mc/patches/patch-aa6
-rw-r--r--sysutils/mc/pkg/PLIST56
-rw-r--r--textproc/textutils/Makefile4
-rw-r--r--textproc/textutils/pkg/PLIST28
-rw-r--r--wm/sawfish/Makefile14
-rw-r--r--wm/sawfish/patches/patch-aa4
-rw-r--r--wm/sawfish/pkg/PLIST50
-rw-r--r--x11/gnome-core/Makefile3
-rw-r--r--x11/gnome-core/pkg/PLIST76
-rw-r--r--x11/gnome-libs/Makefile3
-rw-r--r--x11/gnome-libs/pkg/PLIST74
42 files changed, 509 insertions, 507 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
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 64e43fb82c5..2603531c845 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/02/06 03:16:57 fredb Exp $
+# $NetBSD: Makefile,v 1.20 2001/02/13 11:47:01 tron Exp $
DISTNAME= gnome-games-1.2.0
CATEGORIES= games gnome
@@ -24,12 +24,12 @@ USE_LIBINTL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= YES
-CONFIGURE_ENV+= LOCALEBASE=${LOCALEBASE}
+CONFIGURE_ENV+= LOCALEDIR=${LOCALEDIR}
CONFIGURE_ARGS+= --localstatedir=/var
CFLAGS+= -I${LOCALBASE}/include
INSTALL_FILE= ${WRKDIR}/INSTALL
-PLIST_SUBST+= LOCALEBASE=${LOCALEBASE}
+PLIST_SUBST+= LOCALEDIR=${LOCALEDIR}
AUTOGEN_ENV= NOCONFIGURE=1
AUTOGEN_ENV+= srcdir=${WRKSRC}
@@ -45,12 +45,12 @@ post-build:
# 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/games/gnome-games/patches/patch-ad b/games/gnome-games/patches/patch-ad
index b26230b3e49..c5ec11ef853 100644
--- a/games/gnome-games/patches/patch-ad
+++ b/games/gnome-games/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2000/11/09 20:06:05 mycroft Exp $
+$NetBSD: patch-ad,v 1.3 2001/02/13 11:47:01 tron Exp $
--- aclocal.m4.orig Sun May 21 23:56:34 2000
+++ aclocal.m4 Thu Nov 9 18:58:34 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.2 2000/11/09 20:06:05 mycroft Exp $
DATADIRNAME=share],
[CATOBJEXT=.mo
- DATADIRNAME=lib])
-+ DATADIRNAME=${LOCALEBASE}])
++ DATADIRNAME=${LOCALEDIR}])
INSTOBJEXT=.mo
fi
fi
diff --git a/games/gnome-games/pkg/PLIST b/games/gnome-games/pkg/PLIST
index 349dcd9b71e..5224feecc37 100644
--- a/games/gnome-games/pkg/PLIST
+++ b/games/gnome-games/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2001/01/04 15:10:35 agc Exp $
+@comment $NetBSD: PLIST,v 1.11 2001/02/13 11:47:01 tron Exp $
bin/GnomeScott
bin/ctali
bin/freecell
@@ -189,33 +189,33 @@ share/gturing/examples/bin2dec.tur
share/gturing/examples/dashnumbers.tur
share/gturing/examples/dec2bin.tur
share/gturing/examples/subst.tur
-${LOCALEBASE}/locale/cs/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/da/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/de/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/el/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/en_GB/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/es/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/et/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/fi/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/fr/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/ga/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/gl/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/hu/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/it/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/ja/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/ko/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/lt/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/nl/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/no/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/pl/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/pt/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/pt_BR/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/ru/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/sv/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/uk/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/wa/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/zh_CN.GB2312/LC_MESSAGES/gnome-games.mo
-${LOCALEBASE}/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/cs/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/da/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/de/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/el/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/es/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/et/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/fi/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/fr/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/ga/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/gl/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/hu/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/it/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/ja/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/ko/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/lt/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/nl/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/no/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/pl/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/pt/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/ru/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/sv/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/uk/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/wa/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gnome-games.mo
+${LOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo
share/mime-info/gnome-stones.keys
share/mime-info/gnome-stones.mime
share/pixmaps/cards/backs/beige.png
diff --git a/graphics/ee/Makefile b/graphics/ee/Makefile
index 84a0e41001a..eaf0c0b43f5 100644
--- a/graphics/ee/Makefile
+++ b/graphics/ee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/10/23 17:06:56 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/02/13 11:47:01 tron Exp $
DISTNAME= ee-0.3.12
CATEGORIES= x11 gnome
@@ -20,20 +20,20 @@ LOCALSTATEDIR= /var/gnome
CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \
--with-glib-prefix=${LOCALBASE}
CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
-CONFIGURE_ENV+= LOCALEBASE=${LOCALEBASE}
+CONFIGURE_ENV+= LOCALEDIR=${LOCALEDIR}
-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
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ee/patches/patch-ab b/graphics/ee/patches/patch-ab
index 53ff81e82e3..e116db418b3 100644
--- a/graphics/ee/patches/patch-ab
+++ b/graphics/ee/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2000/10/23 17:06:56 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2001/02/13 11:47:01 tron Exp $
--- configure.orig Mon Jul 17 17:42:39 2000
+++ configure
@@ -6,8 +6,8 @@ $NetBSD: patch-ab,v 1.1 2000/10/23 17:06:56 jlam Exp $
-+# Set DATADIRNAME to "${LOCALEBASE}"
-+DATADIRNAME="${LOCALEBASE}"
++# Set DATADIRNAME to "${LOCALEDIR}"
++DATADIRNAME="${LOCALEDIR}"
+INTLDEPS=
+INTLLIBS="-lintl"
diff --git a/graphics/ee/pkg/PLIST b/graphics/ee/pkg/PLIST
index 319d5275256..2f95aa82b12 100644
--- a/graphics/ee/pkg/PLIST
+++ b/graphics/ee/pkg/PLIST
@@ -1,35 +1,35 @@
-@comment $NetBSD: PLIST,v 1.4 2000/10/23 17:06:57 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/02/13 11:47:02 tron Exp $
bin/ee
share/gnome/apps/Graphics/ee.desktop
share/gnome/help/ee/C/index.html
share/gnome/help/ee/C/ee.jpg
-${LOCALEBASE}/locale/ca/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/da/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/de/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/el/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/en_GB/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/es/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/fi/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/fr/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/ga/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/gl/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/hu/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/it/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/ja/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/ko/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/lt/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/nl/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/no/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/pl/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/pt/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/pt_BR/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/ru/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/sv/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/uk/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/zh_TW.Big5/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/zh_CN.GB2312/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/ro/LC_MESSAGES/ee.mo
-${LOCALEBASE}/locale/tr/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/ca/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/da/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/de/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/el/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/en_GB/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/es/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/fi/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/fr/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/ga/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/gl/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/hu/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/it/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/ja/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/ko/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/lt/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/nl/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/no/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/pl/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/pt/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/pt_BR/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/ru/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/sv/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/uk/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/ro/LC_MESSAGES/ee.mo
+${LOCALEDIR}/locale/tr/LC_MESSAGES/ee.mo
share/mime-info/ee.keys
share/pixmaps/gnome-ee.png
@dirrm share/gnome/help/ee/C
diff --git a/mail/mutt-unstable/Makefile b/mail/mutt-unstable/Makefile
index 640bbe55a91..114adec10c3 100644
--- a/mail/mutt-unstable/Makefile
+++ b/mail/mutt-unstable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/02/12 18:34:38 tron Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/13 11:47:02 tron Exp $
DISTNAME= mutt-unstable-20010212
PKGNAME= mutt-1.3.14.20010212i
@@ -46,7 +46,7 @@ CONFIGURE_ARGS+= --without-ssl
.endif
BUILD_DEFS+= MUTT_USE_SSL
-PLIST_SUBST+= LOCALEBASE=${LOCALEBASE}
+PLIST_SUBST+= LOCALEDIR=${LOCALEDIR}
pre-configure:
cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf
diff --git a/mail/mutt-unstable/pkg/PLIST b/mail/mutt-unstable/pkg/PLIST
index 524a130306b..8335d708149 100644
--- a/mail/mutt-unstable/pkg/PLIST
+++ b/mail/mutt-unstable/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/02/12 19:29:11 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/02/13 11:47:02 tron Exp $
bin/flea
bin/mutt
bin/muttbug
@@ -35,28 +35,28 @@ share/doc/mutt/samples/pgp6.rc
share/doc/mutt/samples/sample.mailcap
share/doc/mutt/samples/sample.muttrc
share/doc/mutt/samples/sample.muttrc-tlr
-${LOCALEBASE}/locale/cs/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/da/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/de/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/el/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/eo/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/es/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/fr/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/gl/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/id/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/it/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/ko/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/lt/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/nl/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/pl/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/pt_BR/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/ru/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/sk/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/sv/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/tr/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/uk/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/zh_CN.GB2312/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/cs/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/da/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/de/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/el/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/eo/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/es/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/fr/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/gl/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/id/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/it/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/ko/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/lt/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/nl/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/pl/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/pt_BR/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/ru/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/sk/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/sv/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/tr/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/uk/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
@exec mkdir -p %D/share/mutt
@dirrm share/mutt
@dirrm share/doc/mutt/samples
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index c34916d8bc4..d5f1f58c01d 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2001/02/12 14:53:57 tron Exp $
+# $NetBSD: Makefile,v 1.66 2001/02/13 11:47:02 tron Exp $
DISTNAME= mutt-1.2.5i
CATEGORIES= mail
@@ -45,6 +45,6 @@ CONFIGURE_ARGS+= --without-ssl
.endif
BUILD_DEFS+= MUTT_USE_SSL
-PLIST_SUBST+= LOCALEBASE=${LOCALEBASE}
+PLIST_SUBST+= LOCALEDIR=${LOCALEDIR}
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mutt/pkg/PLIST b/mail/mutt/pkg/PLIST
index 7e5e1623c9f..ae43a2832df 100644
--- a/mail/mutt/pkg/PLIST
+++ b/mail/mutt/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2000/05/09 18:09:10 tron Exp $
+@comment $NetBSD: PLIST,v 1.12 2001/02/13 11:47:02 tron Exp $
bin/mutt
bin/muttbug
bin/pgpewrap
@@ -40,25 +40,25 @@ share/doc/mutt/samples/pgp6.rc
share/doc/mutt/samples/sample.mailcap
share/doc/mutt/samples/sample.muttrc
share/doc/mutt/samples/sample.muttrc-tlr
-${LOCALEBASE}/locale/cs/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/da/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/de/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/el/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/eo/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/es/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/fr/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/gl/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/id/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/it/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/ko/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/nl/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/pl/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/pt_BR/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/ru/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/sk/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/sv/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/uk/LC_MESSAGES/mutt.mo
-${LOCALEBASE}/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/cs/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/da/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/de/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/el/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/eo/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/es/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/fr/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/gl/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/id/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/it/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/ko/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/nl/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/pl/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/pt_BR/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/ru/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/sk/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/sv/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/uk/LC_MESSAGES/mutt.mo
+${LOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
@dirrm share/mutt
@dirrm share/doc/mutt/samples
@dirrm share/doc/mutt/html
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
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 7c46fafd3f1..99fc4da3a78 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.660 2001/02/12 01:17:24 sommerfeld Exp $
+# $NetBSD: bsd.pkg.mk,v 1.661 2001/02/13 11:47:04 tron Exp $
#
# This file is in the public domain.
#
@@ -556,7 +556,7 @@ ID?= /usr/xpg4/bin/id
IDENT?= ${LOCALBASE}/bin/ident
LDCONFIG?= /usr/bin/true
LN?= /usr/bin/ln
-LOCALEBASE?= lib
+LOCALEDIR?= lib
LS?= /usr/bin/ls
MKDIR?= /usr/bin/mkdir -p
MTREE?= ${LOCALBASE}/bsd/bin/mtree
@@ -606,7 +606,7 @@ ID?= /usr/bin/id
IDENT?= /usr/bin/ident
LDCONFIG?= /sbin/ldconfig
LN?= /bin/ln
-LOCALEBASE?= share
+LOCALEDIR?= share
LS?= /bin/ls
MKDIR?= /bin/mkdir -p
MTREE?= ${LOCALBASE}/bsd/bin/mtree
@@ -652,7 +652,7 @@ ID?= /usr/bin/id
IDENT?= /usr/bin/ident
LDCONFIG?= /sbin/ldconfig
LN?= /bin/ln
-LOCALEBASE?= share
+LOCALEDIR?= share
LS?= /bin/ls
MKDIR?= /bin/mkdir -p
MTREE?= /usr/sbin/mtree
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 2b9307458f6..f0bae6981fc 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2001/01/23 22:49:25 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.30 2001/02/13 11:47:04 tron Exp $
# FreeBSD Id: Makefile,v 1.14 1998/02/14 16:46:50 andreas Exp
#
@@ -22,6 +22,6 @@ CONFIGURE_ARGS= --with-extra-lib="${X11BASE}/lib" \
--with-extra-inc="${X11BASE}/include ${X11BASE}/include/X11"
LDFLAGS+= -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
-PLIST_SUBST+= LOCALEBASE=${LOCALEBASE}
+PLIST_SUBST+= LOCALEDIR=${LOCALEDIR}
.include "../../mk/bsd.pkg.mk"
diff --git a/print/lyx/pkg/PLIST b/print/lyx/pkg/PLIST
index c8ac6074e12..cd72532be82 100644
--- a/print/lyx/pkg/PLIST
+++ b/print/lyx/pkg/PLIST
@@ -1,29 +1,29 @@
-@comment $NetBSD: PLIST,v 1.10 2001/01/23 22:49:26 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.11 2001/02/13 11:47:04 tron Exp $
bin/listerrors
bin/lyx
bin/noweb2lyx
bin/reLyX
-${LOCALEBASE}/locale/ca/LC_MESSAGES/lyx.mo
-${LOCALEBASE}/locale/cs/LC_MESSAGES/lyx.mo
-${LOCALEBASE}/locale/da/LC_MESSAGES/lyx.mo
-${LOCALEBASE}/locale/de/LC_MESSAGES/lyx.mo
-${LOCALEBASE}/locale/es/LC_MESSAGES/lyx.mo
-${LOCALEBASE}/locale/eu/LC_MESSAGES/lyx.mo
-${LOCALEBASE}/locale/fi/LC_MESSAGES/lyx.mo
-${LOCALEBASE}/locale/fr/LC_MESSAGES/lyx.mo
-${LOCALEBASE}/locale/he/LC_MESSAGES/lyx.mo
-${LOCALEBASE}/locale/hu/LC_MESSAGES/lyx.mo
-${LOCALEBASE}/locale/it/LC_MESSAGES/lyx.mo
-${LOCALEBASE}/locale/nl/LC_MESSAGES/lyx.mo
-${LOCALEBASE}/locale/no/LC_MESSAGES/lyx.mo
-${LOCALEBASE}/locale/pl/LC_MESSAGES/lyx.mo
-${LOCALEBASE}/locale/pt/LC_MESSAGES/lyx.mo
-${LOCALEBASE}/locale/ro/LC_MESSAGES/lyx.mo
-${LOCALEBASE}/locale/ru/LC_MESSAGES/lyx.mo
-${LOCALEBASE}/locale/sl/LC_MESSAGES/lyx.mo
-${LOCALEBASE}/locale/sv/LC_MESSAGES/lyx.mo
-${LOCALEBASE}/locale/tr/LC_MESSAGES/lyx.mo
-${LOCALEBASE}/locale/wa/LC_MESSAGES/lyx.mo
+${LOCALEDIR}/locale/ca/LC_MESSAGES/lyx.mo
+${LOCALEDIR}/locale/cs/LC_MESSAGES/lyx.mo
+${LOCALEDIR}/locale/da/LC_MESSAGES/lyx.mo
+${LOCALEDIR}/locale/de/LC_MESSAGES/lyx.mo
+${LOCALEDIR}/locale/es/LC_MESSAGES/lyx.mo
+${LOCALEDIR}/locale/eu/LC_MESSAGES/lyx.mo
+${LOCALEDIR}/locale/fi/LC_MESSAGES/lyx.mo
+${LOCALEDIR}/locale/fr/LC_MESSAGES/lyx.mo
+${LOCALEDIR}/locale/he/LC_MESSAGES/lyx.mo
+${LOCALEDIR}/locale/hu/LC_MESSAGES/lyx.mo
+${LOCALEDIR}/locale/it/LC_MESSAGES/lyx.mo
+${LOCALEDIR}/locale/nl/LC_MESSAGES/lyx.mo
+${LOCALEDIR}/locale/no/LC_MESSAGES/lyx.mo
+${LOCALEDIR}/locale/pl/LC_MESSAGES/lyx.mo
+${LOCALEDIR}/locale/pt/LC_MESSAGES/lyx.mo
+${LOCALEDIR}/locale/ro/LC_MESSAGES/lyx.mo
+${LOCALEDIR}/locale/ru/LC_MESSAGES/lyx.mo
+${LOCALEDIR}/locale/sl/LC_MESSAGES/lyx.mo
+${LOCALEDIR}/locale/sv/LC_MESSAGES/lyx.mo
+${LOCALEDIR}/locale/tr/LC_MESSAGES/lyx.mo
+${LOCALEDIR}/locale/wa/LC_MESSAGES/lyx.mo
man/man1/lyx.1
man/man1/reLyX.1
share/lyx/CREDITS
diff --git a/sysutils/fileutils/Makefile b/sysutils/fileutils/Makefile
index b04ae862974..acbca6d84e4 100644
--- a/sysutils/fileutils/Makefile
+++ b/sysutils/fileutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/01/10 13:22:16 tron Exp $
+# $NetBSD: Makefile,v 1.11 2001/02/13 11:47:05 tron Exp $
DISTNAME= fileutils-3.16
CATEGORIES= sysutils
@@ -12,6 +12,6 @@ NO_PATCH= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --program-prefix=g
-PLIST_SUBST+= LOCALEBASE=${LOCALEBASE}
+PLIST_SUBST+= LOCALEDIR=${LOCALEDIR}
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/fileutils/pkg/PLIST b/sysutils/fileutils/pkg/PLIST
index 82340a54678..9e346e76877 100644
--- a/sysutils/fileutils/pkg/PLIST
+++ b/sysutils/fileutils/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/02/01 00:52:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/02/13 11:47:05 tron Exp $
bin/gchgrp
bin/gchown
bin/gchmod
@@ -41,11 +41,11 @@ man/man1/grm.1
man/man1/gdu.1
man/man1/gtouch.1
man/man1/ginstall.1
-${LOCALEBASE}/locale/de/LC_MESSAGES/fileutils.mo
-${LOCALEBASE}/locale/fr/LC_MESSAGES/fileutils.mo
-${LOCALEBASE}/locale/es/LC_MESSAGES/fileutils.mo
-${LOCALEBASE}/locale/pt/LC_MESSAGES/fileutils.mo
-${LOCALEBASE}/locale/nl/LC_MESSAGES/fileutils.mo
-${LOCALEBASE}/locale/sl/LC_MESSAGES/fileutils.mo
-${LOCALEBASE}/locale/sv/LC_MESSAGES/fileutils.mo
-${LOCALEBASE}/locale/pl/LC_MESSAGES/fileutils.mo
+${LOCALEDIR}/locale/de/LC_MESSAGES/fileutils.mo
+${LOCALEDIR}/locale/fr/LC_MESSAGES/fileutils.mo
+${LOCALEDIR}/locale/es/LC_MESSAGES/fileutils.mo
+${LOCALEDIR}/locale/pt/LC_MESSAGES/fileutils.mo
+${LOCALEDIR}/locale/nl/LC_MESSAGES/fileutils.mo
+${LOCALEDIR}/locale/sl/LC_MESSAGES/fileutils.mo
+${LOCALEDIR}/locale/sv/LC_MESSAGES/fileutils.mo
+${LOCALEDIR}/locale/pl/LC_MESSAGES/fileutils.mo
diff --git a/sysutils/gmc/pkg/PLIST b/sysutils/gmc/pkg/PLIST
index 31921522a8a..09ce6263984 100644
--- a/sysutils/gmc/pkg/PLIST
+++ b/sysutils/gmc/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2000/10/19 23:31:17 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2001/02/13 11:47:05 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
-${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
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 26f05365f15..3c2ad5da699 100644
--- a/sysutils/gtop/Makefile
+++ b/sysutils/gtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/02/05 19:08:55 fredb Exp $
+# $NetBSD: Makefile,v 1.13 2001/02/13 11:47:05 tron Exp $
DISTNAME= gtop-1.0.9
CATEGORIES= sysutils gnome
@@ -21,10 +21,10 @@ USE_LIBINTL= YES
GNU_CONFIGURE= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-CONFIGURE_ENV+= LOCALEBASE=${LOCALEBASE}
+CONFIGURE_ENV+= LOCALEDIR=${LOCALEDIR}
CFLAGS+= -I${LOCALBASE}/include
-PLIST_SUBST+= LOCALEBASE=${LOCALEBASE}
+PLIST_SUBST+= LOCALEDIR=${LOCALEDIR}
AUTOGEN_ENV= NOCONFIGURE=1
AUTOGEN_ENV+= srcdir=${WRKSRC}
@@ -36,12 +36,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/sysutils/gtop/patches/patch-aa b/sysutils/gtop/patches/patch-aa
index abd0cc42b84..3395406cdce 100644
--- a/sysutils/gtop/patches/patch-aa
+++ b/sysutils/gtop/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2000/11/09 22:28:58 mycroft Exp $
+$NetBSD: patch-aa,v 1.2 2001/02/13 11:47:05 tron Exp $
--- aclocal.m4.orig Sat May 27 16:34:36 2000
+++ aclocal.m4 Thu Nov 9 22:21:28 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1 2000/11/09 22:28:58 mycroft Exp $
DATADIRNAME=share],
[CATOBJEXT=.mo
- DATADIRNAME=lib])
-+ DATADIRNAME=${LOCALEBASE}])
++ DATADIRNAME=${LOCALEDIR}])
INSTOBJEXT=.mo
fi
fi
diff --git a/sysutils/gtop/pkg/PLIST b/sysutils/gtop/pkg/PLIST
index 9eda9f26d41..dd056e8ec1c 100644
--- a/sysutils/gtop/pkg/PLIST
+++ b/sysutils/gtop/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/11/09 22:28:22 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/02/13 11:47:06 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
-${LOCALEBASE}/locale/ca/LC_MESSAGES/gtop.mo
-${LOCALEBASE}/locale/cs/LC_MESSAGES/gtop.mo
-${LOCALEBASE}/locale/da/LC_MESSAGES/gtop.mo
-${LOCALEBASE}/locale/de/LC_MESSAGES/gtop.mo
-${LOCALEBASE}/locale/el/LC_MESSAGES/gtop.mo
-${LOCALEBASE}/locale/es/LC_MESSAGES/gtop.mo
-${LOCALEBASE}/locale/fr/LC_MESSAGES/gtop.mo
-${LOCALEBASE}/locale/ga/LC_MESSAGES/gtop.mo
-${LOCALEBASE}/locale/gl/LC_MESSAGES/gtop.mo
-${LOCALEBASE}/locale/hu/LC_MESSAGES/gtop.mo
-${LOCALEBASE}/locale/it/LC_MESSAGES/gtop.mo
-${LOCALEBASE}/locale/ja/LC_MESSAGES/gtop.mo
-${LOCALEBASE}/locale/ko/LC_MESSAGES/gtop.mo
-${LOCALEBASE}/locale/lt/LC_MESSAGES/gtop.mo
-${LOCALEBASE}/locale/no/LC_MESSAGES/gtop.mo
-${LOCALEBASE}/locale/pt/LC_MESSAGES/gtop.mo
-${LOCALEBASE}/locale/ru/LC_MESSAGES/gtop.mo
-${LOCALEBASE}/locale/sv/LC_MESSAGES/gtop.mo
-${LOCALEBASE}/locale/pl/LC_MESSAGES/gtop.mo
-${LOCALEBASE}/locale/uk/LC_MESSAGES/gtop.mo
-${LOCALEBASE}/locale/zh_CN.GB2312/LC_MESSAGES/gtop.mo
-${LOCALEBASE}/locale/zh_TW.Big5/LC_MESSAGES/gtop.mo
+${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
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 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
diff --git a/textproc/textutils/Makefile b/textproc/textutils/Makefile
index 81b84f4373c..53068238dae 100644
--- a/textproc/textutils/Makefile
+++ b/textproc/textutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/01/13 16:10:55 tron Exp $
+# $NetBSD: Makefile,v 1.6 2001/02/13 11:47:06 tron Exp $
# FreeBSD Id: ports/textproc/textutils/Makefile,v 1.7 1999/09/18 17:46:30 steve Exp
DISTNAME= textutils-2.0
@@ -12,7 +12,7 @@ USE_GMAKE= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS= --program-prefix=g
-PLIST_SUBST+= LOCALEBASE="${LOCALEBASE}"
+PLIST_SUBST+= LOCALEDIR="${LOCALEDIR}"
post-install:
install-info ${PREFIX}/info/textutils.info ${PREFIX}/info/dir
diff --git a/textproc/textutils/pkg/PLIST b/textproc/textutils/pkg/PLIST
index 3d7458f54b3..4f0fb290551 100644
--- a/textproc/textutils/pkg/PLIST
+++ b/textproc/textutils/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/01/04 18:06:33 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/02/13 11:47:07 tron Exp $
bin/gcat
bin/gcksum
bin/gcomm
@@ -29,16 +29,16 @@ bin/gwc
info/textutils.info
@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
@exec install-info %D/info/textutils.info %D/info/dir
-${LOCALEBASE}/locale/cs/LC_MESSAGES/textutils.mo
-${LOCALEBASE}/locale/de/LC_MESSAGES/textutils.mo
-${LOCALEBASE}/locale/el/LC_MESSAGES/textutils.mo
-${LOCALEBASE}/locale/es/LC_MESSAGES/textutils.mo
-${LOCALEBASE}/locale/fr/LC_MESSAGES/textutils.mo
-${LOCALEBASE}/locale/ko/LC_MESSAGES/textutils.mo
-${LOCALEBASE}/locale/nl/LC_MESSAGES/textutils.mo
-${LOCALEBASE}/locale/no/LC_MESSAGES/textutils.mo
-${LOCALEBASE}/locale/pl/LC_MESSAGES/textutils.mo
-${LOCALEBASE}/locale/ru/LC_MESSAGES/textutils.mo
-${LOCALEBASE}/locale/sk/LC_MESSAGES/textutils.mo
-${LOCALEBASE}/locale/sv/LC_MESSAGES/textutils.mo
-${LOCALEBASE}/locale/zh/LC_MESSAGES/textutils.mo
+${LOCALEDIR}/locale/cs/LC_MESSAGES/textutils.mo
+${LOCALEDIR}/locale/de/LC_MESSAGES/textutils.mo
+${LOCALEDIR}/locale/el/LC_MESSAGES/textutils.mo
+${LOCALEDIR}/locale/es/LC_MESSAGES/textutils.mo
+${LOCALEDIR}/locale/fr/LC_MESSAGES/textutils.mo
+${LOCALEDIR}/locale/ko/LC_MESSAGES/textutils.mo
+${LOCALEDIR}/locale/nl/LC_MESSAGES/textutils.mo
+${LOCALEDIR}/locale/no/LC_MESSAGES/textutils.mo
+${LOCALEDIR}/locale/pl/LC_MESSAGES/textutils.mo
+${LOCALEDIR}/locale/ru/LC_MESSAGES/textutils.mo
+${LOCALEDIR}/locale/sk/LC_MESSAGES/textutils.mo
+${LOCALEDIR}/locale/sv/LC_MESSAGES/textutils.mo
+${LOCALEDIR}/locale/zh/LC_MESSAGES/textutils.mo
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
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index 03d818b2aa7..5ce3af28d3e 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2000/11/29 17:25:40 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2001/02/13 11:47:07 tron Exp $
DISTNAME= gnome-core-1.2.4
CATEGORIES= x11 gnome
@@ -28,6 +28,7 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
USE_PERL5= YES
PERL_SCRIPTS= help-browser/gnome-convert help-browser/gnome-download
+PLIST_SUBST+= LOCALEDIR=${LOCALEDIR}
post-patch:
cd ${WRKSRC}; \
diff --git a/x11/gnome-core/pkg/PLIST b/x11/gnome-core/pkg/PLIST
index c1d01ffd4f0..292941a7a19 100644
--- a/x11/gnome-core/pkg/PLIST
+++ b/x11/gnome-core/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2001/01/04 15:11:00 agc Exp $
+@comment $NetBSD: PLIST,v 1.23 2001/02/13 11:47:08 tron Exp $
bin/deskguide_applet
bin/gmenu
bin/gnome-about
@@ -622,43 +622,43 @@ share/gnome/html/panel/x95.html
share/idl/Terminal.idl
share/idl/gnome-panel.idl
share/idl/help-browser.idl
-share/locale/bg_BG.cp1251/LC_MESSAGES/gnome-core.mo
-share/locale/ca/LC_MESSAGES/gnome-core.mo
-share/locale/cs/LC_MESSAGES/gnome-core.mo
-share/locale/da/LC_MESSAGES/gnome-core.mo
-share/locale/de/LC_MESSAGES/gnome-core.mo
-share/locale/el/LC_MESSAGES/gnome-core.mo
-share/locale/en_GB/LC_MESSAGES/gnome-core.mo
-share/locale/es/LC_MESSAGES/gnome-core.mo
-share/locale/et/LC_MESSAGES/gnome-core.mo
-share/locale/eu/LC_MESSAGES/gnome-core.mo
-share/locale/fi/LC_MESSAGES/gnome-core.mo
-share/locale/fr/LC_MESSAGES/gnome-core.mo
-share/locale/ga/LC_MESSAGES/gnome-core.mo
-share/locale/gl/LC_MESSAGES/gnome-core.mo
-share/locale/hu/LC_MESSAGES/gnome-core.mo
-share/locale/it/LC_MESSAGES/gnome-core.mo
-share/locale/ja/LC_MESSAGES/gnome-core.mo
-share/locale/ko/LC_MESSAGES/gnome-core.mo
-share/locale/lt/LC_MESSAGES/gnome-core.mo
-share/locale/nl/LC_MESSAGES/gnome-core.mo
-share/locale/nn/LC_MESSAGES/gnome-core.mo
-share/locale/no/LC_MESSAGES/gnome-core.mo
-share/locale/pl/LC_MESSAGES/gnome-core.mo
-share/locale/pt/LC_MESSAGES/gnome-core.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-core.mo
-share/locale/ru/LC_MESSAGES/gnome-core.mo
-share/locale/sk/LC_MESSAGES/gnome-core.mo
-share/locale/sl/LC_MESSAGES/gnome-core.mo
-share/locale/sp/LC_MESSAGES/gnome-core.mo
-share/locale/sr/LC_MESSAGES/gnome-core.mo
-share/locale/sv/LC_MESSAGES/gnome-core.mo
-share/locale/ta/LC_MESSAGES/gnome-core.mo
-share/locale/tr/LC_MESSAGES/gnome-core.mo
-share/locale/uk/LC_MESSAGES/gnome-core.mo
-share/locale/wa/LC_MESSAGES/gnome-core.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-core.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/bg_BG.cp1251/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/ca/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/cs/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/da/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/de/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/el/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/es/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/et/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/eu/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/fi/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/fr/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/ga/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/gl/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/hu/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/it/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/ja/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/ko/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/lt/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/nl/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/nn/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/no/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/pl/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/pt/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/ru/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/sk/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/sl/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/sp/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/sr/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/sv/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/ta/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/tr/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/uk/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/wa/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gnome-core.mo
+${LOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gnome-core.mo
share/mc/templates/GIMP.desktop
share/pixmaps/apple-green.png
share/pixmaps/apple-red.png
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index e224451d7a2..2205eff2b0e 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2000/11/29 02:37:43 mycroft Exp $
+# $NetBSD: Makefile,v 1.56 2001/02/13 11:47:08 tron Exp $
DISTNAME= gnome-libs-1.2.8
CATEGORIES= x11 gnome
@@ -33,6 +33,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
LOCALSTATEDIR= /var/gnome
PLIST_SUBST+= LOCALBASE=${LOCALBASE} \
+ LOCALEDIR=${LOCALEDIR} \
LOCALSTATEDIR=${LOCALSTATEDIR}
.include "../../mk/bsd.prefs.mk"
diff --git a/x11/gnome-libs/pkg/PLIST b/x11/gnome-libs/pkg/PLIST
index 06c5d2cdbd9..4d8e7a35bd5 100644
--- a/x11/gnome-libs/pkg/PLIST
+++ b/x11/gnome-libs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2001/01/04 15:11:01 agc Exp $
+@comment $NetBSD: PLIST,v 1.36 2001/02/13 11:47:08 tron Exp $
bin/dns-helper
bin/gconfigger
bin/gnome-bug
@@ -548,42 +548,42 @@ share/idl/desktop-textviewer.idl
share/idl/gnome-factory.idl
share/idl/gnome-unknown.idl
share/idl/name-service.idl
-share/locale/ca/LC_MESSAGES/gnome-libs.mo
-share/locale/cs/LC_MESSAGES/gnome-libs.mo
-share/locale/da/LC_MESSAGES/gnome-libs.mo
-share/locale/de/LC_MESSAGES/gnome-libs.mo
-share/locale/el/LC_MESSAGES/gnome-libs.mo
-share/locale/en_GB/LC_MESSAGES/gnome-libs.mo
-share/locale/es/LC_MESSAGES/gnome-libs.mo
-share/locale/et/LC_MESSAGES/gnome-libs.mo
-share/locale/eu/LC_MESSAGES/gnome-libs.mo
-share/locale/fi/LC_MESSAGES/gnome-libs.mo
-share/locale/fr/LC_MESSAGES/gnome-libs.mo
-share/locale/ga/LC_MESSAGES/gnome-libs.mo
-share/locale/gl/LC_MESSAGES/gnome-libs.mo
-share/locale/hr/LC_MESSAGES/gnome-libs.mo
-share/locale/hu/LC_MESSAGES/gnome-libs.mo
-share/locale/it/LC_MESSAGES/gnome-libs.mo
-share/locale/ja/LC_MESSAGES/gnome-libs.mo
-share/locale/ko/LC_MESSAGES/gnome-libs.mo
-share/locale/lt/LC_MESSAGES/gnome-libs.mo
-share/locale/nl/LC_MESSAGES/gnome-libs.mo
-share/locale/nn/LC_MESSAGES/gnome-libs.mo
-share/locale/no/LC_MESSAGES/gnome-libs.mo
-share/locale/pl/LC_MESSAGES/gnome-libs.mo
-share/locale/pt/LC_MESSAGES/gnome-libs.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-libs.mo
-share/locale/ro/LC_MESSAGES/gnome-libs.mo
-share/locale/ru/LC_MESSAGES/gnome-libs.mo
-share/locale/sk/LC_MESSAGES/gnome-libs.mo
-share/locale/sl/LC_MESSAGES/gnome-libs.mo
-share/locale/sp/LC_MESSAGES/gnome-libs.mo
-share/locale/sr/LC_MESSAGES/gnome-libs.mo
-share/locale/sv/LC_MESSAGES/gnome-libs.mo
-share/locale/tr/LC_MESSAGES/gnome-libs.mo
-share/locale/wa/LC_MESSAGES/gnome-libs.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-libs.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/ca/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/cs/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/da/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/de/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/el/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/es/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/et/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/eu/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/fi/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/fr/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/ga/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/gl/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/hr/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/hu/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/it/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/ja/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/ko/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/lt/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/nl/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/nn/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/no/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/pl/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/pt/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/ro/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/ru/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/sk/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/sl/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/sp/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/sr/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/sv/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/tr/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/wa/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gnome-libs.mo
+${LOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gnome-libs.mo
share/mime-info/gnome.mime
share/pixmaps/calculator-font.png
share/pixmaps/gnome-default-dlg.png