Replaced ${MACHINE_ARCH} with i386 as this always installs files for

i386, ppc32, sparc32 and x86_64. Also sorted PLIST.

This was previously not working properly on non-i386 hosts...

2 files changed, 37 insertions, 37 deletions

diff --git a/lang/erlang/PLIST.common b/lang/erlang/PLIST.common
index 054cc1c9a60..ccc46943824 100644
--- a/lang/erlang/PLIST.common
+++ b/lang/erlang/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.7 2008/01/04 14:05:05 ghen Exp $
+@comment $NetBSD: PLIST.common,v 1.8 2008/04/08 13:22:06 martti Exp $
 bin/dialyzer
 bin/epmd
 bin/erl
@@ -51,10 +51,10 @@ lib/erlang/erts-${VERSION.erts}/include/internal/erl_printf_format.h
 lib/erlang/erts-${VERSION.erts}/include/internal/ethread.h
 lib/erlang/erts-${VERSION.erts}/include/internal/ethread.mk
 lib/erlang/erts-${VERSION.erts}/include/internal/ethread_header_config.h
-lib/erlang/erts-${VERSION.erts}/include/internal/${MACHINE_ARCH}/atomic.h
-lib/erlang/erts-${VERSION.erts}/include/internal/${MACHINE_ARCH}/ethread.h
-lib/erlang/erts-${VERSION.erts}/include/internal/${MACHINE_ARCH}/rwlock.h
-lib/erlang/erts-${VERSION.erts}/include/internal/${MACHINE_ARCH}/spinlock.h
+lib/erlang/erts-${VERSION.erts}/include/internal/i386/atomic.h
+lib/erlang/erts-${VERSION.erts}/include/internal/i386/ethread.h
+lib/erlang/erts-${VERSION.erts}/include/internal/i386/rwlock.h
+lib/erlang/erts-${VERSION.erts}/include/internal/i386/spinlock.h
 lib/erlang/erts-${VERSION.erts}/include/internal/ppc32/atomic.h
 lib/erlang/erts-${VERSION.erts}/include/internal/ppc32/ethread.h
 lib/erlang/erts-${VERSION.erts}/include/internal/ppc32/rwlock.h
@@ -2220,13 +2220,13 @@ lib/erlang/lib/kernel-${VERSION.kernel}/ebin/user_drv.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/user_sup.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/wrap_log_reader.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/zlib.beam
-lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/src/uds_server.erl
-lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/src/uds_dist.app
+lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/c_src/Makefile
+lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/c_src/uds_drv.c
 lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/src/Makefile
-lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/src/uds_dist.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/src/uds.erl
-lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/c_src/uds_drv.c
-lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/c_src/Makefile
+lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/src/uds_dist.app
+lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/src/uds_dist.erl
+lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/src/uds_server.erl
 lib/erlang/lib/kernel-${VERSION.kernel}/include/file.hrl
 lib/erlang/lib/kernel-${VERSION.kernel}/include/inet.hrl
 lib/erlang/lib/kernel-${VERSION.kernel}/src/application.erl
@@ -3440,48 +3440,48 @@ lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_ssl2.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_ssl3.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_tls1.beam
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/ebin/make_certs.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/Makefile
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/newcerts/01.pem
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/cert.pem
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/req.cnf
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/private/key.pem
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/private/RAND
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/index.txt.old
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/ebin/make_certs.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/cacerts.pem
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/cert.pem
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/key.pem
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/req.cnf
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/req.pem
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/ca.cnf
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/cert.pem
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/index.txt
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/serial.old
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/serial
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/index.txt.attr
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/index.txt.old
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/index.txt.old
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/newcerts/01.pem
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/private/RAND
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/private/key.pem
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/req.cnf
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/serial
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/erlangCA/serial.old
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/ca.cnf
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/cert.pem
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/req.cnf
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/req.pem
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/index.txt
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/index.txt.attr
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/index.txt.attr.old
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/index.txt.old
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/newcerts/01.pem
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/newcerts/02.pem
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/serial
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/index.txt.attr.old
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/ca.cnf
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/private/key.pem
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/private/RAND
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/index.txt
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/private/key.pem
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/req.cnf
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/req.pem
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/serial
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/serial.old
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/otpCA/index.txt.attr
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/cacerts.pem
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/key.pem
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/cert.pem
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/req.cnf
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/req.pem
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/server/cacerts.pem
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/server/key.pem
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/server/cert.pem
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/server/key.pem
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/server/req.cnf
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/server/req.pem
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/rnd/RAND
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/src/make_certs.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/examples/ebin/client_server.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/src/Makefile
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/src/client_server.erl
-lib/erlang/lib/ssl-${VERSION.ssl}/examples/ebin/client_server.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/include/OTP-PKIX.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/include/ssl_pkix.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/pkix/OTP-PKIX.asn1config
diff --git a/lang/erlang/PLIST.common_end b/lang/erlang/PLIST.common_end
index 623deda55da..72d0f6504b5 100644
--- a/lang/erlang/PLIST.common_end
+++ b/lang/erlang/PLIST.common_end
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common_end,v 1.6 2008/01/04 14:05:05 ghen Exp $
+@comment $NetBSD: PLIST.common_end,v 1.7 2008/04/08 13:22:06 martti Exp $
 @dirrm lib/erlang/usr/lib
 @dirrm lib/erlang/usr/include/obsolete
 @dirrm lib/erlang/usr/include
@@ -366,7 +366,7 @@
 @dirrm lib/erlang/erts-${VERSION.erts}/include/internal/x86_64
 @dirrm lib/erlang/erts-${VERSION.erts}/include/internal/sparc32
 @dirrm lib/erlang/erts-${VERSION.erts}/include/internal/ppc32
-@dirrm lib/erlang/erts-${VERSION.erts}/include/internal/${MACHINE_ARCH}
+@dirrm lib/erlang/erts-${VERSION.erts}/include/internal/i386
 @dirrm lib/erlang/erts-${VERSION.erts}/include/internal
 @dirrm lib/erlang/erts-${VERSION.erts}/include
 @exec ${MKDIR} %D/lib/erlang/erts-${VERSION.erts}/doc