From owner-freebsd-ports-bugs@FreeBSD.ORG  Thu Jul 28 19:30:12 2011
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
Delivered-To: freebsd-ports-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 22EE21065670
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Thu, 28 Jul 2011 19:30:12 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id DBD5C8FC19
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Thu, 28 Jul 2011 19:30:11 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p6SJUBdw009314
	for <freebsd-ports-bugs@freefall.freebsd.org>;
	Thu, 28 Jul 2011 19:30:11 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p6SJUBAB009313;
	Thu, 28 Jul 2011 19:30:11 GMT (envelope-from gnats)
Resent-Date: Thu, 28 Jul 2011 19:30:11 GMT
Resent-Message-Id: <201107281930.p6SJUBAB009313@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-ports-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
	David Naylor <naylor.b.david@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 913E01065670
	for <freebsd-gnats-submit@FreeBSD.org>;
	Thu, 28 Jul 2011 19:24:24 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 820138FC08
	for <freebsd-gnats-submit@FreeBSD.org>;
	Thu, 28 Jul 2011 19:24:24 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p6SJOOmT011571
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 28 Jul 2011 19:24:24 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p6SJOOb2011570;
	Thu, 28 Jul 2011 19:24:24 GMT (envelope-from nobody)
Message-Id: <201107281924.p6SJOOb2011570@red.freebsd.org>
Date: Thu, 28 Jul 2011 19:24:24 GMT
From: David Naylor <naylor.b.david@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-3.1
Cc: 
Subject: ports/159268: [patch] fix for ports-mgmt/portbuilder
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jul 2011 19:30:12 -0000


>Number:         159268
>Category:       ports
>Synopsis:       [patch] fix for ports-mgmt/portbuilder
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 28 19:30:11 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     David Naylor
>Release:        
>Organization:
Private
>Environment:
>Description:
Fix assertion when using PKGINSTALL builder (-DUSE_PACKAGE_DEPENDS)
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -uNr /usr/ports/ports-mgmt/portbuilder/Makefile port/Makefile
--- /usr/ports/ports-mgmt/portbuilder/Makefile	2011-07-26 03:12:58.000000000 +0200
+++ portbuilder/Makefile	2011-07-28 20:52:28.000000000 +0200
@@ -6,6 +6,7 @@
 
 PORTNAME=	portbuilder
 DISTVERSION=	0.1.3.1
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://cloud.github.com/downloads/DragonSA/portbuilder/
 
diff -uNr /usr/ports/ports-mgmt/portbuilder/files/patch-0001-8be91ccb port/files/patch-0001-8be91ccb
--- /usr/ports/ports-mgmt/portbuilder/files/patch-0001-8be91ccb	1970-01-01 02:00:00.000000000 +0200
+++ portbuilder/files/patch-0001-8be91ccb	2011-07-28 21:03:32.000000000 +0200
@@ -0,0 +1,11 @@
+--- libpb/builder.py
++++ libpb/builder.py
+@@ -425,7 +425,7 @@ class StageBuilder(Builder):
+         assert not port.dependency.check(self.stage)
+         del self._pending[port]
+         if self._port_check(port):
+-            assert port.stage == self.stage - 1
++            assert port.stage == self.stage - 1 or self.stage > Port.PACKAGE
+             self.update.emit(self, Builder.QUEUED, port)
+             self.ports[port].started.connect(self._started)
+             self.queue.add(self.ports[port])


>Release-Note:
>Audit-Trail:
>Unformatted: