ports/159268: [patch] fix for ports-mgmt/portbuilder

[David Naylor]

>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: