diff options
author | taca <taca> | 2004-11-28 04:57:17 +0000 |
---|---|---|
committer | taca <taca> | 2004-11-28 04:57:17 +0000 |
commit | c6e7cb8146b1c98ca2947fa58bc67541b4728fd8 (patch) | |
tree | 26c414320893631f40c9fff904d3cb06b26a2224 | |
parent | 9a2f739a0449fd6e7c72fb484beab8c5af3a051f (diff) | |
download | pkgsrc-c6e7cb8146b1c98ca2947fa58bc67541b4728fd8.tar.gz |
Migrate ap2-ruby to use new framework for Ruby packages.
-rw-r--r-- | www/ap2-ruby/Makefile | 49 | ||||
-rw-r--r-- | www/ap2-ruby/PLIST | 30 |
2 files changed, 52 insertions, 27 deletions
diff --git a/www/ap2-ruby/Makefile b/www/ap2-ruby/Makefile index 474a7369c06..71d05fc8fb5 100644 --- a/www/ap2-ruby/Makefile +++ b/www/ap2-ruby/Makefile @@ -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 @@ MAINTAINER= rasputin@idoru.mine.nu HOMEPAGE= http://www.modruby.net/ COMMENT= Embedded Ruby for Apache2 (development version) -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" +CONFLICTS+= ap-ruby* + +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 @@ 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 > ${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 --git a/www/ap2-ruby/PLIST b/www/ap2-ruby/PLIST index 8ae03c8e118..a1f3e20f207 100644 --- a/www/ap2-ruby/PLIST +++ b/www/ap2-ruby/PLIST @@ -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 |