From owner-svn-ports-head@FreeBSD.ORG  Mon Jul 21 14:41:43 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 446B0F4F;
 Mon, 21 Jul 2014 14:41:43 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 31A742DC1;
 Mon, 21 Jul 2014 14:41:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6LEfhfR064522;
 Mon, 21 Jul 2014 14:41:43 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6LEfhAg064521;
 Mon, 21 Jul 2014 14:41:43 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201407211441.s6LEfhAg064521@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Mon, 21 Jul 2014 14:41:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r362439 - head/Mk/Uses
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Jul 2014 14:41:43 -0000

Author: des
Date: Mon Jul 21 14:41:42 2014
New Revision: 362439
URL: http://svnweb.freebsd.org/changeset/ports/362439
QAT: https://qat.redports.org/buildarchive/r362439/

Log:
  Switch from CPE 2.2 URIs to CPE 2.3 formatted strings.

Modified:
  head/Mk/Uses/cpe.mk

Modified: head/Mk/Uses/cpe.mk
==============================================================================
--- head/Mk/Uses/cpe.mk	Mon Jul 21 14:33:51 2014	(r362438)
+++ head/Mk/Uses/cpe.mk	Mon Jul 21 14:41:42 2014	(r362439)
@@ -39,17 +39,16 @@ CPE_PRODUCT	?= ${PORTNAME}
 CPE_VENDOR	?= ${CPE_PRODUCT}
 CPE_VERSION	?= ${PORTVERSION}
 CPE_UPDATE	?=
-CPE_LEGACY_EDITION	?=
+CPE_EDITION	?=
+CPE_LANG	?=
 CPE_SW_EDITION	?=
 CPE_TARGET_SW	?= freebsd
 CPE_TARGET_HW	?=
-CPE_OTHER	?=
-CPE_EDITION	?= ~${CPE_LEGACY_EDITION}~${CPE_SW_EDITION}~${CPE_TARGET_SW}~${CPE_TARGET_HW}~${CPE_OTHER}
-CPE_LANG	?=
-_CPE_URI	 = cpe:/${CPE_PART}:${CPE_VENDOR}:${CPE_PRODUCT}:${CPE_VERSION}:${CPE_UPDATE}:${CPE_EDITION}:${CPE_LANG}
-CPE_URI		?= ${_CPE_URI:C/:+$//}
+CPE_OTHER	?= ${PORTREVISION:N0}
+_CPE_STR	 = cpe:2.3:${CPE_PART}:${CPE_VENDOR}:${CPE_PRODUCT}:${CPE_VERSION}:${CPE_UPDATE}:${CPE_EDITION}:${CPE_LANG}:${CPE_SW_EDITION}:${CPE_TARGET_SW}:${CPE_TARGET_HW}:${CPE_OTHER}
+CPE_STR		?= ${_CPE_STR:C/:+$//}
 
 PKG_NOTES	+= cpe
-PKG_NOTE_cpe	 = ${CPE_URI}
+PKG_NOTE_cpe	 = ${CPE_STR}
 
 .endif