svn commit: r483607 - head/math/py-cvxopt

[Yuri Victorovich]

Author: yuri
Date: Wed Oct 31 19:20:14 2018
New Revision: 483607
URL: https://svnweb.freebsd.org/changeset/ports/483607

Log:
  math/py-cvxopt: Remove WITH_ from options; Improve option descriptions
  
  Reported by:	mat

Modified:
  head/math/py-cvxopt/Makefile

Modified: head/math/py-cvxopt/Makefile
==============================================================================
--- head/math/py-cvxopt/Makefile	Wed Oct 31 19:01:34 2018	(r483606)
+++ head/math/py-cvxopt/Makefile	Wed Oct 31 19:20:14 2018	(r483607)
@@ -21,25 +21,24 @@ USE_PYTHON=	distutils autoplist
 
 CFLAGS+=	-I${LOCALBASE}/include/suitesparse
 
-OPTIONS_DEFINE=		WITH_GSL WITH_FFTW WITH_GLPK WITH_DSDP
-OPTIONS_DEFAULT=	WITH_GSL WITH_FFTW WITH_GLPK WITH_DSDP
+OPTIONS_DEFINE=		GSL FFTW GLPK DSDP
+OPTIONS_DEFAULT=	GSL FFTW GLPK DSDP
 
-WITH_GSL_DESC=		Build with gsl
-WITH_GSL_MAKE_ENV=	CVXOPT_BUILD_GSL=1
-WITH_GSL_LIB_DEPENDS=	libgsl.so:math/gsl
+GSL_DESC=		Build with GSL, the GNU scientific library
+GSL_MAKE_ENV=		CVXOPT_BUILD_GSL=1
+GSL_LIB_DEPENDS=	libgsl.so:math/gsl
 
-WITH_FFTW_DESC=		Build with fftw
-WITH_FFTW_MAKE_ENV=	CVXOPT_BUILD_FFTW=1
-WITH_FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
+FFTW_MAKE_ENV=		CVXOPT_BUILD_FFTW=1
+FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
 
-WITH_GLPK_DESC=		Build with GLPK
-WITH_GLPK_MAKE_ENV=	CVXOPT_BUILD_GLPK=1
-WITH_GLPK_LIB_DEPENDS=	libglpk.so:math/glpk
+GLPK_DESC=		Build with GLPK, the linear programming solver
+GLPK_MAKE_ENV=		CVXOPT_BUILD_GLPK=1
+GLPK_LIB_DEPENDS=	libglpk.so:math/glpk
 
-WITH_DSDP_DESC=		Build with DSDP
-WITH_DSDP_MAKE_ENV=	CVXOPT_BUILD_DSDP=1
-WITH_DSDP_CFLAGS=	-I${LOCALBASE}/include/dsdp
-WITH_DSDP_LIB_DEPENDS=	libdsdp.so:math/dsdp
+DSDP_DESC=		Build with DSDP, the interior-point method
+DSDP_MAKE_ENV=		CVXOPT_BUILD_DSDP=1
+DSDP_CFLAGS=		-I${LOCALBASE}/include/dsdp
+DSDP_LIB_DEPENDS=	libdsdp.so:math/dsdp
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/cvxopt/*.so