From owner-svn-ports-head@FreeBSD.ORG  Thu Jul 31 22:44:28 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 042BF72D;
 Thu, 31 Jul 2014 22:44:28 +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 E6225251B;
 Thu, 31 Jul 2014 22:44:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6VMiRF3057368;
 Thu, 31 Jul 2014 22:44:27 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6VMiRZN057367;
 Thu, 31 Jul 2014 22:44:27 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201407312244.s6VMiRZN057367@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 31 Jul 2014 22:44:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r363681 - head/Mk
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: Thu, 31 Jul 2014 22:44:28 -0000

Author: bapt
Date: Thu Jul 31 22:44:27 2014
New Revision: 363681
URL: http://svnweb.freebsd.org/changeset/ports/363681
QAT: https://qat.redports.org/buildarchive/r363681/

Log:
  Simplify manifest generation and make it ucl compliant so pkg(8) does not have to fall back on the libyaml parser

Modified:
  head/Mk/bsd.pkgng.mk

Modified: head/Mk/bsd.pkgng.mk
==============================================================================
--- head/Mk/bsd.pkgng.mk	Thu Jul 31 22:18:12 2014	(r363680)
+++ head/Mk/bsd.pkgng.mk	Thu Jul 31 22:44:27 2014	(r363681)
@@ -31,51 +31,32 @@ PLIST_REINPLACE:=	${PLIST_REINPLACE:Nsto
 
 ACTUAL-PACKAGE-DEPENDS?= \
 	if [ "${_LIB_RUN_DEPENDS}" != "  " ]; then \
-		${PKG_QUERY} "%n: {origin: %o, version: \"%v\"}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} 2>/dev/null || : ; \
+		${PKG_QUERY} "\"%n\": {origin: %o, version: \"%v\"}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} 2>/dev/null || : ; \
 	fi
 
 create-manifest:
-	@${MKDIR} ${METADIR}
-	@${ECHO_CMD} "name: ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}" > ${MANIFESTF} 
-	@${ECHO_CMD} "version: ${PKGVERSION}" >> ${MANIFESTF}
-	@${ECHO_CMD} "origin: ${PKGORIGIN}" >> ${MANIFESTF}
-	@${ECHO_CMD} "comment: |" >> ${MANIFESTF}
-	@${ECHO_CMD} "  "${COMMENT:Q} >> ${MANIFESTF}
-	@${ECHO_CMD} "maintainer: ${MAINTAINER}" >> ${MANIFESTF}
-	@${ECHO_CMD} "prefix: ${PREFIX}" >> ${MANIFESTF}
-.if defined(NO_ARCH)
-	@${ECHO_CMD} "arch: `${PKG_BIN} config abi | ${CUT} -d: -f1,2`:*" >> ${MANIFESTF}
-.endif
-.if defined(WWW)
-	@${ECHO_CMD} "www: ${WWW}" >> ${MANIFESTF}
-.endif
-	@${ECHO_CMD} "deps: " >> ${MANIFESTF}
-	@${ACTUAL-PACKAGE-DEPENDS} | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u | ${SED} 's/^/  /' >> ${MANIFESTF}
-	@${ECHO_CMD} -n "categories: [" >> ${MANIFESTF}
-.for cat in ${CATEGORIES:u}
-	@${ECHO_CMD} -n "${cat}," >> ${MANIFESTF}
-.endfor
-	@${ECHO_CMD} "]" >> ${MANIFESTF}
-.if defined(LICENSE_COMB)
-	@${ECHO_CMD} "licenselogic: ${LICENSE_COMB}" >> ${MANIFESTF}
-.else
-	@${ECHO_CMD} "licenselogic: single" >> ${MANIFESTF}
-.endif
-	@${ECHO_CMD} -n "licenses: [" >> ${MANIFESTF}
-.for lic in ${LICENSE:u}
-	@${ECHO_CMD} -n "${lic}," >> ${MANIFESTF}
-.endfor
-	@${ECHO_CMD} "]" >> ${MANIFESTF}
-	@${ECHO_CMD} -n "users: [" >> ${MANIFESTF}
-.for user in ${USERS:u}
-	@${ECHO_CMD} -n "${user}, " >> ${MANIFESTF}
-.endfor
-	@${ECHO_CMD} "]" >> ${MANIFESTF}
-	@${ECHO_CMD} -n "groups: [" >> ${MANIFESTF}
-.for group in ${GROUPS:u}
-	@${ECHO_CMD} -n "${group}, " >> ${MANIFESTF}
-.endfor
-	@${ECHO_CMD} "]" >> ${MANIFESTF}
+	@${MKDIR} ${METADIR}; \
+	(\
+		echo "name: \"${PKGBASE}\"" ; \
+		echo "version: \"${PKGVERSION}\"" ; \
+		echo "origin: ${PKGORIGIN}" ; \
+		echo "comment: <<EOD" ; \
+		echo ${COMMENT:Q} ; \
+		echo "EOD" ; \
+		echo "maintainer: ${MAINTAINER}" ; \
+		echo "prefix: ${PREFIX}" ; \
+		[ -z "${WWW}" ] || echo "www: ${WWW}" ; \
+		echo "deps: { "; \
+		${ACTUAL-PACKAGE-DEPENDS} | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u ; \
+		echo "}" ; \
+		echo "categories: [ ${CATEGORIES:u:S/$/,/} ]" ; \
+		l=${LICENSE_COMB} ; \
+		[ -n "${NO_ARCH}" ] && echo "arch : `${PKG_BIN} config abi | ${CUT} -d: -f1,2`:*" ; \
+		echo "licenselogic: $${l:-single}" ; \
+		[ -z "${LICENSE}" ] || echo "licenses: [ ${LICENSE:u:S/$/,/} ]" ; \
+		[ -z "${USERS}" ] || echo "users: [ ${USERS:u:S/$/,/} ]" ; \
+		[ -z "${GROUPS}" ] || echo "groups: [ ${GROUPS:u:S/$/,/} ]" ; \
+	) > ${MANIFESTF}
 	@${ECHO_CMD} -n "options: {" >> ${MANIFESTF}
 .for opt in ${COMPLETE_OPTIONS_LIST}
 	@[ -z "${PORT_OPTIONS:M${opt}}" ] || match="on" ; ${ECHO_MSG} -n " ${opt}: $${match:-off}," >> ${MANIFESTF}