Index: head/cad/calculix-ccx/Makefile =================================================================== --- head/cad/calculix-ccx/Makefile (revision 522058) +++ head/cad/calculix-ccx/Makefile (revision 522059) @@ -1,83 +1,82 @@ # Created by: Pedro Giffuni # $FreeBSD$ PORTNAME= ccx PORTVERSION= 2.16 +PORTREVISION= 1 CATEGORIES= cad MASTER_SITES= http://www.dhondt.de/ PKGNAMEPREFIX= CalculiX- DISTFILES= ${DIST_SOURCES} DIST_SUBDIR= calculix EXTRACT_ONLY= ${DIST_SOURCES} MAINTAINER= pfg@FreeBSD.org COMMENT= Three-Dimensional Structural Finite Element Program LICENSE= GPLv2 LIB_DEPENDS= libarpack.so:math/arpack-ng \ - libmetis.so:math/metis \ - libspooles.so:math/spooles \ - libtaucs.so:math/taucs + libspooles.so:math/spooles USES= blaslapack compiler:openmp fortran gmake tar:bzip2 USE_PERL5= build DIST_SOURCES= ccx_${PORTVERSION}.src${EXTRACT_SUFX} DIST_HTM= ccx_${PORTVERSION}.htm${EXTRACT_SUFX} DIST_PS= ccx_${PORTVERSION}.ps${EXTRACT_SUFX} DIST_EXAMPLES= ccx_${PORTVERSION}.test${EXTRACT_SUFX} ALL_TARGET= #Empty CCX_VER= ccx_${PORTVERSION} WRKSRC= ${WRKDIR}/CalculiX/${CCX_VER}/src DOCSDIR= ${PREFIX}/share/doc/CalculiX OPTIONS_DEFINE= DOCS EXAMPLES .include .if ${PORT_OPTIONS:MDOCS} DISTFILES+= ${DIST_HTM} ${DIST_PS} EXTRACT_ONLY+= ${DIST_HTM} ${DIST_PS} .endif .if $(PORT_OPTIONS:MEXAMPLES) DISTFILES+= ${DIST_EXAMPLES} EXTRACT_ONLY+= ${DIST_EXAMPLES} .endif .if ${ARCH} == "sparc64" CFLAGS+= -fPIC FFLAGS+= -fPIC .else CFLAGS+= -fpic FFLAGS+= -fpic .endif pre-build: @${REINPLACE_CMD} -e 's+%%FC%%+${FC}+g ; s+%%CC%%+${CC}+g ; \ s+%%BLAS_LIBS%%+${BLASLIB}+ ; \ s+%%LAPACK_LIBS%%+${LAPACKLIB}+ ; \ s+%%LOCALBASE%%+${LOCALBASE}+g;' \ ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${CCX_VER} \ ${STAGEDIR}${PREFIX}/bin/ccx do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @(cd ${WRKDIR}/CalculiX/${CCX_VER}/doc/ccx && ${COPYTREE_SHARE} . \ ${STAGEDIR}${DOCSDIR}/ccx) ${INSTALL_DATA} ${WRKDIR}/CalculiX/${CCX_VER}/doc/${CCX_VER}.ps \ ${STAGEDIR}${DOCSDIR} @${GZIP_CMD} ${STAGEDIR}${DOCSDIR}/${CCX_VER}.ps do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @(cd ${WRKDIR}/CalculiX/${CCX_VER}/test && ${COPYTREE_SHARE} . \ ${STAGEDIR}${EXAMPLESDIR}) .include Index: head/cad/calculix-ccx/files/patch-Makefile =================================================================== --- head/cad/calculix-ccx/files/patch-Makefile (revision 522058) +++ head/cad/calculix-ccx/files/patch-Makefile (revision 522059) @@ -1,33 +1,33 @@ --- Makefile.orig 2019-11-25 17:54:53 UTC +++ Makefile -@@ -1,9 +1,9 @@ +@@ -1,9 +1,10 @@ -CFLAGS = -Wall -O2 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT -FFLAGS = -Wall -O2 -+CFLAGS += -O2 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT -DTAUCS ++CFLAGS += -O2 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT \ ++ -DUSE_MT=1 +FFLAGS += -O2 -CC=cc -FC=gfortran +CC=%%CC%% +FC=%%FC%% .c.o : $(CC) $(CFLAGS) -c $< -@@ -21,12 +21,12 @@ OCCXMAIN = $(SCCXMAIN:.c=.o) +@@ -21,12 +22,11 @@ OCCXMAIN = $(SCCXMAIN:.c=.o) DIR=../../../SPOOLES.2.2 LIBS = \ - $(DIR)/spooles.a \ - ../../../ARPACK/libarpack_INTEL.a \ - -lpthread -lm -lc -+ -ltaucs -lmetis \ + -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% \ + -lpthread -lm ccx_2.16: $(OCCXMAIN) ccx_2.16.a $(LIBS) - ./date.pl; $(CC) $(CFLAGS) -c ccx_2.16.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.16.a $(LIBS) + ./date.pl; $(CC) $(CFLAGS) -c ccx_2.16.c; $(FC) -O2 -o $@ $(OCCXMAIN) ccx_2.16.a $(LIBS) $(LDFLAGS) ccx_2.16.a: $(OCCXF) $(OCCXC) ar vr $@ $? Index: head/cad/calculix-ccx/pkg-descr =================================================================== --- head/cad/calculix-ccx/pkg-descr (revision 522058) +++ head/cad/calculix-ccx/pkg-descr (revision 522059) @@ -1,12 +1,13 @@ A Three-Dimensional Structural Finite Element Program CalculiX Finite Element Models can be built, calculated, and post-processed. Notice: The authors acknowledge that naming conventions and input style formats for CalculiX are based on those used by ABAQUS, a proprietary, general purpose finite element code developed and supported by Hibbitt, Karlsson & Sorensen, Inc (HKS) and are used with kind permission from HKS. Results obtained from CalculiX are in no way connected to ABAQUS. WWW: http://www.calculix.de + Index: head/cad/calculix-ccx/pkg-message =================================================================== --- head/cad/calculix-ccx/pkg-message (nonexistent) +++ head/cad/calculix-ccx/pkg-message (revision 522059) @@ -0,0 +1,9 @@ +[ +{ type: install + message: <