make ap2-ruby compile on NetBSD 1.6.1, without non-native thread environment.

I'll send thses patch to mod_ruby people later.

3 files changed, 65 insertions, 1 deletions

diff --git a/www/ap2-ruby/distinfo b/www/ap2-ruby/distinfo
index 77c5f572ed6..1f4e8b0d868 100644
--- a/www/ap2-ruby/distinfo
+++ b/www/ap2-ruby/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/07/21 17:43:53 taca Exp $
+$NetBSD: distinfo,v 1.2 2003/07/27 08:07:05 taca Exp $
 
 SHA1 (ruby/mod_ruby-1.1.1.tar.gz) = 87540c3be006ea04d40927af8a3d99dedecc153e
 Size (ruby/mod_ruby-1.1.1.tar.gz) = 62191 bytes
+SHA1 (patch-aa) = 3413b96e9a881afdb17ebe931b167d7e6ae281cd
+SHA1 (patch-ab) = 46e9903be8f851668177d298cb2603812585d559
diff --git a/www/ap2-ruby/patches/patch-aa b/www/ap2-ruby/patches/patch-aa
new file mode 100644
index 00000000000..4c5613fcebf
--- /dev/null
+++ b/www/ap2-ruby/patches/patch-aa
@@ -0,0 +1,49 @@
+$NetBSD: patch-aa,v 1.1 2003/07/27 08:07:06 taca Exp $
+
+--- mod_ruby.c.orig	Mon Mar 17 11:34:23 2003
++++ mod_ruby.c
+@@ -86,7 +86,7 @@ static const char *default_kcode;
+ static int ruby_is_running = 0;
+ array_header *ruby_required_libraries = NULL;
+ 
+-#ifdef APR_HAS_THREADS
++#if APR_HAS_THREADS
+ #include "apr_thread_cond.h"
+ 
+ static apr_thread_t *ruby_thread;
+@@ -662,7 +662,7 @@ static void ruby_finalize_interpreter()
+     }
+ }
+ 
+-#ifdef APR_HAS_THREADS
++#if APR_HAS_THREADS
+ static void *ruby_thread_start(apr_thread_t *t, void *data)
+ {
+     server_rec *s = (server_rec *) data;
+@@ -731,7 +731,7 @@ apr_status_t ruby_call_interpreter(pool 
+ 
+ static APR_CLEANUP_RETURN_TYPE ruby_child_cleanup(void *data)
+ {
+-#ifdef APR_HAS_THREADS
++#if APR_HAS_THREADS
+     pool *p;
+     apr_status_t status;
+ 
+@@ -754,7 +754,7 @@ static void ruby_child_init(server_rec *
+ #endif
+ {
+     if (!ruby_running()) {
+-#ifdef APR_HAS_THREADS
++#if APR_HAS_THREADS
+ 	apr_status_t status;
+ 	status = apr_thread_mutex_create(&ruby_request_queue_mutex,
+ 					 APR_THREAD_MUTEX_DEFAULT, p);
+@@ -1097,7 +1097,7 @@ static int ruby_handler(request_rec *r,
+     arg->run_all = run_all;
+     arg->flush = flush;
+     arg->retval = 0;
+-#ifdef APR_HAS_THREADS
++#if APR_HAS_THREADS
+     {
+ 	apr_status_t status;
+ 	char buf[256];
diff --git a/www/ap2-ruby/patches/patch-ab b/www/ap2-ruby/patches/patch-ab
new file mode 100644
index 00000000000..3ced2aee75f
--- /dev/null
+++ b/www/ap2-ruby/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2003/07/27 08:07:06 taca Exp $
+
+--- ruby_config.c.orig	Mon Mar 17 11:34:23 2003
++++ ruby_config.c
+@@ -229,7 +229,7 @@ static void ruby_require(pool *p, char *
+     arg->server = server;
+     arg->sconf = sconf;
+     arg->dconf = dconf;
+-#ifdef APR_HAS_THREADS
++#if APR_HAS_THREADS
+     {
+ 	apr_status_t status;
+ 	char buf[256];