Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Nov 2015 18:42:51 +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: r401119 - in head: devel/ruby-gems security/rubygem-ezcrypto/files www/rubygem-gitlab-grack/files
Message-ID:  <201511091842.tA9IgpEH096068@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Mon Nov  9 18:42:51 2015
New Revision: 401119
URL: https://svnweb.freebsd.org/changeset/ports/401119

Log:
  - Update to 2.5.0
  - Add LICENSE_FILE
  - Convert to new options target helper
  - Convert to new options variable helper
  - Use = instead of += for PLIST_SUB
  - Cleanup Makefile
  
  Changes:	https://github.com/rubygems/rubygems/blob/master/History.txt
  PR:		204328
  Exp-run by:	antoine

Modified:
  head/devel/ruby-gems/Makefile
  head/devel/ruby-gems/distinfo
  head/devel/ruby-gems/pkg-plist
  head/security/rubygem-ezcrypto/files/patch-gemspec
  head/www/rubygem-gitlab-grack/files/patch-gemspec

Modified: head/devel/ruby-gems/Makefile
==============================================================================
--- head/devel/ruby-gems/Makefile	Mon Nov  9 17:51:05 2015	(r401118)
+++ head/devel/ruby-gems/Makefile	Mon Nov  9 18:42:51 2015	(r401119)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gems
-PORTVERSION=	2.4.8
+PORTVERSION=	2.5.0
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://production.cf.rubygems.org/rubygems/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -14,11 +14,13 @@ COMMENT=	Package management framework fo
 
 LICENSE=	MIT RUBY
 LICENSE_COMB=	dual
+LICENSE_FILE_MIT=	${WRKSRC}/MIT.txt
+LICENSE_FILE_RUBY=	${WRKSRC}/LICENSE.txt
 
+NO_ARCH=	yes
+NO_BUILD=	yes
 USE_RUBY=	yes
 RUBY_SETUP=	setup.rb
-
-NO_BUILD=	yes
 USES=		tar:tgz
 
 GEMS_BASE_DIR=		lib/ruby/gems
@@ -37,7 +39,7 @@ CACHE_DIR=		${GEMS_VER_DIR}/cache
 SPEC_DIR=		${GEMS_VER_DIR}/specifications
 EXT_DIR=		${GEMS_VER_DIR}/extensions
 
-PLIST_SUB+=	DISTNAME="${DISTNAME}" \
+PLIST_SUB=	DISTNAME="${DISTNAME}" \
 		RUBY_VER_SHORT="${RUBY_VER_SHORT}" \
 		GEMS_DIR="${GEMS_DIR}" \
 		DOC_DIR="${DOC_DIR}" \
@@ -47,17 +49,13 @@ PLIST_SUB+=	DISTNAME="${DISTNAME}" \
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-RUBY_SETUP_OPTIONS=	--destdir=${STAGEDIR}
 GEM_ENV=		GEM_HOME=${STAGEDIR}${PREFIX}/${GEMS_VER_DIR}
 
-.if !${PORT_OPTIONS:MDOCS}
-RUBY_SETUP_OPTIONS+=	--no-ri --no-rdoc
-.endif
+DOCS_VARS_OFF=		RUBY_SETUP_OPTIONS="--destdir=${STAGEDIR} --no-ri --no-rdoc"
+DOCS_VARS=		RUBY_SETUP_OPTIONS="--destdir=${STAGEDIR}"
 
 do-install:
-	cd ${WRKSRC}; ${SETENV} ${GEM_ENV} ${RUBY} ${RUBY_SETUP} ${RUBY_SETUP_OPTIONS}
+	cd ${WRKSRC}/ && ${SETENV} ${GEM_ENV} ${RUBY} ${RUBY_SETUP} ${RUBY_SETUP_OPTIONS}
 
 post-install:
 	@${LN} -sf gem${RUBY_VER_SHORT} ${STAGEDIR}${PREFIX}/bin/gem
@@ -65,9 +63,7 @@ post-install:
 #
 # Find all RDOC and RI files
 #
