Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Nov 2020 19:02:42 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r555776 - in head: . Mk Mk/Uses
Message-ID:  <202011201902.0AKJ2gfV072030@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tcberner
Date: Fri Nov 20 19:02:42 2020
New Revision: 555776
URL: https://svnweb.freebsd.org/changeset/ports/555776

Log:
  Add new default-version variant for librsvg2
  
    New default version for librsvg2.
  
    Current versions of graphics/librsvg2 are using parts written in rust.
    For architectures that do not have support for rust, and for people
    who prefer not to have, or are not able to compile rust software due
    to hardware limitations, the version can be chosen via this new flag.
  
    The default on almost all architectures is rust.
  
    If you prefer no to use rust, add the following to your make.conf:
  
          DEFAULT_VERSIONS+=librsvg2=legacy
  
  This makes the change committed in r554733 a bit more flexible for people
  who are opposed to oxidation.
  
  PR:		251014
  Exp-run by:	antoine

Modified:
  head/CHANGES
  head/Mk/Uses/gnome.mk
  head/Mk/bsd.default-versions.mk

Modified: head/CHANGES
==============================================================================
--- head/CHANGES	Fri Nov 20 18:06:08 2020	(r555775)
+++ head/CHANGES	Fri Nov 20 19:02:42 2020	(r555776)
@@ -11,6 +11,22 @@ in the release notes and/or placed into UPDATING.
 All ports committers are allowed to commit to this file.
 
 20201120:
+AUTHOR: gnome@FreeBSD.org
+
+  New default version for librsvg2.
+
+  Current versions of graphics/librsvg2 are using parts written in rust.
+  For architectures that do not have support for rust, and for people
+  who prefer not to have, or are not able to compile rust software due
+  to hardware limitations, the version can be chosen via this new flag.
+
+  The default on almost all architectures is rust.
+
+  If you prefer no to use rust, add the following to your make.conf:
+
+  	DEFAULT_VERSIONS+=librsvg2=legacy
+
+20201120:
 AUTHOR: pauamma@gundo.com
 
   New virtual category: education.

Modified: head/Mk/Uses/gnome.mk
==============================================================================
--- head/Mk/Uses/gnome.mk	Fri Nov 20 18:06:08 2020	(r555775)
+++ head/Mk/Uses/gnome.mk	Fri Nov 20 19:02:42 2020	(r555776)
@@ -261,7 +261,7 @@ vte3_LIB_DEPENDS=	libvte-2.91.so:x11-toolkits/vte3
 vte3_USE_GNOME_IMPL=	gtk30
 
 # Use librsvg2-rust where lang/rust is available
-.if empty(ARCH:Naarch64:Narmv6:Narmv7:Namd64:Ni386:Npowerpc64:Npowerpc64le)
+.if ${LIBRSVG2_DEFAULT:Mrust}
 librsvg2_BUILD_DEPENDS=	librsvg2-rust>=0:graphics/librsvg2-rust
 librsvg2_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2-rust
 librsvg2_RUN_DEPENDS=	librsvg2-rust>=0:graphics/librsvg2-rust

Modified: head/Mk/bsd.default-versions.mk
==============================================================================
--- head/Mk/bsd.default-versions.mk	Fri Nov 20 18:06:08 2020	(r555775)
+++ head/Mk/bsd.default-versions.mk	Fri Nov 20 19:02:42 2020	(r555776)
@@ -20,7 +20,7 @@ _INCLUDE_BSD_DEFAULT_VERSIONS_MK=	yes
 LOCALBASE?=	/usr/local
 
 .for lang in APACHE BDB COROSYNC EMACS FIREBIRD FORTRAN FPC GCC GHOSTSCRIPT \
-	JAVA JULIA LAZARUS LINUX LLVM LUA MYSQL PERL5 PGSQL PHP PYTHON PYTHON2 \
+	JAVA JULIA 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"
@@ -61,6 +61,12 @@ JAVA_DEFAULT?=		8
 JULIA_DEFAULT?=		1.0
 # Possible values: 2.0.8
 LAZARUS_DEFAULT?=	2.0.8
+# Possible values: rust legacy
+.if empty(ARCH:Naarch64:Narmv6:Narmv7:Namd64:Ni386:Npowerpc64:Npowerpc64le)
+LIBRSVG2_DEFAULT?=	rust
+.else
+LIBRSVG2_DEFAULT?=	legacy
+.endif
 # Possible values: c7
 LINUX_DEFAULT?=		c7
 # Possible values: 60, 70, 80, 90, -devel (to be used when non-base compiler is required)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011201902.0AKJ2gfV072030>