From c4cc84afc60bbfa34b405ac1589a52087212fd84 Mon Sep 17 00:00:00 2001 From: Jerzy Grzegorek Date: Tue, 14 Jan 2014 11:30:58 +0100 Subject: [PATCH] package: unification of use $(subst [._-], [._-], $(_VERSION)) macro Currently, there are five packages which use 'subst' macro to change their version. * Three of them (ebtables, icu, perl) use this macro "in place" : EBTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/ebtables/ebtables-$(subst .,-,$(EBTABLES_VERSION)) ICU_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-src.tgz PERL_CROSS_OLD_POD = perl$(subst .,,$(PERL_CROSS_BASE_VERSION))delta.pod PERL_CROSS_NEW_POD = perl$(subst .,,$(PERL_VERSION))delta.pod * Two of them (boost, libnss) use an additional variable : BOOST_FILE_VERSION = $(subst .,_,$(BOOST_VERSION)) BOOST_SOURCE = boost_$(BOOST_FILE_VERSION).tar.bz2 LIBNSS_SITE_VERSION = $(subst .,_,$(LIBNSS_VERSION)) LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(LIBNSS_SITE_VERSION)_RTM/src * Additionally two packages (duma, rings) doesn't use it at all : DUMA_VERSION = 2_5_15 DUMA_SITE = http://downloads.sourceforge.net/project/duma/duma/2.5.15 RINGS_VERSION_MAJOR = 1.3.0 RINGS_SUBDIR = rings-v_1_3_0 This commit makes changes to use 'subst' macro "in place", in all of them. Signed-off-by: Jerzy Grzegorek Signed-off-by: Peter Korsgaard --- package/boost/boost.mk | 3 +-- package/duma/duma.mk | 6 +++--- package/libnss/libnss.mk | 3 +-- package/rings/rings.mk | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 9ead1ddf9..7aab6145a 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -5,8 +5,7 @@ ################################################################################ BOOST_VERSION = 1.55.0 -BOOST_FILE_VERSION = $(subst .,_,$(BOOST_VERSION)) -BOOST_SOURCE = boost_$(BOOST_FILE_VERSION).tar.bz2 +BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION) BOOST_INSTALL_STAGING = YES BOOST_LICENSE = Boost Software License 1.0 diff --git a/package/duma/duma.mk b/package/duma/duma.mk index 93ae16e48..d11987f4a 100644 --- a/package/duma/duma.mk +++ b/package/duma/duma.mk @@ -4,9 +4,9 @@ # ################################################################################ -DUMA_VERSION = 2_5_15 -DUMA_SOURCE = duma_$(DUMA_VERSION).tar.gz -DUMA_SITE = http://downloads.sourceforge.net/project/duma/duma/2.5.15 +DUMA_VERSION = 2.5.15 +DUMA_SOURCE = duma_$(subst .,_,$(DUMA_VERSION)).tar.gz +DUMA_SITE = http://downloads.sourceforge.net/project/duma/duma/$(DUMA_VERSION) DUMA_LICENSE = GPLv2+ LGPLv2.1+ DUMA_LICENSE_FILES = COPYING-GPL COPYING-LGPL diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 721512778..666df744c 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -6,8 +6,7 @@ LIBNSS_VERSION = 3.14.5 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz -LIBNSS_SITE_VERSION = $(subst .,_,$(LIBNSS_VERSION)) -LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(LIBNSS_SITE_VERSION)_RTM/src +LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_SUBDIR = mozilla/security LIBNSS_DISTDIR = mozilla/dist LIBNSS_INSTALL_STAGING = YES diff --git a/package/rings/rings.mk b/package/rings/rings.mk index 28761622c..09d9b0292 100644 --- a/package/rings/rings.mk +++ b/package/rings/rings.mk @@ -6,7 +6,7 @@ RINGS_VERSION_MAJOR = 1.3.0 RINGS_VERSION = $(RINGS_VERSION_MAJOR)-1 -RINGS_SUBDIR = rings-v_1_3_0 +RINGS_SUBDIR = rings-v_$(subst .,_,$(RINGS_VERSION_MAJOR)) RINGS_LICENSE = MIT $(eval $(luarocks-package))