summaryrefslogtreecommitdiff
path: root/www/mod_perl2/files
diff options
context:
space:
mode:
authorMarcelo Araujo <araujo@FreeBSD.org>2008-06-07 15:31:21 +0000
committerMarcelo Araujo <araujo@FreeBSD.org>2008-06-07 15:31:21 +0000
commit748c043793a9e15f2d96852201594ac388d904ad (patch)
tree8da6b1a9165e2121ee55846cbb5ddf5ab194e257 /www/mod_perl2/files
parentAdd missing dependency on www/rubygem-rails-app-installer. (diff)
- Update to 2.0.4.
Changes: http://perl.apache.org/dist/mod_perl-2.0-current/Changes PR: ports/123535 Submitted by: Philip M. Gollucci <pgollucci@p6m7g8.com> (maintainer) Reworked by: araujo (myself)
Notes
Notes: svn path=/head/; revision=214463
Diffstat (limited to 'www/mod_perl2/files')
-rw-r--r--www/mod_perl2/files/patch-RegistryCooker.pm12
-rw-r--r--www/mod_perl2/files/patch-lib__ModPerl__BuildMM.pm11
-rw-r--r--www/mod_perl2/files/patch-src__modules__perl__modperl_apache_compat.h10
-rw-r--r--www/mod_perl2/files/patch-xs-APR-APR-Makefile.PL11
4 files changed, 21 insertions, 23 deletions
diff --git a/www/mod_perl2/files/patch-RegistryCooker.pm b/www/mod_perl2/files/patch-RegistryCooker.pm
deleted file mode 100644
index cf86c8a04306..000000000000
--- a/www/mod_perl2/files/patch-RegistryCooker.pm
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp ModPerl-Registry/lib/ModPerl/RegistryCooker.pm.orig ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
---- ModPerl-Registry/lib/ModPerl/RegistryCooker.pm.orig 2006-11-19 18:31:41.000000000 -0500
-+++ ModPerl-Registry/lib/ModPerl/RegistryCooker.pm 2007-03-30 19:08:05.000000000 -0400
-@@ -337,7 +337,7 @@ sub namespace_from_uri {
- my $self = shift;
-
- my $path_info = $self->{REQ}->path_info;
-- my $script_name = $path_info && $self->{URI} =~ /$path_info$/
-+ my $script_name = $path_info && $self->{URI} =~ /\Q$path_info\E$/
- ? substr($self->{URI}, 0, length($self->{URI}) - length($path_info))
- : $self->{URI};
-
diff --git a/www/mod_perl2/files/patch-lib__ModPerl__BuildMM.pm b/www/mod_perl2/files/patch-lib__ModPerl__BuildMM.pm
new file mode 100644
index 000000000000..2f9d33371448
--- /dev/null
+++ b/www/mod_perl2/files/patch-lib__ModPerl__BuildMM.pm
@@ -0,0 +1,11 @@
+--- ./lib/ModPerl/BuildMM.pm.orig 2008-05-08 13:00:34.000000000 -0400
++++ ./lib/ModPerl/BuildMM.pm 2008-05-08 13:01:03.000000000 -0400
+@@ -359,7 +359,7 @@
+
+ $apr_config ||= $build->get_apr_config();
+
+- if ($path =~ m/(Thread|Global)Mutex/) {
++ if ($path =~ m/(Thread|Global)(Mutex|RWLock)/) {
+ return unless $apr_config->{HAS_THREADS};
+ }
+
diff --git a/www/mod_perl2/files/patch-src__modules__perl__modperl_apache_compat.h b/www/mod_perl2/files/patch-src__modules__perl__modperl_apache_compat.h
new file mode 100644
index 000000000000..bf2215abb044
--- /dev/null
+++ b/www/mod_perl2/files/patch-src__modules__perl__modperl_apache_compat.h
@@ -0,0 +1,10 @@
+--- ./src/modules/perl/modperl_apache_compat.h.orig 2008-05-08 12:59:16.000000000 -0400
++++ ./src/modules/perl/modperl_apache_compat.h 2008-05-08 12:59:30.000000000 -0400
+@@ -22,6 +22,7 @@
+ #if !APR_HAS_THREADS
+ typedef unsigned long apr_os_thread_t;
+ typedef void * apr_thread_mutex_t;
++typedef void * apr_thread_rwlock_t;
+ #endif
+
+ /* back compat adjustements for older Apache versions
diff --git a/www/mod_perl2/files/patch-xs-APR-APR-Makefile.PL b/www/mod_perl2/files/patch-xs-APR-APR-Makefile.PL
deleted file mode 100644
index 34530507ea4f..000000000000
--- a/www/mod_perl2/files/patch-xs-APR-APR-Makefile.PL
+++ /dev/null
@@ -1,11 +0,0 @@
---- xs/APR/APR/Makefile.PL.orig Sun Nov 19 15:31:02 2006
-+++ xs/APR/APR/Makefile.PL Sun Dec 3 15:30:46 2006
-@@ -15,7 +15,7 @@
-
- my %args;
-
--%args = map { split /=/, $_ } @ARGV;
-+%args = map { split /=/, $_, 2 } @ARGV;
-
- $args{NAME} = 'APR';
- $args{VERSION_FROM} = 'APR.pm';