Expand MACHINE_ARCH, it should always be "i386".

This fixes package on non-i386 platforms.

1 files changed, 94 insertions, 94 deletions

diff --git a/cross/mingw-gcc/PLIST b/cross/mingw-gcc/PLIST
index 9450a655cd1..a9b478a1a84 100644
--- a/cross/mingw-gcc/PLIST
+++ b/cross/mingw-gcc/PLIST
@@ -1,21 +1,21 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/03/15 18:34:38 asau Exp $
-bin/${MACHINE_ARCH}--mingw32-c++
-bin/${MACHINE_ARCH}--mingw32-cc
-bin/${MACHINE_ARCH}--mingw32-cpp
-bin/${MACHINE_ARCH}--mingw32-g++
-bin/${MACHINE_ARCH}--mingw32-gcc
-bin/${MACHINE_ARCH}--mingw32-gcc-3.4.5
-bin/${MACHINE_ARCH}--mingw32-gccbug
-bin/${MACHINE_ARCH}--mingw32-gcov
-${MACHINE_ARCH}--mingw32/bin/c++
-${MACHINE_ARCH}--mingw32/bin/cc
-${MACHINE_ARCH}--mingw32/bin/cpp
-${MACHINE_ARCH}--mingw32/bin/g++
-${MACHINE_ARCH}--mingw32/bin/gcc
-${MACHINE_ARCH}--mingw32/lib/libiberty.a
-${MACHINE_ARCH}--mingw32/lib/libobjc.la
-${MACHINE_ARCH}--mingw32/lib/libstdc++.la
-${MACHINE_ARCH}--mingw32/lib/libsupc++.la
+@comment $NetBSD: PLIST,v 1.2 2010/03/23 17:10:21 asau Exp $
+bin/i386--mingw32-c++
+bin/i386--mingw32-cc
+bin/i386--mingw32-cpp
+bin/i386--mingw32-g++
+bin/i386--mingw32-gcc
+bin/i386--mingw32-gcc-3.4.5
+bin/i386--mingw32-gccbug
+bin/i386--mingw32-gcov
+i386--mingw32/bin/c++
+i386--mingw32/bin/cc
+i386--mingw32/bin/cpp
+i386--mingw32/bin/g++
+i386--mingw32/bin/gcc
+i386--mingw32/lib/libiberty.a
+i386--mingw32/lib/libobjc.la
+i386--mingw32/lib/libstdc++.la
+i386--mingw32/lib/libsupc++.la
 include/c++/3.4.5/algorithm
 include/c++/3.4.5/backward/algo.h
 include/c++/3.4.5/backward/algobase.h
@@ -192,25 +192,25 @@ include/c++/3.4.5/ext/stdio_filebuf.h
 include/c++/3.4.5/ext/stdio_sync_filebuf.h
 include/c++/3.4.5/fstream
 include/c++/3.4.5/functional
