Page MenuHomeFreeBSD
Files F168316439

D18878.id52936.diff
No OneTemporary
Actions

D18878.id52936.diff
View Options

Index: Mk/Uses/gnome.mk
===================================================================
--- Mk/Uses/gnome.mk
+++ Mk/Uses/gnome.mk
@@ -276,7 +276,7 @@
vte3_LIB_DEPENDS= libvte-2.91.so:x11-toolkits/vte3
vte3_USE_GNOME_IMPL= gtk30
-librsvg2_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2
+librsvg2_LIB_DEPENDS= librsvg-2.so:graphics/${LIBRSVG2_DEFAULT}
librsvg2_USE_GNOME_IMPL=libgsf gdkpixbuf2 pango
nautilus3_LIB_DEPENDS= libnautilus-extension.so:x11-fm/nautilus
Index: Mk/bsd.default-versions.mk
===================================================================
--- Mk/bsd.default-versions.mk
+++ Mk/bsd.default-versions.mk
@@ -16,8 +16,8 @@
LOCALBASE?= /usr/local
.for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT \
- LAZARUS LINUX LLVM LUA MYSQL PERL5 PGSQL PHP PYTHON PYTHON2 PYTHON3 \
- RUBY RUST SAMBA SSL TCLTK VARNISH
+ LAZARUS LIBRSVG2 LINUX LLVM LUA MYSQL PERL5 PGSQL PHP PYTHON PYTHON2 \
+ PYTHON3 RUBY RUST SAMBA SSL TCLTK VARNISH
.if defined(${lang}_DEFAULT)
ERROR+= "The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf"
.endif
@@ -49,6 +49,8 @@
GHOSTSCRIPT_DEFAULT?= agpl
# Possible values: 1.8.4
LAZARUS_DEFAULT?= 1.8.4
+# Possible values: librsvg2, librsvg2-rust
+LIBRSVG2_DEFAULT?= librsvg2
.if ${ARCH} == amd64
# Possible values: c6, c6_64, c7
LINUX_DEFAULT?= c6_64
Index: deskutils/shutter/Makefile
===================================================================
--- deskutils/shutter/Makefile
+++ deskutils/shutter/Makefile
@@ -14,7 +14,7 @@
LICENSE_COMB= multi
RUN_DEPENDS= ImageMagick6>=6.9.3.1,1:graphics/ImageMagick6 \
- librsvg2>=2.40.6:graphics/librsvg2 \
+ ${LIBRSVG2_DEFAULT}>=2.40.6:graphics/${LIBRSVG2_DEFAULT} \
p5-File-BaseDir>=0.03:devel/p5-File-BaseDir \
p5-File-Copy-Recursive>=0.38_1:devel/p5-File-Copy-Recursive \
p5-File-Spec-Native>=1.003_1:devel/p5-File-Spec-Native \
Index: devel/dissy/Makefile
===================================================================
--- devel/dissy/Makefile
+++ devel/dissy/Makefile
@@ -14,7 +14,7 @@
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}webkitgtk>0:www/py-webkitgtk@${PY_FLAVOR}
-LIB_DEPENDS= librsvg-2.so:graphics/librsvg2
+LIB_DEPENDS= librsvg-2.so:graphics/${LIBRSVG2_DEFAULT}
USES= python:2.7
USE_PYTHON= distutils
Index: graphics/ImageMagick6/Makefile
===================================================================
--- graphics/ImageMagick6/Makefile
+++ graphics/ImageMagick6/Makefile
@@ -157,7 +157,7 @@
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_LIB_DEPENDS= librsvg-2.so:graphics/${LIBRSVG2_DEFAULT}
SVG_USE= gnome=cairo,gdkpixbuf2
SVG_IMPLIES= X11
Index: graphics/ImageMagick7/Makefile
===================================================================
--- graphics/ImageMagick7/Makefile
+++ graphics/ImageMagick7/Makefile
@@ -155,7 +155,7 @@
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_LIB_DEPENDS= librsvg-2.so:graphics/${LIBRSVG2_DEFAULT}
SVG_USE= gnome=cairo,gdkpixbuf2
SVG_IMPLIES= X11
Index: graphics/fpc-rsvg/Makefile
===================================================================
--- graphics/fpc-rsvg/Makefile
+++ graphics/fpc-rsvg/Makefile
@@ -17,6 +17,6 @@
LIBRSVG2_DESC= Install librsvg2 library
OPTIONS_DEFAULT= LIBRSVG2
-LIBRSVG2_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2
+LIBRSVG2_LIB_DEPENDS= librsvg-2.so:graphics/${LIBRSVG2_DEFAULT}
.include "${MASTERDIR}/Makefile"
Index: graphics/gimageview/Makefile
===================================================================
--- graphics/gimageview/Makefile
+++ graphics/gimageview/Makefile
@@ -40,7 +40,7 @@
LIBWMF_LIB_DEPENDS= libwmf.so:graphics/libwmf
LIBRSVG2_CONFIGURE_WITH=librsvg
-LIBRSVG2_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2
+LIBRSVG2_LIB_DEPENDS= librsvg-2.so:graphics/${LIBRSVG2_DEFAULT}
LIBEXIF_CONFIGURE_ENABLE=exif # bundled exif is used
LIBEXIF_BROKEN_OFF= does not build without libexif support
Index: graphics/osg-devel/Makefile
===================================================================
--- graphics/osg-devel/Makefile
+++ graphics/osg-devel/Makefile
@@ -111,7 +111,7 @@
SDL_USE= sdl=sdl
SDL_VARS= FORCE_REQUIRE+=SDL
SDL_VARS_OFF= FORCE_IGNORE+=SDL
-SVG_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2
+SVG_LIB_DEPENDS= librsvg-2.so:graphics/${LIBRSVG2_DEFAULT}
SVG_USE= gnome=cairo
SVG_VARS= FORCE_REQUIRE+=RSVG
SVG_VARS_OFF= FORCE_IGNORE+=RSVG
Index: graphics/osg/Makefile
===================================================================
--- graphics/osg/Makefile
+++ graphics/osg/Makefile
@@ -114,7 +114,7 @@
SDL_USE= sdl=sdl
SDL_VARS= FORCE_REQUIRE+=SDL
SDL_VARS_OFF= FORCE_IGNORE+=SDL
-SVG_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2
+SVG_LIB_DEPENDS= librsvg-2.so:graphics/${LIBRSVG2_DEFAULT}
SVG_USE= gnome=cairo
SVG_VARS= FORCE_REQUIRE+=RSVG
SVG_VARS_OFF= FORCE_IGNORE+=RSVG
Index: multimedia/ffmpeg/Makefile
===================================================================
--- multimedia/ffmpeg/Makefile
+++ multimedia/ffmpeg/Makefile
@@ -281,7 +281,7 @@
LIBBLURAY_CONFIGURE_ENABLE= libbluray
# librsvg
-LIBRSVG2_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2
+LIBRSVG2_LIB_DEPENDS= librsvg-2.so:graphics/${LIBRSVG2_DEFAULT}
LIBRSVG2_CONFIGURE_ENABLE= librsvg
# libxml
Index: net-p2p/mldonkey/Makefile
===================================================================
--- net-p2p/mldonkey/Makefile
+++ net-p2p/mldonkey/Makefile
@@ -66,7 +66,7 @@
.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
+LIB_DEPENDS+= librsvg-2.so:graphics/${LIBRSVG2_DEFAULT}
CONFIGURE_ARGS+=--enable-gui=newgui2
# we don't need lablgtk as RUN dependency, but we need gtk+glib
Index: science/chemical-mime-data/Makefile
===================================================================
--- science/chemical-mime-data/Makefile
+++ science/chemical-mime-data/Makefile
@@ -10,7 +10,7 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= Collection of chemical MIME types for UNIX desktops
-BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc:graphics/librsvg2
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/librsvg-2.0.pc:graphics/${LIBRSVG2_DEFAULT}
USES= gettext-tools gmake pathfix pkgconfig tar:bzip2 shared-mime-info
USE_GNOME= gnomemimedata intlhack libxslt:build
Index: www/midori/Makefile
===================================================================
--- www/midori/Makefile
+++ www/midori/Makefile
@@ -11,7 +11,7 @@
LICENSE= LGPL21 MIT
LICENSE_COMB= multi
-BUILD_DEPENDS= rsvg-convert:graphics/librsvg2 \
+BUILD_DEPENDS= rsvg-convert:graphics/${LIBRSVG2_DEFAULT} \
valac:lang/vala
LIB_DEPENDS= libnotify.so:devel/libnotify \
libsoup-2.4.so:devel/libsoup \
Index: x11-fm/librfm/Makefile
===================================================================
--- x11-fm/librfm/Makefile
+++ x11-fm/librfm/Makefile
@@ -17,7 +17,7 @@
LIB_DEPENDS= libtubo.so:x11-fm/libtubo \
libdbh.so:databases/dbh \
libzip.so:archivers/libzip \
- librsvg-2.so:graphics/librsvg2
+ librsvg-2.so:graphics/${LIBRSVG2_DEFAULT}
OPTIONS_DEFINE= NLS
Index: x11-toolkits/gtk30/Makefile
===================================================================
--- x11-toolkits/gtk30/Makefile
+++ x11-toolkits/gtk30/Makefile
@@ -27,7 +27,7 @@
RUN_DEPENDS+= hicolor-icon-theme>=0:misc/hicolor-icon-theme \
adwaita-icon-theme>=0:x11-themes/adwaita-icon-theme \
at-spi2-atk>=0:accessibility/at-spi2-atk \
- librsvg2>=0:graphics/librsvg2
+ ${LIBRSVG2_DEFAULT}>=0:graphics/${LIBRSVG2_DEFAULT}
USE_PERL5= build
USE_LDCONFIG= yes
Index: x11/xxkb/Makefile
===================================================================
--- x11/xxkb/Makefile
+++ x11/xxkb/Makefile
@@ -20,7 +20,7 @@
OPTIONS_DEFINE= LIBRSVG2 DOCS
-LIBRSVG2_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2
+LIBRSVG2_LIB_DEPENDS= librsvg-2.so:graphics/${LIBRSVG2_DEFAULT}
LIBRSVG2_VARS= XMKMF_ARGS=-DWITH_SVG_SUPPORT
post-build:

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 28, 2:34 PM (4 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37460389
Default Alt Text
D18878.id52936.diff (8 KB)

Event Timeline