From owner-freebsd-gecko@FreeBSD.ORG Sat Feb 2 13:13:16 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 254486BF for ; Sat, 2 Feb 2013 13:13:16 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 9B4A4F0 for ; Sat, 2 Feb 2013 13:13:15 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r12DD7GY003491 for ; Sat, 2 Feb 2013 13:13:07 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r12DD2MP002739 for freebsd-gecko@freebsd.org; Sat, 2 Feb 2013 13:13:02 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 2 Feb 2013 13:13:02 GMT Message-Id: <201302021313.r12DD2MP002739@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1154 - in trunk/security: ca_root_nss nss MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Feb 2013 13:13:16 -0000 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