From 905865615893c9c1a9520cbaa20d17eb9e17a445 Mon Sep 17 00:00:00 2001 From: pawel Date: Thu, 18 Aug 2016 16:19:56 +0000 Subject: - Update to version 3.4.0, now hosted on GitHub [1] - Add EXAMPLES option [1] - Fix COMMENT declaration, use ?= so that slave can overide it - Add LICENSE_FILE - Convert to options helpers, test framework - Remove MPI option and move it's all functionality to slave port This allows removal of setting PKGNAMESUFFIX in master port depending on options selected which is deprecated. Move LIB_DEPENDS on mpich2 to slave, declare CONFLICTS_INSTALL, MPICH_ARG in such way that can be overidden by the slave. PR: 211454 [1] Submitted by: Iblis Lin [1] --- math/arpack-ng/Makefile | 62 ++++++++++++++++++++++-------------------------- math/arpack-ng/distinfo | 5 ++-- math/arpack-ng/pkg-plist | 11 --------- 3 files changed, 32 insertions(+), 46 deletions(-) (limited to 'math/arpack-ng') diff --git a/math/arpack-ng/Makefile b/math/arpack-ng/Makefile index 171c3bb5186b..fa46fb310c72 100644 --- a/math/arpack-ng/Makefile +++ b/math/arpack-ng/Makefile @@ -2,44 +2,38 @@ # $FreeBSD$ PORTNAME= arpack-ng -PORTVERSION= 3.1.5 -PORTREVISION= 2 +PORTVERSION= 3.4.0 CATEGORIES= math -MASTER_SITES= http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/ \ - LOCAL/bf -DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= ports@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 -USES= fortran libtool -USE_LDCONFIG= yes - -CONFLICTS= arpack-[0-9]* -SLAVEDIRS= math/arpack-ng-mpich +USE_GITHUB= yes +GH_ACCOUNT= opencollab +USES= autoreconf:build fortran libtool GNU_CONFIGURE= yes - CONFIGURE_ARGS= --with-blas="${BLAS}" \ - --with-lapack="${LAPACK}" + --with-lapack="${LAPACK}" \ + ${MPICH_ARG} +MPICH_ARG?= --disable-mpi LDFLAGS+= -L${LOCALBASE}/lib +TEST_TARGET= check +USE_LDCONFIG= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +PORTEXAMPLES= * -OPTIONS_DEFINE= DOCS MPI -OPTIONS_SUB= yes -MPI_CONFIGURE_ENABLE= mpi -MPI_LIB_DEPENDS= libmpich.so.8:net/mpich2 -MPI_CONFLICTS_INSTALL+= arpack-ng-3.* -MPI_CONFLICTS_INSTALL_OFF+= arpack-ng-mpich-3.* +CONFLICTS= arpack-[0-9]* +CONFLICTS_INSTALL?= arpack-ng-mpich-3.* +SLAVEDIRS= math/arpack-ng-mpich -.include +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -.if ${PORT_OPTIONS:MMPI} -PKGNAMESUFFIX= -mpich -.endif +OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_SUB= yes WITH_BLAS?= blas @@ -62,7 +56,10 @@ IGNORE= unknown value of WITH_BLAS: ${WITH_BLAS} post-patch: @${REINPLACE_CMD} -Ee 's|\(libdir\)(/pkgconfig)|(prefix)/libdata\1|' \ - ${WRKSRC}/Makefile.in + ${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 \ @@ -70,15 +67,14 @@ post-patch: ${WRKSRC}/TESTS/Makefile.in post-build: - @cd ${WRKSRC}/.libs; ${STRIP_CMD} libarpack.a libarpack.so.*.* + @cd ${WRKSRC}/SRC/.libs; ${STRIP_CMD} libarpack.so.*.* -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC}/DOCUMENTS && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} -.endif + cd ${WRKSRC}/DOCUMENTS && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} -check regression-test test: build - @cd ${WRKSRC}; ${DO_MAKE_BUILD} check +post-install-EXAMPLES-on: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/EXAMPLES && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} -.include +.include diff --git a/math/arpack-ng/distinfo b/math/arpack-ng/distinfo index e390a0b7f1ea..2e143a97e6a9 100644 --- a/math/arpack-ng/distinfo +++ b/math/arpack-ng/distinfo @@ -1,2 +1,3 @@ -SHA256 (arpack-ng_3.1.5.tar.gz) = a269ce7806bc77ced31ef794d23c3e3aff8543b65550fd7e3e24660f2a79d515 -SIZE (arpack-ng_3.1.5.tar.gz) = 1516406 +TIMESTAMP = 1469850136 +SHA256 (opencollab-arpack-ng-3.4.0_GH0.tar.gz) = 69e9fa08bacb2475e636da05a6c222b17c67f1ebeab3793762062248dd9d842f +SIZE (opencollab-arpack-ng-3.4.0_GH0.tar.gz) = 942149 diff --git a/math/arpack-ng/pkg-plist b/math/arpack-ng/pkg-plist index 1ecde1102e65..9eb849df2b33 100644 --- a/math/arpack-ng/pkg-plist +++ b/math/arpack-ng/pkg-plist @@ -1,18 +1,7 @@ -%%MPI%%bin/pcndrv1 -%%MPI%%bin/pdndrv1 -%%MPI%%bin/pdndrv3 -%%MPI%%bin/pdsdrv1 -%%MPI%%bin/psndrv3 -%%MPI%%bin/pssdrv1 -%%MPI%%bin/pzndrv1 lib/libarpack.a lib/libarpack.so lib/libarpack.so.2 lib/libarpack.so.2.0.0 -%%MPI%%lib/libparpack.a -%%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 -- cgit