Update to MPICH2 1.3.1 Changes in 1.3.1 # OVERALL: MPICH2 is now fully compliant with the CIFTS FTB standard MPI events (based on the draft standard). # OVERALL: Major improvements to RMA performance for long lists of RMA operations. # OVERALL: Performance improvements for Group_translate_ranks. # COLLECTIVES: Collective algorithm selection thresholds can now be controlled at runtime via environment variables. # ROMIO: PVFS error codes are now mapped to MPI error codes. # Several other minor bug fixes, memory leak fixes, and code cleanup. A full list of changes is available using: svn log -r7350:HEAD https://svn.mcs.anl.gov/repos/mpi/mpich2/tags/release/mpich2-1.3.1 ... or at the following link: https://trac.mcs.anl.gov/projects/mpich2/log/mpich2/tags/release/mpich2-1.3.1?action=follow_copy&rev=HEAD&stop_rev=7350&mode=follow_copy Changes in 1.3 # OVERALL: Initial support for fine-grained threading in ch3:nemesis:tcp. # OVERALL: Support for Asynchronous Communication Progress. # OVERALL: The ssm and shm channels have been removed. # OVERALL: Checkpoint/restart support using BLCR. # OVERALL: Improved tolerance to process and communication failures when error handler is set to MPI_ERRORS_RETURN. If a communication operation fails (e.g., due to a process failure) MPICH2 will return an error, and further communication to that process is not possible. However, communication with other processes will still proceed normally. Note, however, that the behavior collective operations on communicators containing the failed process is undefined, and may give incorrect results or hang some processes. # OVERALL: Experimental support for inter-library dependencies. # PM/PMI: Hydra is now the default process management framework replacing MPD. # PM/PMI: Added dynamic process support for Hydra. # PM/PMI: Added support for LSF, SGE and POE in Hydra. # PM/PMI: Added support for CPU and memory/cache topology aware process-core binding. # DEBUGGER: Improved support and bug fixes in the Totalview support. # Build system: Replaced F90/F90FLAGS by FC/FCFLAGS. F90/F90FLAGS are not longer supported in the configure. # Multi-compiler support: On systems where C compiler that is used to build mpich2 libraries supports multiple weak symbols and multiple aliases, the Fortran binding built in the mpich2 libraries can handle different Fortran compilers (than the one used to build mpich2). Details in README. # Several other minor bug fixes, memory leak fixes, and code cleanup. A full list of changes is available using: svn log -r5762:HEAD https://svn.mcs.anl.gov/repos/mpi/mpich2/tags/release/mpich2-1.3 ... or at the following link: https://trac.mcs.anl.gov/projects/mpich2/log/mpich2/tags/release/mpich2-1.3?action=follow_copy&rev=HEAD&stop_rev=5762&mode=follow_copydiff -r1.65 -r1.66 pkgsrc/parallel/mpi-ch/Makefile
(asau)
@@ -1,79 +1,71 @@ | @@ -1,79 +1,71 @@ | |||
1 | # $NetBSD: Makefile,v 1.65 2010/07/30 10:36:33 asau Exp $ | 1 | # $NetBSD: Makefile,v 1.66 2010/12/17 02:47:18 asau Exp $ | |
2 | 2 | |||
3 | DISTNAME= mpich2-1.2.1p1 | 3 | DISTNAME= mpich2-1.3.1 | |
4 | #PKGREVISION= 1 | |||
5 | CATEGORIES= parallel | 4 | CATEGORIES= parallel | |
6 | MASTER_SITES= http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/1.2.1p1/ | 5 | MASTER_SITES= http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/1.3.1/ | |
7 | 6 | |||
8 | MAINTAINER= asau@inbox.ru | 7 | MAINTAINER= asau@inbox.ru | |
9 | HOMEPAGE= http://www.mcs.anl.gov/research/projects/mpich2/ | 8 | HOMEPAGE= http://www.mcs.anl.gov/research/projects/mpich2/ | |
10 | COMMENT= Open source MPI and MPI-2 implementation from Univ. of Chicago | 9 | COMMENT= Open source MPI and MPI-2 implementation from Univ. of Chicago | |
11 | 10 | |||
12 | CONFLICTS+= musicpd-[0-9]* # installs bin/mpd | |||
13 | CONFLICTS+= mpich-[0-9]* # installs bin/mpicc & other wrappers | 11 | CONFLICTS+= mpich-[0-9]* # installs bin/mpicc & other wrappers | |
14 | CONFLICTS+= openmpi-[0-9]* # installs bin/mpicc & other wrappers | 12 | CONFLICTS+= openmpi-[0-9]* # installs bin/mpicc & other wrappers | |
15 | 13 | |||
16 | PKG_DESTDIR_SUPPORT= user-destdir | 14 | PKG_DESTDIR_SUPPORT= user-destdir | |
17 | 15 | |||
18 | MAKE_JOBS_SAFE= no | 16 | MAKE_JOBS_SAFE= no | |
19 | 17 | |||
18 | DEPENDS+= bash-[0-9]*:../../shells/bash | |||
19 | ||||
20 | GNU_CONFIGURE= yes | 20 | GNU_CONFIGURE= yes | |
21 | USE_LANGUAGES= c c++ fortran77 | 21 | USE_LANGUAGES= c c++ fortran77 | |
22 | 22 | |||
23 | PKG_SYSCONFSUBDIR= mpich | 23 | PKG_SYSCONFSUBDIR= mpich | |
24 | 24 | |||
25 | CONFIGURE_ARGS+= --datadir=${PREFIX}/share/${PKGBASE} | 25 | CONFIGURE_ARGS+= --datadir=${PREFIX}/share/${PKGBASE} | |
26 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} | 26 | CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} | |
27 | CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/${PKGBASE} | 27 | CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/${PKGBASE} | |
28 | CONFIGURE_ARGS+= --htmldir=${PREFIX}/share/doc/${PKGBASE}/html | 28 | CONFIGURE_ARGS+= --htmldir=${PREFIX}/share/doc/${PKGBASE}/html | |
29 | 29 | |||
30 | CONFIGURE_ARGS+= --disable-f90 # problems? | 30 | CONFIGURE_ARGS+= --with-pm=hydra:gforker | |
31 | CONFIGURE_ARGS+= --without-java | 31 | CONFIGURE_ARGS+= --with-hydra-bindlib=plpa # problems with hwloc | |
32 | CONFIGURE_ARGS+= --without-java2 | 32 | CONFIGURE_ARGS+= --disable-fc # problems? | |
33 | CONFIGURE_ARGS+= --with-openpa-prefix=$(BUILDLINK_PREFIX.openpa:Q) # reuse it | |||
33 | 34 | |||
34 | USE_TOOLS+= perl:run | 35 | USE_TOOLS+= perl:run | |
35 | 36 | |||
36 | REPLACE_PYTHON+= src/pm/mpd/*.py src/pm/mpd/test/*.py | |||
37 | ||||
38 | CONF_FILES+= share/${PKGBASE}/examples/mpe_callstack_ldflags.conf \ | 37 | CONF_FILES+= share/${PKGBASE}/examples/mpe_callstack_ldflags.conf \ | |
39 | ${PKG_SYSCONFDIR}/mpe_callstack_ldflags.conf | 38 | ${PKG_SYSCONFDIR}/mpe_callstack_ldflags.conf | |
40 | CONF_FILES+= share/${PKGBASE}/examples/mpe_f77env.conf \ | 39 | CONF_FILES+= share/${PKGBASE}/examples/mpe_f77env.conf \ | |
41 | ${PKG_SYSCONFDIR}/mpe_f77env.conf | 40 | ${PKG_SYSCONFDIR}/mpe_f77env.conf | |
42 | CONF_FILES+= share/${PKGBASE}/examples/mpe_help.conf \ | 41 | CONF_FILES+= share/${PKGBASE}/examples/mpe_help.conf \ | |
43 | ${PKG_SYSCONFDIR}/mpe_help.conf | 42 | ${PKG_SYSCONFDIR}/mpe_help.conf | |
44 | CONF_FILES+= share/${PKGBASE}/examples/mpe_log.conf \ | 43 | CONF_FILES+= share/${PKGBASE}/examples/mpe_log.conf \ | |
45 | ${PKG_SYSCONFDIR}/mpe_log.conf | 44 | ${PKG_SYSCONFDIR}/mpe_log.conf | |
46 | CONF_FILES+= share/${PKGBASE}/examples/mpe_log_postlib.conf \ | 45 | CONF_FILES+= share/${PKGBASE}/examples/mpe_log_postlib.conf \ | |
47 | ${PKG_SYSCONFDIR}/mpe_log_postlib.conf | 46 | ${PKG_SYSCONFDIR}/mpe_log_postlib.conf | |
48 | CONF_FILES+= share/${PKGBASE}/examples/mpe_mpicheck.conf \ | 47 | CONF_FILES+= share/${PKGBASE}/examples/mpe_mpicheck.conf \ | |
49 | ${PKG_SYSCONFDIR}/mpe_mpicheck.conf | 48 | ${PKG_SYSCONFDIR}/mpe_mpicheck.conf | |
50 | CONF_FILES+= share/${PKGBASE}/examples/mpe_mpilog.conf \ | 49 | CONF_FILES+= share/${PKGBASE}/examples/mpe_mpilog.conf \ | |
51 | ${PKG_SYSCONFDIR}/mpe_mpilog.conf | 50 | ${PKG_SYSCONFDIR}/mpe_mpilog.conf | |
52 | CONF_FILES+= share/${PKGBASE}/examples/mpe_mpitrace.conf \ | 51 | CONF_FILES+= share/${PKGBASE}/examples/mpe_mpitrace.conf \ | |
53 | ${PKG_SYSCONFDIR}/mpe_mpitrace.conf | 52 | ${PKG_SYSCONFDIR}/mpe_mpitrace.conf | |
54 | CONF_FILES+= share/${PKGBASE}/examples/mpe_nolog.conf \ | 53 | CONF_FILES+= share/${PKGBASE}/examples/mpe_nolog.conf \ | |
55 | ${PKG_SYSCONFDIR}/mpe_nolog.conf | 54 | ${PKG_SYSCONFDIR}/mpe_nolog.conf | |
56 | ||||
57 | CONF_FILES+= share/${PKGBASE}/examples/mpicc.conf \ | 55 | CONF_FILES+= share/${PKGBASE}/examples/mpicc.conf \ | |
58 | ${PKG_SYSCONFDIR}/mpicc.conf | 56 | ${PKG_SYSCONFDIR}/mpicc.conf | |
59 | CONF_FILES+= share/${PKGBASE}/examples/mpicxx.conf \ | 57 | CONF_FILES+= share/${PKGBASE}/examples/mpicxx.conf \ | |
60 | ${PKG_SYSCONFDIR}/mpicxx.conf | 58 | ${PKG_SYSCONFDIR}/mpicxx.conf | |
61 | CONF_FILES+= share/${PKGBASE}/examples/mpif77.conf \ | 59 | CONF_FILES+= share/${PKGBASE}/examples/mpif77.conf \ | |
62 | ${PKG_SYSCONFDIR}/mpif77.conf | 60 | ${PKG_SYSCONFDIR}/mpif77.conf | |
63 | CONF_FILES+= share/${PKGBASE}/examples/mpixxx_opts.conf \ | |||
64 | ${PKG_SYSCONFDIR}/mpixxx_opts.conf | |||
65 | ||||
66 | # disable bundled OpenPA: | |||
67 | post-extract: | |||
68 | mv $(WRKSRC)/src/openpa $(WRKSRC)/src/openpa.off | |||
69 | ||||
70 | .include "../../mk/bsd.prefs.mk" | |||
71 | 61 | |||
72 | # FreeBSD 6 hack: | 62 | # FreeBSD 6 hack: | |
63 | .include "../../mk/bsd.prefs.mk" | |||
73 | .if $(OPSYS) == "FreeBSD" || $(OPSYS) == "DragonFly" | 64 | .if $(OPSYS) == "FreeBSD" || $(OPSYS) == "DragonFly" | |
74 | BUILDLINK_TRANSFORM+= rm:-lrt | 65 | BUILDLINK_TRANSFORM+= rm:-lrt | |
75 | .endif | 66 | .endif | |
76 | 67 | |||
77 | .include "../../lang/python/application.mk" | 68 | .include "options.mk" | |
69 | ||||
78 | .include "../../parallel/openpa/buildlink3.mk" | 70 | .include "../../parallel/openpa/buildlink3.mk" | |
79 | .include "../../mk/bsd.pkg.mk" | 71 | .include "../../mk/bsd.pkg.mk" |
@@ -1,109 +1,63 @@ | @@ -1,109 +1,63 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.14 2009/12/13 18:38:10 asau Exp $ | 1 | @comment $NetBSD: PLIST,v 1.15 2010/12/17 02:47:18 asau Exp $ | |
2 | bin/bt2line | |||
2 | bin/check_callstack | 3 | bin/check_callstack | |
3 | bin/clog2_join | 4 | bin/clog2_join | |
4 | bin/clog2_print | 5 | bin/clog2_print | |
5 | bin/clog2_repair | 6 | bin/clog2_repair | |
6 | bin/mpd | 7 | bin/hydra_nameserver | |
7 | bin/mpd.py | 8 | bin/hydra_persist | |
8 | bin/mpdallexit | 9 | bin/hydra_pmi_proxy | |
9 | bin/mpdallexit.py | |||
10 | bin/mpdboot | |||
11 | bin/mpdboot.py | |||
12 | bin/mpdcheck | |||
13 | bin/mpdcheck.py | |||
14 | bin/mpdchkpyver.py | |||
15 | bin/mpdcleanup | |||
16 | bin/mpdcleanup.py | |||
17 | bin/mpdexit | |||
18 | bin/mpdexit.py | |||
19 | bin/mpdgdbdrv.py | |||
20 | bin/mpdhelp | |||
21 | bin/mpdhelp.py | |||
22 | bin/mpdkilljob | |||
23 | bin/mpdkilljob.py | |||
24 | bin/mpdlib.py | |||
25 | bin/mpdlistjobs | |||
26 | bin/mpdlistjobs.py | |||
27 | bin/mpdman.py | |||
28 | bin/mpdringtest | |||
29 | bin/mpdringtest.py | |||
30 | bin/mpdroot | |||
31 | bin/mpdrun | |||
32 | bin/mpdrun.py | |||
33 | bin/mpdsigjob | |||
34 | bin/mpdsigjob.py | |||
35 | bin/mpdtrace | |||
36 | bin/mpdtrace.py | |||
37 | bin/mpic++ | 10 | bin/mpic++ | |
38 | bin/mpicc | 11 | bin/mpicc | |
39 | bin/mpich2version | 12 | bin/mpich2version | |
40 | bin/mpicxx | 13 | bin/mpicxx | |
41 | bin/mpiexec | 14 | bin/mpiexec | |
42 | bin/mpiexec.gforker | 15 | bin/mpiexec.gforker | |
43 | bin/mpiexec.hydra | 16 | bin/mpiexec.hydra | |
44 | bin/mpiexec.py | |||
45 | bin/mpif77 | 17 | bin/mpif77 | |
46 | bin/mpirun | 18 | bin/mpirun | |
47 | bin/mpirun.py | |||
48 | bin/parkill | 19 | bin/parkill | |
49 | bin/pmi_proxy | |||
50 | include/clog_commset.h | 20 | include/clog_commset.h | |
51 | include/clog_const.h | 21 | include/clog_const.h | |
52 | include/clog_inttypes.h | 22 | include/clog_inttypes.h | |
53 | include/clog_uuid.h | 23 | include/clog_uuid.h | |
54 | include/mpe.h | 24 | include/mpe.h | |
55 | include/mpe_callstack.h | 25 | include/mpe_callstack.h | |
56 | include/mpe_graphics.h | 26 | include/mpe_graphics.h | |
57 | include/mpe_log.h | 27 | include/mpe_log.h | |
58 | include/mpe_log_thread.h | 28 | include/mpe_log_thread.h | |
59 | include/mpe_logf.h | 29 | include/mpe_logf.h | |
60 | include/mpe_misc.h | 30 | include/mpe_misc.h | |
61 | include/mpi.h | 31 | include/mpi.h | |
62 | include/mpicxx.h | 32 | include/mpicxx.h | |
63 | include/mpif.h | 33 | include/mpif.h | |
64 | include/mpio.h | 34 | include/mpio.h | |
65 | include/mpiof.h | 35 | include/mpiof.h | |
66 | lib/libfmpich.a | 36 | lib/libfmpich.a | |
67 | lib/liblmpe.a | 37 | lib/liblmpe.a | |
68 | lib/libmpe.a | 38 | lib/libmpe.a | |
69 | lib/libmpe_collchk.a | 39 | lib/libmpe_collchk.a | |
70 | lib/libmpe_f2cmpi.a | 40 | lib/libmpe_f2cmpi.a | |
71 | lib/libmpe_nompi.a | 41 | lib/libmpe_nompi.a | |
72 | lib/libmpe_nompi_null.a | 42 | lib/libmpe_nompi_null.a | |
73 | lib/libmpe_null.a | 43 | lib/libmpe_null.a | |
74 | lib/libmpich.a | 44 | lib/libmpich.a | |
75 | lib/libmpichcxx.a | 45 | lib/libmpichcxx.a | |
46 | lib/libmpl.la | |||
76 | lib/libtmpe.a | 47 | lib/libtmpe.a | |
77 | lib/mpe_prof.o | 48 | lib/mpe_prof.o | |
78 | lib/pkgconfig/mpich2-ch3.pc | 49 | lib/pkgconfig/mpich2-ch3.pc | |
79 | man/man1/MPI.1 | 50 | man/man1/MPI.1 | |
80 | man/man1/Zeroconf.1 | |||
81 | man/man1/mpd.1 | |||
82 | man/man1/mpdallexit.1 | |||
83 | man/man1/mpdboot.1 | |||
84 | man/man1/mpdcheck.1 | |||
85 | man/man1/mpdchkpyver.1 | |||
86 | man/man1/mpdcleanup.1 | |||
87 | man/man1/mpdexit.1 | |||
88 | man/man1/mpdgdbdrv.1 | |||
89 | man/man1/mpdhelp.1 | |||
90 | man/man1/mpdkilljob.1 | |||
91 | man/man1/mpdlib.1 | |||
92 | man/man1/mpdlistjobs.1 | |||
93 | man/man1/mpdman.1 | |||
94 | man/man1/mpdringtest.1 | |||
95 | man/man1/mpdsigjob.1 | |||
96 | man/man1/mpdtrace.1 | |||
97 | man/man1/mpicc.1 | 51 | man/man1/mpicc.1 | |
98 | man/man1/mpicxx.1 | 52 | man/man1/mpicxx.1 | |
99 | man/man1/mpiexec.1 | 53 | man/man1/mpiexec.1 | |
100 | man/man1/mpif77.1 | 54 | man/man1/mpif77.1 | |
101 | man/man1/mpif90.1 | 55 | man/man1/mpif90.1 | |
102 | man/man3/MPI_Abort.3 | 56 | man/man3/MPI_Abort.3 | |
103 | man/man3/MPI_Accumulate.3 | 57 | man/man3/MPI_Accumulate.3 | |
104 | man/man3/MPI_Add_error_class.3 | 58 | man/man3/MPI_Add_error_class.3 | |
105 | man/man3/MPI_Add_error_code.3 | 59 | man/man3/MPI_Add_error_code.3 | |
106 | man/man3/MPI_Add_error_string.3 | 60 | man/man3/MPI_Add_error_string.3 | |
107 | man/man3/MPI_Address.3 | 61 | man/man3/MPI_Address.3 | |
108 | man/man3/MPI_Allgather.3 | 62 | man/man3/MPI_Allgather.3 | |
109 | man/man3/MPI_Allgatherv.3 | 63 | man/man3/MPI_Allgatherv.3 | |
@@ -739,85 +693,85 @@ share/doc/mpich2/html/www3/MPI_Win_get_g | @@ -739,85 +693,85 @@ share/doc/mpich2/html/www3/MPI_Win_get_g | |||
739 | share/doc/mpich2/html/www3/MPI_Win_get_name.html | 693 | share/doc/mpich2/html/www3/MPI_Win_get_name.html | |
740 | share/doc/mpich2/html/www3/MPI_Win_lock.html | 694 | share/doc/mpich2/html/www3/MPI_Win_lock.html | |
741 | share/doc/mpich2/html/www3/MPI_Win_post.html | 695 | share/doc/mpich2/html/www3/MPI_Win_post.html | |
742 | share/doc/mpich2/html/www3/MPI_Win_set_attr.html | 696 | share/doc/mpich2/html/www3/MPI_Win_set_attr.html | |
743 | share/doc/mpich2/html/www3/MPI_Win_set_errhandler.html | 697 | share/doc/mpich2/html/www3/MPI_Win_set_errhandler.html | |
744 | share/doc/mpich2/html/www3/MPI_Win_set_name.html | 698 | share/doc/mpich2/html/www3/MPI_Win_set_name.html | |
745 | share/doc/mpich2/html/www3/MPI_Win_start.html | 699 | share/doc/mpich2/html/www3/MPI_Win_start.html | |
746 | share/doc/mpich2/html/www3/MPI_Win_test.html | 700 | share/doc/mpich2/html/www3/MPI_Win_test.html | |
747 | share/doc/mpich2/html/www3/MPI_Win_unlock.html | 701 | share/doc/mpich2/html/www3/MPI_Win_unlock.html | |
748 | share/doc/mpich2/html/www3/MPI_Win_wait.html | 702 | share/doc/mpich2/html/www3/MPI_Win_wait.html | |
749 | share/doc/mpich2/html/www3/MPI_Wtick.html | 703 | share/doc/mpich2/html/www3/MPI_Wtick.html | |
750 | share/doc/mpich2/html/www3/MPI_Wtime.html | 704 | share/doc/mpich2/html/www3/MPI_Wtime.html | |
751 | share/doc/mpich2/html/www3/index.htm | 705 | share/doc/mpich2/html/www3/index.htm | |
752 | share/doc/mpich2/html/www4/MPE_Add_RGB_color.html | |||
753 | share/doc/mpich2/html/www4/MPE_CaptureFile.html | |||
754 | share/doc/mpich2/html/www4/MPE_Close_graphics.html | |||
755 | share/doc/mpich2/html/www4/MPE_Comm_global_rank.html | |||
756 | share/doc/mpich2/html/www4/MPE_Decomp1d.html | |||
757 | share/doc/mpich2/html/www4/MPE_Describe_comm_event.html | |||
758 | share/doc/mpich2/html/www4/MPE_Describe_comm_state.html | |||
759 | share/doc/mpich2/html/www4/MPE_Describe_event.html | |||
760 | share/doc/mpich2/html/www4/MPE_Describe_info_event.html | |||
761 | share/doc/mpich2/html/www4/MPE_Describe_info_state.html | |||
762 | share/doc/mpich2/html/www4/MPE_Describe_state.html | |||
763 | share/doc/mpich2/html/www4/MPE_Draw_circle.html | |||
764 | share/doc/mpich2/html/www4/MPE_Draw_line.html | |||
765 | share/doc/mpich2/html/www4/MPE_Draw_logic.html | |||
766 | share/doc/mpich2/html/www4/MPE_Draw_point.html | |||
767 | share/doc/mpich2/html/www4/MPE_Draw_points.html | |||
768 | share/doc/mpich2/html/www4/MPE_Draw_string.html | |||
769 | share/doc/mpich2/html/www4/MPE_Errors_call_debugger.html | |||
770 | share/doc/mpich2/html/www4/MPE_Fill_circle.html | |||
771 | share/doc/mpich2/html/www4/MPE_Fill_rectangle.html | |||
772 | share/doc/mpich2/html/www4/MPE_Finish_log.html | |||
773 | share/doc/mpich2/html/www4/MPE_GetHostName.html | |||
774 | share/doc/mpich2/html/www4/MPE_GetTags.html | |||
775 | share/doc/mpich2/html/www4/MPE_Get_mouse_press.html | |||
776 | share/doc/mpich2/html/www4/MPE_IO_Stdout_to_file.html | |||
777 | share/doc/mpich2/html/www4/MPE_Iget_mouse_press.html | |||
778 | share/doc/mpich2/html/www4/MPE_Init_log.html | |||
779 | share/doc/mpich2/html/www4/MPE_Initialized_logging.html | |||
780 | share/doc/mpich2/html/www4/MPE_Line_thickness.html | |||
781 | share/doc/mpich2/html/www4/MPE_Log_bare_event.html | |||
782 | share/doc/mpich2/html/www4/MPE_Log_comm_event.html | |||
783 | share/doc/mpich2/html/www4/MPE_Log_comm_receive.html | |||
784 | share/doc/mpich2/html/www4/MPE_Log_comm_send.html | |||
785 | share/doc/mpich2/html/www4/MPE_Log_event.html | |||
786 | share/doc/mpich2/html/www4/MPE_Log_get_event_number.html | |||
787 | share/doc/mpich2/html/www4/MPE_Log_get_solo_eventID.html | |||
788 | share/doc/mpich2/html/www4/MPE_Log_get_state_eventIDs.html | |||
789 | share/doc/mpich2/html/www4/MPE_Log_info_event.html | |||
790 | share/doc/mpich2/html/www4/MPE_Log_merged_logfilename.html | |||
791 | share/doc/mpich2/html/www4/MPE_Log_pack.html | |||
792 | share/doc/mpich2/html/www4/MPE_Log_receive.html | |||
793 | share/doc/mpich2/html/www4/MPE_Log_send.html | |||
794 | share/doc/mpich2/html/www4/MPE_Log_sync_clocks.html | |||
795 | share/doc/mpich2/html/www4/MPE_Make_color_array.html | |||
796 | share/doc/mpich2/html/www4/MPE_Num_colors.html | |||
797 | share/doc/mpich2/html/www4/MPE_Open_graphics.html | |||
798 | share/doc/mpich2/html/www4/MPE_ReturnTags.html | |||
799 | share/doc/mpich2/html/www4/MPE_Seq_begin.html | |||
800 | share/doc/mpich2/html/www4/MPE_Seq_end.html | |||
801 | share/doc/mpich2/html/www4/MPE_Signals_call_debugger.html | |||
802 | share/doc/mpich2/html/www4/MPE_Start_log.html | |||
803 | share/doc/mpich2/html/www4/MPE_Stop_log.html | |||
804 | share/doc/mpich2/html/www4/MPE_TagsEnd.html | |||
805 | share/doc/mpich2/html/www4/MPE_Update.html | |||
806 | share/doc/mpich2/html/www4/libmpe.cit | |||
807 | share/doc/mpich2/install.pdf | 706 | share/doc/mpich2/install.pdf | |
808 | share/doc/mpich2/logging.pdf | 707 | share/doc/mpich2/logging.pdf | |
809 | share/doc/mpich2/smpd_pmi.pdf | 708 | share/doc/mpich2/smpd_pmi.pdf | |
810 | share/doc/mpich2/user.pdf | 709 | share/doc/mpich2/user.pdf | |
710 | share/mpich2/doc/www4/MPE_Add_RGB_color.html | |||
711 | share/mpich2/doc/www4/MPE_CaptureFile.html | |||
712 | share/mpich2/doc/www4/MPE_Close_graphics.html | |||
713 | share/mpich2/doc/www4/MPE_Comm_global_rank.html | |||
714 | share/mpich2/doc/www4/MPE_Decomp1d.html | |||
715 | share/mpich2/doc/www4/MPE_Describe_comm_event.html | |||
716 | share/mpich2/doc/www4/MPE_Describe_comm_state.html | |||
717 | share/mpich2/doc/www4/MPE_Describe_event.html | |||
718 | share/mpich2/doc/www4/MPE_Describe_info_event.html | |||
719 | share/mpich2/doc/www4/MPE_Describe_info_state.html | |||
720 | share/mpich2/doc/www4/MPE_Describe_state.html | |||
721 | share/mpich2/doc/www4/MPE_Draw_circle.html | |||
722 | share/mpich2/doc/www4/MPE_Draw_line.html | |||
723 | share/mpich2/doc/www4/MPE_Draw_logic.html | |||
724 | share/mpich2/doc/www4/MPE_Draw_point.html | |||
725 | share/mpich2/doc/www4/MPE_Draw_points.html | |||
726 | share/mpich2/doc/www4/MPE_Draw_string.html | |||
727 | share/mpich2/doc/www4/MPE_Errors_call_debugger.html | |||
728 | share/mpich2/doc/www4/MPE_Fill_circle.html | |||
729 | share/mpich2/doc/www4/MPE_Fill_rectangle.html | |||
730 | share/mpich2/doc/www4/MPE_Finish_log.html | |||
731 | share/mpich2/doc/www4/MPE_GetHostName.html | |||
732 | share/mpich2/doc/www4/MPE_GetTags.html | |||
733 | share/mpich2/doc/www4/MPE_Get_mouse_press.html | |||
734 | share/mpich2/doc/www4/MPE_IO_Stdout_to_file.html | |||
735 | share/mpich2/doc/www4/MPE_Iget_mouse_press.html | |||
736 | share/mpich2/doc/www4/MPE_Init_log.html | |||
737 | share/mpich2/doc/www4/MPE_Initialized_logging.html | |||
738 | share/mpich2/doc/www4/MPE_Line_thickness.html | |||
739 | share/mpich2/doc/www4/MPE_Log_bare_event.html | |||
740 | share/mpich2/doc/www4/MPE_Log_comm_event.html | |||
741 | share/mpich2/doc/www4/MPE_Log_comm_receive.html | |||
742 | share/mpich2/doc/www4/MPE_Log_comm_send.html | |||
743 | share/mpich2/doc/www4/MPE_Log_event.html | |||
744 | share/mpich2/doc/www4/MPE_Log_get_event_number.html | |||
745 | share/mpich2/doc/www4/MPE_Log_get_solo_eventID.html | |||
746 | share/mpich2/doc/www4/MPE_Log_get_state_eventIDs.html | |||
747 | share/mpich2/doc/www4/MPE_Log_info_event.html | |||
748 | share/mpich2/doc/www4/MPE_Log_merged_logfilename.html | |||
749 | share/mpich2/doc/www4/MPE_Log_pack.html | |||
750 | share/mpich2/doc/www4/MPE_Log_receive.html | |||
751 | share/mpich2/doc/www4/MPE_Log_send.html | |||
752 | share/mpich2/doc/www4/MPE_Log_sync_clocks.html | |||
753 | share/mpich2/doc/www4/MPE_Make_color_array.html | |||
754 | share/mpich2/doc/www4/MPE_Num_colors.html | |||
755 | share/mpich2/doc/www4/MPE_Open_graphics.html | |||
756 | share/mpich2/doc/www4/MPE_ReturnTags.html | |||
757 | share/mpich2/doc/www4/MPE_Seq_begin.html | |||
758 | share/mpich2/doc/www4/MPE_Seq_end.html | |||
759 | share/mpich2/doc/www4/MPE_Signals_call_debugger.html | |||
760 | share/mpich2/doc/www4/MPE_Start_log.html | |||
761 | share/mpich2/doc/www4/MPE_Stop_log.html | |||
762 | share/mpich2/doc/www4/MPE_TagsEnd.html | |||
763 | share/mpich2/doc/www4/MPE_Update.html | |||
764 | share/mpich2/doc/www4/libmpe.cit | |||
811 | share/mpich2/examples/mpe_callstack_ldflags.conf | 765 | share/mpich2/examples/mpe_callstack_ldflags.conf | |
812 | share/mpich2/examples/mpe_f77env.conf | 766 | share/mpich2/examples/mpe_f77env.conf | |
813 | share/mpich2/examples/mpe_help.conf | 767 | share/mpich2/examples/mpe_help.conf | |
814 | share/mpich2/examples/mpe_log.conf | 768 | share/mpich2/examples/mpe_log.conf | |
815 | share/mpich2/examples/mpe_log_postlib.conf | 769 | share/mpich2/examples/mpe_log_postlib.conf | |
816 | share/mpich2/examples/mpe_mpicheck.conf | 770 | share/mpich2/examples/mpe_mpicheck.conf | |
817 | share/mpich2/examples/mpe_mpilog.conf | 771 | share/mpich2/examples/mpe_mpilog.conf | |
818 | share/mpich2/examples/mpe_mpitrace.conf | 772 | share/mpich2/examples/mpe_mpitrace.conf | |
819 | share/mpich2/examples/mpe_nolog.conf | 773 | share/mpich2/examples/mpe_nolog.conf | |
820 | share/mpich2/examples/mpicc.conf | 774 | share/mpich2/examples/mpicc.conf | |
821 | share/mpich2/examples/mpicxx.conf | 775 | share/mpich2/examples/mpicxx.conf | |
822 | share/mpich2/examples/mpif77.conf | 776 | share/mpich2/examples/mpif77.conf | |
823 | share/mpich2/examples/mpixxx_opts.conf | 777 | share/mpich2/examples/mpixxx_opts.conf | |
@@ -843,13 +797,14 @@ share/mpich2/examples_logging/cpi.c | @@ -843,13 +797,14 @@ share/mpich2/examples_logging/cpi.c | |||
843 | share/mpich2/examples_logging/cpilog.c | 797 | share/mpich2/examples_logging/cpilog.c | |
844 | share/mpich2/examples_logging/cpilog_pack.c | 798 | share/mpich2/examples_logging/cpilog_pack.c | |
845 | share/mpich2/examples_logging/fcomm1_isr.f | 799 | share/mpich2/examples_logging/fcomm1_isr.f | |
846 | share/mpich2/examples_logging/fpilog.f | 800 | share/mpich2/examples_logging/fpilog.f | |
847 | share/mpich2/examples_logging/fpilog_pack.F | 801 | share/mpich2/examples_logging/fpilog_pack.F | |
848 | share/mpich2/examples_logging/iotest.c | 802 | share/mpich2/examples_logging/iotest.c | |
849 | share/mpich2/examples_logging/log_cost.c | 803 | share/mpich2/examples_logging/log_cost.c | |
850 | share/mpich2/examples_logging/openmp_mpilog.F | 804 | share/mpich2/examples_logging/openmp_mpilog.F | |
851 | share/mpich2/examples_logging/openmp_sendrecv.c | 805 | share/mpich2/examples_logging/openmp_sendrecv.c | |
852 | share/mpich2/examples_logging/pthread_allreduce.c | 806 | share/mpich2/examples_logging/pthread_allreduce.c | |
853 | share/mpich2/examples_logging/pthread_sendrecv.c | 807 | share/mpich2/examples_logging/pthread_sendrecv.c | |
854 | share/mpich2/examples_logging/pthread_sendrecv_user.c | 808 | share/mpich2/examples_logging/pthread_sendrecv_user.c | |
855 | share/mpich2/examples_logging/srtest.c | 809 | share/mpich2/examples_logging/srtest.c | |
810 | @pkgdir etc/mpich |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | # $NetBSD: buildlink3.mk,v 1.14 2009/12/13 18:38:11 asau Exp $ | 1 | # $NetBSD: buildlink3.mk,v 1.15 2010/12/17 02:47:18 asau Exp $ | |
2 | 2 | |||
3 | BUILDLINK_TREE+= mpich2 | 3 | BUILDLINK_TREE+= mpich2 | |
4 | 4 | |||
5 | .if !defined(MPICH2_BUILDLINK3_MK) | 5 | .if !defined(MPICH2_BUILDLINK3_MK) | |
6 | MPICH2_BUILDLINK3_MK:= | 6 | MPICH2_BUILDLINK3_MK:= | |
7 | 7 | |||
8 | BUILDLINK_API_DEPENDS.mpich2+= mpich2>=1.0.7 | 8 | BUILDLINK_API_DEPENDS.mpich2+= mpich2>=1.0.7 | |
9 | BUILDLINK_PKGSRCDIR.mpich2?= ../../parallel/mpi-ch | 9 | BUILDLINK_PKGSRCDIR.mpich2?= ../../parallel/mpi-ch | |
10 | 10 | |||
11 | .include "../../parallel/openpa/buildlink3.mk" | 11 | .include "../../parallel/openpa/buildlink3.mk" | |
12 | .endif # MPICH2_BUILDLINK3_MK | 12 | .endif # MPICH2_BUILDLINK3_MK | |
13 | 13 | |||
14 | BUILDLINK_TREE+= -mpich2 | 14 | BUILDLINK_TREE+= -mpich2 |
bin/mpd
bin/mpd.py
bin/mpdallexit
bin/mpdallexit.py
bin/mpdboot
bin/mpdboot.py
bin/mpdcheck
bin/mpdcheck.py
bin/mpdchkpyver.py
bin/mpdcleanup
bin/mpdcleanup.py
bin/mpdexit
bin/mpdexit.py
bin/mpdgdbdrv.py
bin/mpdhelp
bin/mpdhelp.py
bin/mpdkilljob
bin/mpdkilljob.py
bin/mpdlib.py
bin/mpdlistjobs
bin/mpdlistjobs.py
bin/mpdman.py
bin/mpdringtest
bin/mpdringtest.py
bin/mpdrun
bin/mpdsigjob
bin/mpdsigjob.py
bin/mpdtrace
bin/mpdtrace.py
bin/mpiexec.mpd
# $NetBSD: options.mk,v 1.1 2010/12/17 02:47:18 asau Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mpich
PKG_SUPPORTED_OPTIONS= debug mpich-mpd threads
PKG_SUGGESTED_OPTIONS= threads
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mdebug)
CONFIGURE_ARGS+= --enable-g=debug # problems
INSTALL_UNSTRIPPED= yes
.endif
.if !empty(PKG_OPTIONS:Mthreads)
CONFIGURE_ARGS+= --with-thread-package=posix # aka pthreads
.include "../../mk/pthread.buildlink3.mk"
.endif
# Allow coexistance of MPICH2 and musicpd by disabling MPICH2 parts:
.if !empty(PKG_OPTIONS:Mmpich-mpd)
CONFLICTS+= musicpd-[0-9]* # installs bin/mpd
REPLACE_PYTHON+= src/pm/mpd/*.py src/pm/mpd/test/*.py
CONFIGURE_ARGS+= --with-pm=hydra:mpd:gforker
PLIST_SRC+= PLIST.mpd
.include "../../lang/python/application.mk"
.endif
PLIST_SRC+= PLIST
@@ -1,9 +1,7 @@ | @@ -1,9 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.16 2010/05/17 18:27:15 asau Exp $ | 1 | $NetBSD: distinfo,v 1.17 2010/12/17 02:47:18 asau Exp $ | |
2 | 2 | |||
3 | SHA1 (mpich2-1.2.1p1.tar.gz) = 26bd5620b45bc654aa3945755d11450be63d650c | 3 | SHA1 (mpich2-1.3.1.tar.gz) = 6fc6723d693c381b231aebc51745b73398bd37aa | |
4 | RMD160 (mpich2-1.2.1p1.tar.gz) = 810cc486b65e4bcf977ac8d96ccbbcea87e0cbaa | 4 | RMD160 (mpich2-1.3.1.tar.gz) = 70ea44bab15b127921b046f1b97088ac14309e8c | |
5 | Size (mpich2-1.2.1p1.tar.gz) = 18014859 bytes | 5 | Size (mpich2-1.3.1.tar.gz) = 19421084 bytes | |
6 | SHA1 (patch-aa) = a11348d3003c8dccc07d061019f1f754c48ddded | 6 | SHA1 (patch-aa) = 9d7f22f9401687ccf6114b915a26ad67958d8ccd | |
7 | SHA1 (patch-ac) = d31277411645b5c05c049a26d80f51b937fe5faf | 7 | SHA1 (patch-ac) = b956a355ef381d759077288916c40e32b022f178 | |
8 | SHA1 (patch-ae) = c9b9d8144bbecec3b71ec0999d8f7036d6672bca | |||
9 | SHA1 (patch-af) = 47ed56d04a7e196ee67d81cf27328a1f53539505 |
@@ -1,45 +1,57 @@ | @@ -1,45 +1,57 @@ | |||
1 | $NetBSD: patch-aa,v 1.9 2009/12/13 18:38:11 asau Exp $ | 1 | $NetBSD: patch-aa,v 1.10 2010/12/17 02:47:18 asau Exp $ | |
2 | 2 | |||
3 | Install configuration files into example directory. | 3 | Install configuration files into example directory. | |
4 | 4 | |||
5 | --- src/env/Makefile.in.orig 2009-11-18 19:40:34.000000000 +0300 | 5 | --- src/env/Makefile.in.orig 2010-11-17 19:51:55.000000000 +0300 | |
6 | +++ src/env/Makefile.in 2009-12-13 20:12:58.000000000 +0300 | 6 | +++ src/env/Makefile.in 2010-12-17 02:06:35.000000000 +0300 | |
7 | @@ -19,6 +19,7 @@ | 7 | @@ -19,6 +19,8 @@ | |
8 | srcdir = @srcdir@ | 8 | srcdir = @srcdir@ | |
9 | abs_srcdir = @abs_srcdir@ | 9 | abs_srcdir = @abs_srcdir@ | |
10 | sysconfdir = @sysconfdir@ | 10 | sysconfdir = @sysconfdir@ | |
11 | +datadir = @datadir@ | 11 | +datadir = @datadir@ | |
12 | +exampledir = ${datadir}/examples | |||
12 | DEFS = @DEFS@ -I. -I${srcdir} | 13 | DEFS = @DEFS@ -I. -I${srcdir} | |
13 | CPPFLAGS = @CPPFLAGS@ | 14 | CPPFLAGS = @CPPFLAGS@ | |
14 | LIBS = @LIBS@ | 15 | LIBS = @LIBS@ | |
15 | @@ -39,6 +40,8 @@ | 16 | @@ -95,15 +97,15 @@ | |
16 | INCLUDES = -I../include | 17 | $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpich2version ${DESTDIR}${bindir}/mpich2version | |
17 | doc_sources = mpicc.txt mpif77.txt mpicxx.txt mpif90.txt mpiexec.txt | 18 | $(INSTALL_SCRIPT) mpicc ${DESTDIR}${bindir}/mpicc | |
18 | 19 | $(INSTALL_SCRIPT) parkill ${DESTDIR}${bindir}/parkill | ||
19 | +exampledir = $(datadir)/examples | |||
20 | + | |||
21 | .SUFFIXES: | |||
22 | .SUFFIXES: .o .lo .c .man .html .latex .txt | |||
23 | .c.o: | |||
24 | @@ -135,15 +138,15 @@ | |||
25 | $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpich2version ${DESTDIR}${bindir}/mpich2version | |||
26 | $(INSTALL_SCRIPT) mpicc ${DESTDIR}${bindir}/mpicc | |||
27 | $(INSTALL_SCRIPT) parkill ${DESTDIR}${bindir}/parkill | |||
28 | - if [ ! -d ${DESTDIR}${sysconfdir} ] ; then $(MKDIR_P) ${DESTDIR}${sysconfdir} ; fi | 20 | - if [ ! -d ${DESTDIR}${sysconfdir} ] ; then $(MKDIR_P) ${DESTDIR}${sysconfdir} ; fi | |
29 | - $(INSTALL_DATA) mpixxx_opts.conf ${DESTDIR}${sysconfdir}/mpixxx_opts.conf | 21 | - $(INSTALL_DATA) mpixxx_opts.conf ${DESTDIR}${sysconfdir}/mpixxx_opts.conf | |
30 | - $(INSTALL_DATA) mpicc.conf ${DESTDIR}${sysconfdir}/mpicc.conf | 22 | - $(INSTALL_DATA) mpicc.conf ${DESTDIR}${sysconfdir}/mpicc.conf | |
31 | + if [ ! -d ${DESTDIR}${exampledir} ] ; then $(MKDIR_P) ${DESTDIR}${exampledir} ; fi | 23 | + if [ ! -d ${DESTDIR}${exampledir} ] ; then $(MKDIR_P) ${DESTDIR}${exampledir} ; fi | |
32 | + $(INSTALL_DATA) mpixxx_opts.conf ${DESTDIR}${exampledir}/mpixxx_opts.conf | 24 | + $(INSTALL_DATA) mpixxx_opts.conf ${DESTDIR}${exampledir}/mpixxx_opts.conf | |
33 | + $(INSTALL_DATA) mpicc.conf ${DESTDIR}${exampledir}/mpicc.conf | 25 | + $(INSTALL_DATA) mpicc.conf ${DESTDIR}${exampledir}/mpicc.conf | |
34 | if [ -s mpicxx ] ; then $(INSTALL_SCRIPT) mpicxx ${DESTDIR}${bindir}/mpicxx ; fi | 26 | if [ -s mpicxx ] ; then $(INSTALL_SCRIPT) mpicxx ${DESTDIR}${bindir}/mpicxx ; fi | |
35 | if [ -s mpif77 ] ; then $(INSTALL_SCRIPT) mpif77 ${DESTDIR}${bindir}/mpif77 ; fi | 27 | if [ -s mpif77 ] ; then $(INSTALL_SCRIPT) mpif77 ${DESTDIR}${bindir}/mpif77 ; fi | |
36 | if [ -s mpif90 ] ; then $(INSTALL_SCRIPT) mpif90 ${DESTDIR}${bindir}/mpif90 ; fi | 28 | if [ -s mpif90 ] ; then $(INSTALL_SCRIPT) mpif90 ${DESTDIR}${bindir}/mpif90 ; fi | |
37 | - if [ -s mpicxx.conf ] ; then $(INSTALL_DATA) mpicxx.conf ${DESTDIR}${sysconfdir}/mpicxx.conf ; fi | 29 | - if [ -s mpicxx.conf ] ; then $(INSTALL_DATA) mpicxx.conf ${DESTDIR}${sysconfdir}/mpicxx.conf ; fi | |
38 | - if [ -s mpif77.conf ] ; then $(INSTALL_DATA) mpif77.conf ${DESTDIR}${sysconfdir}/mpif77.conf ; fi | 30 | - if [ -s mpif77.conf ] ; then $(INSTALL_DATA) mpif77.conf ${DESTDIR}${sysconfdir}/mpif77.conf ; fi | |
39 | - if [ -s mpif90.conf ] ; then $(INSTALL_DATA) mpif90.conf ${DESTDIR}${sysconfdir}/mpif90.conf ; fi | 31 | - if [ -s mpif90.conf ] ; then $(INSTALL_DATA) mpif90.conf ${DESTDIR}${sysconfdir}/mpif90.conf ; fi | |
40 | + if [ -s mpicxx.conf ] ; then $(INSTALL_DATA) mpicxx.conf ${DESTDIR}${exampledir}/mpicxx.conf ; fi | 32 | + if [ -s mpicxx.conf ] ; then $(INSTALL_DATA) mpicxx.conf ${DESTDIR}${exampledir}/mpicxx.conf ; fi | |
41 | + if [ -s mpif77.conf ] ; then $(INSTALL_DATA) mpif77.conf ${DESTDIR}${exampledir}/mpif77.conf ; fi | 33 | + if [ -s mpif77.conf ] ; then $(INSTALL_DATA) mpif77.conf ${DESTDIR}${exampledir}/mpif77.conf ; fi | |
42 | + if [ -s mpif90.conf ] ; then $(INSTALL_DATA) mpif90.conf ${DESTDIR}${exampledir}/mpif90.conf ; fi | 34 | + if [ -s mpif90.conf ] ; then $(INSTALL_DATA) mpif90.conf ${DESTDIR}${exampledir}/mpif90.conf ; fi | |
43 | ${MAKE} install-postamble | 35 | ${MAKE} install-postamble | |
44 | 36 | |||
45 | install-strip: | 37 | install-strip: | |
38 | @@ -112,14 +114,14 @@ | |||
39 | -rm -f ${DESTDIR}${bindir}/mpich2version | |||
40 | -rm -f ${DESTDIR}${bindir}/mpicc | |||
41 | -rm -f ${DESTDIR}${bindir}/parkill | |||
42 | - -rm -f ${DESTDIR}${sysconfdir}/mpixxx_opts.conf | |||
43 | - -rm -f ${DESTDIR}${sysconfdir}/mpicc.conf | |||
44 | + -rm -f ${DESTDIR}${exampledir}/mpixxx_opts.conf | |||
45 | + -rm -f ${DESTDIR}${exampledir}/mpicc.conf | |||
46 | -rm -f ${DESTDIR}${bindir}/mpicxx | |||
47 | -rm -f ${DESTDIR}${bindir}/mpif77 | |||
48 | -rm -f ${DESTDIR}${bindir}/mpif90 | |||
49 | - -rm -f ${DESTDIR}${sysconfdir}/mpicxx.conf | |||
50 | - -rm -f ${DESTDIR}${sysconfdir}/mpif77.conf | |||
51 | - -rm -f ${DESTDIR}${sysconfdir}/mpif90.conf | |||
52 | + -rm -f ${DESTDIR}${exampledir}/mpicxx.conf | |||
53 | + -rm -f ${DESTDIR}${exampledir}/mpif77.conf | |||
54 | + -rm -f ${DESTDIR}${exampledir}/mpif90.conf | |||
55 | ${MAKE} uninstall-postamble | |||
56 | installcheck: | |||
57 | # -------------------------------------------------------------------------- |
@@ -1,35 +1,20 @@ | @@ -1,35 +1,20 @@ | |||
1 | $NetBSD: patch-ac,v 1.7 2009/12/13 18:38:11 asau Exp $ | 1 | $NetBSD: patch-ac,v 1.8 2010/12/17 02:47:18 asau Exp $ | |
2 | 2 | |||
3 | Install sample configuration files in example directory. | 3 | Install sample configuration files in example directory. | |
4 | 4 | |||
5 | --- src/mpe2/sbin/mpeinstall.in.orig 2009-10-16 03:50:22.000000000 +0400 | 5 | --- src/mpe2/sbin/mpeinstall.in.orig 2009-01-31 02:56:35.000000000 +0300 | |
6 | +++ src/mpe2/sbin/mpeinstall.in 2009-12-11 12:55:38.000000000 +0300 | 6 | +++ src/mpe2/sbin/mpeinstall.in 2009-03-22 21:29:26.000000000 +0300 | |
7 | @@ -40,12 +40,8 @@ | 7 | @@ -487,14 +487,16 @@ | |
8 | mandir=@mandir@ | |||
9 | # Since autoconf < 2.60 does not set @docdir@ and @htmldir@, | |||
10 | # If not set, docdir=@docdir@ remains, set them accordingly. | |||
11 | -if [ "$docdir" = "@docdir@" ] ; then | |||
12 | - docdir=${datadir}/doc/${PACKAGE} | |||
13 | -fi | |||
14 | -if [ "$htmldir" = "@htmldir@" ] ; then | |||
15 | - htmldir=${docdir} | |||
16 | -fi | |||
17 | +case "$docdir" in @docdir) docdir=${datadir}/doc/${PACKAGE} ;; esac | |||
18 | +case "$htmldir" in @htmldir) htmldir=${docdir} ;; esac | |||
19 | ||||
20 | # Assume PROF_LIBNAME=MPE_LIBNAME. | |||
21 | PROF_LIBNAME=@MPE_LIBNAME@ | |||
22 | @@ -494,14 +490,16 @@ | |||
23 | fi | 8 | fi | |
24 | fi | 9 | fi | |
25 | 10 | |||
26 | +exampledir=${datadir}/examples | 11 | +exampledir=${datadir}/examples | |
27 | + | 12 | + | |
28 | # Install compiler configuration files | 13 | # Install compiler configuration files | |
29 | if [ -n "$etcbuild_dir" ] ; then | 14 | if [ -n "$etcbuild_dir" ] ; then | |
30 | if [ -d $etcbuild_dir ] ; then | 15 | if [ -d $etcbuild_dir ] ; then | |
31 | - echo "Installing $pkgname configuration files to $DESTDIR$sysconfdir" | 16 | - echo "Installing $pkgname configuration files to $DESTDIR$sysconfdir" | |
32 | - MkDir $sysconfdir | 17 | - MkDir $sysconfdir | |
33 | + echo "Installing $pkgname configuration files to $DESTDIR$exampledir" | 18 | + echo "Installing $pkgname configuration files to $DESTDIR$exampledir" | |
34 | + MkDir $exampledir | 19 | + MkDir $exampledir | |
35 | cd $etcbuild_dir && \ | 20 | cd $etcbuild_dir && \ |