-include/c++/3.4.5/${MACHINE_ARCH}--mingw32/bits/atomic_word.h
-include/c++/3.4.5/${MACHINE_ARCH}--mingw32/bits/basic_file.h
-include/c++/3.4.5/${MACHINE_ARCH}--mingw32/bits/c++allocator.h
-include/c++/3.4.5/${MACHINE_ARCH}--mingw32/bits/c++config.h
-include/c++/3.4.5/${MACHINE_ARCH}--mingw32/bits/c++io.h
-include/c++/3.4.5/${MACHINE_ARCH}--mingw32/bits/c++locale.h
-include/c++/3.4.5/${MACHINE_ARCH}--mingw32/bits/codecvt_specializations.h
-include/c++/3.4.5/${MACHINE_ARCH}--mingw32/bits/ctype_base.h
-include/c++/3.4.5/${MACHINE_ARCH}--mingw32/bits/ctype_inline.h
-include/c++/3.4.5/${MACHINE_ARCH}--mingw32/bits/ctype_noninline.h
-include/c++/3.4.5/${MACHINE_ARCH}--mingw32/bits/gthr-default.h
-include/c++/3.4.5/${MACHINE_ARCH}--mingw32/bits/gthr-posix.h
-include/c++/3.4.5/${MACHINE_ARCH}--mingw32/bits/gthr-single.h
-include/c++/3.4.5/${MACHINE_ARCH}--mingw32/bits/gthr.h
-include/c++/3.4.5/${MACHINE_ARCH}--mingw32/bits/messages_members.h
-include/c++/3.4.5/${MACHINE_ARCH}--mingw32/bits/os_defines.h
-include/c++/3.4.5/${MACHINE_ARCH}--mingw32/bits/stdc++.h.gch/O0g.gch
-include/c++/3.4.5/${MACHINE_ARCH}--mingw32/bits/stdc++.h.gch/O2g.gch
-include/c++/3.4.5/${MACHINE_ARCH}--mingw32/bits/time_members.h
+include/c++/3.4.5/i386--mingw32/bits/atomic_word.h
+include/c++/3.4.5/i386--mingw32/bits/basic_file.h
+include/c++/3.4.5/i386--mingw32/bits/c++allocator.h
+include/c++/3.4.5/i386--mingw32/bits/c++config.h
+include/c++/3.4.5/i386--mingw32/bits/c++io.h
+include/c++/3.4.5/i386--mingw32/bits/c++locale.h
+include/c++/3.4.5/i386--mingw32/bits/codecvt_specializations.h
+include/c++/3.4.5/i386--mingw32/bits/ctype_base.h
+include/c++/3.4.5/i386--mingw32/bits/ctype_inline.h
+include/c++/3.4.5/i386--mingw32/bits/ctype_noninline.h
+include/c++/3.4.5/i386--mingw32/bits/gthr-default.h
+include/c++/3.4.5/i386--mingw32/bits/gthr-posix.h
+include/c++/3.4.5/i386--mingw32/bits/gthr-single.h
+include/c++/3.4.5/i386--mingw32/bits/gthr.h
+include/c++/3.4.5/i386--mingw32/bits/messages_members.h
+include/c++/3.4.5/i386--mingw32/bits/os_defines.h
+include/c++/3.4.5/i386--mingw32/bits/stdc++.h.gch/O0g.gch
+include/c++/3.4.5/i386--mingw32/bits/stdc++.h.gch/O2g.gch
+include/c++/3.4.5/i386--mingw32/bits/time_members.h
 include/c++/3.4.5/iomanip
 include/c++/3.4.5/ios
 include/c++/3.4.5/iosfwd
