Index: head/cad/elmerfem/Makefile =================================================================== --- head/cad/elmerfem/Makefile (revision 481249) +++ head/cad/elmerfem/Makefile (revision 481250) @@ -1,50 +1,50 @@ # Created by: Pedro Giffuni # $FreeBSD$ PORTNAME= elmerfem PORTVERSION= 8.3.20170524 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad science MAINTAINER= ports@FreeBSD.org COMMENT= ELMER FEM package LICENSE= GPLv2 -LIB_DEPENDS= libparpack.so:math/arpack-ng-mpich \ +LIB_DEPENDS= libparpack.so:math/arpack-ng \ libmpich.so:net/mpich USE_GITHUB= yes GH_ACCOUNT= ElmerCSC GH_TAGNAME= release-8.3 USES= blaslapack:netlib cmake:outsource fortran gmake tcl USE_LDCONFIG= ${PREFIX}/lib/elmersolver ALL_TARGET= # empty CMAKE_ARGS+= -DHAVE_INTTYPES_H=ON .if !defined(MAINTAINER_MODE) CMAKE_ARGS+= -Wno-dev .endif .include .if ${ARCH} == "amd64" CFLAGS_${ARCH}= -fPIC CXXFLAGS_${ARCH}= -fPIC FCFLAGS+= -fPIC FFLAGS+= -fPIC .endif LDFLAGS+= -L${LOCALBASE}/lib FCPPFLAGS+= -ansi post-install: ${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver @${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/ElmerGrid do-test: cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${PREFIX}/share/elmersolver/lib ${MAKE_CMD} 1dtest_Source .include Index: head/math/arpack-ng-mpich/Makefile =================================================================== --- head/math/arpack-ng-mpich/Makefile (revision 481249) +++ head/math/arpack-ng-mpich/Makefile (nonexistent) @@ -1,22 +0,0 @@ -# Created by: Thierry Thomas -# $FreeBSD$ - -PORTNAME= arpack-ng -PORTREVISION= 2 -PKGNAMESUFFIX= -mpich - -COMMENT= Revised Argand library for solving large-scale eigenvalue problems with MPI support - -LIB_DEPENDS+= libmpich.so:net/mpich - -MASTERDIR= ${.CURDIR}/../../math/arpack-ng - -MPICH_ARG= --enable-mpi -CONFLICTS_INSTALL= arpack-ng-3.* - -PLIST_FILES+= lib/libparpack.a \ - lib/libparpack.so \ - lib/libparpack.so.2 \ - lib/libparpack.so.2.0.0 - -.include "${MASTERDIR}/Makefile" Property changes on: head/math/arpack-ng-mpich/Makefile ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/arpack-ng/Makefile =================================================================== --- head/math/arpack-ng/Makefile (revision 481249) +++ head/math/arpack-ng/Makefile (revision 481250) @@ -1,78 +1,81 @@ # Created by: bf # $FreeBSD$ PORTNAME= arpack-ng -DISTVERSION= 3.5.0 -PORTREVISION= 2 +DISTVERSION= 3.6.3 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org -COMMENT?= Revised Argand library for solving large-scale eigenvalue problems +COMMENT= Revised Argand library for solving large-scale eigenvalue problems LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING +LIB_DEPENDS= libmpich.so:net/mpich # MPI is incremental: it adds the libparpack.so lib, it is a candidate for a sub-package + USES= autoreconf:build fortran libtool USE_GITHUB= yes GH_ACCOUNT= opencollab GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-blas="${BLAS}" \ --with-lapack="${LAPACK}" \ - ${MPICH_ARG} -MPICH_ARG?= --disable-mpi + --enable-mpi \ + --disable-static LDFLAGS+= -L${LOCALBASE}/lib TEST_TARGET= check USE_LDCONFIG= yes +PORTDOCS= * PORTEXAMPLES= * -CONFLICTS= arpack-[0-9]* -CONFLICTS_INSTALL?= arpack-ng-mpich-3.* -SLAVEDIRS= math/arpack-ng-mpich +CONFLICTS_INSTALL= arpack OPTIONS_DEFINE= DOCS EXAMPLES OPTIONS_SUB= yes WITH_BLAS?= blas .if ${WITH_BLAS} == "gotoblas" BLAS= -lgoto2p LAPACK= -lgoto2p LIB_DEPENDS+= libgoto2p.so:math/gotoblas .elif ${WITH_BLAS} == "atlas" BLAS= -lptf77blas LAPACK= -lalapack -lptcblas LIB_DEPENDS+= libptf77blas.so:math/atlas .elif ${WITH_BLAS} == "blas" BLAS= -lblas LAPACK= -llapack LIB_DEPENDS+= libblas.so:math/blas \ liblapack.so:math/lapack .else IGNORE= unknown value of WITH_BLAS: ${WITH_BLAS} .endif post-patch: @${REINPLACE_CMD} -Ee 's|\(libdir\)(/pkgconfig)|(prefix)/libdata\1|' \ ${WRKSRC}/Makefile.am pre-configure: @cd ${WRKSRC}; ./bootstrap @${REINPLACE_CMD} -e '/BLAS_LIBS.*LAPACK_LIBS/ \ {s/LAPACK_LIBS/BLAS_LIBS/;s/BLAS_LIBS/LAPACK_LIBS/;}' \ ${WRKSRC}/Makefile.in \ ${WRKSRC}/arpack.pc.in \ ${WRKSRC}/TESTS/Makefile.in post-build: @cd ${WRKSRC}/SRC/.libs; ${STRIP_CMD} libarpack.so.*.* + +post-install: + ${INSTALL_DATA} ${WRKSRC}/arpack.h ${STAGEDIR}${PREFIX}/include post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/DOCUMENTS && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/EXAMPLES && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include Index: head/math/arpack-ng/distinfo =================================================================== --- head/math/arpack-ng/distinfo (revision 481249) +++ head/math/arpack-ng/distinfo (revision 481250) @@ -1,3 +1,3 @@ -TIMESTAMP = 1518478796 -SHA256 (opencollab-arpack-ng-3.5.0_GH0.tar.gz) = 50f7a3e3aec2e08e732a487919262238f8504c3ef927246ec3495617dde81239 -SIZE (opencollab-arpack-ng-3.5.0_GH0.tar.gz) = 949853 +TIMESTAMP = 1538675107 +SHA256 (opencollab-arpack-ng-3.6.3_GH0.tar.gz) = 64f3551e5a2f8497399d82af3076b6a33bf1bc95fc46bbcabe66442db366f453 +SIZE (opencollab-arpack-ng-3.6.3_GH0.tar.gz) = 970355 Index: head/math/arpack-ng/pkg-plist =================================================================== --- head/math/arpack-ng/pkg-plist (revision 481249) +++ head/math/arpack-ng/pkg-plist (revision 481250) @@ -1,11 +1,10 @@ -lib/libarpack.a +include/arpack.h +include/arpack/debug.h +include/arpack/stat.h lib/libarpack.so lib/libarpack.so.2 lib/libarpack.so.2.0.0 +%%MPI%%lib/libparpack.so +%%MPI%%lib/libparpack.so.2 +%%MPI%%lib/libparpack.so.2.0.0 libdata/pkgconfig/arpack.pc -%%DOCS%%%%DOCSDIR%%/README -%%DOCS%%%%DOCSDIR%%/debug.doc -%%DOCS%%%%DOCSDIR%%/ex-complex.doc -%%DOCS%%%%DOCSDIR%%/ex-nonsym.doc -%%DOCS%%%%DOCSDIR%%/ex-sym.doc -%%DOCS%%%%DOCSDIR%%/stat.doc