Re: math/grace fix FLAVORS

On 2019/05/02 13:36, Martin Reindl wrote:
> Hello ports,
>
> for math/grace, the three available FLAVORS are not enabled in the Makefile. Because
> fftw can be used on netcdf data, I suggest removing these flavors altogether and
> only keeping the no_x11.
>
> -m
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/math/Makefile,v
> retrieving revision 1.158
> diff -u -p -u -p -r1.158 Makefile
> --- Makefile 4 Mar 2019 12:51:15 -0000 1.158
> +++ Makefile 2 May 2019 11:22:43 -0000
> @@ -33,6 +33,7 @@
> SUBDIR += gnuplot
> SUBDIR += gnuplot,no_x11
> SUBDIR += grace
> + SUBDIR += grace,no_x11
> SUBDIR += graphviz
> SUBDIR += grpn
> SUBDIR += gunits
> Index: grace/Makefile
> ===================================================================
> RCS file: /cvs/ports/math/grace/Makefile,v
> retrieving revision 1.44
> diff -u -p -u -p -r1.44 Makefile
> --- grace/Makefile 23 Jun 2018 19:53:36 -0000 1.44
> +++ grace/Makefile 2 May 2019 11:22:43 -0000
> @@ -3,7 +3,7 @@
> COMMENT= GRaphing, Advanced Computation and Exploration of data
>
> DISTNAME= grace-5.1.15
> -REVISION= 8
> +REVISION= 9
> CATEGORIES= math
>
> HOMEPAGE= http://plasma-gate.weizmann.ac.il/Grace/
> @@ -22,14 +22,20 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/ac-t
> CONFIGURE_ARGS+= --with-bundled-xbae \
> --with-extra-incpath=${LOCALBASE}/include \
> --with-extra-ldpath=${LOCALBASE}/lib \
> + --with-fftw \
> + --enable-netcdf \
> --enable-grace-home=${PREFIX}/grace
>
> -LIB_DEPENDS = graphics/jpeg \
> +LIB_DEPENDS = devel/t1lib \
> + graphics/jpeg \
> graphics/png \
> - devel/t1lib \
> graphics/tiff \
> + math/fftw \
> + math/netcdf \
> print/pdflib
> -WANTLIB += jpeg>=62 png>=2 t1>=5 tiff>=35 pdf>=2
> +
> +WANTLIB += jpeg>=62 png>=2 pdf>=2 t1>=5 tiff>=35 fftw>=2 \
> + netcdf>=1
>
> FLAVORS= no_x11 fftw netcdf

They need removing here ^^ as well, and also in pkg/DESCR.

> FLAVOR?=
> @@ -43,22 +49,6 @@ LIB_DEPENDS+= x11/motif
> WANTLIB+= ICE SM X11 Xext Xmu Xpm Xt Xm
> MAKE_ENV+= MOTIFLIB='-L${LOCALBASE}/lib -lXm'
> CONFIGURE_ENV= LDFLAGS=-lm
> -.endif
> -
> -.if ${FLAVOR:Mfftw}
> -LIB_DEPENDS += math/fftw
> -WANTLIB += fftw>=2
> -CONFIGURE_ARGS+= --with-fftw
> -.else
> -CONFIGURE_ARGS+= --without-fftw
> -.endif
> -
> -.if ${FLAVOR:Mnetcdf}
> -LIB_DEPENDS += math/netcdf
> -WANTLIB += netcdf>=1
> -CONFIGURE_ARGS+= --enable-netcdf
> -.else
> -CONFIGURE_ARGS+= --disable-netcdf
> .endif
>
> GRACE_DIR=${TRUEPREFIX}/grace
>