Use "PKGLOCALEDIR" instead of "LOCALEDIR".

4 files changed, 45 insertions, 47 deletions

diff --git a/mail/mutt-unstable/Makefile b/mail/mutt-unstable/Makefile
index 49ea1429456..2ec23d1b08b 100644
--- a/mail/mutt-unstable/Makefile
+++ b/mail/mutt-unstable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 18:24:56 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/26 20:19:46 tron Exp $
 
 DISTNAME=	mutt-unstable-20010212
 PKGNAME=	mutt-1.3.14.20010212i
@@ -47,7 +47,6 @@ CONFIGURE_ARGS+= --without-ssl
 .endif
 
 BUILD_DEFS+=	MUTT_USE_SSL
-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 8335d708149..e2d51b4a90a 100644
--- a/mail/mutt-unstable/pkg/PLIST
+++ b/mail/mutt-unstable/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2001/02/13 11:47:02 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/02/26 20:19:46 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
-${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
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/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 700f3027cab..2c3345985ba 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2001/02/17 18:24:55 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2001/02/26 20:19:45 tron Exp $
 
 DISTNAME=	mutt-1.2.5i
 CATEGORIES=	mail
@@ -46,6 +46,5 @@ CONFIGURE_ARGS+= --without-ssl
 .endif
 
 BUILD_DEFS+=	MUTT_USE_SSL
-PLIST_SUBST+=	LOCALEDIR=${LOCALEDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mutt/pkg/PLIST b/mail/mutt/pkg/PLIST
index ae43a2832df..f4471bae96b 100644
--- a/mail/mutt/pkg/PLIST
+++ b/mail/mutt/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2001/02/13 11:47:02 tron Exp $
+@comment $NetBSD: PLIST,v 1.13 2001/02/26 20:19:46 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
-${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
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/mutt.mo
+${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
 @dirrm share/mutt
 @dirrm share/doc/mutt/samples
 @dirrm share/doc/mutt/html