Update ap-ruby to 1.2.6.

pkgsrc changes: merge ap2-ruby to here.


mod_ruby-1.2.6 released

mod_ruby-1.2.6 is released.

Main changes from mod_ruby-1.2.5

 - apache/rails-dispatcher.rb supports Rails 1.1.
 - added guard conditionals around code that uses dconf to avoid SEGV. Thanks,
    Michael Granger.
 - fixes for Ruby 1.6.x.
 - do not call downcase content_type, content_encoding, and content_lnaguages.

at 2006-06-15 13:32

mod_ruby-1.2.5 released

mod_ruby-1.2.5 is released.

Main changes from mod_ruby-1.2.4

 - added RubyRestrictDirectives by David Garamond.
 - added Apache::Request#all_params.
 - set $0 correctly
 - added Apache::RubyProfile.
 - added RubyOption.
 - added Apache::RailsDispatcher.
 - supported Apache 2.2 thanks to Michael Sullivan.
 - added RubyGcPerRequest.
 - do not timeout if RubyTimeOut is 0.

at 2006-02-19 21:52

4 files changed, 30 insertions, 15 deletions

diff --git a/www/ap-ruby/MESSAGE b/www/ap-ruby/MESSAGE
index 311ae3e4998..ad9393cb705 100644
--- a/www/ap-ruby/MESSAGE
+++ b/www/ap-ruby/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2004/03/11 16:32:03 taca Exp $
+$NetBSD: MESSAGE,v 1.5 2007/01/28 15:30:25 taca Exp $
 
 In order to use this module in your Apache installation, you need to
 add the following to your httpd.conf file:
@@ -9,6 +9,10 @@ add the following to your httpd.conf file:
 You may also need to create a htpasswd file, if you introduce basic
 authentication.
 
+Note for apache2 (and lator):
+
+* Some methods are not implemented because of different API.
+
 For more information, see
 
 	${RUBY_DOCDIR}/mod_ruby
diff --git a/www/ap-ruby/Makefile b/www/ap-ruby/Makefile
index 2d944bcb2c2..27603bab1d7 100644
--- a/www/ap-ruby/Makefile
+++ b/www/ap-ruby/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2006/06/02 18:27:59 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2007/01/28 15:30:25 taca Exp $
 #
 
 DISTNAME=	mod_ruby-${VERSION}
-PKGNAME=	ap13-${RUBY_PKGPREFIX}-${VERSION}
+PKGNAME=	${APACHE_PKG_PREFIX}-${RUBY_PKGPREFIX}-${VERSION}
 CATEGORIES=	www ruby
 MASTER_SITES=	http://www.modruby.net/archive/
 
@@ -10,18 +10,18 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://www.modruby.net/
 COMMENT=	Apache module that embeds Ruby interpreter within
 
-CONFLICTS=	ap-ruby* ap2-ruby*
-
 RUBY_HAS_ARCHLIB=	yes
 APACHE_MODULE=		yes
-VERSION=		1.2.4
+PKG_APACHE_ACCEPTED=	apache13 apache2 apache22
+USE_APR=		yes
+VERSION=		1.2.6
 HAS_CONFIGURE=  	yes
 INSTALL_TARGET=		site-install
-CONFIGURE_SCRIPT=	${RUBY} configure.rb
+CONFIGURE_SCRIPT=	./configure.rb
 CONFIGURE_ARGS+=	--with-apxs=${APXS:Q}
 MESSAGE_SUBST+=		RUBY_DOCDIR=${RUBY_DOCDIR}
 DOCS=			ChangeLog NOTICE README.en README.ja
-REPLACE_RUBY+=		install-rb
+REPLACE_RUBY+=		configure.rb install-rb
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -30,6 +30,16 @@ PKG_SYSCONFSUBDIR?=	httpd
 CONF_FILES+=		${RUBY_EXAMPLESDIR}/mod_ruby/mod_ruby.conf \
 			${PKG_SYSCONFDIR}/mod_ruby.conf
 
+.include "../../mk/apache.mk"
+
+.if empty(PKG_APACHE:Mapache13)
+.if empty(PKG_APACHE:Mapache22)
+CONFIGURE_ARGS+=	--with-apr-includes=${PREFIX}/include/apr-0
+.else
+CONFIGURE_ARGS+=	--with-apr-includes=${PREFIX}/include/apr-1
+.endif
+.endif
+
 post-build:
 	cd ${WRKSRC}/doc; ${MAKE}
 	${SED} -e 's|/usr/local/apache/libexec|${LOCALBASE}/lib/httpd|g' \
@@ -49,5 +59,4 @@ post-install:
 .include "../../lang/ruby/modules.mk"
 .include "../../textproc/ruby-eruby/buildlink3.mk"
 .include "../../textproc/ruby-rdtool/buildlink3.mk"
-.include "../../www/apache/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-ruby/PLIST b/www/ap-ruby/PLIST
index b8b91c24da7..b8d9103cb55 100644
--- a/www/ap-ruby/PLIST
+++ b/www/ap-ruby/PLIST
@@ -1,12 +1,14 @@
-@comment $NetBSD: PLIST,v 1.7 2006/09/07 15:56:40 taca Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/01/28 15:30:25 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/registry.rb
+${RUBY_SITELIBDIR}/apache/rails-dispatcher.rb
 ${RUBY_SITELIBDIR}/apache/ruby-debug.rb
+${RUBY_SITELIBDIR}/apache/ruby-profile.rb
 ${RUBY_SITELIBDIR}/apache/ruby-run.rb
 ${RUBY_SITELIBDIR}/auto-reload.rb
 ${RUBY_DOCDIR}/mod_ruby/ChangeLog
diff --git a/www/ap-ruby/distinfo b/www/ap-ruby/distinfo
index 7a8790a2565..7f3bb83dde9 100644
--- a/www/ap-ruby/distinfo
+++ b/www/ap-ruby/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2006/01/03 14:25:51 taca Exp $
+$NetBSD: distinfo,v 1.9 2007/01/28 15:30:25 taca Exp $
 
-SHA1 (mod_ruby-1.2.4.tar.gz) = 758e1706944ab77a1547c88ceb0aadd69131d732
-RMD160 (mod_ruby-1.2.4.tar.gz) = 720058d331207dcc79531fdb3bf9c4080834b2cc
-Size (mod_ruby-1.2.4.tar.gz) = 107797 bytes
+SHA1 (mod_ruby-1.2.6.tar.gz) = 3934fdb206a78baf9deb592334ef4d05400ea133
+RMD160 (mod_ruby-1.2.6.tar.gz) = 08a7beb415608d93b7e48b484e3969a08eec4f31
+Size (mod_ruby-1.2.6.tar.gz) = 110886 bytes
 SHA1 (patch-ac) = 675f906fc5a08347a83eef440ee41d64381d23fe