svn commit: r432064 - in head: Mk/Uses converters/rubygem-bsdconv devel/rubygem-ascii85 devel/rubygem-io-like devel/rubygem-platform devel/rubygem-popen4 devel/rubygem-ptreloaded devel/rubygem-ruby...

Sat Jan 21 17:29:27 UTC 2017

Author: sunpoet
Date: Sat Jan 21 17:29:23 2017
New Revision: 432064
URL: https://svnweb.freebsd.org/changeset/ports/432064

Log:
  Update default GEM_NAME
  
  Change default GEM_NAME from ${PORTNAME}-${PORTVERSION} to ${DISTNAME} to avoid
  unnecessary GEM_NAME setting in ports Makefile
  
  Differential Revision:	https://reviews.FreeBSD.org/D9250
  PR:		216267
  Exp-run by:	antoine

Modified:
  head/Mk/Uses/gem.mk
  head/converters/rubygem-bsdconv/Makefile
  head/devel/rubygem-ascii85/Makefile
  head/devel/rubygem-io-like/Makefile
  head/devel/rubygem-platform/Makefile
  head/devel/rubygem-popen4/Makefile
  head/devel/rubygem-ptreloaded/Makefile
  head/devel/rubygem-rubyinline/Makefile
  head/devel/rubygem-rubyinlineaccel/Makefile
  head/devel/rubygem-zentest/Makefile
  head/security/ruby-hmac/Makefile
  head/security/rubygem-jugyo-twitter_oauth/Makefile
  head/security/rubygem-razorback-scriptNugget/Makefile
  head/sysutils/rubygem-sys-proctable/Makefile
  head/textproc/rubygem-rugments/Makefile
  head/www/rubygem-redcloth/Makefile

Modified: head/Mk/Uses/gem.mk
==============================================================================

--- head/Mk/Uses/gem.mk	Sat Jan 21 17:19:26 2017	(r432063)
+++ head/Mk/Uses/gem.mk	Sat Jan 21 17:29:23 2017	(r432064)
@@ -36,7 +36,7 @@ DOC_DIR=	${GEMS_BASE_DIR}/doc
 CACHE_DIR=	${GEMS_BASE_DIR}/cache
 SPEC_DIR=	${GEMS_BASE_DIR}/specifications
 EXT_DIR=	${GEMS_BASE_DIR}/extensions
-GEM_NAME?=	${PORTNAME}-${PORTVERSION}
+GEM_NAME?=	${DISTNAME}
 GEM_LIB_DIR?=	${GEMS_DIR}/${GEM_NAME}
 GEM_DOC_DIR?=	${DOC_DIR}/${GEM_NAME}
 GEM_SPEC?=	${SPEC_DIR}/${GEM_NAME}.gemspec

Modified: head/converters/rubygem-bsdconv/Makefile
==============================================================================
--- head/converters/rubygem-bsdconv/Makefile	Sat Jan 21 17:19:26 2017	(r432063)
+++ head/converters/rubygem-bsdconv/Makefile	Sat Jan 21 17:29:23 2017	(r432064)
@@ -15,7 +15,6 @@ LICENSE=	ISCL
 LIB_DEPENDS=	libbsdconv.so:converters/bsdconv
 
 CONFIGURE_ARGS=	--with-bsdconv-dir=${LOCALBASE}
-GEM_NAME=	${DISTNAME}
 USE_RUBY=	yes
 USES=		gem
 

Modified: head/devel/rubygem-ascii85/Makefile
==============================================================================
--- head/devel/rubygem-ascii85/Makefile	Sat Jan 21 17:19:26 2017	(r432063)
+++ head/devel/rubygem-ascii85/Makefile	Sat Jan 21 17:29:23 2017	(r432064)
@@ -12,9 +12,7 @@ COMMENT=	Encode/decode Adobe's binary-to
 
 LICENSE=	MIT
 
-GEM_NAME=	${DISTNAME}
 NO_ARCH=	yes
-
 USE_RUBY=	yes
 USES=		gem
 

Modified: head/devel/rubygem-io-like/Makefile
==============================================================================
--- head/devel/rubygem-io-like/Makefile	Sat Jan 21 17:19:26 2017	(r432063)
+++ head/devel/rubygem-io-like/Makefile	Sat Jan 21 17:29:23 2017	(r432064)
@@ -25,7 +25,7 @@ GEMS_DIR=	${GEMS_BASE_DIR}/gems
 DOC_DIR=	${GEMS_BASE_DIR}/doc
 CACHE_DIR=	${GEMS_BASE_DIR}/cache
 SPEC_DIR=	${GEMS_BASE_DIR}/specifications
