reinit the tree, so we can have metadata

5 files changed, 128 insertions, 0 deletions

diff --git a/sci-libs/mc/files/1.4-doc.patch b/sci-libs/mc/files/1.4-doc.patch
new file mode 100644
index 000000000000..f57777b8a419
--- /dev/null
+++ b/sci-libs/mc/files/1.4-doc.patch
@@ -0,0 +1,20 @@
+diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
+index da96a19..afdf06d 100644
+--- a/doc/doxygen/Makefile.am
++++ b/doc/doxygen/Makefile.am
+@@ -29,13 +29,11 @@
+ ## Author:  Michael Holst
+ ## ###########################################################################
+ 
+-docdir = @prefix@/doc/mc
+-
+ doc_DATA = mc_doc
+ 
+ mc_doc: 
+ 	$(doxygen_path) $(top_srcdir)/doc/doxygen/mc.dox
+ 
+ install-docDATA:
+-	mkdir -p $(docdir)
+-	cp -r ../api $(docdir)/
++	mkdir -p $(DESTDIR)/@docdir@
++	cp -r ../api $(DESTDIR)/@docdir@/
diff --git a/sci-libs/mc/files/1.4-multilib.patch b/sci-libs/mc/files/1.4-multilib.patch
new file mode 100644
index 000000000000..427cb94f2c8b
--- /dev/null
+++ b/sci-libs/mc/files/1.4-multilib.patch
@@ -0,0 +1,16 @@
+diff --git a/src/aaa_lib/Makefile.am b/src/aaa_lib/Makefile.am
+index d5b8d47..132824b 100644
+--- a/src/aaa_lib/Makefile.am
++++ b/src/aaa_lib/Makefile.am
+@@ -47,10 +47,9 @@ NAM_LIBS  = ../nam/libnam.la
+ DYN_LIBS  = ../dyn/libdyn.la
+ PDE_LIBS  = ../pde/libpde.la
+ 
+-libdir = ${prefix}/lib
+ lib_LTLIBRARIES = libmc.la
+ 
+ libmc_la_SOURCES = 
+-libmc_la_LIBADD  = ${BASE_LIBS} ${BAM_LIBS} ${WHB_LIBS} ${APRX_LIBS} ${GEM_LIBS} ${MCSH_LIBS} ${NAM_LIBS} ${DYN_LIBS} ${PDE_LIBS}
++libmc_la_LIBADD  = ${BASE_LIBS} ${BAM_LIBS} ${WHB_LIBS} ${APRX_LIBS} ${GEM_LIBS} ${MCSH_LIBS} ${NAM_LIBS} ${DYN_LIBS} ${PDE_LIBS} -lmaloc -lpunc -lumfpack -lamd -lsuperlu
+ libmc_la_LDFLAGS = -version-info ${FETK_VERSION}
+ 
diff --git a/sci-libs/mc/files/1.4-overflow.patch b/sci-libs/mc/files/1.4-overflow.patch
new file mode 100644
index 000000000000..78610b0f2210
--- /dev/null
+++ b/sci-libs/mc/files/1.4-overflow.patch
@@ -0,0 +1,13 @@
+diff --git a/src/gem/gemdisp.c b/src/gem/gemdisp.c
+index 01f277f..96d5851 100644
+--- a/src/gem/gemdisp.c
++++ b/src/gem/gemdisp.c
+@@ -1631,7 +1631,7 @@ VPUBLIC void Gem_writeDX(Gem *thee, Vio *sock,
+ VPUBLIC void Gem_writeTEC(Gem *thee, Vio *sock,
+     int fldKey, double *defX[MAXV])
+ {
+-    char str1[10], str2[10];
++    char str1[16], str2[16];
+     int i, j, vec, dim, dimII, dimVV, numVV, numSS;
+     VV *vx;
+     SS *sm;
diff --git a/sci-libs/mc/files/1.4-superlu.patch b/sci-libs/mc/files/1.4-superlu.patch
new file mode 100644
index 000000000000..cc3ce0a24740
--- /dev/null
+++ b/sci-libs/mc/files/1.4-superlu.patch
@@ -0,0 +1,21 @@
+diff --git a/src/bam/zslu.c b/src/bam/zslu.c
+index 973b911..d82c7fd 100644
+--- a/src/bam/zslu.c
++++ b/src/bam/zslu.c
+@@ -401,6 +401,7 @@ VPUBLIC int Zslu_factor(Zslu *thee)
+     SCformat *Lstore;
+     SuperMatrix *BB;
+     superlu_options_t *oopts;
++    SuperLUStat_t stat;
+ 
+     VASSERT( thee != VNULL );
+ 
+@@ -444,7 +445,7 @@ VPUBLIC int Zslu_factor(Zslu *thee)
+             Lstore->nnz + Ustore->nnz - thee->n);
+         printf("L\\U MB %.3f\ttotal MB needed %.3f\texpansions %d\n",
+             mem_usage.for_lu/1e6, mem_usage.total_needed/1e6,
+-            mem_usage.expansions);
++            stat.expansions);
+         fflush(stdout);
+ 
+     } else if ( info > 0 && thee->lwork == -1 ) {
diff --git a/sci-libs/mc/files/mc-1.5-unbundle.patch b/sci-libs/mc/files/mc-1.5-unbundle.patch
new file mode 100644
index 000000000000..5a9a97241980
--- /dev/null
+++ b/sci-libs/mc/files/mc-1.5-unbundle.patch
@@ -0,0 +1,58 @@
+ configure.ac |   38 ++++++--------------------------------
+ 1 files changed, 6 insertions(+), 32 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6198ac0..4b1b169 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -191,44 +191,18 @@ dnl # -----------------------
+ dnl # HANDLE THE BLAS LIBRARY
+ dnl # -----------------------
+ blas_lib="";
+-AC_MSG_CHECKING([whether your environment defines FETK_BLAS_LIBRARY])
+-if test -n "${FETK_BLAS_LIBRARY}"; then
+-    AC_MSG_RESULT([yes])
+-    blas_lib_path="-L${FETK_BLAS_LIBRARY} ";
+-else
+-    AC_MSG_RESULT([no])
+-    blas_lib_path="-L${FETK_LIBRARY} ";
+-fi
+-LDFLAGS_SAVE=${LDFLAGS};
+-LDFLAGS=${blas_lib_path};
+-blas_use="";
+-AC_CHECK_LIB(blas,dscal_,
+-    [blas_use="yes";blas_lib="${blas_lib_path}-lblas";AC_DEFINE(HAVE_BLAS)],
+-    [blas_use="";blas_lib=""],
+-    [${blas_lib_path}-lblas ${vf2c_lib}])
+-LDFLAGS=${LDFLAGS_SAVE};
++blas_lib_path="";
++PKG_CHECK_MODULES([BLAS], [blas])
++blas_lib="${BLAS_LIBS}";
+ AC_SUBST(blas_lib)
+ 
+ dnl # -------------------------
+ dnl # HANDLE THE LAPACK LIBRARY
+ dnl # -------------------------
+ lapack_lib="";
+-AC_MSG_CHECKING([whether your environment defines FETK_LAPACK_LIBRARY])
+-if test -n "${FETK_LAPACK_LIBRARY}"; then
+-    AC_MSG_RESULT([yes])
+-    lapack_lib_path="-L${FETK_LAPACK_LIBRARY} ";
+-else
+-    AC_MSG_RESULT([no])
+-    lapack_lib_path="-L${FETK_LIBRARY} ";
+-fi
+-LDFLAGS_SAVE=${LDFLAGS};
+-LDFLAGS=${lapack_lib_path};
+-lapack_use="";
+-AC_CHECK_LIB(lapack,dsysv_,
+-    [lapack_use="yes";lapack_lib="${lapack_lib_path}-llapack";AC_DEFINE(HAVE_LAPACK)],
+-    [lapack_use="";lapack_lib=""],
+-    [${lapack_lib_path}-llapack ${blas_lib} ${vf2c_lib}])
+-LDFLAGS=${LDFLAGS_SAVE};
++lapack_lib_path="";
++PKG_CHECK_MODULES([LAPACK], [lapack])
++lapack_lib="${LAPACK_LIBS}"
+ AC_SUBST(lapack_lib)
+ 
+ dnl # --------------------------