From owner-svn-soc-all@FreeBSD.ORG Wed Jun 27 17:17:13 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id B7C8C106566B for ; Wed, 27 Jun 2012 17:17:11 +0000 (UTC) (envelope-from scher@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Wed, 27 Jun 2012 17:17:11 +0000 Date: Wed, 27 Jun 2012 17:17:11 +0000 From: scher@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120627171711.B7C8C106566B@hub.freebsd.org> Cc: Subject: socsvn commit: r238408 - soc2012/scher/par_ports/head/Mk X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2012 17:17:13 -0000 Author: scher Date: Wed Jun 27 17:17:11 2012 New Revision: 238408 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238408 Log: [fixed] Parallel intergation in bsd.port.mk is shifted to "include section" just befor .BEGIN target Modified: soc2012/scher/par_ports/head/Mk/bsd.port.mk Modified: soc2012/scher/par_ports/head/Mk/bsd.port.mk ============================================================================== --- soc2012/scher/par_ports/head/Mk/bsd.port.mk Wed Jun 27 17:09:48 2012 (r238407) +++ soc2012/scher/par_ports/head/Mk/bsd.port.mk Wed Jun 27 17:17:11 2012 (r238408) @@ -1152,61 +1152,6 @@ .include "${PORTSDIR}/Mk/bsd.commands.mk" -############### PAR_PORTS SPECIFIC COMMENT LINE ############### - -# TODO: doc needed -.if defined(_parv_WANT_NON_PARALLEL_BUILD) -.undef _parv_WANT_PARALLEL_BUILD -.endif - -.if defined(_parv_WANT_PARALLEL_BUILD) -.include "${PORTSDIR}/Mk/bsd.parallel.mk" -.endif - -_PROCESS_ACTIVE_BUILDS?= ${DO_NADA} - -.if !target(lock-port-dbdir) -lock-port-dbdir: - @${DO_NADA} -.endif - -.if !target(lock-pkg-dbdir) -lock-pkg-dbdir: - @${DO_NADA} -.endif - -.if !target(unlock-port-dbdir) -unlock-port-dbdir: - @${DO_NADA} -.endif - -.if !target(unlock-pkg-dbdir) -unlock-pkg-dbdir: - @${DO_NADA} -.endif - -.if !target(check-active-build-conflicts) -check-active-build-conflicts: - @${DO_NADA} -.endif - -.if !target(locking-config-recursive) -locking-config-recursive: - @${DO_NADA} -.endif - -.if !target(locking-config-message) -locking-config-message: - @${DO_NADA} -.endif - -.if !target(check-license-depends) -check-license-depends: - @${DO_NADA} -.endif - -############### ENDF OF PAR_PORTS SPECIFIC COMMENT LINE ############### - # # DESTDIR section to start a chrooted process if invoked with DESTDIR set # @@ -1554,6 +1499,61 @@ .include "${PORTSDIR}/Mk/bsd.ncurses.mk" .endif +############### PAR_PORTS SPECIFIC COMMENT LINE ############### + +# TODO: doc needed +.if defined(_parv_WANT_NON_PARALLEL_BUILD) +.undef _parv_WANT_PARALLEL_BUILD +.endif + +.if defined(_parv_WANT_PARALLEL_BUILD) +.include "${PORTSDIR}/Mk/bsd.parallel.mk" +.endif + +_PROCESS_ACTIVE_BUILDS?= ${DO_NADA} + +.if !target(lock-port-dbdir) +lock-port-dbdir: + @${DO_NADA} +.endif + +.if !target(lock-pkg-dbdir) +lock-pkg-dbdir: + @${DO_NADA} +.endif + +.if !target(unlock-port-dbdir) +unlock-port-dbdir: + @${DO_NADA} +.endif + +.if !target(unlock-pkg-dbdir) +unlock-pkg-dbdir: + @${DO_NADA} +.endif + +.if !target(check-active-build-conflicts) +check-active-build-conflicts: + @${DO_NADA} +.endif + +.if !target(locking-config-recursive) +locking-config-recursive: + @${DO_NADA} +.endif + +.if !target(locking-config-message) +locking-config-message: + @${DO_NADA} +.endif + +.if !target(check-license-depends) +check-license-depends: + @${DO_NADA} +.endif + +############### ENDF OF PAR_PORTS SPECIFIC COMMENT LINE ############### + ############### PAR_PORTS SPECIFIC COMMENT LINE ############### # .if defined(_parv_WANT_PARALLEL_BUILD) || !defined(IGNORE_PATH_CHECKS)