* Use lang/ruby/gem.mk instead of misc/rubygems/rubygem.mk.

* Update HOMEPAGE.
* Add LICENSE.
* Remove default value of GEM_BUILD.
* Add patch to support both ruby18 and ruby19.

4 files changed, 58 insertions, 18 deletions

diff --git a/www/mongrel/Makefile b/www/mongrel/Makefile
index 3976d18c48c..2ea7fd3f9e3 100644
--- a/www/mongrel/Makefile
+++ b/www/mongrel/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.9 2008/10/07 05:28:33 minskim Exp $
+# $NetBSD: Makefile,v 1.10 2010/09/10 12:27:34 taca Exp $
 
 DISTNAME=	mongrel-1.1.5
 CATEGORIES=	www
 
 MAINTAINER=	minskim@NetBSD.org
-HOMEPAGE=	http://mongrel.rubyforge.org/
+HOMEPAGE=	http://github.com/fauna/mongrel
 COMMENT=	Fast HTTP library and server for Ruby
+LICENSE=	gnu-gpl-v2 OR ruby-license
 
-DEPENDS+=	${RUBY_PKGPREFIX}-daemons>=1.0.9:../../misc/ruby-daemons
+DEPENDS+=	${RUBY_PKGPREFIX}-daemons>=1.0.3:../../misc/ruby-daemons
 DEPENDS+=	${RUBY_PKGPREFIX}-gem_plugin>=0.2.3:../../misc/ruby-gem_plugin
 
 RUBY_REQD=	1.8.6.110
-GEM_BUILD=	gemspec
 
-.include "../../misc/rubygems/rubygem.mk"
+.include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/mongrel/distinfo b/www/mongrel/distinfo
index 3af48f56644..70669199266 100644
--- a/www/mongrel/distinfo
+++ b/www/mongrel/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2008/10/07 05:28:33 minskim Exp $
+$NetBSD: distinfo,v 1.5 2010/09/10 12:27:34 taca Exp $
 
 SHA1 (mongrel-1.1.5.gem) = ce2393a56d49c5fcf726c744917b9a37b6daa743
 RMD160 (mongrel-1.1.5.gem) = d678d5a07e4ae61c28d0174f1c591a261a335056
 Size (mongrel-1.1.5.gem) = 105472 bytes
-SHA1 (patch-ac) = 427f3865e31bcbebd02fb35f8ffcbbebde78fc37
+SHA1 (patch-ac) = 5307cdf60bbae90e1f56da8b084dfd160b84b85c
+SHA1 (patch-ad) = ce004bbaa84b581660e35773e3a1a9e63bcebd4c
diff --git a/www/mongrel/patches/patch-ac b/www/mongrel/patches/patch-ac
index 12c4e4b2fe1..7123201a067 100644
--- a/www/mongrel/patches/patch-ac
+++ b/www/mongrel/patches/patch-ac
@@ -1,6 +1,11 @@
-$NetBSD: patch-ac,v 1.2 2008/10/07 05:28:33 minskim Exp $
+$NetBSD: patch-ac,v 1.3 2010/09/10 12:27:34 taca Exp $
 
---- ../mongrel-1.1.5.gemspec.orig	2008-10-06 22:22:28.000000000 -0700
+* Remove certificate. (why?)
+* Remove dependency to fastthread and cgi_multipart_eof_fix and make
+  minimum Ruby's version to 1.8.6.  Since these depending packages aren't
+  needed by Ruby 1.8.6 at least.
+
+--- ../mongrel-1.1.5.gemspec.orig	2010-09-07 00:11:11.000000000 +0000
 +++ ../mongrel-1.1.5.gemspec
 @@ -7,51 +7,6 @@ authors: 
  - Zed A. Shaw
@@ -79,12 +84,3 @@ $NetBSD: patch-ac,v 1.2 2008/10/07 05:28:33 minskim Exp $
  description: A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps.
  email: ""
  executables: 
-@@ -206,7 +143,7 @@ required_ruby_version: !ruby/object:Gem:
-   requirements: 
-   - - ">="
-     - !ruby/object:Gem::Version 
--      version: 1.8.4
-+      version: 1.8.6
-   version: 
- required_rubygems_version: !ruby/object:Gem::Requirement 
-   requirements: 
diff --git a/www/mongrel/patches/patch-ad b/www/mongrel/patches/patch-ad
new file mode 100644
index 00000000000..0cdf52cbf86
--- /dev/null
+++ b/www/mongrel/patches/patch-ad
@@ -0,0 +1,43 @@
+$NetBSD: patch-ad,v 1.1 2010/09/10 12:27:34 taca Exp $
+
+Use modern API of Ruby.
+
+--- ext/http11/http11.c.orig	2010-08-29 08:20:01.000000000 +0000
++++ ext/http11/http11.c
+@@ -74,7 +74,7 @@ void http_field(void *data, const char *
+   f = rb_str_dup(global_http_prefix);
+   f = rb_str_buf_cat(f, field, flen); 
+ 
+-  for(ch = RSTRING(f)->ptr, end = ch + RSTRING(f)->len; ch < end; ch++) {
++  for(ch = RSTRING_PTR(f), end = ch + RSTRING_LEN(f); ch < end; ch++) {
+     if(*ch == '-') {
+       *ch = '_';
+     } else {
+@@ -169,12 +169,12 @@ void header_done(void *data, const char 
+   rb_hash_aset(req, global_gateway_interface, global_gateway_interface_value);
+   if((temp = rb_hash_aref(req, global_http_host)) != Qnil) {
+     /* ruby better close strings off with a '\0' dammit */
+-    colon = strchr(RSTRING(temp)->ptr, ':');
++    colon = strchr(RSTRING_PTR(temp), ':');
+     if(colon != NULL) {
+-      rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING(temp)->ptr));
++      rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING_PTR(temp)));
+       rb_hash_aset(req, global_server_port, 
+-          rb_str_substr(temp, colon - RSTRING(temp)->ptr+1, 
+-            RSTRING(temp)->len));
++          rb_str_substr(temp, colon - RSTRING_PTR(temp)+1, 
++            RSTRING_LEN(temp)));
+     } else {
+       rb_hash_aset(req, global_server_name, temp);
+       rb_hash_aset(req, global_server_port, global_port_80);
+@@ -295,8 +295,8 @@ VALUE HttpParser_execute(VALUE self, VAL
+   DATA_GET(self, http_parser, http);
+ 
+   from = FIX2INT(start);
+-  dptr = RSTRING(data)->ptr;
+-  dlen = RSTRING(data)->len;
++  dptr = RSTRING_PTR(data);
++  dlen = RSTRING_LEN(data);
+ 
+   if(from >= dlen) {
+     rb_raise(eHttpParserError, "Requested start is after data buffer end.");