From 2934216a8f14de7f891eac134fc5ebb78e0c0e72 Mon Sep 17 00:00:00 2001
From: taca <taca@pkgsrc.org>
Date: Sun, 28 Nov 2004 15:43:32 +0000
Subject: Update ap-ruby package to 1.2.4.

Changes are huge, please see ChangeLog file.
---
 www/ap-ruby/Makefile         | 10 ++++------
 www/ap-ruby/PLIST            |  5 ++++-
 www/ap-ruby/distinfo         |  7 ++++---
 www/ap-ruby/patches/patch-ac | 13 +++++++++++++
 4 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 www/ap-ruby/patches/patch-ac

(limited to 'www/ap-ruby')

diff --git a/www/ap-ruby/Makefile b/www/ap-ruby/Makefile
index 80a9d869a09..3d007437b4c 100644
--- a/www/ap-ruby/Makefile
+++ b/www/ap-ruby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/11/28 04:54:36 taca Exp $
+# $NetBSD: Makefile,v 1.19 2004/11/28 15:43:32 taca Exp $
 #
 
 DISTNAME=	mod_ruby-${VERSION}
@@ -15,15 +15,13 @@ CONFLICTS+=		ap2-ruby*
 USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 APACHE_MODULE=		yes
-VERSION=		1.0.7
+VERSION=		1.2.4
 HAS_CONFIGURE=  	yes
 INSTALL_TARGET=		site-install
 CONFIGURE_SCRIPT=	${RUBY} configure.rb
-CONFIGURE_ARGS=		--with-apxs="${APXS}" \
-	--with-eruby-includes="${BUILDLINK_PREFIX.ruby-eruby}/include" \
-	--with-eruby-libraries="${BUILDLINK_PREFIX.ruby-eruby}/lib"
+CONFIGURE_ARGS=		--with-apxs="${APXS}"
 MESSAGE_SUBST+=	RUBY_DOCDIR=${RUBY_DOCDIR}
-DOCS=		ChangeLog README.en README.ja
+DOCS=		ChangeLog NOTICE README.en README.ja
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/www/ap-ruby/PLIST b/www/ap-ruby/PLIST
index 98b56301979..3d8a031b2e8 100644
--- a/www/ap-ruby/PLIST
+++ b/www/ap-ruby/PLIST
@@ -1,14 +1,17 @@
-@comment $NetBSD: PLIST,v 1.5 2004/11/28 04:54:36 taca Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/11/28 15:43:32 taca Exp $
 lib/httpd/mod_ruby.so
 ${RUBY_SITELIBDIR}/apache/erb-run.rb
 ${RUBY_SITELIBDIR}/apache/eruby-debug.rb
 ${RUBY_SITELIBDIR}/apache/eruby-run.rb
 ${RUBY_SITELIBDIR}/apache/rd2html.rb
+${RUBY_SITELIBDIR}/apache/registry.rb
+${RUBY_SITELIBDIR}/apache/query.rb
 ${RUBY_SITELIBDIR}/apache/ruby-debug.rb
 ${RUBY_SITELIBDIR}/apache/ruby-run.rb
 @dirrm ${RUBY_SITELIBDIR}/apache
 ${RUBY_SITELIBDIR}/auto-reload.rb
 ${RUBY_DOCDIR}/mod_ruby/ChangeLog
+${RUBY_DOCDIR}/mod_ruby/NOTICE
 ${RUBY_DOCDIR}/mod_ruby/README.en
 ${RUBY_DOCDIR}/mod_ruby/README.ja
 ${RUBY_DOCDIR}/mod_ruby/classes.en.rd
diff --git a/www/ap-ruby/distinfo b/www/ap-ruby/distinfo
index e4031edcb95..60411aee8ed 100644
--- a/www/ap-ruby/distinfo
+++ b/www/ap-ruby/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.5 2004/03/11 16:32:03 taca Exp $
+$NetBSD: distinfo,v 1.6 2004/11/28 15:43:32 taca Exp $
 
-SHA1 (ruby/mod_ruby-1.0.7.tar.gz) = c9738ef257c266e67456b4a3f87868b3f65e7372
-Size (ruby/mod_ruby-1.0.7.tar.gz) = 69035 bytes
+SHA1 (ruby/mod_ruby-1.2.4.tar.gz) = 758e1706944ab77a1547c88ceb0aadd69131d732
+Size (ruby/mod_ruby-1.2.4.tar.gz) = 107797 bytes
+SHA1 (patch-ac) = 675f906fc5a08347a83eef440ee41d64381d23fe
diff --git a/www/ap-ruby/patches/patch-ac b/www/ap-ruby/patches/patch-ac
new file mode 100644
index 00000000000..9ce96379b8b
--- /dev/null
+++ b/www/ap-ruby/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2004/11/28 15:43:32 taca Exp $
+
+--- apache_request.c.orig	2004-09-24 03:43:18.000000000 +0900
++++ apache_request.c
+@@ -230,7 +230,7 @@ static unsigned int utf8_convert(char *s
+ 		x = x * 16 + str[i] - '0';
+ 	    }
+ 	    else {
+-		str[i] = tolower( str[i] );
++		str[i] = tolower((unsigned int)str[i] );
+ 		x = x * 16 + str[i] - 'a' + 10;
+ 	    }
+ 	}
-- 
cgit v1.2.3