From owner-svn-soc-all@FreeBSD.ORG Thu May 31 14:06:50 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 E3199106566B for ; Thu, 31 May 2012 14:06:48 +0000 (UTC) (envelope-from scher@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Thu, 31 May 2012 14:06:48 +0000 Date: Thu, 31 May 2012 14:06:48 +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: <20120531140648.E3199106566B@hub.freebsd.org> Cc: Subject: socsvn commit: r236812 - 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: Thu, 31 May 2012 14:06:51 -0000 Author: scher Date: Thu May 31 14:06:48 2012 New Revision: 236812 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=236812 Log: [fixed] PKG_DBDIR locking erased from fake-pkg target, not to spam bsd.port.mk fake-pkg target is surrounded by PKG_DBDIR locking targets 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 Thu May 31 13:51:25 2012 (r236811) +++ soc2012/scher/par_ports/head/Mk/bsd.port.mk Thu May 31 14:06:48 2012 (r236812) @@ -4370,7 +4370,7 @@ post-install post-install-script add-plist-info \ add-plist-docs add-plist-examples add-plist-data \ add-plist-post fix-plist-sequence compress-man \ - install-ldconfig-file fake-pkg security-check + install-ldconfig-file lock-pkg-dbdir fake-pkg unlock-pkg-dbdir security-check _PACKAGE_DEP= install _PACKAGE_SEQ= package-message pre-package pre-package-script \ do-package post-package-script @@ -6010,11 +6010,6 @@ .if !target(fake-pkg) fake-pkg: .if !defined(NO_PKG_REGISTER) -############### PAR_PORTS SPECIFIC COMMENT LINE ############### -.if defined(_parv_WANT_PARALLEL_BUILD) - @( attempts=-1; ${_parv_PKG_DBDIR_LOCK_LOOP} ) -.endif -############### END OF PAR_PORTS SPECIFIC COMMENT LINE ############### @if [ ! -d ${PKG_DBDIR} ]; then ${RM} -f ${PKG_DBDIR}; ${MKDIR} ${PKG_DBDIR}; fi @${RM} -f /tmp/${PKGNAME}-required-by .if defined(FORCE_PKG_REGISTER) @@ -6060,11 +6055,6 @@ ${CAT} /tmp/${PKGNAME}-required-by >> ${PKG_DBDIR}/${PKGNAME}/+REQUIRED_BY; \ ${RM} -f /tmp/${PKGNAME}-required-by; \ fi -############### PAR_PORTS SPECIFIC COMMENT LINE ############### -.if defined(_parv_WANT_PARALLEL_BUILD) - @( ${_parv_PKG_DBDIR_DO_UNLOCK} ) -.endif -############### END OF PAR_PORTS SPECIFIC COMMENT LINE ############### .else @${DO_NADA} .endif