From owner-svn-ports-head@FreeBSD.ORG Mon Sep 22 21:23:53 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 12B823A8; Mon, 22 Sep 2014 21:23:53 +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 F195FAE2; Mon, 22 Sep 2014 21:23:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8MLNqN4030286; Mon, 22 Sep 2014 21:23:52 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8MLNq25030285; Mon, 22 Sep 2014 21:23:52 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201409222123.s8MLNq25030285@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Mon, 22 Sep 2014 21:23:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368999 - head/ports-mgmt/pkg-devel 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: Mon, 22 Sep 2014 21:23:53 -0000 Author: bdrewery Date: Mon Sep 22 21:23:52 2014 New Revision: 368999 URL: http://svnweb.freebsd.org/changeset/ports/368999 QAT: https://qat.redports.org/buildarchive/r368999/ Log: If not built with WITH_PKG=devel, depend on ports-mgmt/pkg. This will use the normal pkg for packaging pkg-devel. This is needed because the repo is expected to be only non-devel packages. This also fixes a poudriere crash when the repo is empty and both pkg and pkg-devel are built. When pkg-devel would finish first it would crash due to not having a pkg to use for caching various metadata from the package. Differential Revision: D809 With hat: portmgr Reviewed by: bapt Modified: head/ports-mgmt/pkg-devel/Makefile Modified: head/ports-mgmt/pkg-devel/Makefile ============================================================================== --- head/ports-mgmt/pkg-devel/Makefile Mon Sep 22 21:08:59 2014 (r368998) +++ head/ports-mgmt/pkg-devel/Makefile Mon Sep 22 21:23:52 2014 (r368999) @@ -46,6 +46,8 @@ IGNORE= WITH_PKG is not defined to 'deve .else LATEST_LINK= pkg PKGNAMESUFFIX= +#define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :) +PKG_DEPENDS= .endif .if exists(${LOCALBASE}/sbin/pkg_info) || exists(/usr/sbin/pkg_info) NB_OLDPKGS!= pkg_info 2>/dev/null | wc -l @@ -74,8 +76,6 @@ pre-everything:: LATEST_LINK= pkg-devel .endif -#define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :) -PKG_DEPENDS= .undef INSTALLS_DEPENDS .if !exists(${LOCALBASE}/sbin/pkg) PKG_BIN= ${WRKSRC}/src/pkg-static