From owner-svn-src-projects@FreeBSD.ORG Wed Mar 18 09:39:37 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5B4877A2; Wed, 18 Mar 2015 09:39:37 +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 42430A36; Wed, 18 Mar 2015 09:39:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2I9dbW4063849; Wed, 18 Mar 2015 09:39:37 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2I9dWhh063830; Wed, 18 Mar 2015 09:39:32 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201503180939.t2I9dWhh063830@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 18 Mar 2015 09:39:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280209 - in projects/release-pkg: . release/packages release/packages/acpi release/packages/at release/packages/bhyve release/packages/development release/packages/docs release/package... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Mar 2015 09:39:37 -0000 Author: bapt Date: Wed Mar 18 09:39:31 2015 New Revision: 280209 URL: https://svnweb.freebsd.org/changeset/base/280209 Log: Now that pkg create can directly accept both a file and a plist in command line, directly use it Added: projects/release-pkg/release/packages/acpi.ucl - copied unchanged from r280181, projects/release-pkg/release/packages/acpi/+MANIFEST projects/release-pkg/release/packages/at.ucl - copied unchanged from r280181, projects/release-pkg/release/packages/at/+MANIFEST projects/release-pkg/release/packages/bhyve.ucl - copied unchanged from r280181, projects/release-pkg/release/packages/bhyve/+MANIFEST projects/release-pkg/release/packages/development.ucl - copied unchanged from r280181, projects/release-pkg/release/packages/development/+MANIFEST projects/release-pkg/release/packages/docs.ucl - copied unchanged from r280181, projects/release-pkg/release/packages/docs/+MANIFEST projects/release-pkg/release/packages/kernel.ucl - copied, changed from r280181, projects/release-pkg/release/packages/kernel/+MANIFEST projects/release-pkg/release/packages/profile.ucl - copied unchanged from r280181, projects/release-pkg/release/packages/profile/+MANIFEST projects/release-pkg/release/packages/runtime.ucl - copied unchanged from r280181, projects/release-pkg/release/packages/runtime/+MANIFEST projects/release-pkg/release/packages/ssh.ucl projects/release-pkg/release/packages/svn.ucl - copied unchanged from r280181, projects/release-pkg/release/packages/svn/+MANIFEST projects/release-pkg/release/packages/syscons.ucl - copied unchanged from r280181, projects/release-pkg/release/packages/syscons/+MANIFEST projects/release-pkg/release/packages/unbound.ucl - copied unchanged from r280181, projects/release-pkg/release/packages/unbound/+MANIFEST Deleted: projects/release-pkg/release/packages/acpi/ projects/release-pkg/release/packages/at/ projects/release-pkg/release/packages/bhyve/ projects/release-pkg/release/packages/development/ projects/release-pkg/release/packages/docs/ projects/release-pkg/release/packages/kernel/+MANIFEST projects/release-pkg/release/packages/profile/ projects/release-pkg/release/packages/runtime/ projects/release-pkg/release/packages/svn/ projects/release-pkg/release/packages/syscons/ projects/release-pkg/release/packages/unbound/ Modified: projects/release-pkg/Makefile.inc1 Modified: projects/release-pkg/Makefile.inc1 ============================================================================== --- projects/release-pkg/Makefile.inc1 Wed Mar 18 08:46:08 2015 (r280208) +++ projects/release-pkg/Makefile.inc1 Wed Mar 18 09:39:31 2015 (r280209) @@ -1214,24 +1214,22 @@ create-world-packages: ${DESTDIR}/METALOG @for plist in ${DESTDIR}/*.plist; do \ plist=$${plist##*/} ; \ - test -d ${SRCDIR}/release/packages/$${plist%.plist} || \ + test -f ${SRCDIR}/release/packages/$${plist%.plist}.ucl || \ ( echo "Unkown package FreeBSD-$${plist%.plist}" ; false ) ; \ done @for plist in ${DESTDIR}/*.plist; do \ plist=$${plist##*/} ; \ pkgname=$${plist%.plist} ; \ - rm -rf ${DESTDIR}/$${pkgname}-manifestdir ; \ - cp -r ${SRCDIR}/release/packages/$${pkgname} \ - ${DESTDIR}/$${pkgname}-manifestdir ; \ - sed -i '' -e "s/%VERSION%/${PKG_VERSION}/" \ + sed -e "s/%VERSION%/${PKG_VERSION}/" \ -e "s/%PKGNAME%/$${pkgname}/" \ -e "s/%COMMENT%/Generic comment for $${pkgname}/" \ -e "s/%DESC%/Generic description for $${pkgname}/" \ - ${DESTDIR}/$${pkgname}-manifestdir/+MANIFEST ; \ + ${SRCDIR}/release/packages/$${pkgname}.ucl \ + > ${DESTDIR}/$${pkgname}.ucl ; \ awk -F\" '/name/ { printf("===> Creating %s-", $$2) } /version/ {print $$2 }' \ ${DESTDIR}/$${pkgname}-manifestdir/+MANIFEST ; \ pkg -o ABI_FILE=${DESTDIR}/bin/sh \ - create -m ${DESTDIR}/$${pkgname}-manifestdir \ + create -M ${DESTDIR}/$${pkgname}.ucl \ -p ${DESTDIR}/$${pkgname}.plist \ -r ${DESTDIR} -o ${DESTDIR} ; \ done Copied: projects/release-pkg/release/packages/acpi.ucl (from r280181, projects/release-pkg/release/packages/acpi/+MANIFEST) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/release/packages/acpi.ucl Wed Mar 18 09:39:31 2015 (r280209, copy of r280181, projects/release-pkg/release/packages/acpi/+MANIFEST) @@ -0,0 +1,13 @@ +name = "FreeBSD-acpi" +origin = "base" +version = "%VERSION%" +comment = "ACPI tools" +categories = [ base ] +maintainer = "re@FreeBSD.org" +www = "http://www.FreeBSD.org" +prefix = "/" +licenselogic = "single" +licenses = [ BSD2CLAUSE ] +desc = <