From owner-svn-ports-head@FreeBSD.ORG Thu Dec 11 08:04:28 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 26785386; Thu, 11 Dec 2014 08:04: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 12A6A6AC1F; Thu, 11 Dec 2014 08:04:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBB84Rq7048866; Thu, 11 Dec 2014 08:04:27 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBB84RaZ048865; Thu, 11 Dec 2014 08:04:27 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201412110804.sBB84RaZ048865@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 11 Dec 2014 08:04:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374516 - 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-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Dec 2014 08:04:28 -0000 Author: bapt Date: Thu Dec 11 08:04:27 2014 New Revision: 374516 URL: https://svnweb.freebsd.org/changeset/ports/374516 QAT: https://qat.redports.org/buildarchive/r374516/ Log: Fix NO_ARCH in a way compatible with both pkg 1.3 and pkg 1.4 Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Thu Dec 11 08:04:05 2014 (r374515) +++ head/Mk/bsd.port.mk Thu Dec 11 08:04:27 2014 (r374516) @@ -4864,7 +4864,8 @@ create-manifest: echo "}" ; \ echo "categories: [ ${CATEGORIES:u:S/$/,/} ]" ; \ l=${LICENSE_COMB} ; \ - [ -n "${NO_ARCH}" ] && echo "arch : `${PKG_BIN} config abi | ${CUT} -d: -f1,2`:*" ; \ + [ -n "${NO_ARCH}" ] && echo "arch : `${PKG_BIN} config abi | tr '[:upper:]' '[:lower:]' | ${CUT} -d: -f1,2`:*" ; \ + [ -n "${NO_ARCH}" ] && echo "abi : `${PKG_BIN} config abi | tr '[:upper:]' '[:lower:]' | ${CUT} -d: -f1,2`:*" ; \ echo "licenselogic: $${l:-single}" ; \ [ -z "${LICENSE}" ] || echo "licenses: [ ${LICENSE:u:S/$/,/} ]" ; \ [ -z "${USERS}" ] || echo "users: [ ${USERS:u:S/$/,/} ]" ; \