From 3025ac13ca31d3194d942d73928c358118219cc6 Mon Sep 17 00:00:00 2001
From: rodrigc <rodrigc@FreeBSD.org>
Date: Thu, 3 Nov 2005 01:36:53 +0000
Subject: In rand.c, include <uuid.h> (from FreeBSD 5.x and up) *OR*
 <uuid/uuid.h> (from e2fsprogs port), not <uuid.h> *AND* <uuid/uuid.h>

PR:		ports/88406
Reported by:	lofi
---
 devel/apr/files/patch-rand.c  | 16 ++++++++++++++++
 devel/apr0/files/patch-rand.c | 16 ++++++++++++++++
 devel/apr1/files/patch-rand.c | 16 ++++++++++++++++
 devel/apr2/files/patch-rand.c | 16 ++++++++++++++++
 4 files changed, 64 insertions(+)
 create mode 100644 devel/apr/files/patch-rand.c
 create mode 100644 devel/apr0/files/patch-rand.c
 create mode 100644 devel/apr1/files/patch-rand.c
 create mode 100644 devel/apr2/files/patch-rand.c

(limited to 'devel')

diff --git a/devel/apr/files/patch-rand.c b/devel/apr/files/patch-rand.c
new file mode 100644
index 000000000000..4d9c982c4c95
--- /dev/null
+++ b/devel/apr/files/patch-rand.c
@@ -0,0 +1,16 @@
+--- apr-1.2.2/misc/unix/rand.c.orig	Wed Nov  2 20:17:10 2005
++++ apr-1.2.2/misc/unix/rand.c	Wed Nov  2 20:17:43 2005
+@@ -35,11 +35,10 @@
+ #if APR_HAVE_SYS_UN_H
+ #include <sys/un.h>
+ #endif
+-#ifdef HAVE_UUID_UUID_H
+-#include <uuid/uuid.h>
+-#endif
+ #ifdef HAVE_UUID_H
+ #include <uuid.h>
++#elif defined(HAVE_UUID_UUID_H)
++#include <uuid/uuid.h>
+ #endif
+ 
+ #ifndef SHUT_RDWR
diff --git a/devel/apr0/files/patch-rand.c b/devel/apr0/files/patch-rand.c
new file mode 100644
index 000000000000..4d9c982c4c95
--- /dev/null
+++ b/devel/apr0/files/patch-rand.c
@@ -0,0 +1,16 @@
+--- apr-1.2.2/misc/unix/rand.c.orig	Wed Nov  2 20:17:10 2005
++++ apr-1.2.2/misc/unix/rand.c	Wed Nov  2 20:17:43 2005
+@@ -35,11 +35,10 @@
+ #if APR_HAVE_SYS_UN_H
+ #include <sys/un.h>
+ #endif
+-#ifdef HAVE_UUID_UUID_H
+-#include <uuid/uuid.h>
+-#endif
+ #ifdef HAVE_UUID_H
+ #include <uuid.h>
++#elif defined(HAVE_UUID_UUID_H)
++#include <uuid/uuid.h>
+ #endif
+ 
+ #ifndef SHUT_RDWR
diff --git a/devel/apr1/files/patch-rand.c b/devel/apr1/files/patch-rand.c
new file mode 100644
index 000000000000..4d9c982c4c95
--- /dev/null
+++ b/devel/apr1/files/patch-rand.c
@@ -0,0 +1,16 @@
+--- apr-1.2.2/misc/unix/rand.c.orig	Wed Nov  2 20:17:10 2005
++++ apr-1.2.2/misc/unix/rand.c	Wed Nov  2 20:17:43 2005
+@@ -35,11 +35,10 @@
+ #if APR_HAVE_SYS_UN_H
+ #include <sys/un.h>
+ #endif
+-#ifdef HAVE_UUID_UUID_H
+-#include <uuid/uuid.h>
+-#endif
+ #ifdef HAVE_UUID_H
+ #include <uuid.h>
++#elif defined(HAVE_UUID_UUID_H)
++#include <uuid/uuid.h>
+ #endif
+ 
+ #ifndef SHUT_RDWR
diff --git a/devel/apr2/files/patch-rand.c b/devel/apr2/files/patch-rand.c
new file mode 100644
index 000000000000..4d9c982c4c95
--- /dev/null
+++ b/devel/apr2/files/patch-rand.c
@@ -0,0 +1,16 @@
+--- apr-1.2.2/misc/unix/rand.c.orig	Wed Nov  2 20:17:10 2005
++++ apr-1.2.2/misc/unix/rand.c	Wed Nov  2 20:17:43 2005
+@@ -35,11 +35,10 @@
+ #if APR_HAVE_SYS_UN_H
+ #include <sys/un.h>
+ #endif
+-#ifdef HAVE_UUID_UUID_H
+-#include <uuid/uuid.h>
+-#endif
+ #ifdef HAVE_UUID_H
+ #include <uuid.h>
++#elif defined(HAVE_UUID_UUID_H)
++#include <uuid/uuid.h>
+ #endif
+ 
+ #ifndef SHUT_RDWR
-- 
cgit