svn commit: r482161 - head/graphics/graphviz

[Tobias Kortkamp]

On Mon, Oct 15, 2018, at 19:10, Mathieu Arnold wrote:
> Author: mat
> Date: Mon Oct 15 17:10:42 2018
> New Revision: 482161
> URL: https://svnweb.freebsd.org/changeset/ports/482161
> 
> Log:
>   Remove LIBRSVG2 option, it creates a dependency loop.
>   
>   It is also discouraged upstream, graphviz can create svg without it.
> 
> Modified:
>   head/graphics/graphviz/Makefile   (contents, props changed)
> 
> Modified: head/graphics/graphviz/Makefile
> ==============================================================================
> --- head/graphics/graphviz/Makefile	Mon Oct 15 16:46:32 2018	(r482160)
> +++ head/graphics/graphviz/Makefile	Mon Oct 15 17:10:42 2018	(r482161)
> @@ -54,7 +54,7 @@ PDOCS_HTML=	doc/*.html doc/info/*.gif
>  
>  USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
>  
> -OPTIONS_DEFINE=	XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO LIBRSVG2 POPPLER \
> +OPTIONS_DEFINE=	XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO POPPLER \
>  		ANN GTS GTK2 GDK GDK_PIXBUF GNOMEUI SMYRNA GVEDIT MING DEVIL \
>  		GHOSTSCRIPT PERL PHP PYTHON RUBY LUA TCL TK GUILE NVTHREADS \
>  		DOCS EXAMPLES
> @@ -89,7 +89,6 @@ XPM_USE=	XORG=xaw,xpm,xmu,xt,sm,ice,xext,x11,xau,xdmcp
>  ICONV_USES=	iconv
>  NLS_USES=	gettext
>  PANGOCAIRO_USE=	GNOME=pango,cairo XORG=xrender,x11,xau,xdmcp
> -LIBRSVG2_USE=	GNOME=librsvg2 GL=gl,glu,glut
>  GTK2_USE=	XORG=sm,ice,xext,xinerama,xi,xrandr,xcursor,xfixes GNOME=gtk20
>  GNOMEUI_USE=	GNOME=libgnomeui
>  SMYRNA_USE=	GNOME=libglade2,pangox-compat GL=glut
> @@ -121,8 +120,6 @@ IPSEPCOLA_CONFIGURE_WITH=	ipsepcola
>  IPSEPCOLA_IMPLIES=		DIGCOLA
>  NLS_CONFIGURE_ENABLE=		nls
>  PANGOCAIRO_CONFIGURE_WITH=	pangocairo
> -LIBRSVG2_CONFIGURE_WITH=	rsvg
> -LIBRSVG2_IMPLIES=		PANGOCAIRO
>  POPPLER_CONFIGURE_WITH=		poppler
>  ANN_CONFIGURE_WITH=		ann
>  ANN_CONFIGURE_ENV=	ANN_CFLAGS=-I${LOCALBASE}/include ANN_LIBS=-lann
> 

I always wonder with commits like this: Since LIBRSVG2_CONFIGURE_WITH
is now gone, I think --without-rsvg should be added to CONFIGURE_ARGS.
Otherwise if librsvg2 is installed in the build environment it will
be accidentally picked up by the configure script.