Attachment #34118 for bug #55544

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





PORTNAME=	metis-edf
PORTVERSION=	3
PORTREVISION=	1
CATEGORIES=	cad
MASTER_SITES=	http://www.code-aster.org/FICHIERS/metis/


CONFLICTS=	metis-[0-9]*

ALL_TARGET=	default
MAKE_ENV+=	CC="${CC}" AR="${AR}" F77="${F77}" FFLAGS="${FFLAGS}"
USE_REINPLACE=	yes
REINPLACE_ARGS=	-i ""

F77?=		f77
FFLAGS?=	-O2

post-patch:
.if ${MACHINE_ARCH} != "i386"
	@${FIND} ${WRKSRC} -type f -name "*.c" -o -name "*.h" | ${XARGS}	\
		${REINPLACE_CMD} -e "s|long int|int|g"				\
			-e "s|long|int|g"					\
			-e "s|\(%[[:digit:]]\)ld|\1d|g"				\
			-e "s|\(%[[:digit:]]\.[[:digit:]]\)le|\1e|g"		\
			-e "s|%ld|%d|g"
.endif

do-install:
	@${CP} ${WRKSRC}/CONFIG/onmetis.in ${WRKSRC}/onmetis

Lines 1-6 Link Here

(-)cad/metis-edf/files/patch-CONFIG::configure (-5 / +15 lines)
1	--- CONFIG/configure.orig Mon Dec 16 18:11:44 2002	1	--- CONFIG/configure.orig Mon Dec 16 18:11:44 2002
2	+++ CONFIG/configure Sun Jun 29 14:58:48 2003	2	+++ CONFIG/configure Tue Aug 12 22:47:59 2003
3	@@ -18,7 +18,7 @@	3	@@ -4,6 +4,7 @@
		4	# SHELL defined by make (sh)
		5
		6	OS_TYPE=`uname -s`
		7	+ARCHI=`uname -p`
		8	if [ $OS_TYPE = "SunOS" ]; then
		9	OS_LEVEL=`uname -r`
		10	OS_NIV=`echo $OS_LEVEL \| awk -F'.' '{print $2}'`
		11	@@ -18,7 +19,7 @@
4	if [ -z "$rtn" ] \|\| [ "$rtn" = "y" -o "$rtn" = "Y" ]; then	12	if [ -z "$rtn" ] \|\| [ "$rtn" = "y" -o "$rtn" = "Y" ]; then
5	OS_TYPE=SunOS64	13	OS_TYPE=SunOS64
6	fi	14	fi
Lines 9-15 Link Here
9	echo " Operating system $OS_TYPE unknown on this distribution"	17	echo " Operating system $OS_TYPE unknown on this distribution"
10	echo " Installation failed !"	18	echo " Installation failed !"
11	exit 8	19	exit 8
12	@@ -30,14 +30,23 @@	20	@@ -30,14 +31,25 @@
13	# FOPTIONS : Fortran compiler options,	21	# FOPTIONS : Fortran compiler options,
14	# LDOPTIONS : link options, AR : archiver	22	# LDOPTIONS : link options, AR : archiver
15		23
Lines 24-32 Link Here
24	+if [ $OS_TYPE = "FreeBSD" ]; then	32	+if [ $OS_TYPE = "FreeBSD" ]; then
25	+ CC="$CC"	33	+ CC="$CC"
26	+ F90="$F77"	34	+ F90="$F77"
27	+ LD="$LD"	35	+ LD="$CC -v"
28	+ COPTIONS="$CFLAGS"	36	+ COPTIONS="$CFLAGS"
29	+ LDOPTIONS="$LDFLAGS -lc -lg2c -L. -L.."	37	+ OPTFLAGS=""
		38	+ FOPTIONS="$FFLAGS"
		39	+ LDOPTIONS="$LDFLAGS -L. -L.."
30	+ AR="$AR rv"	40	+ AR="$AR rv"
31	+else	41	+else
32	+ CC="cc"	42	+ CC="cc"




--- Lib/proto.h.orig	Thu Dec 12 13:47:59 2002
+++ Lib/proto.h	Tue Aug 12 22:53:22 2003
@@ -456,7 +456,9 @@
  void saxpy(long, float, float *, long, float *, long); 
  void RandomPermute(long, idxtype *, long); 
  double drand48(); 
+#if !defined(__FreeBSD__)
  void srand48(long); 
+#endif
  long ispow2(long); 
  void InitRandom(long); 
  long log2(long); 




