Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 28 Oct 2015 17:04:10 +0000 (UTC)
From:      Michael Moll <mmoll@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r400402 - in head: textproc/rubygem-jekyll-assets www www/rubygem-jekyll www/rubygem-jekyll2
Message-ID:  <201510281704.t9SH4AX3037910@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mmoll
Date: Wed Oct 28 17:04:09 2015
New Revision: 400402
URL: https://svnweb.freebsd.org/changeset/ports/400402

Log:
  www/rubygem-jekyll: update to 3.0.0
  
  and preserve 2.5.3 as www/rubygem-jekyll2

Added:
  head/www/rubygem-jekyll2/
     - copied from r400400, head/www/rubygem-jekyll/
Modified:
  head/textproc/rubygem-jekyll-assets/Makefile
  head/www/Makefile
  head/www/rubygem-jekyll/Makefile
  head/www/rubygem-jekyll/distinfo
  head/www/rubygem-jekyll/pkg-descr
  head/www/rubygem-jekyll2/Makefile

Modified: head/textproc/rubygem-jekyll-assets/Makefile
==============================================================================
--- head/textproc/rubygem-jekyll-assets/Makefile	Wed Oct 28 16:58:56 2015	(r400401)
+++ head/textproc/rubygem-jekyll-assets/Makefile	Wed Oct 28 17:04:09 2015	(r400402)
@@ -13,7 +13,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-fastimage>=1.6:${PORTSDIR}/graphics/rubygem-fastimage \
-		rubygem-jekyll>=2:${PORTSDIR}/www/rubygem-jekyll \
+		rubygem-jekyll2>=2:${PORTSDIR}/www/rubygem-jekyll2 \
 		rubygem-mini_magick>=4.1:${PORTSDIR}/graphics/rubygem-mini_magick \
 		rubygem-sass>=3.2:${PORTSDIR}/textproc/rubygem-sass \
 		rubygem-sprockets>=2.10:${PORTSDIR}/devel/rubygem-sprockets \

Modified: head/www/Makefile
==============================================================================
--- head/www/Makefile	Wed Oct 28 16:58:56 2015	(r400401)
+++ head/www/Makefile	Wed Oct 28 17:04:09 2015	(r400402)
@@ -1890,6 +1890,7 @@
     SUBDIR += rubygem-innate
     SUBDIR += rubygem-jekyll
     SUBDIR += rubygem-jekyll-watch
+    SUBDIR += rubygem-jekyll2
     SUBDIR += rubygem-journey
     SUBDIR += rubygem-jquery-atwho-rails
     SUBDIR += rubygem-jquery-atwho-rails-rails4

Modified: head/www/rubygem-jekyll/Makefile
==============================================================================
--- head/www/rubygem-jekyll/Makefile	Wed Oct 28 16:58:56 2015	(r400401)
+++ head/www/rubygem-jekyll/Makefile	Wed Oct 28 17:04:09 2015	(r400402)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	jekyll
-PORTVERSION=	2.5.3
-PORTREVISION=	2
+PORTVERSION=	3.0.0
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
@@ -13,21 +12,16 @@ COMMENT=	Simple, blog aware, static site
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-classifier-reborn>=2.0:${PORTSDIR}/devel/rubygem-classifier-reborn \
-		rubygem-colorator>=0.1:${PORTSDIR}/textproc/rubygem-colorator \
-		rubygem-jekyll-coffeescript>=1.0:${PORTSDIR}/devel/rubygem-jekyll-coffeescript \
-		rubygem-jekyll-gist>=1.0:${PORTSDIR}/textproc/rubygem-jekyll-gist \
-		rubygem-jekyll-paginate>=1.0:${PORTSDIR}/textproc/rubygem-jekyll-paginate \
+RUN_DEPENDS=	rubygem-colorator>=0.1:${PORTSDIR}/textproc/rubygem-colorator \
 		rubygem-jekyll-sass-converter>=1.0:${PORTSDIR}/textproc/rubygem-jekyll-sass-converter \
 		rubygem-jekyll-watch>=1.1:${PORTSDIR}/www/rubygem-jekyll-watch \
 		rubygem-kramdown>=1.3:${PORTSDIR}/textproc/rubygem-kramdown \
-		rubygem-liquid2>=2.6.1:${PORTSDIR}/textproc/rubygem-liquid2 \
+		rubygem-liquid>=3.0.0:${PORTSDIR}/textproc/rubygem-liquid \
 		rubygem-mercenary>=0.3.3:${PORTSDIR}/devel/rubygem-mercenary \
-		rubygem-pygments.rb>=0.6.0:${PORTSDIR}/devel/rubygem-pygments.rb \
-		rubygem-redcarpet>=3.1:${PORTSDIR}/textproc/rubygem-redcarpet \
-		rubygem-safe_yaml>=1.0:${PORTSDIR}/devel/rubygem-safe_yaml \
-		rubygem-toml>=0.1.0:${PORTSDIR}/devel/rubygem-toml
+		rubygem-rouge>=1.7:${PORTSDIR}/textproc/rubygem-rouge \
+		rubygem-safe_yaml>=1.0:${PORTSDIR}/devel/rubygem-safe_yaml
 
+CONFLICTS_INSTALL=	rubygem-jekyll2-*
 NO_ARCH=	yes
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes

Modified: head/www/rubygem-jekyll/distinfo
==============================================================================
--- head/www/rubygem-jekyll/distinfo	Wed Oct 28 16:58:56 2015	(r400401)
+++ head/www/rubygem-jekyll/distinfo	Wed Oct 28 17:04:09 2015	(r400402)
@@ -1,2 +1,2 @@
-SHA256 (rubygem/jekyll-2.5.3.gem) = 56085eb920484394c03bc2cbc96274685a2e72ed43d33eec9e3d97e68569a3a9
-SIZE (rubygem/jekyll-2.5.3.gem) = 58368
+SHA256 (rubygem/jekyll-3.0.0.gem) = b4e524d49b7c318d7c7e2ba0b6e61e0e83e3d1618caca12c1b690cde7542e965
+SIZE (rubygem/jekyll-3.0.0.gem) = 74240

Modified: head/www/rubygem-jekyll/pkg-descr
==============================================================================
--- head/www/rubygem-jekyll/pkg-descr	Wed Oct 28 16:58:56 2015	(r400401)
+++ head/www/rubygem-jekyll/pkg-descr	Wed Oct 28 17:04:09 2015	(r400402)
@@ -3,7 +3,6 @@ template directory (representing the raw
 through Textile or Markdown and Liquid converters, and spits out a
 complete, static website suitable for serving with Apache or your
 favorite web server. This is also the engine behind GitHub Pages,
-which you can use to host your project?s page or blog right here from
-GitHub.
+which you can use to host your project's page or blog on GitHub.
 
-WWW: https://github.com/mojombo/jekyll
+WWW: http://jekyllrb.com/

Modified: head/www/rubygem-jekyll2/Makefile
==============================================================================
--- head/www/rubygem-jekyll/Makefile	Wed Oct 28 16:25:27 2015	(r400400)
+++ head/www/rubygem-jekyll2/Makefile	Wed Oct 28 17:04:09 2015	(r400402)
@@ -6,6 +6,7 @@ PORTVERSION=	2.5.3
 PORTREVISION=	2
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
+PKGNAMESUFFIX=	2
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Simple, blog aware, static site generator
@@ -28,6 +29,7 @@ RUN_DEPENDS=	rubygem-classifier-reborn>=
 		rubygem-safe_yaml>=1.0:${PORTSDIR}/devel/rubygem-safe_yaml \
 		rubygem-toml>=0.1.0:${PORTSDIR}/devel/rubygem-toml
 
+CONFLICTS_INSTALL=	rubygem-jekyll-3.*
 NO_ARCH=	yes
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes



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