[pkgsrc/trunk]: pkgsrc/www/ap2-ruby Migrate ap2-ruby to use new framework for...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4ee2c9be2605
branches:  trunk
changeset: 484540:4ee2c9be2605
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Nov 28 04:57:17 2004 +0000

description:
Migrate ap2-ruby to use new framework for Ruby packages.

diffstat:

 www/ap2-ruby/Makefile |  47 +++++++++++++++++++++++++----------------------
 www/ap2-ruby/PLIST    |  30 ++++++++++++++++++++++++++----
 2 files changed, 51 insertions(+), 26 deletions(-)

diffs (128 lines):

diff -r 6a0948761bfe -r 4ee2c9be2605 www/ap2-ruby/Makefile
--- a/www/ap2-ruby/Makefile     Sun Nov 28 04:54:36 2004 +0000
+++ b/www/ap2-ruby/Makefile     Sun Nov 28 04:57:17 2004 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2004/10/03 00:18:24 tv Exp $
+# $NetBSD: Makefile,v 1.8 2004/11/28 04:57:17 taca Exp $
 
 DISTNAME=      mod_ruby-${VERSION}
-PKGNAME=       ap2-${RUBY_PKGNAMEPREFIX}${VERSION}
-PKGREVISION=   4
+PKGNAME=       ap2-${RUBY_PKGPREFIX}-${VERSION}
 CATEGORIES=    www ruby
 MASTER_SITES=  http://www.modruby.net/archive/
 
@@ -10,23 +9,22 @@
 HOMEPAGE=      http://www.modruby.net/
 COMMENT=       Embedded Ruby for Apache2 (development version)
 
-CONFLICTS+=    ap-ruby
+CONFLICTS+=            ap-ruby*
 
-USE_BUILDLINK3=        YES
-USE_PKGINSTALL=        YES
-APACHE_MODULE= YES
-DIST_SUBDIR=   ruby
-USE_RUBY=      YES
-RUBY_REQD=     1.6
-VERSION=       1.1.1
-
-HAS_CONFIGURE=  yes
-CONFIGURE_SCRIPT= ./configure.rb
-CONFIGURE_ARGS=        --with-apxs="${APXS}" \
-               --with-eruby-includes="${BUILDLINK_PREFIX.ruby-eruby}/include" \
-               --with-eruby-libraries="${BUILDLINK_PREFIX.ruby-eruby}/lib"
+USE_BUILDLINK3=                yes
+USE_PKGINSTALL=                yes
+APACHE_MODULE=         yes
+VERSION=               1.1.1
+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"
 MAKE_FLAGS+= APACHE_INCLUDES='-I${PREFIX}/include/httpd \
                -I${PREFIX}/include/apr-0'
+MESSAGE_SUBST+=        RUBY_DOCDIR=${RUBY_DOCDIR}
+DOCS=          ChangeLog README.en README.ja
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -36,20 +34,25 @@
                        ${PKG_SYSCONFDIR}/mod_ruby.conf
 
 post-build:
+       cd ${WRKSRC}/doc; ${MAKE}
        ${SED} -e 's|/usr/local/apache/libexec|${LOCALBASE}/lib/httpd|g' \
                ${WRKSRC}/examples/httpd.conf > ${WRKSRC}/examples/mod_ruby.conf
 
 post-install:
-       ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/mod_ruby
-       ${INSTALL_DATA} ${WRKSRC}/doc/*  ${RUBY_DOCDIR}/mod_ruby
+       ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/mod_ruby/html
+.for f in ${DOCS}
+       ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/mod_ruby
+.endfor
+       ${INSTALL_DATA} ${WRKSRC}/doc/*.rd  ${RUBY_DOCDIR}/mod_ruby
+       ${INSTALL_DATA} ${WRKSRC}/doc/*.css  ${RUBY_DOCDIR}/mod_ruby/html
+       ${INSTALL_DATA} ${WRKSRC}/doc/*.html  ${RUBY_DOCDIR}/mod_ruby/html
        ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/mod_ruby
        ${INSTALL_DATA} ${WRKSRC}/examples/mod_ruby.conf  \
                ${RUBY_EXAMPLESDIR}/mod_ruby
 
-.include "../../lang/ruby-base/Makefile.common"
-.include "../../lang/ruby-base/buildlink3.mk"
+.include "../../lang/ruby/modules.mk"
 .include "../../textproc/ruby-eruby/buildlink3.mk"
+.include "../../textproc/ruby-rdtool/buildlink3.mk"
 .include "../../devel/apr/buildlink3.mk"
 .include "../../www/apache2/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff -r 6a0948761bfe -r 4ee2c9be2605 www/ap2-ruby/PLIST
--- a/www/ap2-ruby/PLIST        Sun Nov 28 04:54:36 2004 +0000
+++ b/www/ap2-ruby/PLIST        Sun Nov 28 04:57:17 2004 +0000
@@ -1,16 +1,38 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/07/21 17:43:53 taca Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/11/28 04:57: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/query.rb
+${RUBY_SITELIBDIR}/apache/rd2html.rb
+${RUBY_SITELIBDIR}/apache/registry.rb
+${RUBY_SITELIBDIR}/apache/ruby-debug.rb
+${RUBY_SITELIBDIR}/apache/ruby-run.rb
+@dirrm ${RUBY_SITELIBDIR}/apache
+${RUBY_SITELIBDIR}/auto-reload.rb
 ${RUBY_EXAMPLESDIR}/mod_ruby/mod_ruby.conf
 @dirrm ${RUBY_EXAMPLESDIR}/mod_ruby
-${RUBY_DOCDIR}/mod_ruby/Makefile
-${RUBY_DOCDIR}/mod_ruby/Makefile.in
+${RUBY_DOCDIR}/mod_ruby/ChangeLog
+${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/default.css
 ${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
+@dirrm ${RUBY_DOCDIR}/mod_ruby/html
 ${RUBY_DOCDIR}/mod_ruby/index.en.rd
 ${RUBY_DOCDIR}/mod_ruby/index.ja.euc.rd
 ${RUBY_DOCDIR}/mod_ruby/install.en.rd