- Switch to use vendor_dir with Ruby 1.8.7.

- And make it build with Ruby 1.8.7, too.

Bump PKGREVISION.

5 files changed, 101 insertions, 56 deletions

diff --git a/www/ap-ruby/MESSAGE b/www/ap-ruby/MESSAGE
index ad9393cb705..e6a05fabe71 100644
--- a/www/ap-ruby/MESSAGE
+++ b/www/ap-ruby/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2007/01/28 15:30:25 taca Exp $
+$NetBSD: MESSAGE,v 1.6 2008/06/19 15:02:17 taca Exp $
 
 In order to use this module in your Apache installation, you need to
 add the following to your httpd.conf file:
@@ -15,6 +15,6 @@ Note for apache2 (and lator):
 
 For more information, see
 
-	${RUBY_DOCDIR}/mod_ruby
+	${PREFIX}/${RUBY_DOC}/mod_ruby
 
 ===========================================================================
diff --git a/www/ap-ruby/Makefile b/www/ap-ruby/Makefile
index faa79663680..889b899f329 100644
--- a/www/ap-ruby/Makefile
+++ b/www/ap-ruby/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2008/06/12 02:14:54 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2008/06/19 15:02:17 taca Exp $
 #
 
 DISTNAME=	mod_ruby-${VERSION}
 PKGNAME=	${APACHE_PKG_PREFIX}-${RUBY_PKGPREFIX}-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	www ruby
 MASTER_SITES=	http://www.modruby.net/archive/
 
@@ -19,11 +20,11 @@ USE_APR=		yes
 VERSION=		1.2.6
 HAS_CONFIGURE=  	yes
 INSTALL_TARGET=		site-install
-INSTALLATION_DIRS=	${RUBY_DOCDIR}/mod_ruby/html ${RUBY_EXAMPLESDIR}/mod_ruby
+INSTALLATION_DIRS=	${RUBY_DOC}/mod_ruby/html ${RUBY_EG}/mod_ruby
 CONFIG_SHELL=		${RUBY}
 CONFIGURE_SCRIPT=	configure.rb
 CONFIGURE_ARGS+=	--with-apxs=${APXS:Q}
-MESSAGE_SUBST+=		RUBY_DOCDIR=${RUBY_DOCDIR}
+MESSAGE_SUBST+=		RUBY_DOC=${RUBY_DOC}
 DOCS=			ChangeLog NOTICE README.en README.ja
 REPLACE_RUBY+=		configure.rb install-rb
 
@@ -32,22 +33,26 @@ REPLACE_RUBY+=		configure.rb install-rb
 
 PKG_SYSCONFVAR=		apache
 PKG_SYSCONFSUBDIR?=	httpd
-CONF_FILES+=		${RUBY_EXAMPLESDIR}/mod_ruby/mod_ruby.conf \
+CONF_FILES+=		${PREFIX}/${RUBY_EG}/mod_ruby/mod_ruby.conf \
 			${PKG_SYSCONFDIR}/mod_ruby.conf
 
+SUBST_CLASSES+=		path
+SUBST_STAGE.path=	post-build
+SUBST_FILES.path=	examples/httpd.conf
+SUBST_SED.path=		-e 's|/usr/local/apache/libexec|${PREFIX}/lib/httpd|g'
+SUBST_MESSAGE.path=	Fixing configuration files.
+
 post-build:
 	cd ${WRKSRC}/doc; ${MAKE}