-.if ${PORT_OPTIONS:MDOCS}
-	@${FIND} -ds ${STAGEDIR}${PREFIX}/${GEMS_DOC_DIR}/ ! -type d | \
-	    ${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
-.endif
+post-install-DOCS-on:
+	cd ${STAGEDIR}${PREFIX}/ && ${FIND} -ds ${GEMS_DOC_DIR}/ ! -type d >> ${TMPPLIST}
 
 .include <bsd.port.mk>

Modified: head/devel/ruby-gems/distinfo
==============================================================================
--- head/devel/ruby-gems/distinfo	Mon Nov  9 17:51:05 2015	(r401118)
+++ head/devel/ruby-gems/distinfo	Mon Nov  9 18:42:51 2015	(r401119)
@@ -1,2 +1,2 @@
-SHA256 (ruby/rubygems-2.4.8.tgz) = 5a4335fef5904ceb76d912a9d4a2464fbbb172df3b2abcb0c67003e77764845e
-SIZE (ruby/rubygems-2.4.8.tgz) = 447712
+SHA256 (ruby/rubygems-2.5.0.tgz) = a39e95acb86f52fdca38b1484b2eed61a7f76551119079d7a9f8c67c5be78831
+SIZE (ruby/rubygems-2.5.0.tgz) = 467978

Modified: head/devel/ruby-gems/pkg-plist
==============================================================================
--- head/devel/ruby-gems/pkg-plist	Mon Nov  9 17:51:05 2015	(r401118)
+++ head/devel/ruby-gems/pkg-plist	Mon Nov  9 18:42:51 2015	(r401119)
@@ -114,6 +114,16 @@ bin/gem%%RUBY_VER_SHORT%%
 %%RUBY_SITELIBDIR%%/rubygems/resolver/local_specification.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/lock_set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/lock_specification.rb
+%%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo.rb
+%%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo.rb
+%%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb
+%%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/errors.rb
+%%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/gem_metadata.rb
+%%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/modules/specification_provider.rb
+%%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/modules/ui.rb
+%%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/resolution.rb
+%%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/resolver.rb
+%%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/state.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/requirement_list.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/set.rb
 %%RUBY_SITELIBDIR%%/rubygems/resolver/spec_specification.rb
@@ -154,8 +164,8 @@ bin/gem%%RUBY_VER_SHORT%%
 %%RUBY_SITELIBDIR%%/rubygems/uri_formatter.rb
 %%RUBY_SITELIBDIR%%/rubygems/user_interaction.rb
 %%RUBY_SITELIBDIR%%/rubygems/util.rb
+%%RUBY_SITELIBDIR%%/rubygems/util/licenses.rb
 %%RUBY_SITELIBDIR%%/rubygems/util/list.rb
-%%RUBY_SITELIBDIR%%/rubygems/util/stringio.rb
 %%RUBY_SITELIBDIR%%/rubygems/validator.rb
 %%RUBY_SITELIBDIR%%/rubygems/version.rb
 %%RUBY_SITELIBDIR%%/rubygems/version_option.rb

Modified: head/security/rubygem-ezcrypto/files/patch-gemspec
==============================================================================
--- head/security/rubygem-ezcrypto/files/patch-gemspec	Mon Nov  9 17:51:05 2015	(r401118)
+++ head/security/rubygem-ezcrypto/files/patch-gemspec	Mon Nov  9 18:42:51 2015	(r401119)
@@ -9,7 +9,7 @@
    s.homepage = "http://ezcrypto.rubyforge.org"
    s.requirements = ["none"]
    s.rubyforge_project = "ezcrypto"
-   s.rubygems_version = "2.4.8"
+   s.rubygems_version = "2.5.0"
    s.summary = "Simplified encryption library."
 -  s.test_files = ["test/active_crypto_test.rb", "test/agree2.com.cert", "test/association_key_holder_test.rb", "test/database.yml", "test/debug.log", "test/digest_test.rb", "test/dsakey.pem", "test/dsapubkey.pem", "test/dsig_test.rb", "test/encrypt_test.rb", "test/ezcrypto_test.rb", "test/key_holder_test.rb", "test/protectedsigner.pem", "test/sf-class2-root.crt", "test/sf_intermediate.crt", "test/store", "test/test_helper.rb", "test/testchild.pem", "test/testchild.req", "test/testpub.pem", "test/testsigner.cert", "test/testsigner.pem", "test/valicert_class2_root.crt"]
 +  s.test_files = ["test/active_crypto_test.rb", "test/agree2.com.cert", "test/association_key_holder_test.rb", "test/database.yml", "test/debug.log", "test/digest_test.rb", "test/dsakey.pem", "test/dsapubkey.pem", "test/dsig_test.rb", "test/encrypt_test.rb", "test/ezcrypto_test.rb", "test/key_holder_test.rb", "test/protectedsigner.pem", "test/sf-class2-root.crt", "test/sf_intermediate.crt", "test/test_helper.rb", "test/testchild.pem", "test/testchild.req", "test/testpub.pem", "test/testsigner.cert", "test/testsigner.pem", "test/valicert_class2_root.crt"]

Modified: head/www/rubygem-gitlab-grack/files/patch-gemspec
==============================================================================
--- head/www/rubygem-gitlab-grack/files/patch-gemspec	Mon Nov  9 17:51:05 2015	(r401118)
+++ head/www/rubygem-gitlab-grack/files/patch-gemspec	Mon Nov  9 18:42:51 2015	(r401119)
@@ -8,7 +8,7 @@
 -  s.files = [".gitignore", ".gitmodules", ".travis.yml", "CHANGELOG", "Gemfile", "Gemfile.lock", "README.md", "Rakefile", "bin/console", "bin/testserver", "examples/dispatch.fcgi", "grack.gemspec", "install.txt", "lib/grack.rb", "lib/grack/auth.rb", "lib/grack/bundle.rb", "lib/grack/git.rb", "lib/grack/server.rb", "lib/grack/version.rb", "tests/main_test.rb"]
 +  s.files = [".gitignore", ".gitmodules", ".travis.yml", "CHANGELOG", "Gemfile", "Gemfile.lock", "README.md", "Rakefile", "examples/dispatch.fcgi", "grack.gemspec", "install.txt", "lib/grack.rb", "lib/grack/auth.rb", "lib/grack/bundle.rb", "lib/grack/git.rb", "lib/grack/server.rb", "lib/grack/version.rb", "tests/main_test.rb"]
    s.homepage = "https://github.com/gitlabhq/grack"
-   s.rubygems_version = "2.4.8"
+   s.rubygems_version = "2.5.0"
    s.summary = "Ruby/Rack Git Smart-HTTP Server Handler"
 @@ -22,7 +21,7 @@ Gem::Specification.new do |s|
      s.specification_version = 4



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