From 2076b86927491cce919d3346b0eedad3c832775b Mon Sep 17 00:00:00 2001
From: todd <todd@openbsd.org>
Date: Thu, 12 Sep 2002 15:07:23 +0000
Subject: [PATCH] use gc.h and co from /usr/local/include

---
 devel/opencm/Makefile                                |  5 +++--
 devel/opencm/patches/patch-base_libgdiff_diff3_c     | 12 ++++++++++++
 devel/opencm/patches/patch-base_libgdiff_diff_h      | 12 ++++++++++++
 devel/opencm/patches/patch-base_src_opencm_h         | 12 ++++++++++++
 .../opencm/patches/patch-base_src_server_DoRequest_c | 12 ++++++++++++
 5 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 devel/opencm/patches/patch-base_libgdiff_diff3_c
 create mode 100644 devel/opencm/patches/patch-base_libgdiff_diff_h
 create mode 100644 devel/opencm/patches/patch-base_src_opencm_h
 create mode 100644 devel/opencm/patches/patch-base_src_server_DoRequest_c

diff --git a/devel/opencm/Makefile b/devel/opencm/Makefile
index e7f691c3bf7..69ead7e0fa6 100644
--- a/devel/opencm/Makefile
+++ b/devel/opencm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2002/08/28 22:23:29 todd Exp $
+# $OpenBSD: Makefile,v 1.4 2002/09/12 15:07:23 todd Exp $
 
 COMMENT=		"OpenCM change management system"
 COMMENT-docs=		"OpenCM Documentation"
@@ -33,7 +33,8 @@ USE_GMAKE=		Yes
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}
 CONFIGURE_STYLE=	autoconf
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
-CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib" \
+			CPPFLAGS="-I/usr/local/include"
 
 FLAVORS=docs
 FLAVOR?=
diff --git a/devel/opencm/patches/patch-base_libgdiff_diff3_c b/devel/opencm/patches/patch-base_libgdiff_diff3_c
new file mode 100644
index 00000000000..0fc51e4a4f5
--- /dev/null
+++ b/devel/opencm/patches/patch-base_libgdiff_diff3_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-base_libgdiff_diff3_c,v 1.1 2002/09/12 15:07:23 todd Exp $
+--- base/libgdiff/diff3.c.orig	Mon Aug  5 16:03:07 2002
++++ base/libgdiff/diff3.c	Thu Sep 12 10:03:10 2002
+@@ -16,7 +16,7 @@
+ /* Written by Randy Smith */
+ /* Librarification by Tim Pierce */
+ 
+-#include "../gc6.0/include/gc.h"
++#include <gc.h>
+ #include "system.h"
+ #include <stdio.h>
+ #include <setjmp.h>
diff --git a/devel/opencm/patches/patch-base_libgdiff_diff_h b/devel/opencm/patches/patch-base_libgdiff_diff_h
new file mode 100644
index 00000000000..9586e44c77b
--- /dev/null
+++ b/devel/opencm/patches/patch-base_libgdiff_diff_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-base_libgdiff_diff_h,v 1.1 2002/09/12 15:07:23 todd Exp $
+--- base/libgdiff/diff.h.orig	Mon Aug  5 16:03:05 2002
++++ base/libgdiff/diff.h	Thu Sep 12 10:03:09 2002
+@@ -15,7 +15,7 @@ GNU General Public License for more deta
+ 
+ */
+ 
+-#include "../gc6.0/include/gc.h"
++#include <gc.h>
+ #include "system.h"
+ #include <stdio.h>
+ #include <setjmp.h>
diff --git a/devel/opencm/patches/patch-base_src_opencm_h b/devel/opencm/patches/patch-base_src_opencm_h
new file mode 100644
index 00000000000..230a778bdb0
--- /dev/null
+++ b/devel/opencm/patches/patch-base_src_opencm_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-base_src_opencm_h,v 1.3 2002/09/12 15:07:23 todd Exp $
+--- base/src/opencm.h.orig	Mon Aug  5 16:03:07 2002
++++ base/src/opencm.h	Thu Sep 12 10:03:10 2002
+@@ -73,7 +73,7 @@
+ #endif
+ 
+ /* #define GC_DEBUG */
+-#include "../gc6.0/include/gc.h"
++#include <gc.h>
+ 
+ /* #define USE_BASE16 */
+ 
diff --git a/devel/opencm/patches/patch-base_src_server_DoRequest_c b/devel/opencm/patches/patch-base_src_server_DoRequest_c
new file mode 100644
index 00000000000..4fe80b1eced
--- /dev/null
+++ b/devel/opencm/patches/patch-base_src_server_DoRequest_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-base_src_server_DoRequest_c,v 1.3 2002/09/12 15:07:23 todd Exp $
+--- base/src/server/DoRequest.c.orig	Mon Jul 22 02:02:50 2002
++++ base/src/server/DoRequest.c	Thu Sep 12 10:03:11 2002
+@@ -40,7 +40,7 @@
+ 
+ #include <opencm.h>
+ #include "opencmserver.h"
+-#include "../../gc6.0/include/gc_backptr.h"
++#include <gc_backptr.h>
+ 
+ char *storeReposURI = NULL;
+ extern Repository *localRepos;