svn commit: r362439 - head/Mk/Uses

[Dag-Erling Smørgrav]

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