aboutsummaryrefslogtreecommitdiffstats
path: root/ports-mgmt
diff options
context:
space:
mode:
authorzi <zi@FreeBSD.org>2011-08-02 00:37:02 +0800
committerzi <zi@FreeBSD.org>2011-08-02 00:37:02 +0800
commit79c687aef7c0afee14e364fc0c8082426c979704 (patch)
tree77bf234c0f8d890636544e95c8dafec8344cea3c /ports-mgmt
parent5c405bd15a711fe33a18d28e1983676e0cc8c1c8 (diff)
downloadfreebsd-ports-graphics-79c687aef7c0afee14e364fc0c8082426c979704.tar.gz
freebsd-ports-graphics-79c687aef7c0afee14e364fc0c8082426c979704.tar.zst
freebsd-ports-graphics-79c687aef7c0afee14e364fc0c8082426c979704.zip
Fix assertion when using PKGINSTALL builder (-DUSE_PACKAGE_DEPENDS)
PR: ports/159268 Submitted by: David Naylor <naylor.b.david@gmail.com> [maintainer] Approved by: wxs (mentor)
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/portbuilder/Makefile1
-rw-r--r--ports-mgmt/portbuilder/files/patch-libpb_builder.py11
2 files changed, 12 insertions, 0 deletions
diff --git a/ports-mgmt/portbuilder/Makefile b/ports-mgmt/portbuilder/Makefile
index 3bdbfd2f32f..230bba2db46 100644
--- a/ports-mgmt/portbuilder/Makefile
+++ b/ports-mgmt/portbuilder/Makefile
@@ -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 --git a/ports-mgmt/portbuilder/files/patch-libpb_builder.py b/ports-mgmt/portbuilder/files/patch-libpb_builder.py
new file mode 100644
index 00000000000..018b495d498
--- /dev/null
+++ b/ports-mgmt/portbuilder/files/patch-libpb_builder.py
@@ -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])