sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Upgrade to 1.1.

Browse source 
Announcement at
<http://www.mcs.anl.gov/research/projects/mpich2/about/index.php?s=news>

Notified by:	Pavan Balaji <balaji (at) mcs.anl.gov>
This commit is contained in:
Thierry Thomas 2009-06-27 17:00:22 +00:00
parent 33d6e541a2
commit f753c04996
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=236689
14 changed files with 229 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
net/mpich2/Makefile
View file

@ -6,8 +6,7 @@
#
PORTNAME= mpich2
PORTVERSION= 1.0.7
PORTREVISION= 3
PORTVERSION= 1.1
PORTEPOCH= 3
CATEGORIES= net parallel
MASTER_SITES= http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${PORTVERSION}/
@ -80,19 +79,16 @@ CONFIGURE_ARGS+= --with-pmi=simple --with-pm=mpd
PLIST_SUB+= PM_MPD="" PM_SMPD="@comment "
.endif
.if defined(NOPORTDOCS)
CONFIGURE_ARGS+= --without-docdir --without-htmldir
.else
CONFIGURE_ARGS+= --with-docdir=${DOCSDIR} --with-htmldir=${DOCSDIR}
.endif
LIBSSO= fmpich mpich mpichcxx
THREAD2FIX= configure test/mpi/threads/comm/Makefile.in \
test/mpi/threads/pt2pt/Makefile.in
test/mpi/threads/pt2pt/Makefile.in \
src/mpe2/src/logging/configure
LOCALBASE2FIX= src/mpe2/src/slog2sdk/trace_rlog/configure \
src/mpe2/src/slog2sdk/trace_sample/configure \
src/mpe2/src/graphics/configure
DOC2PATCH= Makefile.in src/mpe2/sbin/mpeinstall.in \
src/openpa/Makefile.in src/mpi/romio/util/romioinstall.in
.include <bsd.port.pre.mk>
@ -132,24 +128,24 @@ pre-everything::
pre-configure:
${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${THREAD2FIX:S|^|${WRKSRC}/|}
${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${LOCALBASE2FIX:S|^|${WRKSRC}/|}
${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/confdb/libtool-2.13.m4
${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/confdb/libtool.m4
${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/src/mpe2/src/slog2sdk/trace_rlog/libtool.m4
${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/src/mpe2/src/slog2sdk/trace_sample/libtool.m4
${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${THREAD2FIX:S|^|${WRKSRC}/|}
${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${LOCALBASE2FIX:S|^|${WRKSRC}/|}
.for fin in Makefile.in src/mpe2/sbin/mpeinstall.in
${FIND} ${WRKSRC} -name configure | ${XARGS} \
${REINPLACE_CMD} -e 's|doc/$${PACKAGE}|doc/${PORTNAME}|'
.for fin in ${DOC2PATCH}
. if defined(NOPORTDOCS)
${REINPLACE_CMD} -e 's|%%PORTDOCS%%|#|' ${WRKSRC}/${fin}
. else
${REINPLACE_CMD} -e 's|%%PORTDOCS%%||' ${WRKSRC}/${fin}
. endif
.endfor
.if defined(NOPORTDOCS)
${REINPLACE_CMD} -e 's|lib doc share|lib share|' \
${WRKSRC}/src/mpe2/src/slog2sdk/sbin/install-package.in
.endif
post-configure:
${REINPLACE_CMD} -e 's|$${exec_prefix}|${PREFIX}|g; \
s|$${prefix}|${PREFIX}|g' ${WRKSRC}/src/pkgconfig/mpich2-ch3.pc
s|$${prefix}|${PREFIX}|g' \
${WRKSRC}/src/packaging/pkgconfig/mpich2-ch3.pc
post-install:
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}
@ -170,6 +166,7 @@ regression-test: install
${CHMOD} go-r ${HOME}/.mpd.conf
@${ECHO_MSG} "${HOME}/.mpd.conf has been generated - please change the secret word!"
.endif
@${ECHO_MSG} "Don't hesitate to increase MPIEXEC_RECV_TIMEOUT if needed!"
${PREFIX}/bin/mpd &
(cd ${WRKSRC} && \
PATH=${PATH}:${PREFIX}/bin VERBOSE=1 ${MAKE} testing)

6
net/mpich2/distinfo
View file

@ -1,3 +1,3 @@
MD5 (mpich/mpich2-1.0.7.tar.gz) = c3beb9430d45347078a80cf1c6780509
SHA256 (mpich/mpich2-1.0.7.tar.gz) = d280e6eb81c4d30b5f3fa1a7775870c32f6a9e58673be11e67f05e75cc944998
SIZE (mpich/mpich2-1.0.7.tar.gz) = 16565875
MD5 (mpich/mpich2-1.1.tar.gz) = aad757e1c1502429170403bb3c1a1ace
SHA256 (mpich/mpich2-1.1.tar.gz) = 205b6e46e30620351d3c11281b435367b3d5fc46aae56f0dc9aa32443f7a2f6b
SIZE (mpich/mpich2-1.1.tar.gz) = 18227764

31
net/mpich2/files/patch-Makefile.in
View file

@ -1,6 +1,16 @@
--- Makefile.in.orig 2008-04-05 00:03:17.000000000 +0200
+++ Makefile.in 2008-05-25 15:00:09.000000000 +0200
@@ -187,53 +187,53 @@
--- Makefile.in.orig 2009-06-03 03:49:03.000000000 +0200
+++ Makefile.in 2009-06-27 12:20:51.000000000 +0200
@@ -192,61 +192,61 @@
install: install-preamble FORCE_TARGET
if [ ! -d ${DESTDIR}${prefix} ] ; then $(MKDIR_P) ${DESTDIR}${prefix} ; fi
if [ ! -d ${DESTDIR}${datarootdir} ] ; then $(MKDIR_P) ${DESTDIR}${datarootdir} ; fi
- if [ ! -d ${DESTDIR}${htmldir} ] ; then $(MKDIR_P) ${DESTDIR}${htmldir} ; fi
- if [ ! -d ${DESTDIR}${mandir} ] ; then $(MKDIR_P) ${DESTDIR}${mandir} ; fi
+%%PORTDOCS%% if [ ! -d ${DESTDIR}${htmldir} ] ; then $(MKDIR_P) ${DESTDIR}${htmldir} ; fi
+%%PORTDOCS%% if [ ! -d ${DESTDIR}${mandir} ] ; then $(MKDIR_P) ${DESTDIR}${mandir} ; fi
if [ ! -d ${DESTDIR}${includedir} ] ; then $(MKDIR_P) ${DESTDIR}${includedir} ; fi
if [ ! -d ${DESTDIR}${exec_prefix} ] ; then $(MKDIR_P) ${DESTDIR}${exec_prefix} ; fi
if [ ! -d ${DESTDIR}${libdir} ] ; then $(MKDIR_P) ${DESTDIR}${libdir} ; fi
${MAKE} install-local
$(INSTALL_DATA) src/include/mpi.h ${DESTDIR}${includedir}/mpi.h
$(INSTALL_DATA) lib/lib${MPILIBNAME}.a ${DESTDIR}${libdir}/lib${MPILIBNAME}.a
@ -101,3 +111,18 @@
if [ -s src/mpi/romio/include/mpiof.h ] ; then $(INSTALL_DATA) src/mpi/romio/include/mpiof.h ${DESTDIR}${includedir}/mpiof.h ; fi
if [ -s src/mpi/romio/include/mpio.h ] ; then $(INSTALL_DATA) src/mpi/romio/include/mpio.h ${DESTDIR}${includedir}/mpio.h ; fi
if [ -s lib/lib${MPIFLIBNAME}.a ] ; then $(INSTALL_DATA) lib/lib${MPIFLIBNAME}.a ${DESTDIR}${libdir}/lib${MPIFLIBNAME}.a ; fi
@@ -260,10 +260,10 @@
if [ -s lib/libf${MPILIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) --mode=install lib/libf${MPILIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/libf${MPILIBNAME}.@SHLIB_EXT@ ; fi
if [ -s lib/lib${MPILIBNAME}f90.@SHLIB_EXT@ ] ; then $(CREATESHLIB) --mode=install lib/lib${MPILIBNAME}f90.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${MPILIBNAME}f90.@SHLIB_EXT@ ; fi
if [ -s lib/lib${MPICXXLIBNAME}.@SHLIB_EXT@ ] ; then $(CREATESHLIB) --mode=install lib/lib${MPICXXLIBNAME}.@SHLIB_EXT@ ${DESTDIR}${libdir}/lib${MPICXXLIBNAME}.@SHLIB_EXT@ ; fi
- if [ -s $(srcdir)/doc/userguide/user.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/userguide/user.pdf ${DESTDIR}${docdir}/user.pdf ; fi
- if [ -s $(srcdir)/doc/installguide/install.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/installguide/install.pdf ${DESTDIR}${docdir}/install.pdf ; fi
- if [ -s $(srcdir)/doc/smpd/smpd_pmi.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/smpd/smpd_pmi.pdf ${DESTDIR}${docdir}/smpd_pmi.pdf ; fi
- if [ -s $(srcdir)/doc/logging/logging.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/logging/logging.pdf ${DESTDIR}${docdir}/logging.pdf ; fi
+%%PORTDOCS%% if [ -s $(srcdir)/doc/userguide/user.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/userguide/user.pdf ${DESTDIR}${docdir}/user.pdf ; fi
+%%PORTDOCS%% if [ -s $(srcdir)/doc/installguide/install.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/installguide/install.pdf ${DESTDIR}${docdir}/install.pdf ; fi
+%%PORTDOCS%% if [ -s $(srcdir)/doc/smpd/smpd_pmi.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/smpd/smpd_pmi.pdf ${DESTDIR}${docdir}/smpd_pmi.pdf ; fi
+%%PORTDOCS%% if [ -s $(srcdir)/doc/logging/logging.pdf ] ; then $(INSTALL_DATA) $(srcdir)/doc/logging/logging.pdf ${DESTDIR}${docdir}/logging.pdf ; fi
(cd src/util/thread && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) install)
(cd src/env && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) install)
(cd src/packaging/pkgconfig && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) install)

60
net/mpich2/files/patch-configure
View file

@ -1,22 +1,42 @@
--- configure.orig 2008-04-05 00:04:44.000000000 +0200
+++ configure 2008-04-07 19:06:49.000000000 +0200
@@ -31340,8 +31340,8 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test "$ac_cv_search_pthread_key_create" = no; then
- for ac_lib in pthread; do
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ for ac_lib in $PTHREAD_LIBS; do
+ LIBS="$ac_lib $ac_func_search_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
--- ./configure.orig 2009-06-03 03:49:17.000000000 +0200
+++ ./configure 2009-06-23 19:16:46.000000000 +0200
@@ -36119,12 +36119,12 @@
return 0;
}
_ACEOF
@@ -31385,7 +31385,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_search_pthread_key_create="-l$ac_lib"
+ ac_cv_search_pthread_key_create="$ac_lib"
break
-for ac_lib in '' pthread; do
+for ac_lib in '' $PTHREAD_LIBS; do
if test -z "$ac_lib"; then
ac_res="none required"
else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ ac_res=$ac_lib
+ LIBS="$ac_lib $ac_func_search_save_LIBS"
fi
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
@@ -36248,11 +36248,11 @@
{ $as_echo "$as_me:$LINENO: result: $pac_cv_lib_pthread_broken" >&5
$as_echo "$pac_cv_lib_pthread_broken" >&6; }
if test "$pac_cv_lib_pthread_broken" = yes ; then
- # Try again with -lpthread
+ # Try again with pthread
{ $as_echo "$as_me:$LINENO: checking whether pthread routines with explicit lib are broken" >&5
-$as_echo_n "checking whether pthread routines with explicit lib are broken... " >&6; }
+$as_echo_n "checking whether $PTHREAD_LIBS routines with explicit lib are broken... " >&6; }
saveLIBS=$LIBS
- LIBS="$LIBS -lpthread"
+ LIBS="$LIBS $PTHREAD_LIBS"
if test "$cross_compiling" = yes; then
pac_cv_lib_pthread_broken_explicit=unknown
else
echo "$as_me: failed program was:" >&5
@@ -36608,7 +36608,7 @@
_ACEOF
fi
- THR_LIBS="$THR_LIBS -lpthread"
+ THR_LIBS="$THR_LIBS $PTHREAD_LIBS"
MPICH2_THREAD_PACKAGE=pthreads
;;
solaris)

23
net/mpich2/files/patch-src_env_Makefile.in
View file

@ -1,23 +0,0 @@
--- ./src/env/Makefile.in.orig Wed Dec 13 21:09:28 2006
+++ ./src/env/Makefile.in Sat Dec 16 15:33:30 2006
@@ -52,14 +52,14 @@
if [ ! -d ${DESTDIR}${exec_prefix} ] ; then $(MKDIR_P) ${DESTDIR}${exec_prefix} ; fi
if [ ! -d ${DESTDIR}${prefix} ] ; then $(MKDIR_P) ${DESTDIR}${prefix} ; fi
if [ ! -d ${DESTDIR}${bindir} ] ; then $(MKDIR_P) ${DESTDIR}${bindir} ; fi
- $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpicc ${DESTDIR}${bindir}/mpicc
- $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpich2version ${DESTDIR}${bindir}/mpich2version
- $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) parkill ${DESTDIR}${bindir}/parkill
+ $(BSD_INSTALL_SCRIPT) mpicc ${DESTDIR}${bindir}/mpicc
+ $(BSD_INSTALL_SCRIPT) mpich2version ${DESTDIR}${bindir}/mpich2version
+ $(BSD_INSTALL_SCRIPT) parkill ${DESTDIR}${bindir}/parkill
if [ ! -d ${DESTDIR}${sysconfdir} ] ; then $(MKDIR_P) ${DESTDIR}${sysconfdir} ; fi
$(INSTALL_DATA) mpicc.conf ${DESTDIR}${sysconfdir}/mpicc.conf
- if [ -s mpicxx ] ; then $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpicxx ${DESTDIR}${bindir}/mpicxx ; fi
- if [ -s mpif77 ] ; then $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpif77 ${DESTDIR}${bindir}/mpif77 ; fi
- if [ -s mpif90 ] ; then $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpif90 ${DESTDIR}${bindir}/mpif90 ; fi
+ if [ -s mpicxx ] ; then $(BSD_INSTALL_SCRIPT) mpicxx ${DESTDIR}${bindir}/mpicxx ; fi
+ if [ -s mpif77 ] ; then $(BSD_INSTALL_SCRIPT) mpif77 ${DESTDIR}${bindir}/mpif77 ; fi
+ if [ -s mpif90 ] ; then $(BSD_INSTALL_SCRIPT) mpif90 ${DESTDIR}${bindir}/mpif90 ; fi
if [ -s mpicxx.conf ] ; then $(INSTALL_DATA) mpicxx.conf ${DESTDIR}${sysconfdir}/mpicxx.conf ; fi
if [ -s mpif77.conf ] ; then $(INSTALL_DATA) mpif77.conf ${DESTDIR}${sysconfdir}/mpif77.conf ; fi
if [ -s mpif90.conf ] ; then $(INSTALL_DATA) mpif90.conf ${DESTDIR}${sysconfdir}/mpif90.conf ; fi

23
net/mpich2/files/patch-src_mpe2_src_sbin_mpeinstall.in
View file

@ -1,6 +1,15 @@
--- ./src/mpe2/sbin/mpeinstall.in.orig 2007-11-28 22:51:40.000000000 +0100
+++ ./src/mpe2/sbin/mpeinstall.in 2008-05-25 16:45:21.000000000 +0200
@@ -529,17 +529,17 @@
--- src/mpe2/sbin/mpeinstall.in.orig 2009-01-31 00:56:35.000000000 +0100
+++ src/mpe2/sbin/mpeinstall.in 2009-06-24 18:32:04.000000000 +0200
@@ -522,7 +522,7 @@
# so $docdir (with NULL PACKAGE) is appended to dirlist for removal.
savedPACKAGE=$PACKAGE
PACKAGE=""
- MkDir @docdir@
+%%PORTDOCS%% MkDir @docdir@
PACKAGE=$savedPACKAGE
fi
@@ -570,15 +570,15 @@
# ie INSTALL $top_srcdir/doc $docdir
# INSTALL $top_srcdir/man $mandir
# INSTALL $top_srcdir/html $htmldir
@ -8,9 +17,7 @@
- typename=${type}dir
- eval typevalue=\$"$typename"
- if [ -d $top_srcdir/$type ] ; then
- if [ ! -d $DESTDIR$typevalue ] ; then
- MkDir $typevalue
- fi
- MkDir $typevalue
- echo "Installing $pkgname $type to $DESTDIR$typevalue"
- InstallDirRecur $top_srcdir/$type $typevalue $MODE
- fi
@ -19,9 +26,7 @@
+%%PORTDOCS%% typename=${type}dir
+%%PORTDOCS%% eval typevalue=\$"$typename"
+%%PORTDOCS%% if [ -d $top_srcdir/$type ] ; then
+%%PORTDOCS%% if [ ! -d $DESTDIR$typevalue ] ; then
+%%PORTDOCS%% MkDir $typevalue
+%%PORTDOCS%% fi
+%%PORTDOCS%% MkDir $typevalue
+%%PORTDOCS%% echo "Installing $pkgname $type to $DESTDIR$typevalue"
+%%PORTDOCS%% InstallDirRecur $top_srcdir/$type $typevalue $MODE
+%%PORTDOCS%% fi

18
net/mpich2/files/patch-src_mpi_romio_adio_common_ad_write_nolock.c
View file

@ -1,18 +0,0 @@
--- ./src/mpi/romio/adio/common/ad_write_nolock.c.orig 2008-03-10 23:38:31.000000000 +0100
+++ ./src/mpi/romio/adio/common/ad_write_nolock.c 2008-04-07 23:21:55.000000000 +0200
@@ -89,9 +89,15 @@
/* seek to the right spot in the file */
if (file_ptr_type == ADIO_EXPLICIT_OFFSET) {
off = fd->disp + etype_size * offset;
+#ifdef __FreeBSD__
+ lseek(fd->fd_sys, off, SEEK_SET);
+ }
+ else off = lseek(fd->fd_sys, fd->fp_ind, SEEK_SET);
+#else
lseek64(fd->fd_sys, off, SEEK_SET);
}
else off = lseek64(fd->fd_sys, fd->fp_ind, SEEK_SET);
+#endif
/* loop through all the flattened pieces. combine into buffer until
* no more will fit, then write.

38
net/mpich2/files/patch-src_mpi_romio_configure
View file

@ -1,22 +1,18 @@
--- src/mpi/romio/configure.orig Wed Nov 23 19:41:55 2005
+++ src/mpi/romio/configure Mon Jul 17 01:05:21 2006
@@ -7482,8 +7482,8 @@
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test "$ac_cv_search_pthread_create" = no; then
- for ac_lib in pthread; do
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ for ac_lib in $PTHREAD_LIBS; do
+ LIBS="$ac_lib $ac_func_search_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
--- src/mpi/romio/configure.orig 2009-06-03 03:49:23.000000000 +0200
+++ src/mpi/romio/configure 2009-06-22 19:13:16.000000000 +0200
@@ -8755,12 +8755,12 @@
return 0;
}
_ACEOF
@@ -7527,7 +7527,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_search_pthread_create="-l$ac_lib"
+ ac_cv_search_pthread_create="$ac_lib"
break
else
echo "$as_me: failed program was:" >&5
-for ac_lib in '' pthread; do
+for ac_lib in '' $PTHREAD_LIBS; do
if test -z "$ac_lib"; then
ac_res="none required"
else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ ac_res=$ac_lib
+ LIBS="$ac_lib $ac_func_search_save_LIBS"
fi
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"

19
net/mpich2/files/patch-src_mpi_romio_util_romioinstall.in Normal file
View file

@ -0,0 +1,19 @@
--- ./src/mpi/romio/util/romioinstall.in.orig 2008-08-01 19:31:50.000000000 +0200
+++ ./src/mpi/romio/util/romioinstall.in 2009-06-26 23:36:59.000000000 +0200
@@ -145,11 +145,11 @@
# Files
MkDir $prefix
- echo "copying directory $ROMIO_HOME/doc to $docdir"
- MkDir $docdir
- for file in COPYRIGHT README users-guide.ps.gz ; do
- CopyFile $ROMIO_HOME/$file $docdir
- done
+%%PORTDOCS%% echo "copying directory $ROMIO_HOME/doc to $docdir"
+%%PORTDOCS%% MkDir $docdir
+%%PORTDOCS%% for file in COPYRIGHT README users-guide.ps.gz ; do
+%%PORTDOCS%% CopyFile $ROMIO_HOME/$file $docdir
+%%PORTDOCS%% done
echo "copying directory include to $includedir"
MkDir $includedir

23
net/mpich2/files/patch-src_openpa_Makefile.in Normal file
View file

@ -0,0 +1,23 @@
--- ./src/openpa/Makefile.in.orig 2009-06-03 03:50:27.000000000 +0200
+++ ./src/openpa/Makefile.in 2009-06-26 20:57:38.000000000 +0200
@@ -214,13 +214,13 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
install-dist_docDATA: $(dist_doc_DATA)
@$(NORMAL_INSTALL)
- test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
- @list='$(dist_doc_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
- $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
- done
+%%PORTDOCS%% test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+%%PORTDOCS%% @list='$(dist_doc_DATA)'; for p in $$list; do \
+%%PORTDOCS%% if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+%%PORTDOCS%% f=$(am__strip_dir) \
+%%PORTDOCS%% echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+%%PORTDOCS%% $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+%%PORTDOCS%% done
uninstall-dist_docDATA:
@$(NORMAL_UNINSTALL)

11
net/mpich2/files/patch-src_openpa_configure Normal file
View file

@ -0,0 +1,11 @@
--- ./src/openpa/configure.orig 2009-06-03 03:50:24.000000000 +0200
+++ ./src/openpa/configure 2009-06-23 20:51:27.000000000 +0200
@@ -774,7 +774,7 @@
localstatedir='${prefix}/var'
includedir='${prefix}/include'
oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+docdir='${datarootdir}/doc/${PACKAGE}'
infodir='${datarootdir}/info'
htmldir='${docdir}'
dvidir='${docdir}'

11
net/mpich2/files/patch-src_packaging_pkgconfig_Makefile.in Normal file
View file

@ -0,0 +1,11 @@
--- ./src/packaging/pkgconfig/Makefile.in.orig 2009-06-03 03:49:04.000000000 +0200
+++ ./src/packaging/pkgconfig/Makefile.in 2009-06-22 19:19:08.000000000 +0200
@@ -18,7 +18,7 @@
prefix = @prefix@
libdir = @libdir@
exec_prefix = @exec_prefix@
-pkgconfigdir = @libdir@/pkgconfig
+pkgconfigdir = $(LOCALBASE)/libdata/pkgconfig
MAKE = @MAKE@
MPILIBNAME = @MPILIBNAME@
PMPILIBNAME = @PMPILIBNAME@

20
net/mpich2/files/patch-src_pkgconfig_Makefile.in
View file

@ -1,20 +0,0 @@
--- src/pkgconfig/Makefile.in.orig Tue Oct 30 21:22:35 2007
+++ src/pkgconfig/Makefile.in Mon Nov 5 12:46:18 2007
@@ -16,7 +16,7 @@
prefix = @prefix@
libdir = @libdir@
exec_prefix = @exec_prefix@
-pkgconfigdir = @libdir@/pkgconfig
+pkgconfigdir = $(LOCALBASE)/libdata/pkgconfig
MAKE = @MAKE@
MPILIBNAME = @MPILIBNAME@
PMPILIBNAME = @PMPILIBNAME@
@@ -48,7 +48,7 @@
# Install target
install: FORCE_TARGET
if [ ! -d ${DESTDIR}${pkgconfigdir} ] ; then $(MKDIR_P) ${DESTDIR}${pkgconfigdir} ; fi
- if [ -s mpich2-@DEVICE_NAME@.pc ] ; then $(INSTALL_PROGRAM) mpich2-@DEVICE_NAME@.pc ${DESTDIR}${pkgconfigdir}/mpich2-@DEVICE_NAME@.pc ; fi
+ if [ -s mpich2-@DEVICE_NAME@.pc ] ; then $(BSD_INSTALL_SCRIPT) mpich2-@DEVICE_NAME@.pc ${DESTDIR}${pkgconfigdir}/mpich2-@DEVICE_NAME@.pc ; fi
install-strip:
$(MAKE) INSTALL_STRIP_FLAG=-s install

77
net/mpich2/pkg-plist
View file

@ -1,15 +1,15 @@
@comment "PREFIX set to %D/mpich2."
bin/check_callstack
@comment SLOG-2 tools are not installed if NOPORTDOCS is set
%%PORTDOCS%%%%JAVA%%bin/clog2TOslog2
%%JAVA%%bin/clog2TOslog2
bin/clog2_join
bin/clog2_print
%%PORTDOCS%%%%JAVA%%bin/clog2print
bin/clog2_repair
%%PORTDOCS%%%%JAVA%%bin/clogTOslog2
%%PORTDOCS%%%%JAVA%%bin/clogprint
%%PORTDOCS%%%%JAVA%%bin/jumpshot
%%PORTDOCS%%%%JAVA%%bin/logconvertor
%%JAVA%%bin/clog2print
%%JAVA%%bin/clogTOslog2
%%JAVA%%bin/clogprint
%%JAVA%%bin/jumpshot
%%JAVA%%bin/logconvertor
%%PM_MPD%%bin/mpd
%%PM_MPD%%bin/mpd.py
%%PM_MPD%%bin/mpd.pyc
@ -91,26 +91,23 @@ bin/mpif90
%%PM_MPD%%bin/mpirun.pyc
%%PM_MPD%%bin/mpirun.pyo
bin/parkill
%%PM_SMPD%%bin/smpd
%%PORTDOCS%%%%JAVA%%bin/rlogTOslog2
%%PORTDOCS%%%%JAVA%%bin/rlog_check_timeorder
%%PORTDOCS%%%%JAVA%%bin/rlog_print
%%PORTDOCS%%%%JAVA%%bin/rlogprint
%%PORTDOCS%%%%JAVA%%bin/slog2filter
%%PORTDOCS%%%%JAVA%%bin/slog2navigator
%%PORTDOCS%%%%JAVA%%bin/slog2print
%%PORTDOCS%%%%JAVA%%bin/slog2updater
%%PORTDOCS%%%%JAVA%%bin/traceTOslog2.in
%%PORTDOCS%%%%JAVA%%bin/traceprint.in
%%JAVA%%bin/rlogTOslog2
%%JAVA%%bin/rlog_check_timeorder
%%JAVA%%bin/rlog_print
%%JAVA%%bin/rlogprint
%%JAVA%%bin/slog2filter
%%JAVA%%bin/slog2navigator
%%JAVA%%bin/slog2print
%%JAVA%%bin/slog2updater
%%JAVA%%bin/traceTOslog2.in
%%JAVA%%bin/traceprint.in
etc/mpe_callstack_ldflags.conf
etc/mpe_f77env.conf
etc/mpe_f77env.conf.in
%%X11%%etc/mpe_graphics.conf
etc/mpe_graphics.conf
etc/mpe_help.conf
etc/mpe_help.conf.in
etc/mpe_log.conf
%%X11%%etc/mpe_mpianim.conf
etc/mpe_log_postlib.conf
etc/mpe_mpianim.conf
etc/mpe_mpicheck.conf
etc/mpe_mpilog.conf
etc/mpe_mpitrace.conf
@ -119,6 +116,7 @@ etc/mpicc.conf
etc/mpicxx.conf
etc/mpif77.conf
etc/mpif90.conf
etc/mpixxx_opts.conf
include/clog_commset.h
include/clog_const.h
include/clog_inttypes.h
@ -141,6 +139,19 @@ include/mpicxx.h
include/mpif.h
include/mpio.h
include/mpiof.h
include/opa_config.h
include/opa_primitives.h
include/opa_queue.h
include/opa_util.h
include/primitives/opa_by_lock.h
include/primitives/opa_emulated.h
include/primitives/opa_gcc_ia64.h
include/primitives/opa_gcc_intel_32_64.h
include/primitives/opa_gcc_intrinsics.h
include/primitives/opa_gcc_ppc.h
include/primitives/opa_gcc_sicortex.h
include/primitives/opa_nt_intrinsics.h
include/primitives/opa_sun_atomic_ops.h
%%JAVA%%lib/clog2TOdrawable.jar
%%JAVA%%lib/clog2TOslog2.jar
%%JAVA%%lib/clog2print.jar
@ -170,6 +181,10 @@ lib/libmpichcxx.so
lib/libmpichcxx.so.1
lib/libmpichcxx.so.1.1
lib/libmpichf90.a
lib/libmpichf90.so
lib/libmpichf90.so.1
lib/libmpichf90.so.1.1
lib/libopa.a
lib/libtmpe.a
%%JAVA%%lib/logconvertor.jar
lib/mpe_prof.o
@ -179,15 +194,14 @@ lib/mpe_prof.o
%%JAVA%%lib/slog2printserial.jar
%%JAVA%%lib/slog2update205to206.jar
%%JAVA%%lib/traceTOslog2.jar
%%JAVA%%lib/trace_rlog/libTraceInput.la
%%JAVA%%lib/trace_rlog/libTraceInput.so
%%JAVA%%lib/traceprint.jar
%%PORTDOCS%%%%JAVA%%lib/trace_rlog/libTraceInput.la
%%PORTDOCS%%%%JAVA%%lib/trace_rlog/libTraceInput.so
sbin/mpecheckinstall
sbin/mpetestexec
sbin/mpetestexeclog
sbin/mpetestlink
sbin/mpeuninstall
%%PORTDOCS%%%%JAVA%%share/barrier.rlog
%%PORTDOCS%%%%DOCSDIR%%/index.htm
%%PORTDOCS%%%%DOCSDIR%%/install.pdf
%%PORTDOCS%%%%JAVA%%%%DOCSDIR%%/jumpshot-4/html/About24.png
@ -334,10 +348,11 @@ sbin/mpeuninstall
%%PORTDOCS%%%%JAVA%%%%DOCSDIR%%/jumpshot-4/html/up_g.png
%%PORTDOCS%%%%JAVA%%%%DOCSDIR%%/jumpshot-4/html/usersguide.css
%%PORTDOCS%%%%JAVA%%%%DOCSDIR%%/jumpshot-4/html/usersguide.html
%%PORTDOCS%%%%JAVA%%%%DOCSDIR%%/jumpshot-4/usersguide.pdf
%%PORTDOCS%%%%JAVA%%%%DOCSDIR%%/jumpshot-4/html/yaxis_label_panel_expanded.png
%%PORTDOCS%%%%JAVA%%%%DOCSDIR%%/jumpshot-4/html/yaxis_label_panel_simple.png
%%PORTDOCS%%%%JAVA%%%%DOCSDIR%%/jumpshot-4/usersguide.pdf
%%PORTDOCS%%%%DOCSDIR%%/logging.pdf
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/smpd_pmi.pdf
%%PORTDOCS%%%%DOCSDIR%%/user.pdf
%%PORTDOCS%%%%DOCSDIR%%/www1/MPI.html
@ -726,8 +741,11 @@ share/examples_logging/pthread_allreduce.c
share/examples_logging/pthread_sendrecv.c
share/examples_logging/pthread_sendrecv_user.c
share/examples_logging/srtest.c
%%PORTDOCS%%%%JAVA%%share/fpilog.clog
%%PORTDOCS%%%%JAVA%%share/fpilog.slog2
%%JAVA%%share/logfiles/barrier.rlog
%%JAVA%%share/logfiles/fpilog.clog
%%JAVA%%share/logfiles/fpilog.slog2
share/mpich2.module
%%JAVA%%@dirrm share/logfiles
@dirrm share/examples_logging
%%X11%%@dirrm share/examples_graphics
@dirrm share/examples_collchk
@ -743,9 +761,10 @@ share/examples_logging/srtest.c
%%PORTDOCS%%@dirrm man/man4
%%PORTDOCS%%@dirrm man/man3
%%PORTDOCS%%@dirrm man/man1
@dirrm man
%%PORTDOCS%%%%JAVA%%@dirrm lib/trace_rlog
%%PORTDOCS%%@dirrm man
%%JAVA%%@dirrm lib/trace_rlog
@dirrm lib
@dirrm include/primitives
@dirrm include
@dirrm etc
@dirrm bin