Fix build by renaming libcolamd.a to libcolamd_mbdyn.a.

Submitted by:	maho
Approved by:	maintainer

2 files changed, 115 insertions, 2 deletions

diff --git a/science/mbdyn/files/patch-rename-libcolamd b/science/mbdyn/files/patch-rename-libcolamd
new file mode 100644
index 000000000000..891ec99637d4
--- /dev/null
+++ b/science/mbdyn/files/patch-rename-libcolamd
@@ -0,0 +1,113 @@
+--- libraries/libcolamd/Makefile.in~	Tue Feb 27 09:23:10 2007
++++ libraries/libcolamd/Makefile.in	Tue Feb 27 09:24:35 2007
+@@ -230,7 +230,7 @@
+ target_vendor = @target_vendor@
+ 
+ # Build libcolamd.a library
+-lib_LTLIBRARIES = libcolamd.la
++lib_LTLIBRARIES = libcolamd_mbdyn.la
+ libcolamd_la_SOURCES = \
+ colamd.c \
+ colamd.h
+@@ -300,7 +300,7 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-libcolamd.la: $(libcolamd_la_OBJECTS) $(libcolamd_la_DEPENDENCIES) 
++libcolamd_mbdyn.la: $(libcolamd_la_OBJECTS) $(libcolamd_la_DEPENDENCIES) 
+ 	$(LINK) -rpath $(libdir) $(libcolamd_la_LDFLAGS) $(libcolamd_la_OBJECTS) $(libcolamd_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+--- libraries/libmbwrap/Makefile.in~	Tue Feb 27 09:23:10 2007
++++ libraries/libmbwrap/Makefile.in	Tue Feb 27 09:26:59 2007
+@@ -90,7 +90,7 @@
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ libmbwrap_la_DEPENDENCIES = ../libmbmath/libmbmath.la \
+ 	../libmbutil/libmbutil.la ../libobjs/libobjs.la \
+-	../libcolamd/libcolamd.la ../libnaive/libnaive.la
++	../libcolamd/libcolamd_mbdyn.la ../libnaive/libnaive.la
+ am_libmbwrap_la_OBJECTS = chacowrap.lo harwout.lo harwout_.lo \
+ 	harwrap.lo lapackwrap.lo linsol.lo metiswrap.lo mschwrap.lo \
+ 	naivewrap.lo parsuperluwrap.lo superluwrap.lo umfpackwrap.lo \
+@@ -101,12 +101,12 @@
+ cctest_OBJECTS = $(am_cctest_OBJECTS)
+ cctest_DEPENDENCIES = ./libmbwrap.la ../libmbmath/libmbmath.la \
+ 	../libmbutil/libmbutil.la ../libobjs/libobjs.la \
+-	../libcolamd/libcolamd.la ../libnaive/libnaive.la
++	../libcolamd/libcolamd_mbdyn.la ../libnaive/libnaive.la
+ am_wraptest_OBJECTS = wraptest.$(OBJEXT)
+ wraptest_OBJECTS = $(am_wraptest_OBJECTS)
+ wraptest_DEPENDENCIES = ./libmbwrap.la ../libmbmath/libmbmath.la \
+ 	../libmbutil/libmbutil.la ../libobjs/libobjs.la \
+-	../libcolamd/libcolamd.la ../libnaive/libnaive.la
++	../libcolamd/libcolamd_mbdyn.la ../libnaive/libnaive.la
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+ depcomp = $(SHELL) $(top_srcdir)/build/depcomp
+ am__depfiles_maybe = depfiles
+@@ -293,7 +293,7 @@
+ ../libmbmath/libmbmath.la \
+ ../libmbutil/libmbutil.la \
+ ../libobjs/libobjs.la \
+-../libcolamd/libcolamd.la \
++../libcolamd/libcolamd_mbdyn.la \
+ ../libnaive/libnaive.la \
+ @UMFPACK_LIBS@ \
+ @MESCHACH_LIBS@ \
+@@ -316,7 +316,7 @@
+ ../libmbmath/libmbmath.la \
+ ../libmbutil/libmbutil.la \
+ ../libobjs/libobjs.la \
+-../libcolamd/libcolamd.la \
++../libcolamd/libcolamd_mbdyn.la \
+ ../libnaive/libnaive.la \
+ @UMFPACK_LIBS@ \
+ @MESCHACH_LIBS@ \
+@@ -337,7 +337,7 @@
+ ../libmbmath/libmbmath.la \
+ ../libmbutil/libmbutil.la \
+ ../libobjs/libobjs.la \
+-../libcolamd/libcolamd.la \
++../libcolamd/libcolamd_mbdyn.la \
+ ../libnaive/libnaive.la \
+ @UMFPACK_LIBS@ \
+ @MESCHACH_LIBS@ \
+--- mbdyn/Makefile.in~	Tue Feb 27 09:23:10 2007
++++ mbdyn/Makefile.in	Tue Feb 27 09:34:49 2007
+@@ -89,7 +89,7 @@
+ 	elec/libelec.la hydr/libhydr.la base/libbase.la \
+ 	$(am__DEPENDENCIES_1) ../libraries/libmbmath/libmbmath.la \
+ 	../libraries/libmbutil/libmbutil.la \
+-	../libraries/libcolamd/libcolamd.la \
++	../libraries/libcolamd/libcolamd_mbdyn.la \
+ 	../libraries/libnaive/libnaive.la \
+ 	../libraries/libobjs/libobjs.la $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
+@@ -276,7 +276,7 @@
+ ../libraries/libmbmath/libmbmath.la \
+ ../libraries/libmbutil/libmbutil.la \
+ @Y12_LIBS@ \
+-../libraries/libcolamd/libcolamd.la \
++../libraries/libcolamd/libcolamd_mbdyn.la \
+ ../libraries/libnaive/libnaive.la \
+ @HARWELL_LIBS@ \
+ @UMFPACK_LIBS@ \
+--- utils/Makefile.in~	Tue Feb 27 09:23:10 2007
++++ utils/Makefile.in	Tue Feb 27 09:35:37 2007
+@@ -91,7 +91,7 @@
+ 2vec2phi_OBJECTS = $(am_2vec2phi_OBJECTS)
+ am__DEPENDENCIES_1 = ../libraries/libobjs/libobjs.la \
+ 	../libraries/libmbwrap/libmbwrap.la \
+-	../libraries/libcolamd/libcolamd.la \
++	../libraries/libcolamd/libcolamd_mbdyn.la \
+ 	../libraries/libmbmath/libmbmath.la \
+ 	../libraries/libmbutil/libmbutil.la
+ 2vec2phi_DEPENDENCIES = $(am__DEPENDENCIES_1)
+@@ -340,7 +340,7 @@
+ ../libraries/libobjs/libobjs.la \
+ ../libraries/libmbwrap/libmbwrap.la \
+ @Y12_LIBS@ \
+-../libraries/libcolamd/libcolamd.la \
++../libraries/libcolamd/libcolamd_mbdyn.la \
+ ../libraries/libmbmath/libmbmath.la \
+ ../libraries/libmbutil/libmbutil.la \
+ @HARWELL_LIBS@ \
diff --git a/science/mbdyn/pkg-plist b/science/mbdyn/pkg-plist
index 65083d88fa02..e04ca4836215 100644
--- a/science/mbdyn/pkg-plist
+++ b/science/mbdyn/pkg-plist
@@ -29,8 +29,8 @@ lib/libmbmath.la
 lib/libmbmath.a
 lib/liby12.la
 lib/liby12.a
-lib/libcolamd.la
-lib/libcolamd.a
+lib/libcolamd_mbdyn.la
+lib/libcolamd_mbdyn.a
 lib/libnaive.la
 lib/libnaive.a
 lib/libmbwrap.la