--- Programs/Makefile.orig	Thu Dec 12 13:47:59 2002
+++ Programs/Makefile	Wed Aug 13 15:10:19 2003
@@ -5,7 +5,7 @@
 INCLUDES = -I../Lib 
 CFLAGS = $(COPTIONS) $(OPTFLAGS) $(INCLUDES)
 FFLAGS = $(FOPTIONS) $(OPTFLAGS) $(INCLUDES)
-LIBS = -lmetis -lm
+LIBS = -lmetis -lm  -lg2c
 METISLIB = ../libmetis.a
 
 
 
-ONMETISOBJS = onmetis.o io.o smbfactor.o ecri11.o lect11.o lect00.o
+ONMETISOBJS = onmetis.o io.o smbfactor.o ecri11.o lect11.o lect00.o /usr/lib/crt1.o
 
  

Return to bug 55544

Lines 7-12 Link Here

(-)cad/metis-edf/Makefile (-1 / +14 lines)
7		7
8	PORTNAME= metis-edf	8	PORTNAME= metis-edf
9	PORTVERSION= 3	9	PORTVERSION= 3
		10	PORTREVISION= 1
10	CATEGORIES= cad	11	CATEGORIES= cad
11	MASTER_SITES= http://www.code-aster.org/FICHIERS/metis/	12	MASTER_SITES= http://www.code-aster.org/FICHIERS/metis/
12		13
Lines 16-25 Link Here
16	CONFLICTS= metis-[0-9]*	17	CONFLICTS= metis-[0-9]*
17		18
18	ALL_TARGET= default	19	ALL_TARGET= default
19	MAKE_ENV+= CC="${CC}" AR="${AR}" LD="${LD}" F77="${F77}"	20	MAKE_ENV+= CC="${CC}" AR="${AR}" F77="${F77}" FFLAGS="${FFLAGS}"
20	USE_REINPLACE= yes	21	USE_REINPLACE= yes
		22	REINPLACE_ARGS= -i ""
21		23
22	F77?= f77	24	F77?= f77
		25	FFLAGS?= -O2
		26
		27	post-patch:
		28	.if ${MACHINE_ARCH} != "i386"
		29	@${FIND} ${WRKSRC} -type f -name ".c" -o -name ".h" \| ${XARGS} \
		30	${REINPLACE_CMD} -e "s\|long int\|int\|g" \
		31	-e "s\|long\|int\|g" \
		32	-e "s\|\(%[[:digit:]]\)ld\|\1d\|g" \
		33	-e "s\|\(%[[:digit:]]\.[[:digit:]]\)le\|\1e\|g" \
		34	-e "s\|%ld\|%d\|g"
		35	.endif
23		36
24	do-install:	37	do-install:
25	@${CP} ${WRKSRC}/CONFIG/onmetis.in ${WRKSRC}/onmetis	38	@${CP} ${WRKSRC}/CONFIG/onmetis.in ${WRKSRC}/onmetis

Line 0 Link Here

(-)cad/metis-edf/files/patch-Lib::proto.h (+12 lines)
	1	--- Lib/proto.h.orig Thu Dec 12 13:47:59 2002
	2	+++ Lib/proto.h Tue Aug 12 22:53:22 2003
	3	@@ -456,7 +456,9 @@
	4	void saxpy(long, float, float , long, float , long);
	5	void RandomPermute(long, idxtype *, long);
	6	double drand48();
	7	+#if !defined(__FreeBSD__)
	8	void srand48(long);
	9	+#endif
	10	long ispow2(long);
	11	void InitRandom(long);
	12	long log2(long);

Lines 1-11 Link Here

(-)cad/metis-edf/files/patch-Programs::Makefile (-8 / +8 lines)
1	--- Programs/Makefile.orig Thu Dec 12 13:47:59 2002	1	--- Programs/Makefile.orig Thu Dec 12 13:47:59 2002
2	+++ Programs/Makefile Sun Jun 29 15:39:26 2003	2	+++ Programs/Makefile Wed Aug 13 15:10:19 2003
3	@@ -11,7 +11,7 @@	3	@@ -5,7 +5,7 @@
		4	INCLUDES = -I../Lib
		5	CFLAGS = $(COPTIONS) $(OPTFLAGS) $(INCLUDES)
		6	FFLAGS = $(FOPTIONS) $(OPTFLAGS) $(INCLUDES)
		7	-LIBS = -lmetis -lm
		8	+LIBS = -lmetis -lm -lg2c
		9	METISLIB = ../libmetis.a
4		10
5
6
7	-ONMETISOBJS = onmetis.o io.o smbfactor.o ecri11.o lect11.o lect00.o
8	+ONMETISOBJS = onmetis.o io.o smbfactor.o ecri11.o lect11.o lect00.o /usr/lib/crt1.o
9
10