Date: Fri, 13 Sep 2019 12:44:03 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511954 - in head: graphics/ImageMagick6 graphics/ImageMagick7 graphics/fpc-rsvg graphics/gimageview graphics/osg graphics/osg-devel x11-fm/librfm x11/xxkb Message-ID: <201909131244.x8DCi3RS053614@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Fri Sep 13 12:44:02 2019 New Revision: 511954 URL: https://svnweb.freebsd.org/changeset/ports/511954 Log: Canonicalize librsvg dependency - Use USE_GNOME=librsvg2 where possible - Reduce scope of D18878 Modified: head/graphics/ImageMagick6/Makefile head/graphics/ImageMagick7/Makefile head/graphics/fpc-rsvg/Makefile head/graphics/gimageview/Makefile head/graphics/osg-devel/Makefile head/graphics/osg/Makefile head/x11-fm/librfm/Makefile head/x11/xxkb/Makefile Modified: head/graphics/ImageMagick6/Makefile ============================================================================== --- head/graphics/ImageMagick6/Makefile Fri Sep 13 12:26:40 2019 (r511953) +++ head/graphics/ImageMagick6/Makefile Fri Sep 13 12:44:02 2019 (r511954) @@ -162,8 +162,7 @@ RAW_IMPLIES= LCMS2 SVG_DESC= SVG vector image format support (via librsvg, implies the x11 option) SVG_CONFIGURE_WITH= rsvg -SVG_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 -SVG_USE= gnome=cairo,gdkpixbuf2 +SVG_USE= gnome=cairo,gdkpixbuf2,librsvg2 SVG_IMPLIES= X11 TIFF_CONFIGURE_WITH= tiff Modified: head/graphics/ImageMagick7/Makefile ============================================================================== --- head/graphics/ImageMagick7/Makefile Fri Sep 13 12:26:40 2019 (r511953) +++ head/graphics/ImageMagick7/Makefile Fri Sep 13 12:44:02 2019 (r511954) @@ -161,8 +161,7 @@ RAW_IMPLIES= LCMS2 SVG_DESC= SVG vector image format support (via librsvg, implies the x11 option) SVG_CONFIGURE_WITH= rsvg -SVG_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 -SVG_USE= gnome=cairo,gdkpixbuf2 +SVG_USE= gnome=cairo,gdkpixbuf2,librsvg2 SVG_IMPLIES= X11 TIFF_CONFIGURE_WITH= tiff Modified: head/graphics/fpc-rsvg/Makefile ============================================================================== --- head/graphics/fpc-rsvg/Makefile Fri Sep 13 12:26:40 2019 (r511953) +++ head/graphics/fpc-rsvg/Makefile Fri Sep 13 12:44:02 2019 (r511954) @@ -17,6 +17,7 @@ OPTIONS_DEFINE= LIBRSVG2 LIBRSVG2_DESC= Install librsvg2 library OPTIONS_DEFAULT= LIBRSVG2 -LIBRSVG2_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 +LIBRSVG2_USES= gnome +LIBRSVG2_USE= GNOME=librsvg2 .include "${MASTERDIR}/Makefile" Modified: head/graphics/gimageview/Makefile ============================================================================== --- head/graphics/gimageview/Makefile Fri Sep 13 12:26:40 2019 (r511953) +++ head/graphics/gimageview/Makefile Fri Sep 13 12:44:02 2019 (r511954) @@ -40,7 +40,7 @@ LIBWMF_CONFIGURE_WITH= libwmf LIBWMF_LIB_DEPENDS= libwmf.so:graphics/libwmf LIBRSVG2_CONFIGURE_WITH=librsvg -LIBRSVG2_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 +LIBRSVG2_USE= GNOME=librsvg2 LIBEXIF_CONFIGURE_ENABLE=exif # bundled exif is used LIBEXIF_BROKEN_OFF= does not build without libexif support Modified: head/graphics/osg-devel/Makefile ============================================================================== --- head/graphics/osg-devel/Makefile Fri Sep 13 12:26:40 2019 (r511953) +++ head/graphics/osg-devel/Makefile Fri Sep 13 12:44:02 2019 (r511954) @@ -103,8 +103,8 @@ QT5_VARS_OFF= FORCE_IGNORE+="Qt5Widgets Qt5WebKitWidg SDL_USE= sdl=sdl SDL_VARS= FORCE_REQUIRE+=SDL SDL_VARS_OFF= FORCE_IGNORE+=SDL -SVG_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 -SVG_USE= gnome=cairo +SVG_USES= gnome +SVG_USE= gnome=cairo,librsvg2 SVG_VARS= FORCE_REQUIRE+=RSVG SVG_VARS_OFF= FORCE_IGNORE+=RSVG VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver Modified: head/graphics/osg/Makefile ============================================================================== --- head/graphics/osg/Makefile Fri Sep 13 12:26:40 2019 (r511953) +++ head/graphics/osg/Makefile Fri Sep 13 12:44:02 2019 (r511954) @@ -106,8 +106,8 @@ QT5_VARS_OFF= FORCE_IGNORE+="Qt5Widgets Qt5WebKitWidg SDL_USE= sdl=sdl SDL_VARS= FORCE_REQUIRE+=SDL SDL_VARS_OFF= FORCE_IGNORE+=SDL -SVG_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 -SVG_USE= gnome=cairo +SVG_USES= gnome +SVG_USE= gnome=cairo,librsvg2 SVG_VARS= FORCE_REQUIRE+=RSVG SVG_VARS_OFF= FORCE_IGNORE+=RSVG VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver Modified: head/x11-fm/librfm/Makefile ============================================================================== --- head/x11-fm/librfm/Makefile Fri Sep 13 12:26:40 2019 (r511953) +++ head/x11-fm/librfm/Makefile Fri Sep 13 12:44:02 2019 (r511954) @@ -16,7 +16,6 @@ BUILD_DEPENDS= gawk:lang/gawk LIB_DEPENDS= libtubo.so:x11-fm/libtubo \ libdbh.so:databases/dbh \ libzip.so:archivers/libzip \ - librsvg-2.so:graphics/librsvg2 \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 @@ -26,7 +25,7 @@ CONFIGURE_ARGS+=--with-pkglibdata INSTALLS_ICONS= yes USES= autoreconf gettext gnome gmake libtool:keepla pkgconfig tar:bzip2 GNU_CONFIGURE= yes -USE_GNOME= gtk20 intltool cairo libxml2 +USE_GNOME= gtk20 intltool cairo libxml2 librsvg2 USE_XORG+= x11 USE_LDCONFIG= yes INSTALL_TARGET= install-strip Modified: head/x11/xxkb/Makefile ============================================================================== --- head/x11/xxkb/Makefile Fri Sep 13 12:26:40 2019 (r511953) +++ head/x11/xxkb/Makefile Fri Sep 13 12:44:02 2019 (r511954) @@ -20,8 +20,9 @@ PORTDOCS= README CHANGES.ru README.ru OPTIONS_DEFINE= LIBRSVG2 DOCS -LIBRSVG2_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 -LIBRSVG2_VARS= XMKMF_ARGS=-DWITH_SVG_SUPPORT +LIBRSVG2_USES= gnome +LIBRSVG2_USE= GNOME=librsvg2 +LIBRSVG2_VARS= XMKMF_ARGS=-DWITH_SVG_SUPPORT post-build: # Convert Russian language docs from archaic KOI8-R to modern UTF-8
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909131244.x8DCi3RS053614>