3 files changed, 94 insertions, 4 deletions

diff --git a/devel/zthread/Makefile b/devel/zthread/Makefile
index ce7f262827a0..5fb0588f9e3e 100644
--- a/devel/zthread/Makefile
+++ b/devel/zthread/Makefile
@@ -30,10 +30,6 @@ PORTDOCS=	*
 BROKEN=		"Does not compile on ${ARCH}; mixes pointers and ints"
 .endif
 
-.if ${OSVERSION} >= 503000
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
-
 .if ${OSVERSION} < 500000
 USE_GCC=	3.3
 .endif
diff --git a/devel/zthread/files/patch-include_zthread_Guard.h b/devel/zthread/files/patch-include_zthread_Guard.h
new file mode 100644
index 000000000000..6e0c7c933f60
--- /dev/null
+++ b/devel/zthread/files/patch-include_zthread_Guard.h
@@ -0,0 +1,11 @@
+--- include/zthread/Guard.h.orig	Wed Jul 30 00:40:13 2003
++++ include/zthread/Guard.h	Fri Dec 24 21:15:17 2004
+@@ -490,7 +490,7 @@
+     
+   try {
+     
+-    if(!isDisabled())
++    if(!this->isDisabled())
+       LockingPolicy::destroyScope(*this);
+     
+   } catch (...) { /* ignore */ }  
diff --git a/devel/zthread/files/patch-src_MutexImpl.h b/devel/zthread/files/patch-src_MutexImpl.h
new file mode 100644
index 000000000000..b169fdcc344d
--- /dev/null
+++ b/devel/zthread/files/patch-src_MutexImpl.h
@@ -0,0 +1,83 @@
+--- src/MutexImpl.h.orig	Wed Jul 30 00:40:14 2003
++++ src/MutexImpl.h	Fri Dec 24 21:15:17 2004
+@@ -153,7 +153,7 @@
+ 
+       _owner = self;
+ 
+-      ownerAcquired(self);
++      this->ownerAcquired(self);
+       
+     }
+ 
+@@ -164,7 +164,7 @@
+       _waiters.insert(self);
+       m.acquire();
+ 
+-      waiterArrived(self);
++      this->waiterArrived(self);
+ 
+       {        
+       
+@@ -173,7 +173,7 @@
+       
+       }
+ 
+-      waiterDeparted(self);
++      this->waiterDeparted(self);
+ 
+       m.release();
+         
+@@ -192,7 +192,7 @@
+           assert(_owner == 0);
+           _owner = self;    
+ 
+-          ownerAcquired(self);
++          this->ownerAcquired(self);
+ 
+           break;
+         
+@@ -236,7 +236,7 @@
+ 
+       _owner = self;
+ 
+-      ownerAcquired(self);
++      this->ownerAcquired(self);
+       
+     }
+ 
+@@ -253,7 +253,7 @@
+       
+         m.acquire();
+ 
+-        waiterArrived(self);
++        this->waiterArrived(self);
+       
+         {
+         
+@@ -262,7 +262,7 @@
+         
+         }
+ 
+-        waiterDeparted(self);
++        this->waiterDeparted(self);
+       
+         m.release();
+         
+@@ -284,7 +284,7 @@
+           assert(0 == _owner);
+           _owner = self;
+ 
+-          ownerAcquired(self);
++          this->ownerAcquired(self);
+         
+           break;
+         
+@@ -326,7 +326,7 @@
+ 
+     _owner = 0;
+ 
+-    ownerReleased(impl);
++    this->ownerReleased(impl);
+   
+     // Try to find a waiter with a backoff & retry scheme
+     for(;;) {