Index: head/math/mumps/Makefile =================================================================== --- head/math/mumps/Makefile (revision 443590) +++ head/math/mumps/Makefile (revision 443591) @@ -1,163 +1,170 @@ # Created by: Pedro Giffuni # $FreeBSD$ PORTNAME= mumps -PORTVERSION= 4.10.0 -PORTREVISION= 6 +PORTVERSION= 4.10.0 # Please do not upgrade to 5+: if needed repocopy to math/mumps5 +PORTREVISION= 7 CATEGORIES= math MASTER_SITES= http://mumps.enseeiht.fr/ \ http://graal.ens-lyon.fr/MUMPS/ \ http://www.enseeiht.fr/apo/MUMPS/ \ http://www.enseeiht.fr/irit/apo/MUMPS/ DISTNAME= MUMPS_${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= MUltifrontal Massively Parallel sparse direct Solver LICENSE= PD LICENSE_FILE= ${WRKSRC}/LICENSE #----------------------------------------------------------------------- # WARNING: Non-serviceable parts inside, can break other ports # You may define these options/knobs: # # FFLAGS: Fortran compiler flags for gfortran # WITH_OPTIMIZED_FLAGS:Try to use agressive (non-CPU) FFLAGS # BLAS_LIBS: specify other version of BLAS # WITH_ATLAS: Use ATLAS instead of the regular BLAS # WITH_METIS: Add METIS ordering # WITH_MPI: Use mpich for the parallel version #----------------------------------------------------------------------- SLAVEDIRS= math/mumps-mpich USES= fortran MAKE_JOBS_UNSAFE=yes FORTRANLIBS= -lgfortran GCCLIBDIR= ${LDFLAGS} +USE_LDCONFIG= yes .if defined(WITH_OPTIMIZED_FLAGS) FFLAGS+= -O3 -ffast-math .endif .ifdef WITH_METIS BUILD_DEPENDS+= ${LOCALBASE}/bin/oemetis:math/metis4 MAKE_ENV+= ORDERINGSF=-Dmetis .endif PLIST_SUB+= MUMPSVERSION=${PORTVERSION} OPTIONS_DEFINE= DOCS EXAMPLES .include .if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS) WITH_ATLAS= yes .endif .if defined(WITH_ATLAS) LIB_DEPENDS+= libatlas.so:math/atlas BLAS_LIBS= -lf77blas LAPACK_LIBS= -lalapack -lcblas .else LIB_DEPENDS+= libblas.so:math/blas BLAS_LIBS= -lblas LAPACK_LIBS= -llapack .endif .ifdef WITH_MPI PKGNAMESUFFIX+= -mpich BUILD_DEPENDS+= ${LOCALBASE}/include/mpif.h:net/mpich2 \ ${LOCALBASE}/lib/libblacs.a:math/blacs \ ${LOCALBASE}/lib/libscalapack.a:math/scalapack LIB_DEPENDS+= liblapack.so:math/lapack # Note: -l?mumps still requires to be linked with -lblacs + -lscalapack RUN_DEPENDS+= ${LOCALBASE}/bin/mpirun:net/mpich2 \ ${LOCALBASE}/lib/libblacs.a:math/blacs \ ${LOCALBASE}/lib/libscalapack.a:math/scalapack CONFLICTS= mumps-4* .else CONFLICTS= mumps-mpich-4* .endif .ifndef WITH_MPI PLIST_SUB+= WITH_LIBSEQ="" .else PLIST_SUB+= WITH_LIBSEQ="@comment " .endif pre-configure: .ifdef WITH_MPI ${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.inc.generic \ ${WRKSRC}/Makefile.inc .else ${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.inc.generic.SEQ \ ${WRKSRC}/Makefile.inc + ${REINPLACE_CMD} -e 's+LIBPAR+LIBSEQ+' ${WRKSRC}/src/Makefile .endif pre-build: ${DIRNAME} `${FC} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR +.for MF in Makefile.inc PORD/lib/Makefile libseq/Makefile src/Makefile ${REINPLACE_CMD} -e 's+@CC@+${CC}+g ; s+@FC@+${FC}+g ; \ - s+@CFLAGS@+${CFLAGS}+g; \ - s+@FCFLAGS@+${FCFLAGS}+g; \ + s+@CFLAGS@+${CFLAGS} -fPIC+g; \ + s+@FCFLAGS@+${FCFLAGS} -fPIC+g; \ + s+@SOVER@+${PORTVERSION}+g; \ s+@GCCLIBDIR@+${GCCLIBDIR}+g; \ s+@FORTRANLIBS@+${FORTRANLIBS}+g; \ s+@BLAS_LIBS@+${BLAS_LIBS}+ ; \ s+@LOCALBASE@+${LOCALBASE}+g;' \ - ${WRKSRC}/Makefile.inc + ${WRKSRC}/${MF} +.endfor .ifdef WITH_MPI ${REINPLACE_CMD} -e 's+@LAPACK_LIBS@+${LAPACK_LIBS}+g;' ${WRKSRC}/Makefile.inc .endif .ifdef WITH_METIS ${REINPLACE_CMD} -e 's+#LMETIS+LMETIS+' ${WRKSRC}/Makefile.inc .endif do-install: ${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/lib/lib*.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_LIB} ${WRKSRC}/lib/lib*.so ${STAGEDIR}${PREFIX}/lib .ifndef WITH_MPI ${INSTALL_DATA} ${WRKSRC}/libseq/libmpiseq.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_LIB} ${WRKSRC}/libseq/libmpiseq*.so ${STAGEDIR}${PREFIX}/lib .endif ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/userguide_${PORTVERSION}.pdf ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/userguide_${PORTVERSION}.ps ${STAGEDIR}${DOCSDIR} ${GZIP_CMD} ${STAGEDIR}${DOCSDIR}/userguide_${PORTVERSION}.ps ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} . for ex in Makefile README *.c *.F input_simpletest_* ${INSTALL_DATA} ${WRKSRC}/examples/${ex} ${STAGEDIR}${EXAMPLESDIR} . endfor . for ex in c_example *simpletest ${INSTALL_PROGRAM} ${WRKSRC}/examples/${ex} ${STAGEDIR}${EXAMPLESDIR} . endfor -regression-test: +regression-test: install .if defined (WITH_MPI) && defined(MAINTAINER_MODE) . if !exists(${HOME}/.mpd.conf) @${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${HOME}/.mpd.conf ${CHMOD} go-r ${HOME}/.mpd.conf @${ECHO_MSG} "${HOME}/.mpd.conf has been generated - please change the secret word!" . endif ${LOCALBASE}/bin/mpd & (cd ${WRKSRC}/examples && \ ${LOCALBASE}/bin/mpirun -np 2 ./ssimpletest < input_simpletest_real ; \ ${LOCALBASE}/bin/mpirun -np 2 ./dsimpletest < input_simpletest_real ; \ ${LOCALBASE}/bin/mpirun -np 2 ./csimpletest < input_simpletest_cmplx ; \ ${LOCALBASE}/bin/mpirun -np 2 ./zsimpletest < input_simpletest_cmplx ; \ ${ECHO_MSG} "The solution should be (1,2,3,4,5)" ; \ ${LOCALBASE}/bin/mpirun -np 3 ./c_example ; \ ${ECHO_MSG} "The solution should be (1,2)") ${LOCALBASE}/bin/mpdallexit .else (cd ${WRKSRC}/examples && \ ./ssimpletest < input_simpletest_real ; \ ./dsimpletest < input_simpletest_real ; \ ./csimpletest < input_simpletest_cmplx ; \ ./zsimpletest < input_simpletest_cmplx ; \ ${ECHO_MSG} "The solution should be (1,2,3,4,5)" ; \ ./c_example ; \ ${ECHO_MSG} "The solution should be (1,2)") .endif .include Index: head/math/mumps/files/patch-Make.inc+Makefile.inc.generic =================================================================== --- head/math/mumps/files/patch-Make.inc+Makefile.inc.generic (revision 443590) +++ head/math/mumps/files/patch-Make.inc+Makefile.inc.generic (nonexistent) @@ -1,89 +0,0 @@ ---- Make.inc/Makefile.inc.generic.orig 2011-05-10 14:56:32.000000000 +0200 -+++ Make.inc/Makefile.inc.generic 2013-08-11 17:41:51.000000000 +0200 -@@ -39,7 +39,7 @@ - # Metis/ParMetis and SCOTCH/PT-SCOTCH (ver 5.1 and later) orderings are now available for MUMPS. - # - --#SCOTCHDIR = ${HOME}/scotch_5.1_esmumps -+#SCOTCHDIR = @LOCALBASE@ - #ISCOTCH = -I$(SCOTCHDIR)/include - # You have to choose one among the following two lines depending on - # the type of analysis you want to perform. If you want to perform only -@@ -55,7 +55,7 @@ - IPORD = -I$(topdir)/PORD/include/ - LPORD = -L$(LPORDDIR) -lpord - --#LMETISDIR = /local/metis/ -+#LMETISDIR = @LOCALBASE@/lib - #IMETIS = # Should be provided if you use parmetis - - # You have to choose one among the following two lines depending on -@@ -70,7 +70,7 @@ - # The following variables will be used in the compilation process. - # Please note that -Dptscotch and -Dparmetis imply -Dscotch and -Dmetis respectively. - #ORDERINGSF = -Dscotch -Dmetis -Dpord -Dptscotch -Dparmetis --ORDERINGSF = -Dpord -+ORDERINGSF += -Dpord - ORDERINGSC = $(ORDERINGSF) - - LORDERINGS = $(LMETIS) $(LPORD) $(LSCOTCH) -@@ -91,11 +91,11 @@ - # RM : remove files - RM = /bin/rm -f - # CC : C compiler --CC = cc -+CC = @CC@ - # FC : Fortran 90 compiler --FC = f90 -+FC = @FC@ - # FL : Fortran linker --FL = f90 -+FL = @FC@ - # AR : Archive object in a library - # keep a space at the end if options have to be separated from lib name - AR = ar vr -@@ -105,13 +105,13 @@ - #RANLIB = echo - - # SCALAP should define the SCALAPACK and BLACS libraries. --SCALAP = -lscalapack -lblacs -+SCALAP = -L@LOCALBASE@/lib -lblacs -lblacsc -lblacsf77 -lscalapack - - # INCLUDE DIRECTORY FOR MPI --INCPAR = -I/usr/include -+INCPAR = -I@LOCALBASE@/include - - # LIBRARIES USED BY THE PARALLEL VERSION OF MUMPS: $(SCALAP) and MPI --LIBPAR = $(SCALAP) -L/usr/lib -lmpi -+LIBPAR = -L@LOCALBASE@/lib -lfmpich -lmpich -lmpl $(SCALAP) - - # The parallel version is not concerned by the next two lines. - # They are related to the sequential library provided by MUMPS, -@@ -121,10 +121,10 @@ - - # DEFINE HERE YOUR BLAS LIBRARY - --LIBBLAS = -lblas -+LIBBLAS = -L@LOCALBASE@/lib @LAPACK_LIBS@ @BLAS_LIBS@ - - # DEFINE YOUR PTHREAD LIBRARY --LIBOTHERS = -lpthread -+LIBOTHERS = -lpthread @GCCLIBDIR@ @FORTRANLIBS@ - - # FORTRAN/C COMPATIBILITY: - # Use: -@@ -137,11 +137,11 @@ - # leave empty if your Fortran compiler does not change the symbols. - # - --CDEFS = -DAdd_ -+CDEFS ?= -DAdd_ - - #COMPILER OPTIONS --OPTF = -O --OPTC = -O -I. -+OPTF = @FCFLAGS@ -+OPTC = @CFLAGS@ - OPTL = -O - - # CHOOSE BETWEEN USING THE SEQUENTIAL OR THE PARALLEL VERSION. Property changes on: head/math/mumps/files/patch-Make.inc+Makefile.inc.generic ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/mumps/files/patch-Make.inc+Makefile.inc.generic.SEQ =================================================================== --- head/math/mumps/files/patch-Make.inc+Makefile.inc.generic.SEQ (revision 443590) +++ head/math/mumps/files/patch-Make.inc+Makefile.inc.generic.SEQ (nonexistent) @@ -1,78 +0,0 @@ ---- Make.inc/Makefile.inc.generic.SEQ.orig 2011-05-10 14:56:32.000000000 +0200 -+++ Make.inc/Makefile.inc.generic.SEQ 2013-08-11 18:13:02.000000000 +0200 -@@ -41,7 +41,7 @@ - # Metis/ParMetis and SCOTCH/PT-SCOTCH (ver 5.1 and later) orderings are now available for MUMPS. - # - --#SCOTCHDIR = ${HOME}/scotch_5.1_esmumps -+#SCOTCHDIR = @LOCALBASE@ - #ISCOTCH = -I$(SCOTCHDIR)/include - # You have to choose one among the following two lines depending on - # the type of analysis you want to perform. If you want to perform only -@@ -57,7 +57,7 @@ - IPORD = -I$(topdir)/PORD/include/ - LPORD = -L$(LPORDDIR) -lpord - --#LMETISDIR = /local/metis/ -+#LMETISDIR = @LOCALBASE@/lib - #IMETIS = # Should be provided if you use parmetis - - # You have to choose one among the following two lines depending on -@@ -72,7 +72,7 @@ - # The following variables will be used in the compilation process. - # Please note that -Dptscotch and -Dparmetis imply -Dscotch and -Dmetis respectively. - #ORDERINGSF = -Dscotch -Dmetis -Dpord -Dptscotch -Dparmetis --ORDERINGSF = -Dpord -+ORDERINGSF += -Dpord - ORDERINGSC = $(ORDERINGSF) - - LORDERINGS = $(LMETIS) $(LPORD) $(LSCOTCH) -@@ -95,11 +95,11 @@ - # RM : remove files - RM = /bin/rm -f - # CC : C compiler --CC = cc -+CC = @CC@ - # FC : Fortran 90 compiler --FC = f90 -+FC = @FC@ - # FL : Fortran linker --FL = f90 -+FL = @FC@ - # AR : Archive object in a library - # keep a space at the end if options have to be separated from lib name - AR = ar vr -@@ -112,14 +112,14 @@ - # the sequential library provided by MUMPS, to use instead - # of ScaLAPACK and MPI. - INCSEQ = -I$(topdir)/libseq --LIBSEQ = -Llibseq -lmpiseq -+LIBSEQ = -L$(topdir)/libseq -lmpiseq - - # DEFINE HERE YOUR BLAS LIBRARY - --LIBBLAS = -lblas -+LIBBLAS = -L@LOCALBASE@/lib @BLAS_LIBS@ - - # DEFINE HERE YOUR PTHREAD LIBRARY --LIBOTHERS = -lpthread -+LIBOTHERS = -lpthread @GCCLIBDIR@ @FORTRANLIBS@ - - # FORTRAN/C COMPATIBILITY: - # Use: -@@ -132,12 +132,12 @@ - # leave empty if your Fortran compiler does not change the symbols. - # - --CDEFS = -DAdd_ -+CDEFS ?= -DAdd_ - - #COMPILER OPTIONS - --OPTF = -O --OPTC = -O -I. -+OPTF = @FCFLAGS@ -+OPTC = @CFLAGS@ - OPTL = -O - - #Sequential: Property changes on: head/math/mumps/files/patch-Make.inc+Makefile.inc.generic.SEQ ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/mumps/files/patch-Make.inc_Makefile.inc.generic =================================================================== --- head/math/mumps/files/patch-Make.inc_Makefile.inc.generic (nonexistent) +++ head/math/mumps/files/patch-Make.inc_Makefile.inc.generic (revision 443591) @@ -0,0 +1,89 @@ +--- Make.inc/Makefile.inc.generic.orig 2011-05-10 12:56:32 UTC ++++ Make.inc/Makefile.inc.generic +@@ -39,7 +39,7 @@ + # Metis/ParMetis and SCOTCH/PT-SCOTCH (ver 5.1 and later) orderings are now available for MUMPS. + # + +-#SCOTCHDIR = ${HOME}/scotch_5.1_esmumps ++#SCOTCHDIR = @LOCALBASE@ + #ISCOTCH = -I$(SCOTCHDIR)/include + # You have to choose one among the following two lines depending on + # the type of analysis you want to perform. If you want to perform only +@@ -55,7 +55,7 @@ LPORDDIR = $(topdir)/PORD/lib/ + IPORD = -I$(topdir)/PORD/include/ + LPORD = -L$(LPORDDIR) -lpord + +-#LMETISDIR = /local/metis/ ++#LMETISDIR = @LOCALBASE@/lib + #IMETIS = # Should be provided if you use parmetis + + # You have to choose one among the following two lines depending on +@@ -70,7 +70,7 @@ LPORD = -L$(LPORDDIR) -lpord + # The following variables will be used in the compilation process. + # Please note that -Dptscotch and -Dparmetis imply -Dscotch and -Dmetis respectively. + #ORDERINGSF = -Dscotch -Dmetis -Dpord -Dptscotch -Dparmetis +-ORDERINGSF = -Dpord ++ORDERINGSF += -Dpord + ORDERINGSC = $(ORDERINGSF) + + LORDERINGS = $(LMETIS) $(LPORD) $(LSCOTCH) +@@ -91,11 +91,11 @@ OUTF = -o + # RM : remove files + RM = /bin/rm -f + # CC : C compiler +-CC = cc ++CC = @CC@ + # FC : Fortran 90 compiler +-FC = f90 ++FC = @FC@ + # FL : Fortran linker +-FL = f90 ++FL = @FC@ + # AR : Archive object in a library + # keep a space at the end if options have to be separated from lib name + AR = ar vr +@@ -105,13 +105,13 @@ RANLIB = ranlib + #RANLIB = echo + + # SCALAP should define the SCALAPACK and BLACS libraries. +-SCALAP = -lscalapack -lblacs ++SCALAP = -L@LOCALBASE@/lib -lblacs -lblacsc -lblacsf77 -lscalapack + + # INCLUDE DIRECTORY FOR MPI +-INCPAR = -I/usr/include ++INCPAR = -I@LOCALBASE@/include + + # LIBRARIES USED BY THE PARALLEL VERSION OF MUMPS: $(SCALAP) and MPI +-LIBPAR = $(SCALAP) -L/usr/lib -lmpi ++LIBPAR = -L@LOCALBASE@/lib -lfmpich -lmpich -lmpl $(SCALAP) + + # The parallel version is not concerned by the next two lines. + # They are related to the sequential library provided by MUMPS, +@@ -121,10 +121,10 @@ LIBSEQ = -Llibseq -lmpiseq + + # DEFINE HERE YOUR BLAS LIBRARY + +-LIBBLAS = -lblas ++LIBBLAS = -L@LOCALBASE@/lib @LAPACK_LIBS@ @BLAS_LIBS@ + + # DEFINE YOUR PTHREAD LIBRARY +-LIBOTHERS = -lpthread ++LIBOTHERS = -lpthread @GCCLIBDIR@ @FORTRANLIBS@ + + # FORTRAN/C COMPATIBILITY: + # Use: +@@ -137,11 +137,11 @@ LIBOTHERS = -lpthread + # leave empty if your Fortran compiler does not change the symbols. + # + +-CDEFS = -DAdd_ ++CDEFS ?= -DAdd_ + + #COMPILER OPTIONS +-OPTF = -O +-OPTC = -O -I. ++OPTF = @FCFLAGS@ ++OPTC = @CFLAGS@ + OPTL = -O + + # CHOOSE BETWEEN USING THE SEQUENTIAL OR THE PARALLEL VERSION. Property changes on: head/math/mumps/files/patch-Make.inc_Makefile.inc.generic ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/mumps/files/patch-Make.inc_Makefile.inc.generic.SEQ =================================================================== --- head/math/mumps/files/patch-Make.inc_Makefile.inc.generic.SEQ (nonexistent) +++ head/math/mumps/files/patch-Make.inc_Makefile.inc.generic.SEQ (revision 443591) @@ -0,0 +1,78 @@ +--- Make.inc/Makefile.inc.generic.SEQ.orig 2011-05-10 12:56:32 UTC ++++ Make.inc/Makefile.inc.generic.SEQ +@@ -41,7 +41,7 @@ + # Metis/ParMetis and SCOTCH/PT-SCOTCH (ver 5.1 and later) orderings are now available for MUMPS. + # + +-#SCOTCHDIR = ${HOME}/scotch_5.1_esmumps ++#SCOTCHDIR = @LOCALBASE@ + #ISCOTCH = -I$(SCOTCHDIR)/include + # You have to choose one among the following two lines depending on + # the type of analysis you want to perform. If you want to perform only +@@ -57,7 +57,7 @@ LPORDDIR = $(topdir)/PORD/lib/ + IPORD = -I$(topdir)/PORD/include/ + LPORD = -L$(LPORDDIR) -lpord + +-#LMETISDIR = /local/metis/ ++#LMETISDIR = @LOCALBASE@/lib + #IMETIS = # Should be provided if you use parmetis + + # You have to choose one among the following two lines depending on +@@ -72,7 +72,7 @@ LPORD = -L$(LPORDDIR) -lpord + # The following variables will be used in the compilation process. + # Please note that -Dptscotch and -Dparmetis imply -Dscotch and -Dmetis respectively. + #ORDERINGSF = -Dscotch -Dmetis -Dpord -Dptscotch -Dparmetis +-ORDERINGSF = -Dpord ++ORDERINGSF += -Dpord + ORDERINGSC = $(ORDERINGSF) + + LORDERINGS = $(LMETIS) $(LPORD) $(LSCOTCH) +@@ -95,11 +95,11 @@ OUTF = -o + # RM : remove files + RM = /bin/rm -f + # CC : C compiler +-CC = cc ++CC = @CC@ + # FC : Fortran 90 compiler +-FC = f90 ++FC = @FC@ + # FL : Fortran linker +-FL = f90 ++FL = @FC@ + # AR : Archive object in a library + # keep a space at the end if options have to be separated from lib name + AR = ar vr +@@ -112,14 +112,14 @@ RANLIB = ranlib + # the sequential library provided by MUMPS, to use instead + # of ScaLAPACK and MPI. + INCSEQ = -I$(topdir)/libseq +-LIBSEQ = -Llibseq -lmpiseq ++LIBSEQ = -L$(topdir)/libseq -lmpiseq + + # DEFINE HERE YOUR BLAS LIBRARY + +-LIBBLAS = -lblas ++LIBBLAS = -L@LOCALBASE@/lib @BLAS_LIBS@ + + # DEFINE HERE YOUR PTHREAD LIBRARY +-LIBOTHERS = -lpthread ++LIBOTHERS = -lpthread @GCCLIBDIR@ @FORTRANLIBS@ + + # FORTRAN/C COMPATIBILITY: + # Use: +@@ -132,12 +132,12 @@ LIBOTHERS = -lpthread + # leave empty if your Fortran compiler does not change the symbols. + # + +-CDEFS = -DAdd_ ++CDEFS ?= -DAdd_ + + #COMPILER OPTIONS + +-OPTF = -O +-OPTC = -O -I. ++OPTF = @FCFLAGS@ ++OPTC = @CFLAGS@ + OPTL = -O + + #Sequential: Property changes on: head/math/mumps/files/patch-Make.inc_Makefile.inc.generic.SEQ ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/mumps/files/patch-Makefile =================================================================== --- head/math/mumps/files/patch-Makefile (nonexistent) +++ head/math/mumps/files/patch-Makefile (revision 443591) @@ -0,0 +1,20 @@ +--- Makefile.orig 2011-05-10 12:56:32 UTC ++++ Makefile +@@ -51,7 +51,7 @@ zexamples: z + (cd examples ; $(MAKE) z) + + +-requiredobj: Makefile.inc $(LIBSEQNEEDED) $(libdir)/libpord$(PLAT)$(LIBEXT) ++requiredobj: Makefile.inc $(LIBSEQNEEDED) $(libdir)/libpord$(PLAT)$(LIBEXT) $(libdir)/libpord$(PLAT).so + + # dummy MPI library (sequential version) + +@@ -65,7 +65,7 @@ $(libdir)/libpord$(PLAT)$(LIBEXT): + $(MAKE) CC="$(CC)" CFLAGS="$(OPTC)" AR="$(AR)" RANLIB="$(RANLIB)" OUTC=$(OUTC) LIBEXT=$(LIBEXT); \ + fi; + if [ "$(LPORDDIR)" != "" ] ; then \ +- cp $(LPORDDIR)/libpord$(LIBEXT) $@; \ ++ cp $(LPORDDIR)/libpord* $(libdir)/; \ + fi; + + clean: Property changes on: head/math/mumps/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/mumps/files/patch-PORD_lib_Makefile =================================================================== --- head/math/mumps/files/patch-PORD_lib_Makefile (revision 443590) +++ head/math/mumps/files/patch-PORD_lib_Makefile (revision 443591) @@ -1,11 +1,21 @@ ---- PORD/lib/Makefile.orig 2011-05-10 14:56:32.000000000 +0200 -+++ PORD/lib/Makefile 2013-08-11 18:31:47.000000000 +0200 -@@ -22,7 +22,7 @@ +--- PORD/lib/Makefile.orig 2011-05-10 12:56:32 UTC ++++ PORD/lib/Makefile +@@ -21,10 +21,16 @@ OBJS = graph.o gbipart.o gbisect.o ddcre + .c.o: $(CC) $(COPTIONS) -c $*.c $(OUTC)$*.o - libpord$(LIBEXT):$(OBJS) +-libpord$(LIBEXT):$(OBJS) - $(AR)$@ $(OBJS) ++all: libpord$(LIBEXT) libpord.so ++ ++libpord$(LIBEXT): $(OBJS) + $(AR) $@ $(OBJS) $(RANLIB) $@ ++libpord.so: $(OBJS) ++ $(CC) -shared $(OBJS) -Wl,-soname,libpord$(PLAT)-@SOVER@.so -o libpord$(PLAT)-@SOVER@.so -Wl,-z,defs ++ ln -s libpord$(PLAT)-@SOVER@.so $@ ++ clean: + rm -f *.o + Index: head/math/mumps/files/patch-libseq_Makefile =================================================================== --- head/math/mumps/files/patch-libseq_Makefile (revision 443590) +++ head/math/mumps/files/patch-libseq_Makefile (revision 443591) @@ -1,11 +1,24 @@ ---- libseq/Makefile.orig 2011-05-10 14:56:39.000000000 +0200 -+++ libseq/Makefile 2013-08-11 18:05:34.000000000 +0200 -@@ -10,7 +10,7 @@ - libmpiseq: libmpiseq$(PLAT)$(LIBEXT) +--- libseq/Makefile.orig 2011-05-10 12:56:39 UTC ++++ libseq/Makefile +@@ -7,13 +7,19 @@ all: libmpiseq + include ../Makefile.inc + +-libmpiseq: libmpiseq$(PLAT)$(LIBEXT) ++libmpiseq: libmpiseq$(PLAT)$(LIBEXT) libmpiseq$(PLAT).so + libmpiseq$(PLAT)$(LIBEXT): mpi.o mpic.o elapse.o - $(AR)$@ mpi.o mpic.o elapse.o + $(AR) $@ mpi.o mpic.o elapse.o $(RANLIB) $@ ++ ++libmpiseq$(PLAT).so: mpi.o mpic.o elapse.o ++ $(FC) -shared ${.ALLSRC} -Wl,-soname,libmpiseq$(PLAT)-@SOVER@.so -o libmpiseq$(PLAT)-@SOVER@.so -Wl,-z,defs ++ ln -s libmpiseq$(PLAT)-@SOVER@.so $@ ++ .f.o: $(FC) $(OPTF) -c $*.f $(OUTF)$*.o ++ + .c.o: + $(CC) $(OPTC) $(CDEFS) -I. -c $*.c $(OUTC)$*.o + Index: head/math/mumps/files/patch-src_Makefile =================================================================== --- head/math/mumps/files/patch-src_Makefile (revision 443590) +++ head/math/mumps/files/patch-src_Makefile (revision 443591) @@ -1,16 +1,37 @@ ---- src/Makefile.orig 2011-05-10 14:56:32.000000000 +0200 -+++ src/Makefile 2013-08-11 18:08:25.000000000 +0200 -@@ -53,11 +53,11 @@ +--- src/Makefile.orig 2011-05-10 12:56:32 UTC ++++ src/Makefile +@@ -20,7 +20,9 @@ z: + include $(topdir)/Makefile.inc + mumps_lib: $(libdir)/libmumps_common$(PLAT)$(LIBEXT) \ +- $(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT) ++ $(libdir)/libmumps_common$(PLAT).so \ ++ $(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT) \ ++ $(libdir)/lib$(ARITH)mumps$(PLAT).so + OBJS_COMMON = \ + mumps_part9.o\ +@@ -53,13 +55,21 @@ OBJS = $(ARITH)mumps_part1.o\ + + $(libdir)/libmumps_common$(PLAT)$(LIBEXT): $(OBJS_COMMON) - $(AR)$@ $? + $(AR) $@ $? $(RANLIB) $@ ++$(libdir)/libmumps_common$(PLAT).so: $(OBJS_COMMON) ++ $(FC) -shared ${.ALLSRC} -Wl,-soname,libmumps_common$(PLAT)-@SOVER@.so -L$(libdir) $(LORDERINGS) $(LIBPAR) $(LIBOTHERS) -o $(libdir)/libmumps_common$(PLAT)-@SOVER@.so -Wl,-z,defs ++ ln -s libmumps_common$(PLAT)-@SOVER@.so $@ ++ $(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT): $(OBJS) - $(AR)$@ $? + $(AR) $@ $? $(RANLIB) $@ ++$(libdir)/lib$(ARITH)mumps$(PLAT).so: $(OBJS) ++ $(FC) -shared ${.ALLSRC} -Wl,-soname,lib$(ARITH)mumps$(PLAT)-@SOVER@.so -L$(libdir) -lmumps_common$(PLAT) $(LORDERINGS) $(LIBPAR) -lblas $(SCALAP) $(LIBOTHERS) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-@SOVER@.so -Wl,-z,defs ++ ln -s lib$(ARITH)mumps$(PLAT)-@SOVER@.so $@ ++ $(ARITH)mumps_load.o: $(ARITH)mumps_comm_buffer.o \ + $(ARITH)mumps_struc_def.o + Index: head/math/mumps/pkg-plist =================================================================== --- head/math/mumps/pkg-plist (revision 443590) +++ head/math/mumps/pkg-plist (revision 443591) @@ -1,37 +1,51 @@ include/cmumps_c.h include/cmumps_root.h include/cmumps_struc.h include/dmumps_c.h include/dmumps_root.h include/dmumps_struc.h include/mumps_c_types.h include/mumps_compat.h include/smumps_c.h include/smumps_root.h include/smumps_struc.h include/zmumps_c.h include/zmumps_root.h include/zmumps_struc.h +lib/libcmumps-%%MUMPSVERSION%%.so lib/libcmumps.a +lib/libcmumps.so +lib/libdmumps-%%MUMPSVERSION%%.so lib/libdmumps.a +lib/libdmumps.so +%%WITH_LIBSEQ%%lib/libmpiseq-%%MUMPSVERSION%%.so +%%WITH_LIBSEQ%%lib/libmpiseq.a +%%WITH_LIBSEQ%%lib/libmpiseq.so +lib/libmumps_common-%%MUMPSVERSION%%.so lib/libmumps_common.a +lib/libmumps_common.so +lib/libpord-%%MUMPSVERSION%%.so lib/libpord.a +lib/libpord.so +lib/libsmumps-%%MUMPSVERSION%%.so lib/libsmumps.a +lib/libsmumps.so +lib/libzmumps-%%MUMPSVERSION%%.so lib/libzmumps.a -%%WITH_LIBSEQ%%lib/libmpiseq.a +lib/libzmumps.so %%PORTDOCS%%%%DOCSDIR%%/userguide_%%MUMPSVERSION%%.pdf %%PORTDOCS%%%%DOCSDIR%%/userguide_%%MUMPSVERSION%%.ps.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c_example %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c_example.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/csimpletest %%PORTEXAMPLES%%%%EXAMPLESDIR%%/csimpletest.F %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dsimpletest %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dsimpletest.F %%PORTEXAMPLES%%%%EXAMPLESDIR%%/input_simpletest_cmplx %%PORTEXAMPLES%%%%EXAMPLESDIR%%/input_simpletest_real %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssimpletest %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssimpletest.F %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zsimpletest %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zsimpletest.F