View | Details | Raw Unified | Return to bug 181227
Collapse All | Expand All

(-)math/mumps/Makefile (-11 / +12 lines)
Lines 1-13 Link Here
1
# New ports collection makefile for:	MUMPS
1
# Created by: Pedro Giffuni
2
# Date created:		5 Mar 2006
3
# Whom:			Pedro Giffuni
4
#
5
# $FreeBSD: head/math/mumps/Makefile 300896 2012-07-14 13:54:48Z beat $
2
# $FreeBSD: head/math/mumps/Makefile 300896 2012-07-14 13:54:48Z beat $
6
#
7
3
8
PORTNAME=	mumps
4
PORTNAME=	mumps
9
PORTVERSION=	4.8.4
5
PORTVERSION=	4.10.0
10
PORTREVISION=	2
11
CATEGORIES=	math
6
CATEGORIES=	math
12
MASTER_SITES=	http://mumps.enseeiht.fr/		\
7
MASTER_SITES=	http://mumps.enseeiht.fr/		\
13
		http://graal.ens-lyon.fr/MUMPS/		\
8
		http://graal.ens-lyon.fr/MUMPS/		\
Lines 18-23 Link Here
18
MAINTAINER=	bf@FreeBSD.org
13
MAINTAINER=	bf@FreeBSD.org
19
COMMENT=	MUltifrontal Massively Parallel sparse direct Solver
14
COMMENT=	MUltifrontal Massively Parallel sparse direct Solver
20
15
16
LICENSE=	Public_Domain
17
LICENSE_NAME=	"Public Domain"
18
LICENSE_FILE=	${WRKSRC}/LICENSE
19
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
20
21
#-----------------------------------------------------------------------
21
#-----------------------------------------------------------------------
22
22
23
# WARNING: Non-serviceable parts inside, can break other ports
23
# WARNING: Non-serviceable parts inside, can break other ports
Lines 35-40 Link Here
35
35
36
USE_FORTRAN=	yes
36
USE_FORTRAN=	yes
37
37
38
MAKE_JOBS_UNSAFE=yes
39
38
FORTRANLIBS=	-lgfortran
40
FORTRANLIBS=	-lgfortran
39
GCCLIBDIR=	-L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..
41
GCCLIBDIR=	-L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..
40
42
Lines 85-96 Link Here
85
PLIST_SUB+=	WITH_LIBSEQ="@comment "
87
PLIST_SUB+=	WITH_LIBSEQ="@comment "
86
.endif
88
.endif
87
89
88
post-patch:
90
pre-configure:
89
.ifdef WITH_MPI
91
.ifdef WITH_MPI
90
	@${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.inc.generic \
92
	${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.inc.generic \
91
		${WRKSRC}/Makefile.inc
93
		${WRKSRC}/Makefile.inc
92
.else
94
.else
93
	@${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.inc.generic.SEQ \
95
	${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.inc.generic.SEQ \
94
		${WRKSRC}/Makefile.inc
96
		${WRKSRC}/Makefile.inc
95
.endif
97
.endif
96
98
Lines 103-109 Link Here
103
	s+@FORTRANLIBS@+${FORTRANLIBS}+g; \
105
	s+@FORTRANLIBS@+${FORTRANLIBS}+g; \
104
	s+@PTHREAD_LIBS@+${PTHREAD_LIBS}+g; \
106
	s+@PTHREAD_LIBS@+${PTHREAD_LIBS}+g; \
105
	s+@BLAS_LIBS@+${BLAS_LIBS}+ ; \
107
	s+@BLAS_LIBS@+${BLAS_LIBS}+ ; \
106
	s+../PORD+${WRKSRC}/PORD+; \
107
	s+@LOCALBASE@+${LOCALBASE}+g;' \
108
	s+@LOCALBASE@+${LOCALBASE}+g;' \
108
		${WRKSRC}/Makefile.inc
109
		${WRKSRC}/Makefile.inc
109
.ifdef WITH_MPI
110
.ifdef WITH_MPI
(-)math/mumps/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (MUMPS_4.8.4.tar.gz) = cda022a12ce632ae753dcffc06411b2569647fafa01db947cc6a280d465acb2d
1
SHA256 (MUMPS_4.10.0.tar.gz) = d0f86f91a74c51a17a2ff1be9c9cee2338976f13a6d00896ba5b43a5ca05d933
2
SIZE (MUMPS_4.8.4.tar.gz) = 2007524
2
SIZE (MUMPS_4.10.0.tar.gz) = 2481516
(-)math/mumps/files/patch-Make.inc+Makefile.inc.generic (-25 / +28 lines)
Lines 1-30 Link Here
1
--- Make.inc/Makefile.inc.generic.orig	Fri Apr 14 08:00:50 2006
1
--- Make.inc/Makefile.inc.generic.orig	2011-05-10 14:56:32.000000000 +0200
2
+++ Make.inc/Makefile.inc.generic	Fri May 26 10:28:02 2006
2
+++ Make.inc/Makefile.inc.generic	2013-08-11 17:41:51.000000000 +0200
3
@@ -39,20 +39,20 @@
3
@@ -39,7 +39,7 @@
4
 #          Metis is now available as an internal ordering for MUMPS.
4
 #          Metis/ParMetis and SCOTCH/PT-SCOTCH (ver 5.1 and later) orderings are now available for MUMPS.
5
 
5
 #
6
 
7
-#LSCOTCHDIR = $(HOME)/JY/emilio/bin/generic
8
+#LSCOTCHDIR = @LOCALBASE@/lib
9
 #LSCOTCH   = -L$(LSCOTCHDIR) -lesmumps  -lfax -lorder -lscotch -lsymbol -ldof -lgraph -lcommon -lm
10
 
6
 
11
 LPORDDIR = ../PORD/lib/
7
-#SCOTCHDIR  = ${HOME}/scotch_5.1_esmumps
12
 IPORD    = -I../PORD/include/
8
+#SCOTCHDIR  = @LOCALBASE@
9
 #ISCOTCH    = -I$(SCOTCHDIR)/include 
10
 # You have to choose one among the following two lines depending on
11
 # the type of analysis you want to perform. If you want to perform only
12
@@ -55,7 +55,7 @@
13
 IPORD    = -I$(topdir)/PORD/include/
13
 LPORD    = -L$(LPORDDIR) -lpord
14
 LPORD    = -L$(LPORDDIR) -lpord
14
 
15
 
15
-#LMETISDIR = Directory containing Metis library
16
-#LMETISDIR = /local/metis/
16
+LMETISDIR = @LOCALBASE@/lib
17
+#LMETISDIR = @LOCALBASE@/lib
17
 #IMETIS    = # Metis doesn't need include files (Fortran interface avail.)
18
 #IMETIS    = # Should be provided if you use parmetis
18
 #LMETIS    = -L$(LMETISDIR) -lmetis
19
 
19
 
20
 # You have to choose one among the following two lines depending on
20
 # Corresponding variables reused later
21
@@ -70,7 +70,7 @@
21
 #ORDERINGS = -Dmetis -Dpord
22
 # The following variables will be used in the compilation process.
23
 # Please note that -Dptscotch and -Dparmetis imply -Dscotch and -Dmetis respectively.
24
 #ORDERINGSF = -Dscotch -Dmetis -Dpord -Dptscotch -Dparmetis
22
-ORDERINGSF  = -Dpord
25
-ORDERINGSF  = -Dpord
23
+ORDERINGSF  += -Dpord
26
+ORDERINGSF  += -Dpord
24
 ORDERINGSC  = $(ORDERINGSF)
27
 ORDERINGSC  = $(ORDERINGSF)
28
 
25
 LORDERINGS = $(LMETIS) $(LPORD) $(LSCOTCH)
29
 LORDERINGS = $(LMETIS) $(LPORD) $(LSCOTCH)
26
 IORDERINGS = $(IMETIS) $(IPORD) $(ISCOTCH)
30
@@ -91,11 +91,11 @@
27
@@ -66,11 +66,11 @@
28
 # RM : remove files
31
 # RM : remove files
29
 RM      = /bin/rm -f
32
 RM      = /bin/rm -f
30
 # CC : C compiler
33
 # CC : C compiler
Lines 37-45 Link Here
37
-FL      = f90
40
-FL      = f90
38
+FL      = @FC@
41
+FL      = @FC@
39
 # AR : Archive object in a library
42
 # AR : Archive object in a library
40
 AR      = ar vr
43
 #      keep a space at the end if options have to be separated from lib name
41
 # RANLIB : generate index of an archive file
44
 AR      = ar vr 
42
@@ -79,13 +79,13 @@
45
@@ -105,13 +105,13 @@
43
 #RANLIB  = echo
46
 #RANLIB  = echo
44
 
47
 
45
 # SCALAP should define the SCALAPACK and  BLACS libraries.
48
 # SCALAP should define the SCALAPACK and  BLACS libraries.
Lines 56-62 Link Here
56
 
59
 
57
 # The parallel version is not concerned by the next two lines.
60
 # The parallel version is not concerned by the next two lines.
58
 # They are related to the sequential library provided by MUMPS,
61
 # They are related to the sequential library provided by MUMPS,
59
@@ -95,10 +95,10 @@
62
@@ -121,10 +121,10 @@
60
 
63
 
61
 # DEFINE HERE YOUR BLAS LIBRARY
64
 # DEFINE HERE YOUR BLAS LIBRARY
62
 
65
 
Lines 69-75 Link Here
69
 
72
 
70
 # FORTRAN/C COMPATIBILITY:
73
 # FORTRAN/C COMPATIBILITY:
71
 #  Use:
74
 #  Use:
72
@@ -111,11 +111,11 @@
75
@@ -137,11 +137,11 @@
73
 #     leave empty if your Fortran compiler does not change the symbols.
76
 #     leave empty if your Fortran compiler does not change the symbols.
74
 #
77
 #
75
 
78
 
(-)math/mumps/files/patch-Make.inc+Makefile.inc.generic.SEQ (-24 / +32 lines)
Lines 1-30 Link Here
1
--- Make.inc/Makefile.inc.generic.SEQ.orig	Fri Apr 14 08:00:50 2006
1
--- Make.inc/Makefile.inc.generic.SEQ.orig	2011-05-10 14:56:32.000000000 +0200
2
+++ Make.inc/Makefile.inc.generic.SEQ	Fri May 26 10:27:58 2006
2
+++ Make.inc/Makefile.inc.generic.SEQ	2013-08-11 18:13:02.000000000 +0200
3
@@ -42,20 +42,20 @@
3
@@ -41,7 +41,7 @@
4
 #          Metis is now available as an internal ordering for MUMPS.
4
 #          Metis/ParMetis and SCOTCH/PT-SCOTCH (ver 5.1 and later) orderings are now available for MUMPS.
5
 
5
 #
6
 
7
-#LSCOTCHDIR = $(HOME)/JY/emilio/bin/generic
8
+#LSCOTCHDIR = @LOCALBASE@/lib
9
 #LSCOTCH   = -L$(LSCOTCHDIR) -lesmumps  -lfax -lorder -lscotch -lsymbol -ldof -lgraph -lcommon -lm
10
 
6
 
11
 LPORDDIR = ../PORD/lib/
7
-#SCOTCHDIR  = ${HOME}/scotch_5.1_esmumps
12
 IPORD    = -I../PORD/include/
8
+#SCOTCHDIR  = @LOCALBASE@
9
 #ISCOTCH    = -I$(SCOTCHDIR)/include 
10
 # You have to choose one among the following two lines depending on
11
 # the type of analysis you want to perform. If you want to perform only
12
@@ -57,7 +57,7 @@
13
 IPORD    = -I$(topdir)/PORD/include/
13
 LPORD    = -L$(LPORDDIR) -lpord
14
 LPORD    = -L$(LPORDDIR) -lpord
14
 
15
 
15
-#LMETISDIR = Directory containing Metis library
16
-#LMETISDIR = /local/metis/
16
+LMETISDIR = @LOCALBASE@/lib
17
+#LMETISDIR = @LOCALBASE@/lib
17
 #IMETIS    = # Metis doesn't need include files (Fortran interface avail.)
18
 #IMETIS    = # Should be provided if you use parmetis
18
 #LMETIS    = -L$(LMETISDIR) -lmetis
19
 
19
 
20
 # You have to choose one among the following two lines depending on
20
 # Corresponding variables reused later
21
@@ -72,7 +72,7 @@
21
 #ORDERINGS = -Dmetis -Dpord
22
 # The following variables will be used in the compilation process.
23
 # Please note that -Dptscotch and -Dparmetis imply -Dscotch and -Dmetis respectively.
24
 #ORDERINGSF = -Dscotch -Dmetis -Dpord -Dptscotch -Dparmetis
22
-ORDERINGSF  = -Dpord
25
-ORDERINGSF  = -Dpord
23
+ORDERINGSF  += -Dpord
26
+ORDERINGSF  += -Dpord
24
 ORDERINGSC  = $(ORDERINGSF)
27
 ORDERINGSC  = $(ORDERINGSF)
28
 
25
 LORDERINGS = $(LMETIS) $(LPORD) $(LSCOTCH)
29
 LORDERINGS = $(LMETIS) $(LPORD) $(LSCOTCH)
26
 IORDERINGS = $(IMETIS) $(IPORD) $(ISCOTCH)
30
@@ -95,11 +95,11 @@
27
@@ -69,11 +69,11 @@
28
 # RM : remove files
31
 # RM : remove files
29
 RM      = /bin/rm -f
32
 RM      = /bin/rm -f
30
 # CC : C compiler
33
 # CC : C compiler
Lines 37-45 Link Here
37
-FL      = f90
40
-FL      = f90
38
+FL      = @FC@
41
+FL      = @FC@
39
 # AR : Archive object in a library
42
 # AR : Archive object in a library
40
 AR      = ar vr
43
 #      keep a space at the end if options have to be separated from lib name
41
 # RANLIB : generate index of an archive file
44
 AR      = ar vr 
42
@@ -89,10 +89,10 @@
45
@@ -112,14 +112,14 @@
46
 # the sequential library provided by MUMPS, to use instead
47
 # of ScaLAPACK and MPI.
48
 INCSEQ  = -I$(topdir)/libseq
49
-LIBSEQ  = -Llibseq -lmpiseq
50
+LIBSEQ  = -L$(topdir)/libseq -lmpiseq
43
 
51
 
44
 # DEFINE HERE YOUR BLAS LIBRARY
52
 # DEFINE HERE YOUR BLAS LIBRARY
45
 
53
 
Lines 52-58 Link Here
52
 
60
 
53
 # FORTRAN/C COMPATIBILITY:
61
 # FORTRAN/C COMPATIBILITY:
54
 #  Use:
62
 #  Use:
55
@@ -105,12 +105,12 @@
63
@@ -132,12 +132,12 @@
56
 #     leave empty if your Fortran compiler does not change the symbols.
64
 #     leave empty if your Fortran compiler does not change the symbols.
57
 #
65
 #
58
 
66
 
(-)math/mumps/files/patch-PORD_lib_Makefile (+11 lines)
Line 0 Link Here
1
--- PORD/lib/Makefile.orig	2011-05-10 14:56:32.000000000 +0200
2
+++ PORD/lib/Makefile	2013-08-11 18:31:47.000000000 +0200
3
@@ -22,7 +22,7 @@
4
 	$(CC) $(COPTIONS) -c $*.c $(OUTC)$*.o
5
 
6
 libpord$(LIBEXT):$(OBJS)
7
-	$(AR)$@ $(OBJS)
8
+	$(AR) $@ $(OBJS)
9
 	$(RANLIB) $@
10
 
11
 clean:
(-)math/mumps/files/patch-libseq_Makefile (+11 lines)
Line 0 Link Here
1
--- libseq/Makefile.orig	2011-05-10 14:56:39.000000000 +0200
2
+++ libseq/Makefile	2013-08-11 18:05:34.000000000 +0200
3
@@ -10,7 +10,7 @@
4
 libmpiseq: libmpiseq$(PLAT)$(LIBEXT)
5
 
6
 libmpiseq$(PLAT)$(LIBEXT): mpi.o mpic.o elapse.o
7
-	$(AR)$@ mpi.o mpic.o elapse.o
8
+	$(AR) $@ mpi.o mpic.o elapse.o
9
 	$(RANLIB) $@
10
 .f.o:
11
 	$(FC) $(OPTF)              -c $*.f $(OUTF)$*.o
(-)math/mumps/files/patch-src_Makefile (+16 lines)
Line 0 Link Here
1
--- src/Makefile.orig	2011-05-10 14:56:32.000000000 +0200
2
+++ src/Makefile	2013-08-11 18:08:25.000000000 +0200
3
@@ -53,11 +53,11 @@
4
 
5
 
6
 $(libdir)/libmumps_common$(PLAT)$(LIBEXT):	$(OBJS_COMMON)
7
-	$(AR)$@ $?
8
+	$(AR) $@ $?
9
 	$(RANLIB) $@
10
 
11
 $(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT):    $(OBJS)
12
-	$(AR)$@ $?
13
+	$(AR) $@ $?
14
 	$(RANLIB) $@
15
 
16
 $(ARITH)mumps_load.o:		$(ARITH)mumps_comm_buffer.o \
(-)math/mumps/pkg-descr (-1 / +1 lines)
Lines 13-16 Link Here
13
- Partial factorization and Schur complement matrix.
13
- Partial factorization and Schur complement matrix.
14
- Several orderings interfaced : AMD, AMF, PORD, METIS
14
- Several orderings interfaced : AMD, AMF, PORD, METIS
15
15
16
WWW:	http://graal.ens-lyon.fr/MUMPS/
16
WWW: http://graal.ens-lyon.fr/MUMPS/

Return to bug 181227