Date: Mon, 23 Nov 2015 18:24:48 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r402298 - in head/textproc/rubygem-sass-rails4: . files Message-ID: <201511231824.tANIOmXT067792@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Mon Nov 23 18:24:48 2015 New Revision: 402298 URL: https://svnweb.freebsd.org/changeset/ports/402298 Log: - Use textproc/rubygem-sass instead of textproc/rubygem-sass32 to avoid dependency conflict between textproc/rubygem-sass-rails4 and www/rubygem-bootstrap-sass - Bump PORTREVISION for dependency and package change PR: 203470 Submitted by: Torsten Zuhlsdorff <ports@toco-domains.de> Added: head/textproc/rubygem-sass-rails4/files/ head/textproc/rubygem-sass-rails4/files/patch-gemspec (contents, props changed) Modified: head/textproc/rubygem-sass-rails4/Makefile Modified: head/textproc/rubygem-sass-rails4/Makefile ============================================================================== --- head/textproc/rubygem-sass-rails4/Makefile Mon Nov 23 18:24:42 2015 (r402297) +++ head/textproc/rubygem-sass-rails4/Makefile Mon Nov 23 18:24:48 2015 (r402298) @@ -3,7 +3,7 @@ PORTNAME= sass-rails PORTVERSION= 4.0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc rubygems MASTER_SITES= RG PKGNAMESUFFIX?= 4 @@ -15,7 +15,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS?= rubygem-railties4>=4.0.0:${PORTSDIR}/www/rubygem-railties4 \ - rubygem-sass32>=3.2.2:${PORTSDIR}/textproc/rubygem-sass32 \ + rubygem-sass>=3.2.2:${PORTSDIR}/textproc/rubygem-sass \ rubygem-sprockets>=2.8:${PORTSDIR}/devel/rubygem-sprockets \ rubygem-sprockets-rails>=2.0:${PORTSDIR}/devel/rubygem-sprockets-rails Added: head/textproc/rubygem-sass-rails4/files/patch-gemspec ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/rubygem-sass-rails4/files/patch-gemspec Mon Nov 23 18:24:48 2015 (r402298) @@ -0,0 +1,11 @@ +--- sass-rails.gemspec.orig 2015-11-21 06:58:49 UTC ++++ sass-rails.gemspec +@@ -23,7 +23,7 @@ Gem::Specification.new do |s| + + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then + s.add_runtime_dependency(%q<railties>, ["< 5.0", ">= 4.0.0"]) +- s.add_runtime_dependency(%q<sass>, ["~> 3.2.2"]) ++ s.add_runtime_dependency(%q<sass>, [">= 3.2.2"]) + s.add_runtime_dependency(%q<sprockets-rails>, ["~> 2.0"]) + s.add_runtime_dependency(%q<sprockets>, ["< 3.0", "~> 2.8"]) + s.add_development_dependency(%q<rails>, [">= 0"])
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511231824.tANIOmXT067792>