From e33bd8b3ae6cf8f8c799f1f3f29d1e30a4c42041 Mon Sep 17 00:00:00 2001 From: garbled Date: Tue, 13 Oct 1998 23:31:03 +0000 Subject: Add the whole parallel category to pkgsrc, and sprinkle it with a few packages. mpi-ch: a free implementation of the Message Passing Interface. pvm3: Paralell Virtual Machine libraries and environment clusterit: A clustering package for unix --- parallel/mpi-ch/patches/patch-aa | 59 ++++++ parallel/mpi-ch/patches/patch-ab | 28 +++ parallel/mpi-ch/patches/patch-ac | 29 +++ parallel/mpi-ch/patches/patch-ad | 9 + parallel/mpi-ch/patches/patch-ae | 7 + parallel/mpi-ch/patches/patch-af | 30 +++ parallel/mpi-ch/patches/patch-ag | 15 ++ parallel/mpi-ch/patches/patch-ah | 7 + parallel/mpi-ch/patches/patch-ai | 7 + parallel/mpi-ch/patches/patch-aj | 54 +++++ parallel/mpi-ch/patches/patch-ak | 10 + parallel/mpi-ch/patches/patch-al | 431 +++++++++++++++++++++++++++++++++++++++ parallel/mpi-ch/patches/patch-am | 8 + 13 files changed, 694 insertions(+) create mode 100644 parallel/mpi-ch/patches/patch-aa create mode 100644 parallel/mpi-ch/patches/patch-ab create mode 100644 parallel/mpi-ch/patches/patch-ac create mode 100644 parallel/mpi-ch/patches/patch-ad create mode 100644 parallel/mpi-ch/patches/patch-ae create mode 100644 parallel/mpi-ch/patches/patch-af create mode 100644 parallel/mpi-ch/patches/patch-ag create mode 100644 parallel/mpi-ch/patches/patch-ah create mode 100644 parallel/mpi-ch/patches/patch-ai create mode 100644 parallel/mpi-ch/patches/patch-aj create mode 100644 parallel/mpi-ch/patches/patch-ak create mode 100644 parallel/mpi-ch/patches/patch-al create mode 100644 parallel/mpi-ch/patches/patch-am (limited to 'parallel/mpi-ch/patches') diff --git a/parallel/mpi-ch/patches/patch-aa b/parallel/mpi-ch/patches/patch-aa new file mode 100644 index 00000000000..b63c48844e6 --- /dev/null +++ b/parallel/mpi-ch/patches/patch-aa @@ -0,0 +1,59 @@ +$NetBSD: patch-aa,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $ +--- configure.orig Tue Jul 7 07:52:46 1998 ++++ configure Thu Aug 6 03:18:27 1998 +@@ -6615,3 +6615,3 @@ + -e 's/rs6000/RS6000/g' -e 's/symm_ptx/SYMMETRY_PTX/g' \ +- -e 's/sppux/HP/g'` ++ -e 's/sppux/HP/g' -e 's/netbsd/NETBSD/g'` + fi +@@ -14282,10 +14282,11 @@ + /usr/sgitcl \ ++ /usr/pkg \ + /local/encap/tcl-7.1 ; do +- if test -r $dir/include/tcl.h ; then ++ if test -r $dir/include/tcl8.0/tcl.h ; then + # Check for correct version + +- tclversion=`grep 'TCL_MAJOR_VERSION' $dir/include/tcl.h | \ ++ tclversion=`grep 'TCL_MAJOR_VERSION' $dir/include/tcl8.0/tcl.h | \ + sed -e 's/^.*TCL_MAJOR_VERSION[^0-9]*\([0-9]*\).*$/\1/'` + +- if test "$tclversion" != "7" ; then ++ if test "$tclversion" != "8" ; then + # Skip if it is the wrong version +@@ -14307,5 +14308,5 @@ + if test -z "$ac_echo_test" -a 1 = 1 ; then +-echo "$ac_t""found $TCL_DIR/include/tcl.h and $TCL_DIR/lib/libtcl" ++echo "$ac_t""found $TCL_DIR/include/tcl8.0/tcl.h and $TCL_DIR/lib/libtcl" + else +-echo "$ac_t""found $TCL_DIR/include/tcl.h and $TCL_DIR/lib/libtcl" 1>&1 ++echo "$ac_t""found $TCL_DIR/include/tcl8.0/tcl.h and $TCL_DIR/lib/libtcl" 1>&1 + fi +@@ -14398,10 +14399,11 @@ + /usr/sgitcl \ ++ /usr/pkg \ + /local/encap/tk-3.4 $TCL_DIR ; do +- if test -r $dir/include/tk.h ; then ++ if test -r $dir/include/tk8.0/tk.h ; then + # Check for correct version + +- tkversion=`grep 'TK_MAJOR_VERSION' $dir/include/tk.h | \ ++ tkversion=`grep 'TK_MAJOR_VERSION' $dir/include/tk8.0/tk.h | \ + sed -e 's/^.*TK_MAJOR_VERSION[^0-9]*\([0-9]*\).*$/\1/'` + +- if test "$tkversion" != "3" ; then ++ if test "$tkversion" != "8" ; then + # Skip if it is the wrong version +@@ -14423,5 +14425,5 @@ + if test -z "$ac_echo_test" -a 1 = 1 ; then +-echo "$ac_t""found $TK_DIR/include/tk.h and $TK_DIR/lib/libtk" ++echo "$ac_t""found $TK_DIR/include/tk8.0/tk.h and $TK_DIR/lib/libtk" + else +-echo "$ac_t""found $TK_DIR/include/tk.h and $TK_DIR/lib/libtk" 1>&1 ++echo "$ac_t""found $TK_DIR/include/tk8.0/tk.h and $TK_DIR/lib/libtk" 1>&1 + fi +@@ -14848,3 +14850,3 @@ + CFLAGSsave="$CFLAGS" +- CFLAGS="$CFLAGS -I$TK_DIR/include -I$TCL_DIR/include $XINCLUDES" ++ CFLAGS="$CFLAGS -I$TK_DIR/include/tk8.0 -I$TCL_DIR/include/tcl8.0 $XINCLUDES" + diff --git a/parallel/mpi-ch/patches/patch-ab b/parallel/mpi-ch/patches/patch-ab new file mode 100644 index 00000000000..fab50d60d72 --- /dev/null +++ b/parallel/mpi-ch/patches/patch-ab @@ -0,0 +1,28 @@ +$NetBSD: patch-ab,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $ +--- romio/configure.orig Wed Aug 5 09:47:54 1998 ++++ romio/configure Wed Aug 5 09:50:05 1998 +@@ -691,2 +691,24 @@ + fi ++if test -n "$arch_netbsd" ; then ++ CC=${CC:-gcc} ++ F77=${FC:-f77} ++ CFLAGS="$CFLAGS -D__FREEBSD" ++ longlongsize=${longlongsize:-0} ++# printf doesn't work properly and no integer*8 as far as I can tell ++ if test $DEBUG = 1; then ++ CFLAGS="$CFLAGS -g -D__NO_AIO" ++ else ++ CFLAGS="$CFLAGS -O -D__NO_AIO" ++ fi ++ if test -z "$MPI" ; then ++ MPI=mpich ++ mpi_mpich=1 ++ fi ++ if test -z "$FILE_SYSTEM" ; then ++ file_system_ufs=1 ++ file_system_nfs=1 ++ FILE_SYSTEM="ufs nfs" ++ echo "configuring for file systems ufs and nfs" ++ fi ++fi + # diff --git a/parallel/mpi-ch/patches/patch-ac b/parallel/mpi-ch/patches/patch-ac new file mode 100644 index 00000000000..76aa6726a39 --- /dev/null +++ b/parallel/mpi-ch/patches/patch-ac @@ -0,0 +1,29 @@ +$NetBSD: patch-ac,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $ +--- mpid/ch_p4/p4/configure.orig Wed Jul 1 12:55:53 1998 ++++ mpid/ch_p4/p4/configure Wed Aug 5 23:55:15 1998 +@@ -245,2 +245,9 @@ + fi ++# Any machine running NetBSD ++if test -n "$p4arch_NETBSD"; then ++ P4ARCH=NETBSD ++# if test -n "p4comm_shared"; then ++# DEFINE_SYSV_IPC="#define SYSV_IPC" ++# fi ++fi + # 486 running Linux +@@ -4617,3 +4624,4 @@ + +-trap 'rm -f Makefile lib/Makefile alog/Makefile usc/Makefile usc/usctest/Makefile messages/Makefile include/Makefile lib_f/Makefile contrib/Makefile contrib_f/Makefile bin/Makefile doc/Makefile messages_f/Makefile misc/Makefile monitors/Makefile servers/ +Makefile; exit 1' 1 3 15 ++trap 'rm -f Makefile lib/Makefile alog/Makefile usc/Makefile usc/usctest/Makefile messages/Makefile include/Makefile lib_f/Makefile contrib/Makefile contrib_f/Makefile bin/Makefile doc/Makefile messages_f/Makefile misc/Makefile monitors/Makefile servers/ +M ++akefile; exit 1' 1 3 15 + RANLIB='$RANLIB' +@@ -4655,3 +4663,4 @@ + +-CONFIG_FILES=${CONFIG_FILES-"Makefile lib/Makefile alog/Makefile usc/Makefile usc/usctest/Makefile messages/Makefile include/Makefile lib_f/Makefile contrib/Makefile contrib_f/Makefile bin/Makefile doc/Makefile messages_f/Makefile misc/Makefile monitors/ +Makefile servers/Makefile"} ++CONFIG_FILES=${CONFIG_FILES-"Makefile lib/Makefile alog/Makefile usc/Makefile usc/usctest/Makefile messages/Makefile include/Makefile lib_f/Makefile contrib/Makefile contrib_f/Makefile bin/Makefile doc/Makefile messages_f/Makefile misc/Makefile monitors/ +M ++akefile servers/Makefile"} + for file in .. ${CONFIG_FILES}; do if test "x$file" != x..; then diff --git a/parallel/mpi-ch/patches/patch-ad b/parallel/mpi-ch/patches/patch-ad new file mode 100644 index 00000000000..c36b3d36542 --- /dev/null +++ b/parallel/mpi-ch/patches/patch-ad @@ -0,0 +1,9 @@ +$NetBSD: patch-ad,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $ +--- mpid/ch_shmem/p2ptest/configure.orig Wed Aug 5 09:56:05 1998 ++++ mpid/ch_shmem/p2ptest/configure Wed Aug 5 09:56:43 1998 +@@ -143,2 +143,5 @@ + fi ++if test -n "$p4arch_NETBSD"; then ++P4ARCH=NETBSD ++fi + if test -n "$p4arch_FREEBSD"; then diff --git a/parallel/mpi-ch/patches/patch-ae b/parallel/mpi-ch/patches/patch-ae new file mode 100644 index 00000000000..b1fe381e2d5 --- /dev/null +++ b/parallel/mpi-ch/patches/patch-ae @@ -0,0 +1,7 @@ +$NetBSD: patch-ae,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $ +--- mpid/ch_p4/p4/MACHINES.orig Wed Aug 5 19:23:57 1998 ++++ mpid/ch_p4/p4/MACHINES Wed Aug 5 19:24:12 1998 +@@ -2,2 +2,3 @@ + LINUX ++ NETBSD + FREEBSD diff --git a/parallel/mpi-ch/patches/patch-af b/parallel/mpi-ch/patches/patch-af new file mode 100644 index 00000000000..5c4414ba235 --- /dev/null +++ b/parallel/mpi-ch/patches/patch-af @@ -0,0 +1,30 @@ +$NetBSD: patch-af,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $ +--- mpid/ch_p4/p4/lib/p4_MD.h.orig Wed Aug 5 19:35:35 1998 ++++ mpid/ch_p4/p4/lib/p4_MD.h Wed Aug 5 19:44:58 1998 +@@ -74,2 +74,6 @@ + ++#if defined(NETBSD) ++#define P4_MACHINE_TYPE "NETBSD" ++#endif ++ + #if defined(FREEBSD) +@@ -94,3 +98,3 @@ + /* Rumor has it LINUX support VPRINTF */ +-#if defined(FX2800) || defined(FX2800_SWITCH) || defined(FREEBSD) ++#if defined(FX2800) || defined(FX2800_SWITCH) || defined(FREEBSD) || defined(NETBSD) + #define VPRINTF +@@ -117,3 +121,3 @@ + defined(NEXT) || defined(KSR) || defined(FREEBSD) || \ +- defined(SYMMETRY) || defined(BALANCE) || \ ++ defined(SYMMETRY) || defined(BALANCE) || defined(NETBSD) || \ + defined(ALLIANT) || defined(MULTIMAX) || defined(CM5) || \ +@@ -127,3 +131,3 @@ + defined(NEXT) || defined(KSR) || defined(FREEBSD) || \ +- defined(SYMMETRY) || defined(BALANCE) || \ ++ defined(SYMMETRY) || defined(BALANCE) || defined(NETBSD) || \ + defined(ALLIANT) || defined(MULTIMAX) || \ +@@ -411,3 +415,3 @@ + || defined(RS6000) || defined(IBM3090) || defined(FREEBSD) \ +- || defined(TITAN) \ ++ || defined(TITAN) || defined(NETBSD) \ + || defined(HP) diff --git a/parallel/mpi-ch/patches/patch-ag b/parallel/mpi-ch/patches/patch-ag new file mode 100644 index 00000000000..2ab9fe8b65d --- /dev/null +++ b/parallel/mpi-ch/patches/patch-ag @@ -0,0 +1,15 @@ +$NetBSD: patch-ag,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $ +--- mpid/ch_p4/p4/lib/p4_MD.c.orig Wed Aug 5 19:40:58 1998 ++++ mpid/ch_p4/p4/lib/p4_MD.c Wed Aug 5 19:45:56 1998 +@@ -1305,2 +1305,3 @@ + || defined(MULTIMAX) || defined(IBM3090) || defined(FREEBSD) \ ++ || defined(NETBSD) \ + || (defined(HP) && !defined(SUN_SOLARIS)) +@@ -1355,2 +1356,3 @@ + || defined(MULTIMAX) || defined(IBM3090) || defined(FREEBSD) \ ++ || defined(NETBSD) \ + || (defined(HP) && !defined(SUN_SOLARIS)) +@@ -1584,2 +1586,3 @@ + if (strcmp(machine_type, "FREEBSD") == 0) return 2; ++ if (strcmp(machine_type, "NETBSD") == 0) return 2; + if (strcmp(machine_type, "I86_SOLARIS") == 0) return 2; diff --git a/parallel/mpi-ch/patches/patch-ah b/parallel/mpi-ch/patches/patch-ah new file mode 100644 index 00000000000..fedd2036020 --- /dev/null +++ b/parallel/mpi-ch/patches/patch-ah @@ -0,0 +1,7 @@ +$NetBSD: patch-ah,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $ +--- romio/.config_params.orig Thu Aug 6 00:40:54 1998 ++++ romio/.config_params Thu Aug 6 00:41:03 1998 +@@ -18,2 +18,3 @@ + _freebsd_ ++_netbsd_ + _LINUX_ diff --git a/parallel/mpi-ch/patches/patch-ai b/parallel/mpi-ch/patches/patch-ai new file mode 100644 index 00000000000..483d8ee079e --- /dev/null +++ b/parallel/mpi-ch/patches/patch-ai @@ -0,0 +1,7 @@ +$NetBSD: patch-ai,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $ +--- bin/tarch.orig Thu Aug 6 00:52:15 1998 ++++ bin/tarch Thu Aug 6 00:52:54 1998 +@@ -96,2 +96,3 @@ + FreeBSD) FARCH=freebsd ; break ;; ++ NetBSD) FARCH=netbsd ; break ;; + i386) GARCH=ipsc2 ;; diff --git a/parallel/mpi-ch/patches/patch-aj b/parallel/mpi-ch/patches/patch-aj new file mode 100644 index 00000000000..87ddd235ddf --- /dev/null +++ b/parallel/mpi-ch/patches/patch-aj @@ -0,0 +1,54 @@ +$NetBSD: patch-aj,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $ +--- mpe/profiling/nupshot/configure.orig Sat Jul 4 07:50:32 1998 ++++ mpe/profiling/nupshot/configure Thu Aug 6 05:42:48 1998 +@@ -1219,9 +1219,9 @@ + /local/encap/tcl-7.1 ; do +- if test -r $dir/include/tcl.h ; then ++ if test -r $dir/include/tcl8.0/tcl.h ; then + # Check for correct version + +- tclversion=`grep 'TCL_MAJOR_VERSION' $dir/include/tcl.h | \ ++ tclversion=`grep 'TCL_MAJOR_VERSION' $dir/include/tcl8.0/tcl.h | \ + sed -e 's/^.*TCL_MAJOR_VERSION[^0-9]*\([0-9]*\).*$/\1/'` + +- if test "$tclversion" != "7" ; then ++ if test "$tclversion" != "8" ; then + # Skip if it is the wrong version +@@ -1243,5 +1243,5 @@ + if test -z "$ac_echo_test" -a 1 = 1 ; then +-echo "$ac_t""found $TCL_DIR/include/tcl.h and $TCL_DIR/lib/libtcl" ++echo "$ac_t""found $TCL_DIR/include/tcl8.0/tcl.h and $TCL_DIR/lib/libtcl" + else +-echo "$ac_t""found $TCL_DIR/include/tcl.h and $TCL_DIR/lib/libtcl" 1>&1 ++echo "$ac_t""found $TCL_DIR/include/tcl8.0/tcl.h and $TCL_DIR/lib/libtcl" 1>&1 + fi +@@ -1335,9 +1335,9 @@ + /local/encap/tk-3.4 $TCL_DIR ; do +- if test -r $dir/include/tk.h ; then ++ if test -r $dir/include/tk8.0/tk.h ; then + # Check for correct version + +- tkversion=`grep 'TK_MAJOR_VERSION' $dir/include/tk.h | \ ++ tkversion=`grep 'TK_MAJOR_VERSION' $dir/include/tk8.0/tk.h | \ + sed -e 's/^.*TK_MAJOR_VERSION[^0-9]*\([0-9]*\).*$/\1/'` + +- if test "$tkversion" != "3" ; then ++ if test "$tkversion" != "8" ; then + # Skip if it is the wrong version +@@ -1359,3 +1359,3 @@ + if test -z "$ac_echo_test" -a 1 = 1 ; then +-echo "$ac_t""found $TK_DIR/include/tk.h and $TK_DIR/lib/libtk" ++echo "$ac_t""found $TK_DIR/include/tk8.0/tk.h and $TK_DIR/lib/libtk" + else +@@ -1431,3 +1431,3 @@ + CFLAGSsave="$CFLAGS" +- CFLAGS="$CFLAGS -I$TK_DIR/include -I$TCL_DIR/include $XINCLUDES" ++ CFLAGS="$CFLAGS -I$TK_DIR/include/tk8.0 -I$TCL_DIR/include/tcl8.0 $XINCLUDES" + +@@ -1565,4 +1565,4 @@ + +-if test "$TK_VERSION" != 3.6 ; then +- print_error "This version of nupshot requires tk 3.6 The version in" ++if test "$TK_VERSION" != 8.0 ; then ++ print_error "This version of nupshot requires tk 8.0 The version in" + print_error "$TK_DIR seems to be version $TK_VERSION." diff --git a/parallel/mpi-ch/patches/patch-ak b/parallel/mpi-ch/patches/patch-ak new file mode 100644 index 00000000000..22759eea105 --- /dev/null +++ b/parallel/mpi-ch/patches/patch-ak @@ -0,0 +1,10 @@ +$NetBSD: patch-ak,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $ +--- mpe/profiling/nupshot/Makefile.in.orig Thu Aug 6 03:30:37 1998 ++++ mpe/profiling/nupshot/Makefile.in Thu Aug 6 03:31:16 1998 +@@ -34,4 +34,4 @@ + +-TCL_INC = -I$(TCL_DIR)/include +-TK_INC = -I$(TK_DIR)/include ++TCL_INC = -I$(TCL_DIR)/include/tcl8.0 ++TK_INC = -I$(TK_DIR)/include/tk8.0 + TCLTK_INC = $(TCL_INC) $(TK_INC) diff --git a/parallel/mpi-ch/patches/patch-al b/parallel/mpi-ch/patches/patch-al new file mode 100644 index 00000000000..78259adbf55 --- /dev/null +++ b/parallel/mpi-ch/patches/patch-al @@ -0,0 +1,431 @@ +$NetBSD: patch-al,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $ +--- util/mpiinstall.in.orig Sun Jul 12 08:28:14 1998 ++++ util/mpiinstall.in Thu Aug 6 23:35:41 1998 +@@ -122,3 +122,3 @@ + # trialname=`sed -n -e "s/DEFAULT_MACHINE='\(.*\)'/\1/p" \ +-# lib/$ARCH/$COMM/config.status` ++# libdata/$ARCH/$COMM/config.status` + # if [ -n "$trialname" ] ; then +@@ -126,4 +126,4 @@ + # fi +- if [ $inlib = 0 -a -x lib/$ARCH/$COMM/mpiinstall ] ; then +- ./lib/$ARCH/$COMM/mpiinstall -inlib "$@" ++ if [ $inlib = 0 -a -x libdata/$ARCH/$COMM/mpiinstall ] ; then ++ ./libdata/$ARCH/$COMM/mpiinstall -inlib "$@" + exit $? +@@ -136,5 +136,5 @@ + NFLIB_PATH=`echo "@FLIB_PATH@" | \ +- sed -e "s%^\([^/ ]*\)/[^ ]*%\1$PREFIX/lib/$ARCH/$COMM%g"` ++ sed -e "s%^\([^/ ]*\)/[^ ]*%\1$PREFIX/libdata/$ARCH/$COMM%g"` + NF90LIB_PATH=`echo "@F90LIB_PATH@" | \ +- sed -e "s%^\([^/ ]*\)/[^ ]*%\1$PREFIX/lib/$ARCH/$COMM%g"` ++ sed -e "s%^\([^/ ]*\)/[^ ]*%\1$PREFIX/libdata/$ARCH/$COMM%g"` + NF90INC=`echo "@F90INC@" | \ +@@ -144,3 +144,3 @@ + NCPPFLAGS=`echo "A$CPPFLAGS" | \ +- sed -e "s%-I.*/MPI-2-C++/src%-I$PREFIX/lib/$ARCH/$COMM/c++%g" \ ++ sed -e "s%-I.*/MPI-2-C++/src%-I$PREFIX/libdata/$ARCH/$COMM/c++%g" \ + -e "s/^A//g"` +@@ -271,5 +271,6 @@ + sed \ ++ -e "s%/lib/%/libdata/%g" \ + -e "s%\#ARCH\#%$ARCH%g" \ + -e "s%\#AUTOMOUNTFIX\#%@AUTOMOUNTFIX@%g" \ +- -e "s%\#BITMAP_DIR\#%$PREFIX/lib/bitmaps%g" \ ++ -e "s%\#BITMAP_DIR\#%$PREFIX/libdata/bitmaps%g" \ + -e "s%\#CC\#%@CC@%g" \ +@@ -282,3 +283,3 @@ + -e "s%\#DEFAULT_MACHINE\#%$DEFAULT_MACHINE%g" \ +- -e "s%\#EXECER_DIR\#%$PREFIX/util%g" \ ++ -e "s%\#EXECER_DIR\#%$PREFIX/share/util%g" \ + -e "s%\#F77\#%@F77@%g" \ +@@ -344,3 +345,3 @@ + NLIBPATH=`echo "@LIB_PATH@" | \ +- sed -e "s%^\([^/ ]*\)/[^ ]*%\1$PREFIX/lib/$ARCH/$COMM%g"` ++ sed -e "s%^\([^/ ]*\)/[^ ]*%\1$PREFIX/libdata/$ARCH/$COMM%g"` + if [ -d $2 ] ; then +@@ -358,2 +359,3 @@ + sed \ ++ -e "s%/lib/%/libdata/%g" \ + -e "s%[@]ARCH[@]%$ARCH%g" \ +@@ -362,3 +364,3 @@ + -e "s%[@]F90INC[@]%$NF90INC%g" \ +- -e "s%[@]BITMAP_DIR[@]%$PREFIX/lib/bitmaps%g" \ ++ -e "s%[@]BITMAP_DIR[@]%$PREFIX/libdata/bitmaps%g" \ + -e "s%[@]CC[@]%@CC@%g" \ +@@ -377,3 +379,3 @@ + -e "s%[@]DEFAULT_MACHINE[@]%$DEFAULT_MACHINE%g" \ +- -e "s%[@]EXECER_DIR[@]%$PREFIX/util%g" \ ++ -e "s%[@]EXECER_DIR[@]%$PREFIX/share/util%g" \ + -e "s%[@]F77[@]%@F77@%g" \ +@@ -457,18 +459,19 @@ + +-MkDir $PREFIX/lib +-MkDir $PREFIX/lib/$ARCH +-MkDir $PREFIX/lib/$ARCH/$COMM +-MkDir $PREFIX/lib/bitmaps ++MkDir $PREFIX/libdata ++MkDir $PREFIX/libdata/$ARCH ++MkDir $PREFIX/libdata/$ARCH/$COMM ++MkDir $PREFIX/libdata/bitmaps + if [ -n "$CPP_DIR" -a "$buildcpp" = 1 ] ; then +- MkDir $PREFIX/$CPP_DIR +- MkDir $PREFIX/$CPP_DIR/examples +- MkDir $PREFIX/lib/$ARCH/$COMM/c++ ++# MkDir $PREFIX/libdata/$CPP_DIR ++ MkDir $PREFIX/share/examples/$CPP_DIR ++ MkDir $PREFIX/libdata/$ARCH/$COMM/c++ + fi +-MkDir $PREFIX/util +-MkDir $PREFIX/util/machines ++MkDir $PREFIX/share/util ++MkDir $PREFIX/share/util/machines + MkDir $PREFIX/include +-MkDir $PREFIX/examples ++MkDir $PREFIX/share/examples/mpi + MkDir $PREFIX/bin + MkDir $PREFIX/man +-MkDir $PREFIX/doc ++MkDir $PREFIX/share/doc ++MkDir $PREFIX/share/doc/mpi + if [ -z "$libonly" ] ; then +@@ -480,3 +483,3 @@ + FixupFile util/mpiman.in $PREFIX/bin/mpiman $XMODE +- CopyFile $PREFIX/bin/mpiman $PREFIX/lib/$ARCH/$COMM $XMODE ++ CopyFile $PREFIX/bin/mpiman $PREFIX/libdata/$ARCH/$COMM $XMODE + # +@@ -490,3 +493,3 @@ + if [ -n "@TCL_DIR@" -a -z "$cpnupshot" -a -n "@TK_DIR@" -a \ +- "@TK_VERSION@" = "3.6" ] ; then ++ "@TK_VERSION@" = "8.0" ] ; then + echo "Attempting to build nupshot... " +@@ -528,4 +531,4 @@ + FixupFile $file $PREFIX/bin/$bfile $XMODE +- $Show /bin/rm -f $PREFIX/lib/$ARCH/$COMM/$bfile +- CopyFile $PREFIX/bin/$bfile $PREFIX/lib/$ARCH/$COMM $XMODE ++ $Show /bin/rm -f $PREFIX/libdata/$ARCH/$COMM/$bfile ++ CopyFile $PREFIX/bin/$bfile $PREFIX/libdata/$ARCH/$COMM $XMODE + done +@@ -533,7 +536,7 @@ + echo "/bin/rm -f $PREFIX/bin/mpirun" >> $UNINSTALLFILE +- $Show mv $PREFIX/lib/$ARCH/$COMM/mpirun.sh $PREFIX/lib/$ARCH/$COMM/mpirun +- echo "/bin/rm -f $PREFIX/lib/$ARCH/$COMM/mpirun" >> $UNINSTALLFILE +- if [ ! -r $PREFIX/lib/$ARCH/$COMM/tarch ] ; then +- ( cd $PREFIX/lib/$ARCH/$COMM ; ln -s ../../../bin/tarch tarch ) +- echo "/bin/rm -f $PREFIX/lib/$ARCH/$COMM/tarch" >> $UNINSTALLFILE ++ $Show mv $PREFIX/libdata/$ARCH/$COMM/mpirun.sh $PREFIX/libdata/$ARCH/$COMM/mpirun ++ echo "/bin/rm -f $PREFIX/libdata/$ARCH/$COMM/mpirun" >> $UNINSTALLFILE ++ if [ ! -r $PREFIX/libdata/$ARCH/$COMM/tarch ] ; then ++ ( cd $PREFIX/libdata/$ARCH/$COMM ; ln -s ../../../bin/tarch tarch ) ++ echo "/bin/rm -f $PREFIX/libdata/$ARCH/$COMM/tarch" >> $UNINSTALLFILE + fi +@@ -545,3 +548,3 @@ + FixupFile util/mpireconfig.in $PREFIX/bin/mpireconfig $XMODE +- CopyFile $PREFIX/bin/mpireconfig $PREFIX/lib/$ARCH/$COMM $XMODE ++ CopyFile $PREFIX/bin/mpireconfig $PREFIX/libdata/$ARCH/$COMM $XMODE + $Show /bin/rm -f $PREFIX/bin/execer +@@ -551,7 +554,7 @@ + FixupFileWithAt util/mpicc.in $PREFIX/bin/mpicc $XMODE +- CopyFile $PREFIX/bin/mpicc $PREFIX/lib/$ARCH/$COMM $XMODE ++ CopyFile $PREFIX/bin/mpicc $PREFIX/libdata/$ARCH/$COMM $XMODE + FixupFileWithAt util/mpif77.in $PREFIX/bin/mpif77 $XMODE +- CopyFile $PREFIX/bin/mpif77 $PREFIX/lib/$ARCH/$COMM $XMODE ++ CopyFile $PREFIX/bin/mpif77 $PREFIX/libdata/$ARCH/$COMM $XMODE + FixupFileWithAt util/mpif90.in $PREFIX/bin/mpif90 $XMODE +- CopyFile $PREFIX/bin/mpif90 $PREFIX/lib/$ARCH/$COMM $XMODE ++ CopyFile $PREFIX/bin/mpif90 $PREFIX/libdata/$ARCH/$COMM $XMODE + # +@@ -560,3 +563,3 @@ + FixupFileWithAt util/mpiCC.in $PREFIX/bin/mpiCC $XMODE +- CopyFile $PREFIX/bin/mpiCC $PREFIX/lib/$ARCH/$COMM $XMODE ++ CopyFile $PREFIX/bin/mpiCC $PREFIX/libdata/$ARCH/$COMM $XMODE + fi +@@ -570,24 +573,24 @@ + if [ $verbose = 1 ] ; then +- echo "Creating $PREFIX/lib/$ARCH/$COMM/$bfile from $file" ++ echo "Creating $PREFIX/libdata/$ARCH/$COMM/$bfile from $file" + fi +- FixupFile $file $PREFIX/lib/$ARCH/$COMM/$bfile $XMODE ++ FixupFile $file $PREFIX/libdata/$ARCH/$COMM/$bfile $XMODE + done +- $Show mv $PREFIX/lib/$ARCH/$COMM/mpirun.sh $PREFIX/lib/$ARCH/$COMM/mpirun +- if [ ! -r $PREFIX/lib/$ARCH/$COMM/tarch ] ; then +- ( cd $PREFIX/lib/$ARCH/$COMM ; ln -s ../../../bin/tarch tarch ) +- echo "/bin/rm -f $PREFIX/lib/$ARCH/$COMM/tarch" >> $UNINSTALLFILE ++ $Show mv $PREFIX/libdata/$ARCH/$COMM/mpirun.sh $PREFIX/libdata/$ARCH/$COMM/mpirun ++ if [ ! -r $PREFIX/libdata/$ARCH/$COMM/tarch ] ; then ++ ( cd $PREFIX/libdata/$ARCH/$COMM ; ln -s ../../../bin/tarch tarch ) ++ echo "/bin/rm -f $PREFIX/libdata/$ARCH/$COMM/tarch" >> $UNINSTALLFILE + fi +- FixupFileWithAt util/mpicc.in $PREFIX/lib/$ARCH/$COMM/mpicc $XMODE ++ FixupFileWithAt util/mpicc.in $PREFIX/libdata/$ARCH/$COMM/mpicc $XMODE + if [ -n "@CPP_COMPILER@" ] ; then +- FixupFileWithAt util/mpiCC.in $PREFIX/lib/$ARCH/$COMM/mpiCC $XMODE ++ FixupFileWithAt util/mpiCC.in $PREFIX/libdata/$ARCH/$COMM/mpiCC $XMODE + fi +- FixupFileWithAt util/mpif77.in $PREFIX/lib/$ARCH/$COMM/mpif77 $XMODE +- FixupFileWithAt util/mpif90.in $PREFIX/lib/$ARCH/$COMM/mpif90 $XMODE +- FixupFile util/mpireconfig.in $PREFIX/lib/$ARCH/$COMM/mpireconfig $XMODE +- CopyFile lib/$ARCH/$COMM/mpichconf.h $PREFIX/lib/$ARCH/$COMM +- CopyFile lib/$ARCH/$COMM/mpidefs.h $PREFIX/lib/$ARCH/$COMM +- CopyFile lib/$ARCH/$COMM/mpif.h $PREFIX/lib/$ARCH/$COMM ++ FixupFileWithAt util/mpif77.in $PREFIX/libdata/$ARCH/$COMM/mpif77 $XMODE ++ FixupFileWithAt util/mpif90.in $PREFIX/libdata/$ARCH/$COMM/mpif90 $XMODE ++ FixupFile util/mpireconfig.in $PREFIX/libdata/$ARCH/$COMM/mpireconfig $XMODE ++ CopyFile lib/$ARCH/$COMM/mpichconf.h $PREFIX/libdata/$ARCH/$COMM ++ CopyFile lib/$ARCH/$COMM/mpidefs.h $PREFIX/libdata/$ARCH/$COMM ++ CopyFile lib/$ARCH/$COMM/mpif.h $PREFIX/libdata/$ARCH/$COMM + if [ -s romio/include/mpio.h ] ; then +- CopyFile romio/include/mpio.h $PREFIX/lib/$ARCH/$COMM +- CopyFile romio/include/mpiof.h $PREFIX/lib/$ARCH/$COMM ++ CopyFile romio/include/mpio.h $PREFIX/libdata/$ARCH/$COMM ++ CopyFile romio/include/mpiof.h $PREFIX/libdata/$ARCH/$COMM + fi +@@ -601,8 +604,8 @@ + CopyFile mpid/ch_p4/p4/bin/serv_p4 $PREFIX/bin $XMODE +- CopyFile $PREFIX/bin/serv_p4 $PREFIX/lib/$ARCH/$COMM $XMODE ++ CopyFile $PREFIX/bin/serv_p4 $PREFIX/libdata/$ARCH/$COMM $XMODE + $Show /bin/rm -f util/chp4_servs +- FixupFile util/chp4_servs.in $PREFIX/util/chp4_servs $XMODE +- CopyFile $PREFIX/util/chp4_servs $PREFIX/lib/$ARCH/$COMM $XMODE +- CopyFile util/chkserv $PREFIX/util/chkserv $XMODE +- CopyFile $PREFIX/util/chkserv $PREFIX/lib/$ARCH/$COMM $XMODE ++ FixupFile util/chp4_servs.in $PREFIX/share/util/chp4_servs $XMODE ++ CopyFile $PREFIX/share/util/chp4_servs $PREFIX/libdata/$ARCH/$COMM $XMODE ++ CopyFile util/chkserv $PREFIX/share/util/chkserv $XMODE ++ CopyFile $PREFIX/share/util/chkserv $PREFIX/libdata/$ARCH/$COMM $XMODE + fi +@@ -617,8 +620,8 @@ + CopyFile mpid/server/server $PREFIX/bin $XMODE +- CopyFile mpid/server/server $PREFIX/lib/$ARCH/$COMM $XMODE ++ CopyFile mpid/server/server $PREFIX/libdata/$ARCH/$COMM $XMODE + $Show /bin/rm -f util/chp4_servs +- FixupFile util/chp4_servs.in $PREFIX/util/chp4_servs $XMODE +- CopyFile $PREFIX/util/chp4_servs $PREFIX/lib/$ARCH/$COMM $XMODE +- CopyFile util/chkserv $PREFIX/util/chkserv $XMODE +- CopyFile $PREFIX/util/chkserv $PREFIX/lib/$ARCH/$COMM $XMODE ++ FixupFile util/chp4_servs.in $PREFIX/share/util/chp4_servs $XMODE ++ CopyFile $PREFIX/share/util/chp4_servs $PREFIX/libdata/$ARCH/$COMM $XMODE ++ CopyFile util/chkserv $PREFIX/share/util/chkserv $XMODE ++ CopyFile $PREFIX/share/util/chkserv $PREFIX/libdata/$ARCH/$COMM $XMODE + else +@@ -631,7 +634,7 @@ + # Machines database +- # if [ ! -d $PREFIX/util/machines.anl ] ; then \ +- # mkdir $PREFIX/util/machines.anl ; fi +- # $CPRP -r util/machines $PREFIX/util/machines.anl ++ # if [ ! -d $PREFIX/share/util/machines.anl ] ; then \ ++ # mkdir $PREFIX/share/util/machines.anl ; fi ++ # $CPRP -r util/machines $PREFIX/share/util/machines.anl + for file in util/machines/machines* ; do +- CopyFile $file $PREFIX/util/machines ++ CopyFile $file $PREFIX/share/util/machines + done +@@ -639,3 +642,3 @@ + if [ -f $file ] ; then +- CopyFile $file $PREFIX/lib/bitmaps ++ CopyFile $file $PREFIX/libdata/bitmaps + fi +@@ -651,4 +654,4 @@ + CopyFile include/patchlevel.h $PREFIX/include +- CopyFile lib/$ARCH/$COMM/mpichconf.h $PREFIX/lib/$ARCH/$COMM +- CopyFile lib/$ARCH/$COMM/mpidefs.h $PREFIX/lib/$ARCH/$COMM ++ CopyFile lib/$ARCH/$COMM/mpichconf.h $PREFIX/libdata/$ARCH/$COMM ++ CopyFile lib/$ARCH/$COMM/mpidefs.h $PREFIX/libdata/$ARCH/$COMM + CopyFile mpe/mpe.h $PREFIX/include +@@ -659,4 +662,4 @@ + if [ -s romio/include/mpio.h ] ; then +- CopyFile romio/include/mpio.h $PREFIX/lib/$ARCH/$COMM +- CopyFile romio/include/mpiof.h $PREFIX/lib/$ARCH/$COMM ++ CopyFile romio/include/mpio.h $PREFIX/libdata/$ARCH/$COMM ++ CopyFile romio/include/mpiof.h $PREFIX/libdata/$ARCH/$COMM + fi +@@ -666,7 +669,7 @@ + if [ -n "$CPP_DIR" -a "$buildcpp" = 1 ] ; then +- if [ ! -d $PREFIX/lib/$ARCH/$COMM/c++ ] ; then +- MkDir $PREFIX/lib/$ARCH/$COMM/c++ ++ if [ ! -d $PREFIX/libdata/$ARCH/$COMM/c++ ] ; then ++ MkDir $PREFIX/libdata/$ARCH/$COMM/c++ + fi + for file in `ls MPI-2-C++/src/*.h`; do +- CopyFile $file $PREFIX/lib/$ARCH/$COMM/c++ ++ CopyFile $file $PREFIX/libdata/$ARCH/$COMM/c++ + done +@@ -677,3 +680,3 @@ + if [ -f $file ] ; then +- CopyFileP $file $PREFIX/lib/$ARCH/$COMM ++ CopyFileP $file $PREFIX/libdata/$ARCH/$COMM + fi +@@ -686,3 +689,3 @@ + if [ -x lib/$ARCH/$COMM/$file ] ; then +- CopyFileP lib/$ARCH/$COMM/$file $PREFIX/lib/$ARCH/$COMM ++ CopyFileP lib/$ARCH/$COMM/$file $PREFIX/libdata/$ARCH/$COMM + fi +@@ -698,4 +701,4 @@ + if [ -f lib/$ARCH/mpich.En_US.cat ] ; then +- $Show ln -s $PREFIX/lib/$ARCH/mpich.En_US.cat \ +- $PREFIX/lib/$ARCH/mpich.cat ++ $Show ln -s $PREFIX/libdata/$ARCH/mpich.En_US.cat \ ++ $PREFIX/libdata/$ARCH/mpich.cat + fi +@@ -703,3 +706,3 @@ + # This will handle the case of no mpich.* matches +- CopyFile $file $PREFIX/lib/$ARCH ++ CopyFile $file $PREFIX/libdata/$ARCH + fi +@@ -709,3 +712,3 @@ + # Other files in lib need to be updated... +-CopyFile lib/$ARCH/$COMM/mpidefs.h $PREFIX/lib/$ARCH/$COMM ++CopyFile lib/$ARCH/$COMM/mpidefs.h $PREFIX/libdata/$ARCH/$COMM + # +@@ -737,3 +740,3 @@ + if [ -f $file ] ; then +- CopyFile doc/$file $PREFIX/doc ++ CopyFile doc/$file $PREFIX/share/doc/mpi + fi +@@ -742,6 +745,6 @@ + if [ -f ref/adiman.ps.Z ] ; then +- CopyFile ref/adiman.ps.Z $PREFIX/doc ++ CopyFile ref/adiman.ps.Z $PREFIX/share/doc/mpi + fi + if [ -f ref/mpiman.ps.Z ] ; then +- CopyFile ref/mpiman.ps.Z $PREFIX/doc ++ CopyFile ref/mpiman.ps.Z $PREFIX/share/doc/mpi + fi +@@ -757,12 +760,12 @@ + sed -e "s%MPIR_HOME=.*\$%MPIR_HOME='$PREFIX'%g" \ +- -e "s%^LIB_PATH=\([^/ ]*\)/[^ ']*%LIB_PATH=\1$PREFIX/lib/$ARCH/$COMM%g" \ +- -e "s%^FLIB_PATH=\([^/ ]*\)/[^ ']*%FLIB_PATH=\1$PREFIX/lib/$ARCH/$COMM%g" \ ++ -e "s%^LIB_PATH=\([^/ ]*\)/[^ ']*%LIB_PATH=\1$PREFIX/libdata/$ARCH/$COMM%g" \ ++ -e "s%^FLIB_PATH=\([^/ ]*\)/[^ ']*%FLIB_PATH=\1$PREFIX/libdata/$ARCH/$COMM%g" \ + -e "s%MPE_DIR=.*\$%MPE_DIR='$PREFIX/mpe'%g" \ +- -e "s%^MPICC=\([^/ ]*\)/.*\$%MPICC=$PREFIX/lib/$ARCH/$COMM/mpicc%g" \ +- -e "s%^MPIF77=\([^/ ]*\)/.*\$%MPIF77=$PREFIX/lib/$ARCH/$COMM/mpif77%g" \ +- -e "s%^MPIF90=\([^/ ]*\)/.*\$%MPIF90=$PREFIX/lib/$ARCH/$COMM/mpif90%g" \ +- -e "s%^MPICPLUSPLUS=\([^/ ]*\)/.*\$%MPICPLUSPLUS=$PREFIX/lib/$ARCH/$COMM/mpiCC%g" \ +- > $PREFIX/lib/$ARCH/$COMM/config.status +- echo "/bin/rm -f $PREFIX/lib/$ARCH/$COMM/config.status" >> $UNINSTALLFILE +- chmod $XMODE $PREFIX/lib/$ARCH/$COMM/config.status ++ -e "s%^MPICC=\([^/ ]*\)/.*\$%MPICC=$PREFIX/libdata/$ARCH/$COMM/mpicc%g" \ ++ -e "s%^MPIF77=\([^/ ]*\)/.*\$%MPIF77=$PREFIX/libdata/$ARCH/$COMM/mpif77%g" \ ++ -e "s%^MPIF90=\([^/ ]*\)/.*\$%MPIF90=$PREFIX/libdata/$ARCH/$COMM/mpif90%g" \ ++ -e "s%^MPICPLUSPLUS=\([^/ ]*\)/.*\$%MPICPLUSPLUS=$PREFIX/libdata/$ARCH/$COMM/mpiCC%g" \ ++ > $PREFIX/libdata/$ARCH/$COMM/config.status ++ echo "/bin/rm -f $PREFIX/libdata/$ARCH/$COMM/config.status" >> $UNINSTALLFILE ++ chmod $XMODE $PREFIX/libdata/$ARCH/$COMM/config.status + else +@@ -771,11 +774,11 @@ + sed -e "s%MPIR_HOME=.*\$%MPIR_HOME='$PREFIX'%g" \ +- -e "s%^LIB_PATH=\([^/ ]*\)/[^ ']*%LIB_PATH=\1$PREFIX/lib/$ARCH/$COMM%g" \ +- -e "s%^FLIB_PATH=\([^/ ]*\)/[^ ']*%FLIB_PATH=\1$PREFIX/lib/$ARCH/$COMM%g" \ ++ -e "s%^LIB_PATH=\([^/ ]*\)/[^ ']*%LIB_PATH=\1$PREFIX/libdata/$ARCH/$COMM%g" \ ++ -e "s%^FLIB_PATH=\([^/ ]*\)/[^ ']*%FLIB_PATH=\1$PREFIX/libdata/$ARCH/$COMM%g" \ + -e "s%MPE_DIR=.*\$%MPE_DIR='$PREFIX/mpe'%g" \ +- -e "s%^MPICC=\([^/ ]*\)/.*\$%MPICC=$PREFIX/lib/$ARCH/$COMM/mpicc%g" \ +- -e "s%^MPIF77=\([^/ ]*\)/.*\$%MPIF77=$PREFIX/lib/$ARCH/$COMM/mpif77%g" \ +- -e "s%^MPIF90=\([^/ ]*\)/.*\$%MPIF90=$PREFIX/lib/$ARCH/$COMM/mpif90%g" \ +- -e "s%^MPICPLUSPLUS=\([^/ ]*\)/.*\$%MPICPLUSPLUS=$PREFIX/lib/$ARCH/$COMM/mpiCC%g" \ +- > $PREFIX/lib/$ARCH/$COMM/config.status +- chmod $XMODE $PREFIX/lib/$ARCH/$COMM/config.status ++ -e "s%^MPICC=\([^/ ]*\)/.*\$%MPICC=$PREFIX/libdata/$ARCH/$COMM/mpicc%g" \ ++ -e "s%^MPIF77=\([^/ ]*\)/.*\$%MPIF77=$PREFIX/libdata/$ARCH/$COMM/mpif77%g" \ ++ -e "s%^MPIF90=\([^/ ]*\)/.*\$%MPIF90=$PREFIX/libdata/$ARCH/$COMM/mpif90%g" \ ++ -e "s%^MPICPLUSPLUS=\([^/ ]*\)/.*\$%MPICPLUSPLUS=$PREFIX/libdata/$ARCH/$COMM/mpiCC%g" \ ++ > $PREFIX/libdata/$ARCH/$COMM/config.status ++ chmod $XMODE $PREFIX/libdata/$ARCH/$COMM/config.status + . +@@ -783,7 +786,7 @@ + if [ -z "$libonly" ] ; then +- #CopyFile $PREFIX/lib/$ARCH/$COMM/config.status $PREFIX ++ #CopyFile $PREFIX/libdata/$ARCH/$COMM/config.status $PREFIX + # +- $Show /bin/rm -f $PREFIX/examples/mpif.h +- $Show ln -s $PREFIX/include/mpif.h $PREFIX/examples/mpif.h +- echo "/bin/rm -f $PREFIX/examples/mpif.h" >> $UNINSTALLFILE ++ $Show /bin/rm -f $PREFIX/share/examples/mpi/mpif.h ++ $Show ln -s $PREFIX/include/mpif.h $PREFIX/share/examples/mpi/mpif.h ++ echo "/bin/rm -f $PREFIX/share/examples/mpi/mpif.h" >> $UNINSTALLFILE + fi +@@ -791,3 +794,3 @@ + # Example programs +-CopyFile installtest/Makefile.in $PREFIX/examples ++CopyFile installtest/Makefile.in $PREFIX/share/examples/mpi + # +@@ -796,24 +799,24 @@ + PREFIX=$APREFIX +-#FixupFile installtest/makefile.proto $PREFIX/examples/Makefile +-(cd $PREFIX/examples ; $PREFIX/lib/$ARCH/$COMM/mpireconfig Makefile ) +-echo "(cd $PREFIX/examples ; $MAKE clean)" >> $UNINSTALLFILE +-echo "/bin/rm -f $PREFIX/examples/Makefile" >> $UNINSTALLFILE ++#FixupFile installtest/makefile.proto $PREFIX/share/examples/mpi/Makefile ++(cd $PREFIX/share/examples/mpi ; $PREFIX/libdata/$ARCH/$COMM/mpireconfig Makefile ) ++echo "(cd $PREFIX/share/examples/mpi ; $MAKE clean)" >> $UNINSTALLFILE ++echo "/bin/rm -f $PREFIX/share/examples/mpi/Makefile" >> $UNINSTALLFILE + PREFIX=$Savevar +-CopyFile $PREFIX/examples/Makefile $PREFIX/lib/$ARCH/$COMM/Makefile.sample +-CopyFile installtest/cpi.c $PREFIX/examples +-CopyFile installtest/pi3.f $PREFIX/examples +-CopyFile installtest/cpilog.c $PREFIX/examples +-CopyFile installtest/hello++.cc $PREFIX/examples ++CopyFile $PREFIX/share/examples/mpi/Makefile $PREFIX/libdata/$ARCH/$COMM/Makefile.sample ++CopyFile installtest/cpi.c $PREFIX/share/examples/mpi ++CopyFile installtest/pi3.f $PREFIX/share/examples/mpi ++CopyFile installtest/cpilog.c $PREFIX/share/examples/mpi ++CopyFile installtest/hello++.cc $PREFIX/share/examples/mpi + if [ -s romio/test/simple.c ] ; then +- CopyFile romio/test/simple.c $PREFIX/examples/simpleio.c ++ CopyFile romio/test/simple.c $PREFIX/share/examples/mpi/simpleio.c + fi +-CopyFile installtest/README $PREFIX/examples ++CopyFile installtest/README $PREFIX/share/examples/mpi + # + # Test build the examples +-$Show "(cd $PREFIX/examples ; /bin/rm -f mpirun ; \ ++$Show "(cd $PREFIX/share/examples/mpi ; /bin/rm -f mpirun ; \ + ln -s ../bin/mpirun mpirun )" +-echo "/bin/rm -f $PREFIX/examples/mpirun" >> $UNINSTALLFILE ++echo "/bin/rm -f $PREFIX/share/examples/mpi/mpirun" >> $UNINSTALLFILE + # + echo "About to run installation test..." +-$Show "(cd $PREFIX/examples; $MAKE all )" ++$Show "(cd $PREFIX/share/examples/mpi; $MAKE all )" + # +@@ -823,24 +826,24 @@ + # C++ Example programs +- CopyFile installtest/mpi-2-c++/Makefile.in $PREFIX/$CPP_DIR/examples ++ CopyFile installtest/mpi-2-c++/Makefile.in $PREFIX/share/examples/$CPP_DIR + # + PREFIX=$APREFIX +- (cd $PREFIX/$CPP_DIR/examples ; $PREFIX/lib/$ARCH/$COMM/mpireconfig Makefile ) +- echo "(cd $PREFIX/$CPP_DIR/examples ; $MAKE clean)" >> $UNINSTALLFILE +- echo "/bin/rm -f $PREFIX/$CPP_DIR/examples/Makefile" >> $UNINSTALLFILE ++ (cd $PREFIX/share/examples/$CPP_DIR ; $PREFIX/libdata/$ARCH/$COMM/mpireconfig Makefile ) ++ echo "(cd $PREFIX/share/examples/$CPP_DIR ; $MAKE clean)" >> $UNINSTALLFILE ++ echo "/bin/rm -f $PREFIX/share/examples/$CPP_DIR/Makefile" >> $UNINSTALLFILE + PREFIX=$Savevar +- CopyFile $CPP_DIR/contrib/examples/hello_world.cc $PREFIX/$CPP_DIR/examples +- CopyFile $CPP_DIR/contrib/examples/ring.cc $PREFIX/$CPP_DIR/examples +- CopyFile $CPP_DIR/contrib/examples/topology.cc $PREFIX/$CPP_DIR/examples +- CopyFile $CPP_DIR/contrib/examples/user_bcast.cc $PREFIX/$CPP_DIR/examples +- CopyFile $CPP_DIR/contrib/examples/chapter_10_mpi2.cc $PREFIX/$CPP_DIR/examples +- CopyFile $CPP_DIR/contrib/examples/pi.cc $PREFIX/$CPP_DIR/examples +- CopyFile $CPP_DIR/contrib/examples/README $PREFIX/$CPP_DIR/examples ++ CopyFile $CPP_DIR/contrib/examples/hello_world.cc $PREFIX/share/examples/$CPP_DIR ++ CopyFile $CPP_DIR/contrib/examples/ring.cc $PREFIX/share/examples/$CPP_DIR ++ CopyFile $CPP_DIR/contrib/examples/topology.cc $PREFIX/share/examples/$CPP_DIR ++ CopyFile $CPP_DIR/contrib/examples/user_bcast.cc $PREFIX/share/examples/$CPP_DIR ++ CopyFile $CPP_DIR/contrib/examples/chapter_10_mpi2.cc $PREFIX/share/examples/$CPP_DIR ++ CopyFile $CPP_DIR/contrib/examples/pi.cc $PREFIX/share/examples/$CPP_DIR ++ CopyFile $CPP_DIR/contrib/examples/README $PREFIX/share/examples/$CPP_DIR + # + # Test build the C++ examples +- $Show "(cd $PREFIX/$CPP_DIR/examples ; /bin/rm -f mpirun ; \ ++ $Show "(cd $PREFIX/share/examples/$CPP_DIR ; /bin/rm -f mpirun ; \ + ln -s ../../bin/mpirun mpirun )" +- echo "/bin/rm -f $PREFIX/$CPP_DIR/examples/mpirun" >> $UNINSTALLFILE ++ echo "/bin/rm -f $PREFIX/share/examples/$CPP_DIR/mpirun" >> $UNINSTALLFILE + # + echo "About to run C++ installation test..." +- $Show "(cd $PREFIX/$CPP_DIR/examples; $MAKE)" ++ $Show "(cd $PREFIX/share/examples/$CPP_DIR; $MAKE)" + # diff --git a/parallel/mpi-ch/patches/patch-am b/parallel/mpi-ch/patches/patch-am new file mode 100644 index 00000000000..9b0e9e61fd2 --- /dev/null +++ b/parallel/mpi-ch/patches/patch-am @@ -0,0 +1,8 @@ +$NetBSD: patch-am,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $ +--- mpe/profiling/nupshot/tkAppInit.c.orig Thu Aug 6 05:46:29 1998 ++++ mpe/profiling/nupshot/tkAppInit.c Thu Aug 6 05:46:42 1998 +@@ -100,3 +100,3 @@ + +- tcl_RcFileName = "~/.wishrc"; ++/* tcl_RcFileName = "~/.wishrc";*/ + return TCL_OK; -- cgit v1.2.3