svn commit: r511956 - in head: multimedia/ffmpeg net-p2p/mldonkey

[Tobias Kortkamp]

Author: tobik
Date: Fri Sep 13 12:50:04 2019
New Revision: 511956
URL: https://svnweb.freebsd.org/changeset/ports/511956

Log:
  Canonicalize librsvg dependency
  
  - Use USE_GNOME=librsvg2 where possible
  - Reduce scope of D18878

Modified:
  head/multimedia/ffmpeg/Makefile
  head/net-p2p/mldonkey/Makefile

Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile	Fri Sep 13 12:47:03 2019	(r511955)
+++ head/multimedia/ffmpeg/Makefile	Fri Sep 13 12:50:04 2019	(r511956)
@@ -304,7 +304,8 @@ LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libblur
 LIBBLURAY_CONFIGURE_ENABLE=	libbluray
 
 # librsvg
-LIBRSVG2_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
+LIBRSVG2_USES=			gnome
+LIBRSVG2_USE=			GNOME=librsvg2
 LIBRSVG2_CONFIGURE_ENABLE=	librsvg
 
 # libxml

Modified: head/net-p2p/mldonkey/Makefile
==============================================================================
--- head/net-p2p/mldonkey/Makefile	Fri Sep 13 12:47:03 2019	(r511955)
+++ head/net-p2p/mldonkey/Makefile	Fri Sep 13 12:50:04 2019	(r511956)
@@ -68,11 +68,11 @@ PLIST_SUB+=	CORE="@comment " GUI="" GUICORE="@comment 
 
 .if ${PORT_OPTIONS:MGUI}
 BUILD_DEPENDS+=	${LOCALBASE}/lib/ocaml/site-lib/lablgtk2/lablrsvg.cma:x11-toolkits/ocaml-lablgtk2
-LIB_DEPENDS+=	librsvg-2.so:graphics/librsvg2
 
 CONFIGURE_ARGS+=--enable-gui=newgui2
 # we don't need lablgtk as RUN dependency, but we need gtk+glib
-USE_GNOME=	gtk20
+USES+=		gnome
+USE_GNOME=	gtk20 librsvg2
 .endif # ${PORT_OPTIONS:MGUI}
 
 .if ${PORT_OPTIONS:MCORE}