From 3dea99e48259078b83a0f8e8a37283cca49f207d Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Sat, 21 Jan 2017 17:29:23 +0000 Subject: [PATCH] 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 --- Mk/Uses/gem.mk | 2 +- converters/rubygem-bsdconv/Makefile | 1 - devel/rubygem-ascii85/Makefile | 2 -- devel/rubygem-io-like/Makefile | 2 +- devel/rubygem-platform/Makefile | 3 --- devel/rubygem-popen4/Makefile | 4 +--- devel/rubygem-ptreloaded/Makefile | 3 --- devel/rubygem-rubyinline/Makefile | 1 - devel/rubygem-rubyinlineaccel/Makefile | 3 --- devel/rubygem-zentest/Makefile | 1 - security/ruby-hmac/Makefile | 1 - security/rubygem-jugyo-twitter_oauth/Makefile | 1 - security/rubygem-razorback-scriptNugget/Makefile | 2 -- sysutils/rubygem-sys-proctable/Makefile | 1 - textproc/rubygem-rugments/Makefile | 2 -- www/rubygem-redcloth/Makefile | 1 - 16 files changed, 3 insertions(+), 27 deletions(-) diff --git a/Mk/Uses/gem.mk b/Mk/Uses/gem.mk index 6ea8c99166d3..3182f0afb319 100644 --- a/Mk/Uses/gem.mk +++ b/Mk/Uses/gem.mk @@ -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 diff --git a/converters/rubygem-bsdconv/Makefile b/converters/rubygem-bsdconv/Makefile index 9d606ae14e69..442695f12ac6 100644 --- a/converters/rubygem-bsdconv/Makefile +++ b/converters/rubygem-bsdconv/Makefile @@ -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 diff --git a/devel/rubygem-ascii85/Makefile b/devel/rubygem-ascii85/Makefile index aff2c8a39cd1..2a6245ebad11 100644 --- a/devel/rubygem-ascii85/Makefile +++ b/devel/rubygem-ascii85/Makefile @@ -12,9 +12,7 @@ COMMENT= Encode/decode Adobe's binary-to-text encoding of the same name LICENSE= MIT -GEM_NAME= ${DISTNAME} NO_ARCH= yes - USE_RUBY= yes USES= gem diff --git a/devel/rubygem-io-like/Makefile b/devel/rubygem-io-like/Makefile index 8f59f3e24d84..74c07bbdaa42 100644 --- a/devel/rubygem-io-like/Makefile +++ b/devel/rubygem-io-like/Makefile @@ -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 diff --git a/devel/rubygem-platform/Makefile b/devel/rubygem-platform/Makefile index 518a8d340014..6e6efaaf80bb 100644 --- a/devel/rubygem-platform/Makefile +++ b/devel/rubygem-platform/Makefile @@ -10,10 +10,7 @@ DISTNAME= Platform-${PORTVERSION} MAINTAINER= don@na.rim.or.jp COMMENT= Hopefully robust platform sensing -GEM_NAME= ${DISTNAME} - NO_ARCH= yes - USE_RUBY= yes USES= gem diff --git a/devel/rubygem-popen4/Makefile b/devel/rubygem-popen4/Makefile index edc058f50cf2..061c08f5d53c 100644 --- a/devel/rubygem-popen4/Makefile +++ b/devel/rubygem-popen4/Makefile @@ -5,7 +5,7 @@ PORTNAME= popen4 PORTVERSION= 0.1.4 CATEGORIES= devel rubygems MASTER_SITES= RG -DISTNAME= ${GEM_NAME} +DISTNAME= POpen4-${PORTVERSION} MAINTAINER= ruby@FreeBSD.org COMMENT= Cross platform API for managing child processes @@ -17,9 +17,7 @@ RUN_DEPENDS= rubygem-open4>=0.4.0:devel/rubygem-open4 \ rubygem-platform>=0.4.0:devel/rubygem-platform NO_ARCH= yes - USE_RUBY= yes USES= gem -GEM_NAME= POpen4-${PORTVERSION} .include diff --git a/devel/rubygem-ptreloaded/Makefile b/devel/rubygem-ptreloaded/Makefile index bf2f8b7a6d34..0e0f62142afc 100644 --- a/devel/rubygem-ptreloaded/Makefile +++ b/devel/rubygem-ptreloaded/Makefile @@ -14,10 +14,7 @@ RUN_DEPENDS= rubygem-rubyinlineaccel>=0.0.1:devel/rubygem-rubyinlineaccel LICENSE= GPLv2 -GEM_NAME= ${DISTNAME} - NO_ARCH= yes - USE_RUBY= yes USES= gem diff --git a/devel/rubygem-rubyinline/Makefile b/devel/rubygem-rubyinline/Makefile index 3d464b3029eb..b6ca862aaa57 100644 --- a/devel/rubygem-rubyinline/Makefile +++ b/devel/rubygem-rubyinline/Makefile @@ -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 diff --git a/devel/rubygem-rubyinlineaccel/Makefile b/devel/rubygem-rubyinlineaccel/Makefile index 0a52694074f7..ec65c0c9492a 100644 --- a/devel/rubygem-rubyinlineaccel/Makefile +++ b/devel/rubygem-rubyinlineaccel/Makefile @@ -15,10 +15,7 @@ RUN_DEPENDS= rubygem-rubyinline>=3.6.3:devel/rubygem-rubyinline LICENSE= GPLv2 -GEM_NAME= ${DISTNAME} - NO_ARCH= yes - USE_RUBY= yes USES= gem diff --git a/devel/rubygem-zentest/Makefile b/devel/rubygem-zentest/Makefile index 78c0e8e723a6..5edf0f622adb 100644 --- a/devel/rubygem-zentest/Makefile +++ b/devel/rubygem-zentest/Makefile @@ -13,7 +13,6 @@ COMMENT= Ruby Unit Testing Utility LICENSE= MIT -GEM_NAME= ${DISTNAME} NO_ARCH= yes USE_RUBY= yes USES= gem diff --git a/security/ruby-hmac/Makefile b/security/ruby-hmac/Makefile index c422ae4d921a..95c53aa3a8ee 100644 --- a/security/ruby-hmac/Makefile +++ b/security/ruby-hmac/Makefile @@ -13,7 +13,6 @@ COMMENT= Ruby library which implements the HMAC algorithm USE_RUBY= yes USES= gem -GEM_NAME= ${DISTNAME} DEPRECATED= Use www/rubygem-ruby-hmac instead EXPIRATION_DATE= 2017-01-28 diff --git a/security/rubygem-jugyo-twitter_oauth/Makefile b/security/rubygem-jugyo-twitter_oauth/Makefile index bba4a89d7048..15f043839d8f 100644 --- a/security/rubygem-jugyo-twitter_oauth/Makefile +++ b/security/rubygem-jugyo-twitter_oauth/Makefile @@ -18,7 +18,6 @@ RUN_DEPENDS= rubygem-json>=1.1.9:devel/rubygem-json \ NO_ARCH= yes USE_RUBY= yes -GEM_NAME= ${PORTNAME}-${DISTVERSION} USES= gem .include diff --git a/security/rubygem-razorback-scriptNugget/Makefile b/security/rubygem-razorback-scriptNugget/Makefile index a59c72297991..8b71606cbc66 100644 --- a/security/rubygem-razorback-scriptNugget/Makefile +++ b/security/rubygem-razorback-scriptNugget/Makefile @@ -11,9 +11,7 @@ DISTNAME= scriptNugget-ruby-${PORTVERSION} MAINTAINER= tj@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 diff --git a/sysutils/rubygem-sys-proctable/Makefile b/sysutils/rubygem-sys-proctable/Makefile index e93f32bbc95a..3042497edb7f 100644 --- a/sysutils/rubygem-sys-proctable/Makefile +++ b/sysutils/rubygem-sys-proctable/Makefile @@ -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 diff --git a/textproc/rubygem-rugments/Makefile b/textproc/rubygem-rugments/Makefile index 0d64cea7f7b8..7f0e057a0991 100644 --- a/textproc/rubygem-rugments/Makefile +++ b/textproc/rubygem-rugments/Makefile @@ -11,9 +11,7 @@ COMMENT= Simple, easy to extend drop in replacement for pygments LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -GEM_NAME= ${PORTNAME}-${DISTVERSION} NO_ARCH= yes - USE_RUBY= yes USES= gem diff --git a/www/rubygem-redcloth/Makefile b/www/rubygem-redcloth/Makefile index 2864a543f8b9..5c5dc2dbbf82 100644 --- a/www/rubygem-redcloth/Makefile +++ b/www/rubygem-redcloth/Makefile @@ -12,7 +12,6 @@ COMMENT= Module for using Textile in Ruby LICENSE= MIT -GEM_NAME= ${DISTNAME} USE_RUBY= yes USES= gem