aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorknu <knu@FreeBSD.org>2001-06-04 23:57:50 +0800
committerknu <knu@FreeBSD.org>2001-06-04 23:57:50 +0800
commit17e7d86baceffbf144e14397a4d2489bda3df532 (patch)
treebb807335f396b64b470a0c08c1443cfadcf76362
parent9f5ecce4a3836e2bb04f7993aac54f8d83469579 (diff)
downloadfreebsd-ports-gnome-17e7d86baceffbf144e14397a4d2489bda3df532.tar.gz
freebsd-ports-gnome-17e7d86baceffbf144e14397a4d2489bda3df532.tar.zst
freebsd-ports-gnome-17e7d86baceffbf144e14397a4d2489bda3df532.zip
Update to 0.8.2.
-rw-r--r--www/mod_ruby/Makefile24
-rw-r--r--www/mod_ruby/distinfo3
-rw-r--r--www/mod_ruby/files/httpd.conf.mod_ruby22
-rw-r--r--www/mod_ruby/files/patch-httpd.conf5
-rw-r--r--www/mod_ruby/pkg-plist6
5 files changed, 19 insertions, 41 deletions
diff --git a/www/mod_ruby/Makefile b/www/mod_ruby/Makefile
index 4b34ab7b1050..889261c57eea 100644
--- a/www/mod_ruby/Makefile
+++ b/www/mod_ruby/Makefile
@@ -6,41 +6,35 @@
#
PORTNAME= mod_ruby
-PORTVERSION= 0.8.1
+PORTVERSION= 0.8.2
CATEGORIES= www ruby
MASTER_SITES= http://www.modruby.net/archive/
DIST_SUBDIR= ruby
-PATCH_SITES= http://www.ruby-lang.org/~knu/
-PATCHFILES= ${DISTNAME}-2001.05.24.patch.gz
-PATCH_DIST_STRIP= -p1
-
MAINTAINER= knu@FreeBSD.org
BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13
-LIB_DEPENDS= eruby.9:${PORTSDIR}/textproc/eruby
+LIB_DEPENDS= eruby.09:${PORTSDIR}/textproc/eruby
RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13
USE_RUBY= yes
APXS= ${LOCALBASE}/sbin/apxs
-CONFIGURE_ARGS= --apxs="${APXS}" \
+CONFIGURE_ARGS= --with-apxs="${APXS}" \
--enable-eruby=yes \
- --eruby-includes="${LOCALBASE}/include" \
- --eruby-libraries="${LOCALBASE}/lib"
+ --with-eruby-includes="${LOCALBASE}/include" \
+ --with-eruby-libraries="${LOCALBASE}/lib"
+INSTALL_TARGET= site-install
-DOCS_EN= ChangeLog README.en
+DOCS_EN= COPYING ChangeLog README.en
DOCS_JA= README.ja
do-configure:
@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_FLAGS} configure.rb ${CONFIGURE_ARGS}
-do-install:
- ${APXS} -i -n ruby ${WRKSRC}/mod_ruby.so
- ${INSTALL_DATA} ${FILESDIR}/httpd.conf.${PORTNAME} ${PREFIX}/etc/apache/
- ${MKDIR} ${RUBY_SITELIBDIR}/apache
- ${INSTALL_DATA} ${WRKSRC}/ruby/apache/*.rb ${RUBY_SITELIBDIR}/apache/
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/examples/httpd.conf ${PREFIX}/etc/apache/httpd.conf.${PORTNAME}
.if !defined(NOPORTDOCS)
${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
.for f in ${DOCS_EN}
diff --git a/www/mod_ruby/distinfo b/www/mod_ruby/distinfo
index dce96019f390..f43a711ca147 100644
--- a/www/mod_ruby/distinfo
+++ b/www/mod_ruby/distinfo
@@ -1,2 +1 @@
-MD5 (ruby/mod_ruby-0.8.1.tar.gz) = 8001fe92b7b63c42071613379105aa3f
-MD5 (ruby/mod_ruby-0.8.1-2001.05.24.patch.gz) = f0c57fe7e481b49b03982c80b1904e91
+MD5 (ruby/mod_ruby-0.8.2.tar.gz) = 8360726b2d057f8dd2b1c75d80ac6dcc
diff --git a/www/mod_ruby/files/httpd.conf.mod_ruby b/www/mod_ruby/files/httpd.conf.mod_ruby
deleted file mode 100644
index 99563e984790..000000000000
--- a/www/mod_ruby/files/httpd.conf.mod_ruby
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Example configuration for the mod_ruby module
-#
-# $FreeBSD$
-#
-
-LoadModule ruby_module libexec/apache/mod_ruby.so
-
-AddModule mod_ruby.c
-
-<IfModule mod_ruby.c>
- AddHandler ruby-script .rbx
- AddType application/x-httpd-eruby .rhtml
-
- #RubyKanjiCode euc
-
-# Alias /ruby/ /usr/local/www/ruby/
-# <Location /ruby/>
-# SetHandler ruby-script
-# Options ExecCGI
-# </Location>
-</IfModule>
diff --git a/www/mod_ruby/files/patch-httpd.conf b/www/mod_ruby/files/patch-httpd.conf
new file mode 100644
index 000000000000..e32791ab2e3f
--- /dev/null
+++ b/www/mod_ruby/files/patch-httpd.conf
@@ -0,0 +1,5 @@
+--- examples/httpd.conf.orig Mon Jun 4 19:18:11 2001
++++ examples/httpd.conf Tue Jun 5 00:49:43 2001
+@@ -1 +1 @@
+-LoadModule ruby_module /usr/lib/apache/1.3/mod_ruby.so
++LoadModule ruby_module libexec/apache/mod_ruby.so
diff --git a/www/mod_ruby/pkg-plist b/www/mod_ruby/pkg-plist
index 750f6525883f..c34e076f9fef 100644
--- a/www/mod_ruby/pkg-plist
+++ b/www/mod_ruby/pkg-plist
@@ -1,9 +1,11 @@
-%%RUBY_SITELIBDIR%%/apache/eruby.rb
-%%RUBY_SITELIBDIR%%/apache/ruby.rb
+%%RUBY_SITELIBDIR%%/apache/eruby-run.rb
%%RUBY_SITELIBDIR%%/apache/rd2html.rb
+%%RUBY_SITELIBDIR%%/apache/ruby-run.rb
+%%RUBY_SITELIBDIR%%/auto-reload.rb
@dirrm %%RUBY_SITELIBDIR%%/apache
etc/apache/httpd.conf.mod_ruby
libexec/apache/mod_ruby.so
+%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/COPYING
%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ChangeLog
%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/README.en
%%PORTDOCS%%%%RUBY_DOCDIR%%/mod_ruby/ja/README.ja