[SVN-Commit] r1132 - in trunk/security: ca_root_nss nss

[svn-freebsd-gecko at chruetertee.ch]

Author: flo
Date: Sat Jan  5 22:12:20 2013
New Revision: 1132

Log:
- sync with ports
- trim headers

Modified:
   trunk/security/ca_root_nss/Makefile
   trunk/security/ca_root_nss/distinfo
   trunk/security/nss/Makefile
   trunk/security/nss/distinfo

Modified: trunk/security/ca_root_nss/Makefile
==============================================================================
--- trunk/security/ca_root_nss/Makefile	Sat Jan  5 10:02:26 2013	(r1131)
+++ trunk/security/ca_root_nss/Makefile	Sat Jan  5 22:12:20 2013	(r1132)
@@ -1,15 +1,11 @@
-# New ports collection makefile for:    ca-root-nss
-# Date created:				Thu Jan 25 13:02:14 CST 2007
-# Whom:	      				Brooks Davis <brooks at FreeBSD.org>
-#
-# $FreeBSD: ports/security/ca_root_nss/Makefile,v 1.23 2012/06/04 21:14:30 flo Exp $
-#
+# Created by: Brooks Davis <brooks at FreeBSD.org>
+# $FreeBSD: head/security/ca_root_nss/Makefile 309970 2013-01-05 21:34:25Z flo $
 
 PORTNAME=	ca_root_nss
 PORTVERSION=	${VERSION_NSS}
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	security/nss/releases/NSS_${PORTVERSION:S/./_/g}_RTM/src
+MASTER_SITE_SUBDIR=	security/nss/releases/NSS_${PORTVERSION:S/./_/g}_WITH_CKBI_${CKBI_VER:S/./_/}_RTM/src
 DISTNAME=	nss-${VERSION_NSS}${NSS_SUFFIX}
 
 MAINTAINER=	gecko at FreeBSD.org
@@ -30,6 +26,8 @@
 # !!!  been committed there first.                               !!!
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 VERSION_NSS=	3.14.1
+CKBI_VER=	1.93
+NSS_SUFFIX=	.with.ckbi.${CKBI_VER}
 CERTDATA_TXT_PATH=	nss-${VERSION_NSS}/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
 BUNDLE_PROCESSOR=	MAca-bundle.pl
 

Modified: trunk/security/ca_root_nss/distinfo
==============================================================================
--- trunk/security/ca_root_nss/distinfo	Sat Jan  5 10:02:26 2013	(r1131)
+++ trunk/security/ca_root_nss/distinfo	Sat Jan  5 22:12:20 2013	(r1132)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.14.1.tar.gz) = 80a5d4872da13d0272636ad04e1beddcf8d4572bcc0d47dbea1d12fb592fb7e5
-SIZE (nss-3.14.1.tar.gz) = 5814063
+SHA256 (nss-3.14.1.with.ckbi.1.93.tar.gz) = e22ffcca62d604029145e4f904c59e4a967a20d1276f123a91e76ecaae48ba98
+SIZE (nss-3.14.1.with.ckbi.1.93.tar.gz) = 5813393

Modified: trunk/security/nss/Makefile
==============================================================================
--- trunk/security/nss/Makefile	Sat Jan  5 10:02:26 2013	(r1131)
+++ trunk/security/nss/Makefile	Sat Jan  5 22:12:20 2013	(r1132)
@@ -1,16 +1,12 @@
-# Ports collection Makefile for:	nss
-# Date created:				18 December 2001
-# Whom:					Maxim Sobolev <sobomax at FreeBSD.org>
-#
-# $FreeBSD: ports/security/nss/Makefile,v 1.66 2012/06/04 21:12:14 flo Exp $
-#    $MCom ports-experimental/security/nss/Makefile,v 1.4 2008/02/23 15:47:28 ahze Exp $
+# Created by: Maxim Sobolev <sobomax at FreeBSD.org>
+# $FreeBSD: head/security/nss/Makefile 309970 2013-01-05 21:34:25Z flo $
 
 PORTNAME=	nss
 PORTVERSION=	${_MAJOR}.${_MINOR}.${_PATCH}
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	security/nss/releases/NSS_${PORTVERSION:S/./_/g}_RTM/src
-DISTNAME=	nss-${PORTVERSION}
+MASTER_SITE_SUBDIR=	security/nss/releases/NSS_${PORTVERSION:S/./_/g}_WITH_CKBI_${CKBI_VER:S/./_/}_RTM/src
+DISTNAME=	nss-${PORTVERSION}.with.ckbi.${CKBI_VER}
 
 MAINTAINER=	gecko at FreeBSD.org
 COMMENT=	Libraries to support development of security-enabled applications
@@ -24,6 +20,7 @@
 _MINOR=	14
 _PATCH=	1
 
+CKBI_VER=	1.93
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/mozilla/security/nss
 
 MAKE_JOBS_UNSAFE=	yes

Modified: trunk/security/nss/distinfo
==============================================================================
--- trunk/security/nss/distinfo	Sat Jan  5 10:02:26 2013	(r1131)
+++ trunk/security/nss/distinfo	Sat Jan  5 22:12:20 2013	(r1132)
@@ -1,2 +1,2 @@
-SHA256 (nss-3.14.1.tar.gz) = 80a5d4872da13d0272636ad04e1beddcf8d4572bcc0d47dbea1d12fb592fb7e5
-SIZE (nss-3.14.1.tar.gz) = 5814063
+SHA256 (nss-3.14.1.with.ckbi.1.93.tar.gz) = e22ffcca62d604029145e4f904c59e4a967a20d1276f123a91e76ecaae48ba98
+SIZE (nss-3.14.1.with.ckbi.1.93.tar.gz) = 5813393