From cc2e473f2de7f62d6612b9089d6ed939ec704c7a Mon Sep 17 00:00:00 2001
From: Vasil Dimov <vd@FreeBSD.org>
Date: Tue, 28 Apr 2009 20:15:24 +0000
Subject: Fix the patch for ports/132828 which erroneously checked
 __FreeBSD_version without including osreldate.h.

Not tesed on 8-CURRENT with /usr/include/signal.h after
Apr 17 (>= r191202). sledge is running r191005 from Apr 13,
pointyhat from Mar 7 and tb3.droso.net from Feb 22.

If this is still broken after the present patch then I will
install 8-CURRENT in a qemu...

Reported by:	linimon, markm
PR:		ports/132828
---
 devel/pth/files/patch-pth_p.h.in | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'devel/pth')

diff --git a/devel/pth/files/patch-pth_p.h.in b/devel/pth/files/patch-pth_p.h.in
index 9b8341fcb8e1..e127154c517a 100644
--- a/devel/pth/files/patch-pth_p.h.in
+++ b/devel/pth/files/patch-pth_p.h.in
@@ -1,13 +1,19 @@
---- pth_p.h.in.orig	2009-04-12 21:27:26.000000000 +0300
-+++ pth_p.h.in	2009-04-12 21:38:56.000000000 +0300
-@@ -32,7 +32,10 @@
+--- pth_p.h.in.orig	2006-06-08 20:54:03.000000000 +0300
++++ pth_p.h.in	2009-04-28 23:06:45.000000000 +0300
+@@ -32,7 +32,15 @@
  #include <stdarg.h>
  #include <string.h>
  #include <setjmp.h>
-+#if !(defined(__FreeBSD__) && __FreeBSD_version >= 800070)
-+/* See http://www.freebsd.org/cgi/query-pr.cgi?pr=132828 */
- #include <signal.h>
-+#endif /* FreeBSD */
+-#include <signal.h>
++#ifdef __FreeBSD__
++# include <osreldate.h>
++# if __FreeBSD_version < 800070
++   /* See http://www.freebsd.org/cgi/query-pr.cgi?pr=132828 */
++#  include <signal.h>
++# endif /* __FreeBSD_version */
++#else /* __FreeBSD__ */
++# include <signal.h>
++#endif /* __FreeBSD__ */
  #include <unistd.h>
  #include <fcntl.h>
  #include <errno.h>
-- 
cgit v1.2.3