-GEM_NAME=	${PORTNAME}-${PORTVERSION:C/(\.[0-9]+)$//}
+GEM_NAME=	${DISTNAME:R}
 GEM_LIB_DIR=	${GEMS_DIR}/${GEM_NAME}
 GEM_DOC_DIR=	${DOC_DIR}/${GEM_NAME}
 GEM_SPEC=	${SPEC_DIR}/${GEM_NAME}.gemspec

Modified: head/devel/rubygem-platform/Makefile
==============================================================================
--- head/devel/rubygem-platform/Makefile	Sat Jan 21 17:19:26 2017	(r432063)
+++ head/devel/rubygem-platform/Makefile	Sat Jan 21 17:29:23 2017	(r432064)
@@ -10,10 +10,7 @@ DISTNAME=	Platform-${PORTVERSION}
 MAINTAINER=	don at na.rim.or.jp
 COMMENT=	Hopefully robust platform sensing
 
-GEM_NAME=	${DISTNAME}
-
 NO_ARCH=	yes
-
 USE_RUBY=	yes
 USES=		gem
 

Modified: head/devel/rubygem-popen4/Makefile
==============================================================================
--- head/devel/rubygem-popen4/Makefile	Sat Jan 21 17:19:26 2017	(r432063)
+++ head/devel/rubygem-popen4/Makefile	Sat Jan 21 17:29:23 2017	(r432064)
@@ -5,7 +5,7 @@ PORTNAME=	popen4
 PORTVERSION=	0.1.4
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
-DISTNAME=	${GEM_NAME}
+DISTNAME=	POpen4-${PORTVERSION}
 
 MAINTAINER=	ruby at FreeBSD.org
 COMMENT=	Cross platform API for managing child processes
@@ -17,9 +17,7 @@ RUN_DEPENDS=	rubygem-open4>=0.4.0:devel/
 		rubygem-platform>=0.4.0:devel/rubygem-platform
 
 NO_ARCH=	yes
-
 USE_RUBY=	yes
 USES=		gem
-GEM_NAME=	POpen4-${PORTVERSION}
 
 .include <bsd.port.mk>

Modified: head/devel/rubygem-ptreloaded/Makefile
==============================================================================
--- head/devel/rubygem-ptreloaded/Makefile	Sat Jan 21 17:19:26 2017	(r432063)
+++ head/devel/rubygem-ptreloaded/Makefile	Sat Jan 21 17:29:23 2017	(r432064)
@@ -14,10 +14,7 @@ RUN_DEPENDS=	rubygem-rubyinlineaccel>=0.
 
 LICENSE=	GPLv2
 
-GEM_NAME=	${DISTNAME}
-
 NO_ARCH=	yes
-
 USE_RUBY=	yes
 USES=		gem
 

Modified: head/devel/rubygem-rubyinline/Makefile
==============================================================================
--- head/devel/rubygem-rubyinline/Makefile	Sat Jan 21 17:19:26 2017	(r432063)
+++ head/devel/rubygem-rubyinline/Makefile	Sat Jan 21 17:29:23 2017	(r432064)
@@ -15,7 +15,6 @@ LICENSE=	MIT
 
 RUN_DEPENDS=	rubygem-zentest>=4.3:devel/rubygem-zentest
 
-GEM_NAME=	${DISTNAME}
 NO_ARCH=	yes
 USE_RUBY=	yes
 USES=		gem shebangfix

Modified: head/devel/rubygem-rubyinlineaccel/Makefile
==============================================================================
--- head/devel/rubygem-rubyinlineaccel/Makefile	Sat Jan 21 17:19:26 2017	(r432063)
+++ head/devel/rubygem-rubyinlineaccel/Makefile	Sat Jan 21 17:29:23 2017	(r432064)
@@ -15,10 +15,7 @@ RUN_DEPENDS=	rubygem-rubyinline>=3.6.3:d
 
 LICENSE=	GPLv2
 
-GEM_NAME=	${DISTNAME}
-
 NO_ARCH=	yes
-
 USE_RUBY=	yes
 USES=		gem
 

Modified: head/devel/rubygem-zentest/Makefile
==============================================================================
--- head/devel/rubygem-zentest/Makefile	Sat Jan 21 17:19:26 2017	(r432063)
+++ head/devel/rubygem-zentest/Makefile	Sat Jan 21 17:29:23 2017	(r432064)
@@ -13,7 +13,6 @@ COMMENT=	Ruby Unit Testing Utility
 
 LICENSE=	MIT
 
-GEM_NAME=	${DISTNAME}
 NO_ARCH=	yes
 USE_RUBY=	yes
 USES=		gem

Modified: head/security/ruby-hmac/Makefile
==============================================================================
--- head/security/ruby-hmac/Makefile	Sat Jan 21 17:19:26 2017	(r432063)
+++ head/security/ruby-hmac/Makefile	Sat Jan 21 17:29:23 2017	(r432064)
@@ -13,7 +13,6 @@ COMMENT=	Ruby library which implements t
 
 USE_RUBY=	yes
 USES=		gem
-GEM_NAME=	${DISTNAME}
 
 DEPRECATED=	Use www/rubygem-ruby-hmac instead
 EXPIRATION_DATE=	2017-01-28

Modified: head/security/rubygem-jugyo-twitter_oauth/Makefile
==============================================================================
--- head/security/rubygem-jugyo-twitter_oauth/Makefile	Sat Jan 21 17:19:26 2017	(r432063)
+++ head/security/rubygem-jugyo-twitter_oauth/Makefile	Sat Jan 21 17:29:23 2017	(r432064)
@@ -18,7 +18,6 @@ RUN_DEPENDS=	rubygem-json>=1.1.9:devel/r
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-GEM_NAME=	${PORTNAME}-${DISTVERSION}
 USES=		gem
 
 .include <bsd.port.mk>

Modified: head/security/rubygem-razorback-scriptNugget/Makefile
==============================================================================
--- head/security/rubygem-razorback-scriptNugget/Makefile	Sat Jan 21 17:19:26 2017	(r432063)
+++ head/security/rubygem-razorback-scriptNugget/Makefile	Sat Jan 21 17:29:23 2017	(r432064)
@@ -11,9 +11,7 @@ DISTNAME=	scriptNugget-ruby-${PORTVERSIO
 MAINTAINER=	tj at FreeBSD.org
 COMMENT=	Framework for an intelligence driven security - Script Nugget Ruby
 
-GEM_NAME=		${DISTNAME}
 NO_ARCH=	yes
-
 USE_RUBY=		yes
 USES=		gem shebangfix
 SHEBANG_FILES=	lib/razorback.rb

Modified: head/sysutils/rubygem-sys-proctable/Makefile
==============================================================================
--- head/sysutils/rubygem-sys-proctable/Makefile	Sat Jan 21 17:19:26 2017	(r432063)
+++ head/sysutils/rubygem-sys-proctable/Makefile	Sat Jan 21 17:29:23 2017	(r432064)
@@ -14,7 +14,6 @@ LICENSE=	APACHE20
 
 RUN_DEPENDS=	rubygem-ffi>=0:devel/rubygem-ffi
 
-GEM_NAME=	${PORTNAME}-${DISTVERSIONFULL}
 NO_ARCH=	yes
 USE_RUBY=	yes
 USES=		gem

Modified: head/textproc/rubygem-rugments/Makefile
==============================================================================
--- head/textproc/rubygem-rugments/Makefile	Sat Jan 21 17:19:26 2017	(r432063)
+++ head/textproc/rubygem-rugments/Makefile	Sat Jan 21 17:29:23 2017	(r432064)
@@ -11,9 +11,7 @@ COMMENT=	Simple, easy to extend drop in 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-GEM_NAME=	${PORTNAME}-${DISTVERSION}
 NO_ARCH=	yes
-
 USE_RUBY=	yes
 USES=		gem
 

Modified: head/www/rubygem-redcloth/Makefile
==============================================================================
--- head/www/rubygem-redcloth/Makefile	Sat Jan 21 17:19:26 2017	(r432063)
+++ head/www/rubygem-redcloth/Makefile	Sat Jan 21 17:29:23 2017	(r432064)
@@ -12,7 +12,6 @@ COMMENT=	Module for using Textile in Rub
 
 LICENSE=	MIT
 
-GEM_NAME=	${DISTNAME}
 USE_RUBY=	yes
 USES=		gem
 