@@ -242,64 +242,64 @@ info/dir
 info/gcc.info
 info/gccinstall.info
 info/gccint.info
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/crtbegin.o
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/crtend.o
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/README
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/emmintrin.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/float.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/iso646.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/limits.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/mm_malloc.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/mmintrin.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/objc/NXConstStr.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/objc/Object.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/objc/Protocol.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/objc/encoding.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/objc/hash.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/objc/objc-api.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/objc/objc-list.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/objc/objc.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/objc/sarray.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/objc/thr.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/objc/typedstream.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/pmmintrin.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/stdarg.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/stdbool.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/stddef.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/syslimits.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/unwind.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/varargs.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/include/xmmintrin.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/install-tools/gsyslimits.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/install-tools/include/README
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/install-tools/include/emmintrin.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/install-tools/include/float.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/install-tools/include/iso646.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/install-tools/include/limits.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/install-tools/include/mm_malloc.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/install-tools/include/mmintrin.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/install-tools/include/pmmintrin.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/install-tools/include/stdarg.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/install-tools/include/stdbool.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/install-tools/include/stddef.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/install-tools/include/unwind.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/install-tools/include/varargs.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/install-tools/include/xmmintrin.h
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/install-tools/mkheaders.conf
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/libgcc.a
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/libgcov.a
-lib/gcc/${MACHINE_ARCH}--mingw32/3.4.5/specs
+lib/gcc/i386--mingw32/3.4.5/crtbegin.o
+lib/gcc/i386--mingw32/3.4.5/crtend.o
+lib/gcc/i386--mingw32/3.4.5/include/README
+lib/gcc/i386--mingw32/3.4.5/include/emmintrin.h
+lib/gcc/i386--mingw32/3.4.5/include/float.h
+lib/gcc/i386--mingw32/3.4.5/include/iso646.h
+lib/gcc/i386--mingw32/3.4.5/include/limits.h
+lib/gcc/i386--mingw32/3.4.5/include/mm_malloc.h
+lib/gcc/i386--mingw32/3.4.5/include/mmintrin.h
+lib/gcc/i386--mingw32/3.4.5/include/objc/NXConstStr.h
+lib/gcc/i386--mingw32/3.4.5/include/objc/Object.h
+lib/gcc/i386--mingw32/3.4.5/include/objc/Protocol.h
+lib/gcc/i386--mingw32/3.4.5/include/objc/encoding.h
+lib/gcc/i386--mingw32/3.4.5/include/objc/hash.h
+lib/gcc/i386--mingw32/3.4.5/include/objc/objc-api.h
+lib/gcc/i386--mingw32/3.4.5/include/objc/objc-list.h
+lib/gcc/i386--mingw32/3.4.5/include/objc/objc.h
+lib/gcc/i386--mingw32/3.4.5/include/objc/sarray.h
+lib/gcc/i386--mingw32/3.4.5/include/objc/thr.h
+lib/gcc/i386--mingw32/3.4.5/include/objc/typedstream.h
+lib/gcc/i386--mingw32/3.4.5/include/pmmintrin.h
+lib/gcc/i386--mingw32/3.4.5/include/stdarg.h
+lib/gcc/i386--mingw32/3.4.5/include/stdbool.h
+lib/gcc/i386--mingw32/3.4.5/include/stddef.h
+lib/gcc/i386--mingw32/3.4.5/include/syslimits.h
+lib/gcc/i386--mingw32/3.4.5/include/unwind.h
+lib/gcc/i386--mingw32/3.4.5/include/varargs.h
+lib/gcc/i386--mingw32/3.4.5/include/xmmintrin.h
+lib/gcc/i386--mingw32/3.4.5/install-tools/gsyslimits.h
+lib/gcc/i386--mingw32/3.4.5/install-tools/include/README
+lib/gcc/i386--mingw32/3.4.5/install-tools/include/emmintrin.h
+lib/gcc/i386--mingw32/3.4.5/install-tools/include/float.h
+lib/gcc/i386--mingw32/3.4.5/install-tools/include/iso646.h
+lib/gcc/i386--mingw32/3.4.5/install-tools/include/limits.h
+lib/gcc/i386--mingw32/3.4.5/install-tools/include/mm_malloc.h
+lib/gcc/i386--mingw32/3.4.5/install-tools/include/mmintrin.h
+lib/gcc/i386--mingw32/3.4.5/install-tools/include/pmmintrin.h
+lib/gcc/i386--mingw32/3.4.5/install-tools/include/stdarg.h
+lib/gcc/i386--mingw32/3.4.5/install-tools/include/stdbool.h
+lib/gcc/i386--mingw32/3.4.5/install-tools/include/stddef.h
+lib/gcc/i386--mingw32/3.4.5/install-tools/include/unwind.h
+lib/gcc/i386--mingw32/3.4.5/install-tools/include/varargs.h
+lib/gcc/i386--mingw32/3.4.5/install-tools/include/xmmintrin.h
+lib/gcc/i386--mingw32/3.4.5/install-tools/mkheaders.conf
+lib/gcc/i386--mingw32/3.4.5/libgcc.a
+lib/gcc/i386--mingw32/3.4.5/libgcov.a
+lib/gcc/i386--mingw32/3.4.5/specs
 lib/libiberty.a
-libexec/gcc/${MACHINE_ARCH}--mingw32/3.4.5/cc1
-libexec/gcc/${MACHINE_ARCH}--mingw32/3.4.5/cc1obj
-libexec/gcc/${MACHINE_ARCH}--mingw32/3.4.5/cc1plus
-libexec/gcc/${MACHINE_ARCH}--mingw32/3.4.5/collect2
-libexec/gcc/${MACHINE_ARCH}--mingw32/3.4.5/install-tools/fixinc.sh
-libexec/gcc/${MACHINE_ARCH}--mingw32/3.4.5/install-tools/mkheaders
-man/man1/${MACHINE_ARCH}--mingw32-cpp.1
-man/man1/${MACHINE_ARCH}--mingw32-g++.1
-man/man1/${MACHINE_ARCH}--mingw32-gcc.1
-man/man1/${MACHINE_ARCH}--mingw32-gcov.1
+libexec/gcc/i386--mingw32/3.4.5/cc1
+libexec/gcc/i386--mingw32/3.4.5/cc1obj
+libexec/gcc/i386--mingw32/3.4.5/cc1plus
+libexec/gcc/i386--mingw32/3.4.5/collect2
+libexec/gcc/i386--mingw32/3.4.5/install-tools/fixinc.sh
+libexec/gcc/i386--mingw32/3.4.5/install-tools/mkheaders
+man/man1/i386--mingw32-cpp.1
+man/man1/i386--mingw32-g++.1
+man/man1/i386--mingw32-gcc.1
+man/man1/i386--mingw32-gcov.1
 man/man7/fsf-funding.7
 man/man7/gfdl.7
 man/man7/gpl.7