From owner-svn-ports-head@FreeBSD.ORG Thu Sep 18 13:11:37 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 21C817E8; Thu, 18 Sep 2014 13:11: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 0D81C1A9; Thu, 18 Sep 2014 13:11: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 s8IDBaeK028600; Thu, 18 Sep 2014 13:11:36 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8IDBae8028599; Thu, 18 Sep 2014 13:11:36 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201409181311.s8IDBae8028599@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 18 Sep 2014 13:11:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368451 - 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, 18 Sep 2014 13:11:37 -0000 Author: bapt Date: Thu Sep 18 13:11:36 2014 New Revision: 368451 URL: http://svnweb.freebsd.org/changeset/ports/368451 QAT: https://qat.redports.org/buildarchive/r368451/ Log: Fix WITH_PKGNG=devel backward compatibility Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Thu Sep 18 13:10:52 2014 (r368450) +++ head/Mk/bsd.port.mk Thu Sep 18 13:11:36 2014 (r368451) @@ -1529,6 +1529,12 @@ CD_MOUNTPTS?= /cdrom ${CD_MOUNTPT} WWWOWN?= www WWWGRP?= www +# Keep PKGNG_ORIGIN/WITH_PKGNG for compat with scripts which are looking for it +PKG_ORIGIN?= ports-mgmt/pkg +PKGNG_ORIGIN= ${PKG_ORIGIN} +WITH_PKGNG?= yes +WITH_PKG?= ${WITH_PKGNG} + .endif # End of pre-makefile section. @@ -1663,12 +1669,6 @@ LIB32DIR= lib .endif PLIST_SUB+= LIB32DIR=${LIB32DIR} -# Keep PKGNG_ORIGIN/WITH_PKGNG for compat with scripts which are looking for it -PKG_ORIGIN?= ports-mgmt/pkg -PKGNG_ORIGIN= ${PKG_ORIGIN} -WITH_PKGNG?= yes -WITH_PKG?= ${WITH_PKGNG} - .if ${WITH_PKG} == devel PKG_ORIGIN= ports-mgmt/pkg-devel .endif