diff options
| author | bf <bf@FreeBSD.org> | 2013-08-24 15:42:37 +0800 |
|---|---|---|
| committer | bf <bf@FreeBSD.org> | 2013-08-24 15:42:37 +0800 |
| commit | 53b3e76c72a44dea934c024bc5083adbf1521eaa (patch) | |
| tree | fcf2ab39d7c1434bd785ddc822a946dc30ec706e | |
| parent | c0b578872242960a8973b82e0c0aa703ae07b644 (diff) | |
| download | freebsd-ports-gnome-53b3e76c72a44dea934c024bc5083adbf1521eaa.tar.gz freebsd-ports-gnome-53b3e76c72a44dea934c024bc5083adbf1521eaa.tar.zst freebsd-ports-gnome-53b3e76c72a44dea934c024bc5083adbf1521eaa.zip | |
Use new idioms (LIB_DEPENDS, etc.); fix a mistake from the options conversion,
whitespace, and a plist typo
| -rw-r--r-- | math/fflas-ffpack/Makefile | 26 | ||||
| -rw-r--r-- | math/fflas-ffpack/pkg-descr | 2 |
2 files changed, 12 insertions, 16 deletions
diff --git a/math/fflas-ffpack/Makefile b/math/fflas-ffpack/Makefile index 97a1140b42a7..f91b7c586976 100644 --- a/math/fflas-ffpack/Makefile +++ b/math/fflas-ffpack/Makefile @@ -1,4 +1,4 @@ -# Created by: b.f. <bf@FreeBSD.org> +# Created by: b.f. <bf@FreeBSD.org> # $FreeBSD$ PORTNAME= fflas-ffpack @@ -11,16 +11,12 @@ COMMENT= A library for dense linear algebra over word-size finite fields LICENSE= LGPL20 -LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp +LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp GNU_CONFIGURE= yes -CONFIGURE_ARGS = --with-gmp="${LOCALBASE}" +CONFIGURE_ARGS= --with-gmp="${LOCALBASE}" -.if !defined(PACKAGE_BUILDING) -OPTIONS_DEFINE= OPTIMIZED_CFLAGS -.endif - -OPTIONS_DEFINE= DOXYGEN OPTIMIZED_CFLAGS +OPTIONS_DEFINE= DOXYGEN OPTIMIZED_CFLAGS .include <bsd.port.options.mk> @@ -31,7 +27,7 @@ LDFLAGS+= -L${LOCALBASE}/lib .if defined(MAINTAINER_MODE) CONFIGURE_ARGS+= --with-givaro="${LOCALBASE}" -LIB_DEPENDS+= givaro.3:${PORTSDIR}/math/givaro +LIB_DEPENDS+= libgivaro.so:${PORTSDIR}/math/givaro .else CONFIGURE_ARGS+= --with-givaro=no .endif @@ -41,25 +37,25 @@ WITH_BLAS?= gsl .if ${WITH_BLAS} == "gotoblas" CONFIGURE_ARGS+= --with-gotoblas2="${LOCALBASE}" --with-lapack=blas -LIB_DEPENDS+= goto2p:${PORTSDIR}/math/gotoblas +LIB_DEPENDS+= libgoto2p.so:${PORTSDIR}/math/gotoblas USE_FORTRAN= yes .elif ${WITH_BLAS} == "atlas" CONFIGURE_ARGS+= --with-cblas="${LOCALBASE}" --with-lapack=blas -LIB_DEPENDS+= cblas.2:${PORTSDIR}/math/atlas +LIB_DEPENDS+= libcblas.so:${PORTSDIR}/math/atlas USE_FORTRAN= yes .elif ${WITH_BLAS} == "gsl" CONFIGURE_ARGS+= --with-gsl="${LOCALBASE}" -LIB_DEPENDS+= gslcblas.0:${PORTSDIR}/math/gsl +LIB_DEPENDS+= libgslcblas.so:${PORTSDIR}/math/gsl .else IGNORE = unknown value of WITH_BLAS: ${WITH_BLAS} .endif .if ${PORT_OPTIONS:MDOXYGEN} -BUILD_DEPENDS += doxygen:${PORTSDIR}/devel/doxygen +BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen CONFIGURE_ARGS+= --enable-doc --with-docdir="${DOCSDIR}" PLIST_SUB+= DOXYGEN="" .else -PLIST_SUB+= DOXYGEN="@ccomment " +PLIST_SUB+= DOXYGEN="@comment " .endif .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} @@ -102,7 +98,7 @@ post-install: .if defined(MAINTAINER_MODE) check regression-test test: build - @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \ + @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_ARGS} check .endif diff --git a/math/fflas-ffpack/pkg-descr b/math/fflas-ffpack/pkg-descr index 06ebd9cce17a..6b7d983ecb6e 100644 --- a/math/fflas-ffpack/pkg-descr +++ b/math/fflas-ffpack/pkg-descr @@ -1,4 +1,4 @@ The FFLAS-FFPACK library provides dense linear algebra routines over word-size prime finite fields. -WWW: http://linalg.org/projects/fflas-ffpack +WWW: http://linalg.org/projects/fflas-ffpack |