diff options
author | taca <taca> | 2004-03-11 16:32:03 +0000 |
---|---|---|
committer | taca <taca> | 2004-03-11 16:32:03 +0000 |
commit | 215f09305e5eeb9bd3968b5c6c270a4c5d57baf9 (patch) | |
tree | 2cee34b406af0a2e1ed180450e3ebe4b3b13e051 /www/ap-ruby | |
parent | 779858aed0941157e6baba41e55351b60e0d8bbd (diff) | |
download | pkgsrc-215f09305e5eeb9bd3968b5c6c270a4c5d57baf9.tar.gz |
Update ap-ruby package to 1.0.7 based on PR pkg/24545 from
Rasputin (rasputin at idoru dot mine dot nu).
- stop modifying httpd.conf with apxs.
- install HTML document, too.
- honor PKG_SYSCONFVAR.
Since changes from 0.9.7 are to many, please look into ChangeLog file.
Diffstat (limited to 'www/ap-ruby')
-rw-r--r-- | www/ap-ruby/MESSAGE | 4 | ||||
-rw-r--r-- | www/ap-ruby/Makefile | 28 | ||||
-rw-r--r-- | www/ap-ruby/PLIST | 16 | ||||
-rw-r--r-- | www/ap-ruby/distinfo | 6 |
4 files changed, 38 insertions, 16 deletions
diff --git a/www/ap-ruby/MESSAGE b/www/ap-ruby/MESSAGE index 29aad4fc8ce..311ae3e4998 100644 --- a/www/ap-ruby/MESSAGE +++ b/www/ap-ruby/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2002/08/26 00:12:51 grant Exp $ +$NetBSD: MESSAGE,v 1.4 2004/03/11 16:32:03 taca Exp $ In order to use this module in your Apache installation, you need to add the following to your httpd.conf file: @@ -11,6 +11,6 @@ authentication. For more information, see - ${PREFIX}/share/doc/ruby/mod_ruby + ${RUBY_DOCDIR}/mod_ruby =========================================================================== diff --git a/www/ap-ruby/Makefile b/www/ap-ruby/Makefile index f17d82ccd44..05392899004 100644 --- a/www/ap-ruby/Makefile +++ b/www/ap-ruby/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2003/07/17 22:55:27 grant Exp $ +# $NetBSD: Makefile,v 1.14 2004/03/11 16:32:03 taca Exp $ # DISTNAME= mod_ruby-${VERSION} PKGNAME= ap-${RUBY_PKGNAMEPREFIX}${VERSION} -PKGREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.modruby.net/archive/ @@ -16,7 +15,7 @@ USE_PKGINSTALL= YES DIST_SUBDIR= ruby USE_RUBY= YES RUBY_REQD= 1.6 -VERSION= 0.9.7 +VERSION= 1.0.7 HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ./configure.rb @@ -25,25 +24,38 @@ CONFIGURE_ARGS= --with-apxs="${APXS}" \ --with-eruby-libraries="${BUILDLINK_PREFIX.ruby-eruby}/lib" INSTALL_TARGET= site-install -CONF_FILES= ${RUBY_EXAMPLESDIR}/mod_ruby/mod_ruby.conf \ - ${LOCALBASE}/etc/httpd/mod_ruby.conf FILES_SUBST+= RUBY_DOCDIR=${RUBY_DOCDIR} FILES_SUBST+= RUBY_EXAMPLESDIR=${RUBY_EXAMPLESDIR} +MESSAGE_SUBST+= RUBY_DOCDIR=${RUBY_DOCDIR} DOCS= ChangeLog README.en README.ja +HTMLDOCS= classes.en.html directives.en.html faq.en.html \ + index.en.html install.en.html \ + classes.ja.jis.html directives.ja.jis.html faq.ja.jis.html \ + index.ja.jis.html install.ja.jis.html + +.include "../../mk/bsd.prefs.mk" + +PKG_SYSCONFVAR= apache +PKG_SYSCONFSUBDIR?= httpd +CONF_FILES+= ${RUBY_EXAMPLESDIR}/mod_ruby/mod_ruby.conf \ + ${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 > ${WRKDIR}/mod_ruby.conf post-install: - ${APXS} -i -A -n ruby ${WRKSRC}/mod_ruby.so - ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/mod_ruby - ${INSTALL_DATA} ${WRKDIR}/mod_ruby.conf ${RUBY_EXAMPLESDIR}/mod_ruby ${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/mod_ruby .for f in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/mod_ruby .endfor +.for f in ${HTMLDOCS} + ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${RUBY_DOCDIR}/mod_ruby +.endfor + ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/mod_ruby + ${INSTALL_DATA} ${WRKDIR}/mod_ruby.conf ${RUBY_EXAMPLESDIR}/mod_ruby .include "../../lang/ruby-base/Makefile.common" .include "../../lang/ruby-base/buildlink2.mk" diff --git a/www/ap-ruby/PLIST b/www/ap-ruby/PLIST index 714e0f6c65a..5884e187da7 100644 --- a/www/ap-ruby/PLIST +++ b/www/ap-ruby/PLIST @@ -1,16 +1,26 @@ -@comment $NetBSD: PLIST,v 1.3 2002/02/01 14:04:50 taca Exp $ +@comment $NetBSD: PLIST,v 1.4 2004/03/11 16:32:03 taca Exp $ lib/httpd/mod_ruby.so -@exec %D/sbin/apxs -e -A -n ruby %D/%F -@unexec %D/sbin/apxs -e -A -n ruby %D/%F ${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/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/README.en ${RUBY_DOCDIR}/mod_ruby/README.ja +${RUBY_DOCDIR}/mod_ruby/classes.en.html +${RUBY_DOCDIR}/mod_ruby/classes.ja.jis.html +${RUBY_DOCDIR}/mod_ruby/directives.en.html +${RUBY_DOCDIR}/mod_ruby/directives.ja.jis.html +${RUBY_DOCDIR}/mod_ruby/faq.en.html +${RUBY_DOCDIR}/mod_ruby/faq.ja.jis.html +${RUBY_DOCDIR}/mod_ruby/index.en.html +${RUBY_DOCDIR}/mod_ruby/index.ja.jis.html +${RUBY_DOCDIR}/mod_ruby/install.en.html +${RUBY_DOCDIR}/mod_ruby/install.ja.jis.html @dirrm ${RUBY_DOCDIR}/mod_ruby ${RUBY_EXAMPLESDIR}/mod_ruby/mod_ruby.conf @dirrm ${RUBY_EXAMPLESDIR}/mod_ruby diff --git a/www/ap-ruby/distinfo b/www/ap-ruby/distinfo index 7bdab59009c..e4031edcb95 100644 --- a/www/ap-ruby/distinfo +++ b/www/ap-ruby/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/02/12 14:06:54 taca Exp $ +$NetBSD: distinfo,v 1.5 2004/03/11 16:32:03 taca Exp $ -SHA1 (ruby/mod_ruby-0.9.7.tar.gz) = 7e7005432412efcf1c32582793f0faec8ef777ee -Size (ruby/mod_ruby-0.9.7.tar.gz) = 41442 bytes +SHA1 (ruby/mod_ruby-1.0.7.tar.gz) = c9738ef257c266e67456b4a3f87868b3f65e7372 +Size (ruby/mod_ruby-1.0.7.tar.gz) = 69035 bytes |