Date: Sat, 2 Feb 2013 13:13:02 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1154 - in trunk/security: ca_root_nss nss Message-ID: <201302021313.r12DD2MP002739@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Feb 2 13:13:02 2013
New Revision: 1154
Log:
simplify ckbi version suffix to just one variable
Modified:
trunk/security/ca_root_nss/Makefile
trunk/security/nss/Makefile
Modified: trunk/security/ca_root_nss/Makefile
==============================================================================
--- trunk/security/ca_root_nss/Makefile Fri Feb 1 02:04:36 2013 (r1153)
+++ trunk/security/ca_root_nss/Makefile Sat Feb 2 13:13:02 2013 (r1154)
@@ -5,7 +5,7 @@
PORTVERSION= ${VERSION_NSS}
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR= security/nss/releases/NSS_${PORTVERSION:S/./_/g}_WITH_CKBI_${CKBI_VER:S/./_/}_RTM/src
+MASTER_SITE_SUBDIR= security/nss/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src
DISTNAME= nss-${VERSION_NSS}${NSS_SUFFIX}
MAINTAINER= gecko@FreeBSD.org
@@ -27,8 +27,7 @@
# !!! been committed there first. !!!
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
VERSION_NSS= 3.14.1
-CKBI_VER= 1.93
-NSS_SUFFIX= .with.ckbi.${CKBI_VER}
+NSS_SUFFIX= .with.ckbi.1.93
CERTDATA_TXT_PATH= nss-${VERSION_NSS}/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
BUNDLE_PROCESSOR= MAca-bundle.pl
Modified: trunk/security/nss/Makefile
==============================================================================
--- trunk/security/nss/Makefile Fri Feb 1 02:04:36 2013 (r1153)
+++ trunk/security/nss/Makefile Sat Feb 2 13:13:02 2013 (r1154)
@@ -3,10 +3,10 @@
PORTNAME= nss
PORTVERSION= ${_MAJOR}.${_MINOR}.${_PATCH}
+DISTVERSIONSUFFIX= .with.ckbi.1.93
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR= security/nss/releases/NSS_${PORTVERSION:S/./_/g}_WITH_CKBI_${CKBI_VER:S/./_/}_RTM/src
-DISTNAME= nss-${PORTVERSION}.with.ckbi.${CKBI_VER}
+MASTER_SITE_SUBDIR= security/nss/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src
MAINTAINER= gecko@FreeBSD.org
COMMENT= Libraries to support development of security-enabled applications
@@ -20,7 +20,6 @@
_MINOR= 14
_PATCH= 1
-CKBI_VER= 1.93
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/mozilla/security/nss
MAKE_JOBS_UNSAFE= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302021313.r12DD2MP002739>