From owner-svn-ports-head@FreeBSD.ORG  Fri Sep 27 11:38:49 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
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 ESMTP id 3A433919;
 Fri, 27 Sep 2013 11:38:49 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
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 26E942535;
 Fri, 27 Sep 2013 11:38:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8RBcnum039184;
 Fri, 27 Sep 2013 11:38:49 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8RBcniw039183;
 Fri, 27 Sep 2013 11:38:49 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201309271138.r8RBcniw039183@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 27 Sep 2013 11:38:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r328457 - 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.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Sep 2013 11:38:49 -0000

Author: bdrewery
Date: Fri Sep 27 11:38:48 2013
New Revision: 328457
URL: http://svnweb.freebsd.org/changeset/ports/328457

Log:
  - Fix FORCE_PKG_REGISTER with pkg_install with staging
  
  Submitted by:	garga
  Reviewed by:	bapt
  With hat:	portmgr

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Fri Sep 27 11:28:09 2013	(r328456)
+++ head/Mk/bsd.port.mk	Fri Sep 27 11:38:48 2013	(r328457)
@@ -3940,8 +3940,12 @@ delete-package-list: delete-package-link
 
 .if !target(install-package)
 install-package:
+.if defined(FORCE_PKG_REGISTER)
+	@${PKG_ADD} -f ${PKGFILE}
+.else
 	@${PKG_ADD} ${PKGFILE}
 .endif
+.endif
 
 
 # Utility targets follow