-	${SED} -e 's|/usr/local/apache/libexec|${LOCALBASE}/lib/httpd|g' \
-		${WRKSRC}/examples/httpd.conf > ${WRKDIR}/mod_ruby.conf
 
 post-install:
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${RUBY_DOCDIR}/mod_ruby
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/mod_ruby
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/doc/*.rd  ${DESTDIR}${RUBY_DOCDIR}/mod_ruby
-	${INSTALL_DATA} ${WRKSRC}/doc/*.css  ${DESTDIR}${RUBY_DOCDIR}/mod_ruby/html
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html  ${DESTDIR}${RUBY_DOCDIR}/mod_ruby/html
-	${INSTALL_DATA} ${WRKDIR}/mod_ruby.conf  ${DESTDIR}${RUBY_EXAMPLESDIR}/mod_ruby
+	${INSTALL_DATA} ${WRKSRC}/doc/*.rd  ${DESTDIR}${PREFIX}/${RUBY_DOC}/mod_ruby
+	${INSTALL_DATA} ${WRKSRC}/doc/*.css  ${DESTDIR}${PREFIX}/${RUBY_DOC}/mod_ruby/html
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html  ${DESTDIR}${PREFIX}/${RUBY_DOC}/mod_ruby/html
+	${INSTALL_DATA} ${WRKSRC}/examples/httpd.conf ${DESTDIR}${PREFIX}/${RUBY_EG}/mod_ruby/mod_ruby.conf
 
 .include "../../lang/ruby/modules.mk"
 .include "../../textproc/ruby-eruby/buildlink3.mk"
diff --git a/www/ap-ruby/PLIST b/www/ap-ruby/PLIST
index b8d9103cb55..9b07f0b19f9 100644
--- a/www/ap-ruby/PLIST
+++ b/www/ap-ruby/PLIST
@@ -1,43 +1,43 @@
-@comment $NetBSD: PLIST,v 1.8 2007/01/28 15:30:25 taca Exp $
+@comment $NetBSD: PLIST,v 1.9 2008/06/19 15:02:17 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/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
-${RUBY_DOCDIR}/mod_ruby/NOTICE
-${RUBY_DOCDIR}/mod_ruby/README.en
-${RUBY_DOCDIR}/mod_ruby/README.ja
-${RUBY_DOCDIR}/mod_ruby/classes.en.rd
-${RUBY_DOCDIR}/mod_ruby/classes.ja.euc.rd
-${RUBY_DOCDIR}/mod_ruby/directives.en.rd
-${RUBY_DOCDIR}/mod_ruby/directives.ja.euc.rd
-${RUBY_DOCDIR}/mod_ruby/faq.en.rd
-${RUBY_DOCDIR}/mod_ruby/faq.ja.euc.rd
-${RUBY_DOCDIR}/mod_ruby/html/classes.en.html
-${RUBY_DOCDIR}/mod_ruby/html/classes.ja.jis.html
-${RUBY_DOCDIR}/mod_ruby/html/default.css
-${RUBY_DOCDIR}/mod_ruby/html/directives.en.html
-${RUBY_DOCDIR}/mod_ruby/html/directives.ja.jis.html
-${RUBY_DOCDIR}/mod_ruby/html/faq.en.html
-${RUBY_DOCDIR}/mod_ruby/html/faq.ja.jis.html
-${RUBY_DOCDIR}/mod_ruby/html/index.en.html
-${RUBY_DOCDIR}/mod_ruby/html/index.ja.jis.html
-${RUBY_DOCDIR}/mod_ruby/html/install.en.html
-${RUBY_DOCDIR}/mod_ruby/html/install.ja.jis.html
-${RUBY_DOCDIR}/mod_ruby/index.en.rd
-${RUBY_DOCDIR}/mod_ruby/index.ja.euc.rd
-${RUBY_DOCDIR}/mod_ruby/install.en.rd
-${RUBY_DOCDIR}/mod_ruby/install.ja.euc.rd
-${RUBY_EXAMPLESDIR}/mod_ruby/mod_ruby.conf
-@dirrm ${RUBY_SITELIBDIR}/apache
-@dirrm ${RUBY_DOCDIR}/mod_ruby/html
-@dirrm ${RUBY_DOCDIR}/mod_ruby
-@dirrm ${RUBY_EXAMPLESDIR}/mod_ruby
+${RUBY_VENDORLIB}/apache/erb-run.rb
+${RUBY_VENDORLIB}/apache/eruby-debug.rb
+${RUBY_VENDORLIB}/apache/eruby-run.rb
+${RUBY_VENDORLIB}/apache/rd2html.rb
+${RUBY_VENDORLIB}/apache/query.rb
+${RUBY_VENDORLIB}/apache/registry.rb
+${RUBY_VENDORLIB}/apache/rails-dispatcher.rb
+${RUBY_VENDORLIB}/apache/ruby-debug.rb
+${RUBY_VENDORLIB}/apache/ruby-profile.rb
+${RUBY_VENDORLIB}/apache/ruby-run.rb
+${RUBY_VENDORLIB}/auto-reload.rb
+${RUBY_DOC}/mod_ruby/ChangeLog
+${RUBY_DOC}/mod_ruby/NOTICE
+${RUBY_DOC}/mod_ruby/README.en
+${RUBY_DOC}/mod_ruby/README.ja
+${RUBY_DOC}/mod_ruby/classes.en.rd
+${RUBY_DOC}/mod_ruby/classes.ja.euc.rd
+${RUBY_DOC}/mod_ruby/directives.en.rd
+${RUBY_DOC}/mod_ruby/directives.ja.euc.rd
+${RUBY_DOC}/mod_ruby/faq.en.rd
+${RUBY_DOC}/mod_ruby/faq.ja.euc.rd
+${RUBY_DOC}/mod_ruby/html/classes.en.html
+${RUBY_DOC}/mod_ruby/html/classes.ja.jis.html
+${RUBY_DOC}/mod_ruby/html/default.css
+${RUBY_DOC}/mod_ruby/html/directives.en.html
+${RUBY_DOC}/mod_ruby/html/directives.ja.jis.html
+${RUBY_DOC}/mod_ruby/html/faq.en.html
+${RUBY_DOC}/mod_ruby/html/faq.ja.jis.html
+${RUBY_DOC}/mod_ruby/html/index.en.html
+${RUBY_DOC}/mod_ruby/html/index.ja.jis.html
+${RUBY_DOC}/mod_ruby/html/install.en.html
+${RUBY_DOC}/mod_ruby/html/install.ja.jis.html
+${RUBY_DOC}/mod_ruby/index.en.rd
+${RUBY_DOC}/mod_ruby/index.ja.euc.rd
+${RUBY_DOC}/mod_ruby/install.en.rd
+${RUBY_DOC}/mod_ruby/install.ja.euc.rd
+${RUBY_EG}/mod_ruby/mod_ruby.conf
+@dirrm ${RUBY_VENDORLIB}/apache
+@dirrm ${RUBY_DOC}/mod_ruby/html
+@dirrm ${RUBY_DOC}/mod_ruby
+@dirrm ${RUBY_EG}/mod_ruby
diff --git a/www/ap-ruby/distinfo b/www/ap-ruby/distinfo
index 7f3bb83dde9..b834f9447b1 100644
--- a/www/ap-ruby/distinfo
+++ b/www/ap-ruby/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2007/01/28 15:30:25 taca Exp $
+$NetBSD: distinfo,v 1.10 2008/06/19 15:02:17 taca Exp $
 
 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-aa) = ca79512ff37b483e176467bb97b61026489d15cf
 SHA1 (patch-ac) = 675f906fc5a08347a83eef440ee41d64381d23fe
diff --git a/www/ap-ruby/patches/patch-aa b/www/ap-ruby/patches/patch-aa
new file mode 100644
index 00000000000..ea67e5961a4
--- /dev/null
+++ b/www/ap-ruby/patches/patch-aa
@@ -0,0 +1,39 @@
+$NetBSD: patch-aa,v 1.1 2008/06/19 15:02:17 taca Exp $
+
+--- configure.rb.orig	2006-05-22 22:23:36.000000000 +0000
++++ configure.rb
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env ruby
++#!/usr/pkg/bin/ruby18
+ 
+ # Generated automatically using autoconf.rb version 0.2.4
+ 
+@@ -217,6 +217,7 @@ $bindir = CONFIG["bindir"].sub(prefix, "
+ $datadir = CONFIG["datadir"].sub(prefix, "$(prefix)").sub(drive, '')
+ $libdir = CONFIG["libdir"].sub(prefix, "$(exec_prefix)").sub(drive, '')
+ $archdir = $archdir.sub(prefix, "$(prefix)").sub(drive, '')
++$sitedir = $vendordir
+ $sitelibdir = $sitelibdir.sub(prefix, "$(prefix)").sub(drive, '')
+ $sitearchdir = $sitearchdir.sub(prefix, "$(prefix)").sub(drive, '')
+ $includedir = CONFIG["includedir"].sub(prefix, "$(prefix)").sub(drive, '')
+@@ -321,11 +322,15 @@ if $LDFLAGS.to_s.empty? && /mswin32/ =~ 
+ end
+ $LIBS = CONFIG["LIBS"]
+ $XLDFLAGS = CONFIG["XLDFLAGS"]
+-$XLDFLAGS.gsub!(/-L\./, "")
+-if /mswin32/ !~ RUBY_PLATFORM
+-  $XLDFLAGS += " -L$(libdir)"
+-elsif RUBY_VERSION >= "1.8"
+-  $XLDFLAGS += " #{CONFIG['LIBPATHFLAG'] % '$(libdir)'}"
++if $XLDFLAGS.nil?
++  $XLDFLAGS = ''
++else
++  $XLDFLAGS.gsub!(/-L\./, "")
++  if /mswin32/ !~ RUBY_PLATFORM
++    $XLDFLAGS += " -L$(libdir)"
++  elsif RUBY_VERSION >= "1.8"
++    $XLDFLAGS += " #{CONFIG['LIBPATHFLAG'] % '$(libdir)'}"
++  end
+ end
+ $DLDFLAGS = CONFIG["DLDFLAGS"]
+ $LDSHARED = CONFIG["LDSHARED"]