diff options
author | taca <taca@pkgsrc.org> | 2010-09-10 10:50:27 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2010-09-10 10:50:27 +0000 |
commit | 42fd5780f752d9d1ef1e9e5b1727c32c2f7a7b68 (patch) | |
tree | b9574eea9a975c0175f04eb4d7fd1a22ee21a922 /www | |
parent | 764765700f010f3ecd78595c7be875f0048170da (diff) | |
download | pkgsrc-42fd5780f752d9d1ef1e9e5b1727c32c2f7a7b68.tar.gz |
Update www/ap-ruby package to 1.3.0.
* Remove RUBY_HAS_ARCHLIB.
* add comment to patches.
Main changes from mod_ruby-1.3.0
* supported Ruby 1.8.7.
* supported Ruby 1.9 experimentally.
Diffstat (limited to 'www')
-rw-r--r-- | www/ap-ruby/Makefile | 6 | ||||
-rw-r--r-- | www/ap-ruby/distinfo | 12 | ||||
-rw-r--r-- | www/ap-ruby/patches/patch-aa | 15 | ||||
-rw-r--r-- | www/ap-ruby/patches/patch-ac | 4 |
4 files changed, 20 insertions, 17 deletions
diff --git a/www/ap-ruby/Makefile b/www/ap-ruby/Makefile index 889b899f329..72c66da8374 100644 --- a/www/ap-ruby/Makefile +++ b/www/ap-ruby/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.34 2008/06/19 15:02:17 taca Exp $ +# $NetBSD: Makefile,v 1.35 2010/09/10 10:50:27 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/ @@ -13,11 +12,10 @@ COMMENT= Apache module that embeds Ruby interpreter within PKG_DESTDIR_SUPPORT= user-destdir -RUBY_HAS_ARCHLIB= yes APACHE_MODULE= yes PKG_APACHE_ACCEPTED= apache13 apache2 apache22 USE_APR= yes -VERSION= 1.2.6 +VERSION= 1.3.0 HAS_CONFIGURE= yes INSTALL_TARGET= site-install INSTALLATION_DIRS= ${RUBY_DOC}/mod_ruby/html ${RUBY_EG}/mod_ruby diff --git a/www/ap-ruby/distinfo b/www/ap-ruby/distinfo index b834f9447b1..0d138e49eb9 100644 --- a/www/ap-ruby/distinfo +++ b/www/ap-ruby/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.10 2008/06/19 15:02:17 taca Exp $ +$NetBSD: distinfo,v 1.11 2010/09/10 10:50:27 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 +SHA1 (mod_ruby-1.3.0.tar.gz) = 967c4efa1ec3f8b0d9870db8665295ba6e019fff +RMD160 (mod_ruby-1.3.0.tar.gz) = a87f2a54a0b501e27efffdaab88b5ad4e6abd413 +Size (mod_ruby-1.3.0.tar.gz) = 114246 bytes +SHA1 (patch-aa) = a00f6d5baf7c470e7143aa5ba8b6955516787f27 +SHA1 (patch-ac) = c88ef1288325717750f76e2234c631bd3d8126c5 diff --git a/www/ap-ruby/patches/patch-aa b/www/ap-ruby/patches/patch-aa index ea67e5961a4..7b561eb11e0 100644 --- a/www/ap-ruby/patches/patch-aa +++ b/www/ap-ruby/patches/patch-aa @@ -1,14 +1,17 @@ -$NetBSD: patch-aa,v 1.1 2008/06/19 15:02:17 taca Exp $ +$NetBSD: patch-aa,v 1.2 2010/09/10 10:50:27 taca Exp $ ---- configure.rb.orig 2006-05-22 22:23:36.000000000 +0000 +* Use vendor directory. +* $XLDFLAGS might be nil, so care for it. + +--- configure.rb.orig 2008-11-08 04:15:36.000000000 +0000 +++ configure.rb @@ -1,4 +1,4 @@ -#!/usr/bin/env ruby -+#!/usr/pkg/bin/ruby18 ++#!/usr/pkg/bin/ruby # Generated automatically using autoconf.rb version 0.2.4 -@@ -217,6 +217,7 @@ $bindir = CONFIG["bindir"].sub(prefix, " +@@ -222,6 +222,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, '') @@ -16,10 +19,10 @@ $NetBSD: patch-aa,v 1.1 2008/06/19 15:02:17 taca Exp $ $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/ =~ +@@ -329,11 +330,15 @@ if $LDFLAGS.to_s.empty? && /mswin32/ =~ end $LIBS = CONFIG["LIBS"] - $XLDFLAGS = CONFIG["XLDFLAGS"] + $XLDFLAGS = CONFIG["XLDFLAGS"].to_s -$XLDFLAGS.gsub!(/-L\./, "") -if /mswin32/ !~ RUBY_PLATFORM - $XLDFLAGS += " -L$(libdir)" diff --git a/www/ap-ruby/patches/patch-ac b/www/ap-ruby/patches/patch-ac index 9ce96379b8b..e9c34a36f3a 100644 --- a/www/ap-ruby/patches/patch-ac +++ b/www/ap-ruby/patches/patch-ac @@ -1,4 +1,6 @@ -$NetBSD: patch-ac,v 1.1 2004/11/28 15:43:32 taca Exp $ +$NetBSD: patch-ac,v 1.2 2010/09/10 10:50:27 taca Exp $ + +cast before pass to tolower(). --- apache_request.c.orig 2004-09-24 03:43:18.000000000 +0900 +++ apache_request.c |