aboutsummaryrefslogtreecommitdiff
path: root/net/mpich2/files
diff options
context:
space:
mode:
Diffstat (limited to 'net/mpich2/files')
-rw-r--r--net/mpich2/files/patch-Makefile.in11
-rw-r--r--net/mpich2/files/patch-configure47
-rw-r--r--net/mpich2/files/patch-src_mpe2_src_sbin_mpeinstall.in47
-rw-r--r--net/mpich2/files/patch-src_mpi_romio_configure18
-rw-r--r--net/mpich2/files/patch-src_mpi_romio_util_romioinstall.in19
-rw-r--r--net/mpich2/files/patch-src_openpa_Makefile.in11
-rw-r--r--net/mpich2/files/patch-src_openpa_configure11
-rw-r--r--net/mpich2/files/patch-test_mpi_configure30
-rw-r--r--net/mpich2/files/pkg-message.in7
9 files changed, 0 insertions, 201 deletions
diff --git a/net/mpich2/files/patch-Makefile.in b/net/mpich2/files/patch-Makefile.in
deleted file mode 100644
index d4de96233d19..000000000000
--- a/net/mpich2/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2012-10-08 21:02:46.000000000 +0200
-+++ Makefile.in 2014-08-31 22:55:10.000000000 +0200
-@@ -6153,7 +6153,7 @@
- CLEAN_LOCAL_TARGETS = test-clean $(am__append_125)
-
- # used by nodist_pkgconfig_DATA
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(libdir)data/pkgconfig
-
- # contains all of the "errnames.txt" files that are used by maint/extracterrmsgs
- # to build src/mpi/errhan/defmsg.h
diff --git a/net/mpich2/files/patch-configure b/net/mpich2/files/patch-configure
deleted file mode 100644
index 9914f3ea872f..000000000000
--- a/net/mpich2/files/patch-configure
+++ /dev/null
@@ -1,47 +0,0 @@
---- configure.orig 2012-10-08 19:02:38 UTC
-+++ configure
-@@ -31361,7 +31361,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
- # The best solution is to turn off errors on particular routines
- # if that isn't possible (e.g., too many of them), then
- # just try arguments that turn off all checking
-- for flags in "-mismatch" ; do
-+ for flags in "-fallow-argument-mismatch" "-mismatch" ; do
- testok=no
- FFLAGS="$FFLAGS $flags"
- cat > conftest.$ac_ext <<_ACEOF
-@@ -31403,18 +31403,8 @@ the same routine with arguments of different types." "
- fi
-
- addarg=$pac_cv_prog_f77_mismatched_args_parm
-+FFLAGS="$FFLAGS $addarg"
-
-- if test "X$addarg" != "X" ; then
-- # We could add the names of all of the MPI routines that
-- # accept different types. Instead, we fail cleanly.
-- # Some Fortran compilers allow you to turn off checking for
-- # mismatched arguments for *all* routines. Adding an argument
-- # that turns off checking for *everything* is not something that
-- # configure should do - if the user wants this, they can follow
-- # the instructions in the following error message.
-- as_fn_error $? "The Fortran compiler $F77 does not accept programs that call the same routine with arguments of different types without the option $addarg. Rerun configure with FFLAGS=$addarg" "$LINENO" 5
-- fi
--
- bindings="$bindings f77"
- bindings_dirs="$bindings_dirs src/binding/f77"
-
-@@ -43769,12 +43759,12 @@ return thr_create ();
- return 0;
- }
- _ACEOF
--for ac_lib in '' thread; do
-+for ac_lib in '' -lpthread; 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
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_thr_create=$ac_res
diff --git a/net/mpich2/files/patch-src_mpe2_src_sbin_mpeinstall.in b/net/mpich2/files/patch-src_mpe2_src_sbin_mpeinstall.in
deleted file mode 100644
index a391604385d8..000000000000
--- a/net/mpich2/files/patch-src_mpe2_src_sbin_mpeinstall.in
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/mpe2/sbin/mpeinstall.in.orig 2012-04-30 22:12:21.000000000 +0200
-+++ src/mpe2/sbin/mpeinstall.in 2014-08-31 12:34:38.000000000 +0200
-@@ -531,7 +531,7 @@
- # so $docdir (with NULL PACKAGE) is appended to dirlist for removal.
- savedPACKAGE=$PACKAGE
- PACKAGE=""
-- MkDir @docdir@
-+%%PORTDOCS%% MkDir @docdir@
- PACKAGE=$savedPACKAGE
- fi
-
-@@ -579,15 +579,15 @@
- # ie INSTALL $top_srcdir/doc $docdir
- # INSTALL $top_srcdir/man $mandir
- # INSTALL $top_srcdir/html $htmldir
--for type in doc man html ; do
-- typename=${type}dir
-- eval typevalue=\$"$typename"
-- if [ -d $top_srcdir/$type ] ; then
-- MkDir $typevalue
-- echo "Installing $pkgname $type to $DESTDIR$typevalue"
-- InstallDirRecur $top_srcdir/$type $typevalue $MODE
-- fi
--done
-+%%PORTDOCS%%for type in doc man html ; do
-+%%PORTDOCS%% typename=${type}dir
-+%%PORTDOCS%% eval typevalue=\$"$typename"
-+%%PORTDOCS%% if [ -d $top_srcdir/$type ] ; then
-+%%PORTDOCS%% MkDir $typevalue
-+%%PORTDOCS%% echo "Installing $pkgname $type to $DESTDIR$typevalue"
-+%%PORTDOCS%% InstallDirRecur $top_srcdir/$type $typevalue $MODE
-+%%PORTDOCS%% fi
-+%%PORTDOCS%%done
-
- # Remove old uninstall file
- if [ "$appendUninstall" = 0 -a -f $UNINSTALLFILE ] ; then
-@@ -649,8 +649,8 @@
- if [ "$appendUninstall" = 0 ] ; then
- cp $UNINSTALLFILE $sbinbuild_dir/mpeuninstall
- #
-- echo "Installed $pkgname in $DESTDIR$prefix"
-- echo "$UNINSTALLFILE may be used to remove the installation"
-+ echo "Installed $pkgname in $prefix"
-+ echo "${sbindir}/${UNINSTALL_base} may be used to remove the installation"
- fi
-
- if [ $errs -gt 0 ] ; then
diff --git a/net/mpich2/files/patch-src_mpi_romio_configure b/net/mpich2/files/patch-src_mpi_romio_configure
deleted file mode 100644
index 445f2c63e36d..000000000000
--- a/net/mpich2/files/patch-src_mpi_romio_configure
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
--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"
diff --git a/net/mpich2/files/patch-src_mpi_romio_util_romioinstall.in b/net/mpich2/files/patch-src_mpi_romio_util_romioinstall.in
deleted file mode 100644
index ef4f659c6f66..000000000000
--- a/net/mpich2/files/patch-src_mpi_romio_util_romioinstall.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./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
diff --git a/net/mpich2/files/patch-src_openpa_Makefile.in b/net/mpich2/files/patch-src_openpa_Makefile.in
deleted file mode 100644
index f8008ca54f2a..000000000000
--- a/net/mpich2/files/patch-src_openpa_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/openpa/Makefile.in.orig 2012-10-08 21:02:13.000000000 +0200
-+++ ./src/openpa/Makefile.in 2014-08-31 18:17:46.000000000 +0200
-@@ -316,7 +316,7 @@
- EXTRA_DIST = COPYRIGHT CHANGELOG openpa.pc.in VERSION
-
- # pkgconfig files
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(libdir)data/pkgconfig
- pkgconfig_DATA = openpa.pc
- all: all-recursive
-
diff --git a/net/mpich2/files/patch-src_openpa_configure b/net/mpich2/files/patch-src_openpa_configure
deleted file mode 100644
index 28effdae704b..000000000000
--- a/net/mpich2/files/patch-src_openpa_configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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}'
diff --git a/net/mpich2/files/patch-test_mpi_configure b/net/mpich2/files/patch-test_mpi_configure
deleted file mode 100644
index ca9e5b6c3303..000000000000
--- a/net/mpich2/files/patch-test_mpi_configure
+++ /dev/null
@@ -1,30 +0,0 @@
---- test/mpi/configure.orig 2012-10-08 19:02:24 UTC
-+++ test/mpi/configure
-@@ -9835,7 +9835,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
- # The best solution is to turn off errors on particular routines
- # if that isn't possible (e.g., too many of them), then
- # just try arguments that turn off all checking
-- for flags in "-mismatch" ; do
-+ for flags in "-fallow-argument-mismatch" "-mismatch" ; do
- testok=no
- FFLAGS="$FFLAGS $flags"
- cat > conftest.$ac_ext <<_ACEOF
-@@ -9877,17 +9877,7 @@ the same routine with arguments of different types." "
- fi
-
- addarg=$pac_cv_prog_f77_mismatched_args_parm
--
-- if test "X$addarg" != "X" ; then
-- # We could add the names of all of the MPI routines that
-- # accept different types. Instead, we fail cleanly.
-- # Some Fortran compilers allow you to turn off checking for
-- # mismatched arguments for *all* routines. Adding an argument
-- # that turns off checking for *everything* is not something that
-- # configure should do - if the user wants this, they can follow
-- # the instructions in the following error message.
-- as_fn_error $? "The Fortran compiler $F77 does not accept programs that call the same routine with arguments of different types without the option $addarg. Rerun configure with FFLAGS=$addarg" "$LINENO" 5
-- fi
-+FFLAGS="$FFLAGS $addarg"
-
- # Check whether we need -lU77 to get iargc and getarg, which
- # are used for a few of the tests in spawn (U77 was needed with
diff --git a/net/mpich2/files/pkg-message.in b/net/mpich2/files/pkg-message.in
deleted file mode 100644
index f2bf2b80f2f9..000000000000
--- a/net/mpich2/files/pkg-message.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-{ type: install
- message: <<EOM
-Please change the password in %%PREFIX%%/etc/mpd.conf
-EOM
-}
-]