From johans@stack.nl  Thu Aug 18 12:03:11 2005
Return-Path: <johans@stack.nl>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2011216A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 18 Aug 2005 12:03:11 +0000 (GMT)
	(envelope-from johans@stack.nl)
Received: from mailhost.stack.nl (vaak.stack.nl [131.155.140.140])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BD91A43D45
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 18 Aug 2005 12:03:10 +0000 (GMT)
	(envelope-from johans@stack.nl)
Received: from hammer.stack.nl (hammer.stack.nl [IPv6:2001:610:1108:5010::153])
	by mailhost.stack.nl (Postfix) with ESMTP id 43721A3843
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 18 Aug 2005 14:03:09 +0200 (CEST)
Received: by hammer.stack.nl (Postfix, from userid 801)
	id 1AE826981; Thu, 18 Aug 2005 14:03:09 +0200 (CEST)
Message-Id: <20050818120309.1AE826981@hammer.stack.nl>
Date: Thu, 18 Aug 2005 14:03:09 +0200 (CEST)
From: Johan van Selst <johans@stack.nl>
Reply-To: Johan van Selst <johans@stack.nl>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: devel/ngpt: unbreak on FreeBSD >= 6.0
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         85088
>Category:       ports
>Synopsis:       devel/ngpt: unbreak on FreeBSD >= 6.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    garga
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 18 12:10:15 GMT 2005
>Closed-Date:    Mon Aug 22 16:19:45 GMT 2005
>Last-Modified:  Mon Aug 22 16:19:45 GMT 2005
>Originator:     Johan van Selst
>Release:        FreeBSD 6.0-BETA2 amd64
>Organization:
>Environment:
System: FreeBSD hammer.stack.nl 6.0-BETA2 FreeBSD 6.0-BETA2 #1: Tue Aug 16 17:51:03 CEST 2005 root@hammer.stack.nl:/usr/obj/usr/src/sys/HAMMER amd64


	
>Description:
	
	Avoid conflicts with the system pthread.
>How-To-Repeat:
	
>Fix:

	

	This patch introduces two extra files
		files/patch-pthread.h.in
		files/patch-uthread_spinlock.c


diff -uNr ngpt/Makefile ngpt/Makefile
--- ngpt/Makefile	Thu Jul 21 14:09:53 2005
+++ ngpt/Makefile	Thu Aug 18 13:42:57 2005
@@ -27,8 +27,4 @@
 BROKEN=		"Does not compile on !i386 and !amd64"
 .endif
 
-.if ${OSVERSION} >= 600031
-BROKEN=		"Does not compile on FreeBSD >= 6.0"
-.endif
-
 .include <bsd.port.post.mk>
diff -uNr ngpt/files/patch-pthread.h.in ngpt/files/patch-pthread.h.in
--- ngpt/files/patch-pthread.h.in	Thu Jan  1 01:00:00 1970
+++ ngpt/files/patch-pthread.h.in	Thu Aug 18 13:49:23 2005
@@ -0,0 +1,10 @@
+--- pthread.h.in.orig	Thu Aug 18 13:49:14 2005
++++ pthread.h.in	Thu Aug 18 13:49:07 2005
+@@ -50,6 +50,7 @@
+ #define _SYS_PTHREAD_H_
+ #define SYS_PTHREAD_INCLUDED
+ #define _SYS_PTHREAD_INCLUDED
++#define _SYS__PTHREADTYPES_H_
+ #ifdef _PTHREAD_PRIVATE
+ #define BITS_PTHREADTYPES_H
+ #define _BITS_PTHREADTYPES_H
diff -uNr ngpt/files/patch-uthread_spinlock.c ngpt/files/patch-uthread_spinlock.c
--- ngpt/files/patch-uthread_spinlock.c	Thu Jan  1 01:00:00 1970
+++ ngpt/files/patch-uthread_spinlock.c	Thu Aug 18 13:45:59 2005
@@ -0,0 +1,14 @@
+--- uthread_spinlock.c.orig	Thu Aug 18 13:45:38 2005
++++ uthread_spinlock.c	Thu Aug 18 13:44:36 2005
+@@ -33,10 +33,10 @@
+  *
+  */
+ 
++#include <pthread.h>
+ #include <stdio.h>
+ #include <sched.h>
+ #include <unistd.h>
+-#include <pthread.h>
+ #include <string.h>
+ #include "spinlock.h"
+ 

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->garga-ports-bugs 
Responsible-Changed-By: garga 
Responsible-Changed-When: Mon Aug 22 15:12:28 GMT 2005 
Responsible-Changed-Why:  
Grabbed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=85088 
Responsible-Changed-From-To: garga-ports-bugs->garga 
Responsible-Changed-By: garga 
Responsible-Changed-When: Mon Aug 22 15:12:52 GMT 2005 
Responsible-Changed-Why:  
Now really grabb. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=85088 
State-Changed-From-To: open->closed 
State-Changed-By: garga 
State-Changed-When: Mon Aug 22 16:19:36 GMT 2005 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=85088 
>Unformatted:
