From owner-svn-ports-all@FreeBSD.ORG Sat Nov 23 06:43:15 2013 Return-Path: Delivered-To: svn-ports-all@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 936C9E87; Sat, 23 Nov 2013 06:43:15 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 694AE2845; Sat, 23 Nov 2013 06:43:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAN6hFDJ071528; Sat, 23 Nov 2013 06:43:15 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAN6hFYH071526; Sat, 23 Nov 2013 06:43:15 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201311230643.rAN6hFYH071526@svn.freebsd.org> From: Eitan Adler Date: Sat, 23 Nov 2013 06:43:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334645 - in head/ports-mgmt: pkg 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-all@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Nov 2013 06:43:15 -0000 Author: eadler Date: Sat Nov 23 06:43:14 2013 New Revision: 334645 URL: http://svnweb.freebsd.org/changeset/ports/334645 Log: Move WITH_DEBUG check below b.p.m so it works with WITH_DEBUG_PORTS Approved by: portmgr (bapt, maintainer) Modified: head/ports-mgmt/pkg-devel/Makefile head/ports-mgmt/pkg/Makefile Modified: head/ports-mgmt/pkg-devel/Makefile ============================================================================== --- head/ports-mgmt/pkg-devel/Makefile Sat Nov 23 06:04:35 2013 (r334644) +++ head/ports-mgmt/pkg-devel/Makefile Sat Nov 23 06:43:14 2013 (r334645) @@ -23,9 +23,6 @@ USES= uidfix MAKE_ENV+= WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null \ PORTREVISION=${PORTREVISION} -.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) -MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" -.endif # Use a submake as 'deinstall install' needs to reevaluate PKG_CMD # so that pkg-static is used from the wrkdir @@ -33,6 +30,10 @@ USE_SUBMAKE= yes .include +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) +MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" +.endif + .if defined(WITH_PKGNG) .if ${WITH_PKGNG} != devel NO_LATEST_LINK= yes Modified: head/ports-mgmt/pkg/Makefile ============================================================================== --- head/ports-mgmt/pkg/Makefile Sat Nov 23 06:04:35 2013 (r334644) +++ head/ports-mgmt/pkg/Makefile Sat Nov 23 06:43:14 2013 (r334645) @@ -24,9 +24,6 @@ SHEBANG_FILES= scripts/completion/_pkg.b MAKE_ENV+= WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null \ PORTREVISION=${PORTREVISION} -.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) -MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" -.endif # Use a submake as 'deinstall install' needs to reevaluate PKG_CMD # so that pkg-static is used from the wrkdir @@ -34,6 +31,10 @@ USE_SUBMAKE= yes .include +.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) +MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" +.endif + .if defined(WITH_PKGNG) .if ${WITH_PKGNG} == devel NO_LATEST_LINK= yes