From 1c2ca2f346efa5c9121aeafae2a4e2ae91ca35cd Mon Sep 17 00:00:00 2001
From: grant <grant@pkgsrc.org>
Date: Sun, 1 Dec 2002 05:36:51 +0000
Subject: src/fs/diskd: only include sys/msg.h if we have it.

fixes build on (at least) Darwin 6.2.
---
 www/squid/distinfo         |  5 ++++-
 www/squid/patches/patch-ca | 17 +++++++++++++++++
 www/squid/patches/patch-cb | 17 +++++++++++++++++
 www/squid/patches/patch-cc | 17 +++++++++++++++++
 4 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 www/squid/patches/patch-ca
 create mode 100644 www/squid/patches/patch-cb
 create mode 100644 www/squid/patches/patch-cc

(limited to 'www')

diff --git a/www/squid/distinfo b/www/squid/distinfo
index c3e2bdc7c60..3d8e3d728ed 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2002/11/25 14:46:14 taca Exp $
+$NetBSD: distinfo,v 1.21 2002/12/01 05:36:51 grant Exp $
 
 SHA1 (squid-2.5.STABLE1.tar.bz2) = 6705006527f5fa0753e7c9f14347f36b1b787e62
 Size (squid-2.5.STABLE1.tar.bz2) = 1006600 bytes
@@ -62,3 +62,6 @@ SHA1 (patch-an) = 8748cfb50e0acb6588228b87b424f87b0c48cc59
 SHA1 (patch-ba) = c91bc26e4b6df2cb4b7042591efb4afd7c989462
 SHA1 (patch-bb) = 70e92462230ac3b9920946b089290d9ec814fade
 SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35
+SHA1 (patch-ca) = 652e35b253a6b75a3ac452773d681e70c5fc310d
+SHA1 (patch-cb) = 7fb49ee4f9e21dea9ca6e54da9a581866b225853
+SHA1 (patch-cc) = 9d9cf0b66768b3942c1683a7a908bfb0aa2fe0f2
diff --git a/www/squid/patches/patch-ca b/www/squid/patches/patch-ca
new file mode 100644
index 00000000000..b23d7ad0400
--- /dev/null
+++ b/www/squid/patches/patch-ca
@@ -0,0 +1,17 @@
+$NetBSD: patch-ca,v 1.1 2002/12/01 05:36:51 grant Exp $
+
+--- src/fs/diskd/diskd.c.orig	Thu Feb  8 05:56:54 2001
++++ src/fs/diskd/diskd.c
+@@ -36,8 +36,11 @@
+ #include "squid.h"
+ 
+ #include <sys/ipc.h>
+-#include <sys/msg.h>
+ #include <sys/shm.h>
++
++#ifdef HAVE_SYS_MSG_H
++#include <sys/msg.h>
++#endif
+ 
+ #include "store_diskd.h"
+ 
diff --git a/www/squid/patches/patch-cb b/www/squid/patches/patch-cb
new file mode 100644
index 00000000000..3f62191e654
--- /dev/null
+++ b/www/squid/patches/patch-cb
@@ -0,0 +1,17 @@
+$NetBSD: patch-cb,v 1.1 2002/12/01 05:36:51 grant Exp $
+
+--- src/fs/diskd/store_dir_diskd.c.orig	Sun Jul 21 10:30:04 2002
++++ src/fs/diskd/store_dir_diskd.c
+@@ -36,8 +36,11 @@
+ #include "squid.h"
+ 
+ #include <sys/ipc.h>
+-#include <sys/msg.h>
+ #include <sys/shm.h>
++
++#ifdef HAVE_SYS_MSG_H
++#include <sys/msg.h>
++#endif
+ 
+ #include "store_diskd.h"
+ 
diff --git a/www/squid/patches/patch-cc b/www/squid/patches/patch-cc
new file mode 100644
index 00000000000..7ba380af94b
--- /dev/null
+++ b/www/squid/patches/patch-cc
@@ -0,0 +1,17 @@
+$NetBSD: patch-cc,v 1.1 2002/12/01 05:36:51 grant Exp $
+
+--- src/fs/diskd/store_io_diskd.c.orig	Fri Aug  9 06:17:41 2002
++++ src/fs/diskd/store_io_diskd.c
+@@ -37,8 +37,11 @@
+ #include "squid.h"
+ 
+ #include <sys/ipc.h>
+-#include <sys/msg.h>
+ #include <sys/shm.h>
++
++#ifdef HAVE_SYS_MSG_H
++#include <sys/msg.h>
++#endif
+ 
+ #include "store_diskd.h"
+ 
-- 
cgit v1.2.3