Use MACHINE_GNU_ARCH in PLISTs that require it, so that arm32 (and

possibly other future platforms) will get the `right' name.

2 files changed, 46 insertions, 46 deletions

diff --git a/editors/emacs/pkg/PLIST b/editors/emacs/pkg/PLIST
index 3768f0bc172..37c9cb0667d 100644
--- a/editors/emacs/pkg/PLIST
+++ b/editors/emacs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 1998/03/03 16:27:34 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.10 1998/06/03 17:48:32 tv Exp $
 bin/emacs-etags
 bin/emacs-ctags
 bin/emacsclient
@@ -112,17 +112,17 @@ info/viper-2
 info/viper-3
 info/viper-4
 info/viper-5
-libexec/emacs/20.2/${MACHINE_ARCH}--netbsd/profile
-libexec/emacs/20.2/${MACHINE_ARCH}--netbsd/digest-doc
-libexec/emacs/20.2/${MACHINE_ARCH}--netbsd/sorted-doc
-libexec/emacs/20.2/${MACHINE_ARCH}--netbsd/movemail
-libexec/emacs/20.2/${MACHINE_ARCH}--netbsd/cvtmail
-libexec/emacs/20.2/${MACHINE_ARCH}--netbsd/fakemail
-libexec/emacs/20.2/${MACHINE_ARCH}--netbsd/yow
-libexec/emacs/20.2/${MACHINE_ARCH}--netbsd/emacsserver
-libexec/emacs/20.2/${MACHINE_ARCH}--netbsd/hexl
-libexec/emacs/20.2/${MACHINE_ARCH}--netbsd/rcs2log
-libexec/emacs/20.2/${MACHINE_ARCH}--netbsd/vcdiff
+libexec/emacs/20.2/${MACHINE_GNU_ARCH}--netbsd/profile
+libexec/emacs/20.2/${MACHINE_GNU_ARCH}--netbsd/digest-doc
+libexec/emacs/20.2/${MACHINE_GNU_ARCH}--netbsd/sorted-doc
+libexec/emacs/20.2/${MACHINE_GNU_ARCH}--netbsd/movemail
+libexec/emacs/20.2/${MACHINE_GNU_ARCH}--netbsd/cvtmail
+libexec/emacs/20.2/${MACHINE_GNU_ARCH}--netbsd/fakemail
+libexec/emacs/20.2/${MACHINE_GNU_ARCH}--netbsd/yow
+libexec/emacs/20.2/${MACHINE_GNU_ARCH}--netbsd/emacsserver
+libexec/emacs/20.2/${MACHINE_GNU_ARCH}--netbsd/hexl
+libexec/emacs/20.2/${MACHINE_GNU_ARCH}--netbsd/rcs2log
+libexec/emacs/20.2/${MACHINE_GNU_ARCH}--netbsd/vcdiff
 man/man1/emacs.1
 man/man1/emacs-etags.1
 man/man1/emacs-ctags.1
@@ -1317,6 +1317,6 @@ share/emacs/20.2/lisp/COPYING
 @exec   f=%D/share/emacs/site-lisp ; [ ! -d $f ] && mkdir $f
 @unexec f=%D/share/emacs/site-lisp ; [ -d $f ] && rm -rf $f
 @dirrm share/emacs
-@dirrm libexec/emacs/20.2/${MACHINE_ARCH}--netbsd
+@dirrm libexec/emacs/20.2/${MACHINE_GNU_ARCH}--netbsd
 @dirrm libexec/emacs/20.2
 @dirrm libexec/emacs
diff --git a/editors/xemacs20/pkg/PLIST b/editors/xemacs20/pkg/PLIST
index 3c9d2029a2d..d20d6ccffd0 100644
--- a/editors/xemacs20/pkg/PLIST
+++ b/editors/xemacs20/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 1998/02/23 08:38:56 tron Exp $
+@comment $NetBSD: PLIST,v 1.11 1998/06/03 17:48:32 tv Exp $
 bin/xemacs-b2m
 bin/xemacs-ctags
 bin/xemacs-etags
@@ -2554,37 +2554,37 @@ lib/xemacs-20.3/info/xemacs.info-6
 lib/xemacs-20.3/info/xemacs.info-7
 lib/xemacs-20.3/info/xemacs.info-8
 lib/xemacs-20.3/info/xemacs.info-9
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/make-path
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/wakeup
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/profile
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/make-docfile
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/digest-doc
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/sorted-doc
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/movemail
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/cvtmail
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/fakemail
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/yow
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/hexl
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/gnuserv
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/mmencode
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/rcs2log
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/vcdiff
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/gzip-el.sh
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/install-sid
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/send-pr
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/tm-au
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/tm-file
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/tm-html
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/tm-image
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/tm-mpeg
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/tm-plain
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/tm-ps
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/tmdecode
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/xoobr
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/add-little-package.sh
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/add-big-package.sh
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/DOC
-lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/config.values
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/make-path
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/wakeup
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/profile
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/make-docfile
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/digest-doc
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/sorted-doc
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/movemail
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/cvtmail
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/fakemail
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/yow
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/hexl
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/gnuserv
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/mmencode
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/rcs2log
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/vcdiff
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/gzip-el.sh
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/install-sid
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/send-pr
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/tm-au
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/tm-file
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/tm-html
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/tm-image
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/tm-mpeg
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/tm-plain
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/tm-ps
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/tmdecode
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/xoobr
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/add-little-package.sh
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/add-big-package.sh
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/DOC
+lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd/config.values
 @dirrm lib/xemacs-20.3/lisp/x11
 @dirrm lib/xemacs-20.3/lisp/w3
 @dirrm lib/xemacs-20.3/lisp/vm
@@ -2660,5 +2660,5 @@ lib/xemacs-20.3/${MACHINE_ARCH}--netbsd/config.values
 @dirrm lib/xemacs-20.3/etc/app-defaults/ja
 @dirrm lib/xemacs-20.3/etc/app-defaults
 @dirrm lib/xemacs-20.3/etc
-@dirrm lib/xemacs-20.3/${MACHINE_ARCH}--netbsd
+@dirrm lib/xemacs-20.3/${MACHINE_GNU_ARCH}--netbsd
 @dirrm lib/xemacs-20.3