cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update ruby-passenger to 3.0.0. Switch the directory name from

Browse Source 
phusion_passenger to phusion-passenger, since that's the name used
by upstream. Also tested by Pierre-Yves Ritschard.

OK landry@
This commit is contained in:
jeremy 2010-11-08 23:47:37 +00:00
parent 5139c6b80c
commit f1b7fef9c5
20 changed files with 2790 additions and 647 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
www/ruby-passenger/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.9 2010/10/26 21:42:14 jeremy Exp $
# $OpenBSD: Makefile,v 1.10 2010/11/08 23:47:37 jeremy Exp $
SHARED_ONLY = Yes
COMMENT = Nginx module for deploying Ruby applications
DISTNAME = passenger-2.2.5
DISTNAME = passenger-3.0.0
PKGNAME = ruby-${DISTNAME}
REVISION = 4
CATEGORIES = www
HOMEPAGE = http://www.modrails.com/
@ -44,13 +43,11 @@ do-build:
do-install:
cd ${WRKBUILD}/pkg/fakeroot/usr/local && \
tar -cf - * | tar -C ${PREFIX} -xf -
rm -f ${PREFIX}/bin/passenger-install-apache2-module
rm -f ${PREFIX}/bin/passenger-make-enterprisey
rm -f ${PREFIX}/bin/passenger-install-nginx-module
${INSTALL_DATA_DIR} ${PREFIX}/lib/phusion_passenger/ext
${INSTALL_DATA_DIR} ${PREFIX}/lib/phusion-passenger/ext
cd ${WRKBUILD}/ext && tar -cf - common nginx | \
tar -C ${PREFIX}/lib/phusion_passenger/ext -xf -
find ${PREFIX}/lib/phusion_passenger/ext -name '*.orig' | \
tar -C ${PREFIX}/lib/phusion-passenger/ext -xf -
find ${PREFIX}/lib/phusion-passenger/ext -name '*.orig' | \
xargs -r rm -f
${INSTALL_DATA_DIR} ${PREFIX}/share/nginx
${INSTALL_DATA} ${FILESDIR}/*.sample ${PREFIX}/share/nginx

10
www/ruby-passenger/distinfo
View File

@ -1,5 +1,5 @@
MD5 (passenger-2.2.5.tar.gz) = k4OLhCzgoMZdfG75zlnEHw==
RMD160 (passenger-2.2.5.tar.gz) = qYFtaWrZQIaFJfbPsC6QA9af+1Q=
SHA1 (passenger-2.2.5.tar.gz) = qm5F+gI9Ys4vX3jvujov90LQB6w=
SHA256 (passenger-2.2.5.tar.gz) = sJCBfoQMe34NOcXuopLIfUKLHlbynvSheHBdtCyewyY=
SIZE (passenger-2.2.5.tar.gz) = 1799698
MD5 (passenger-3.0.0.tar.gz) = Li4KCtwqv/3Q+cPBjkdGzw==
RMD160 (passenger-3.0.0.tar.gz) = w3k0a2Jdbmk4+OgcMdf3UklyqHg=
SHA1 (passenger-3.0.0.tar.gz) = wHbeTXOTRfpwXzUCT1GvD3H0CPc=
SHA256 (passenger-3.0.0.tar.gz) = bnafs8KUrUNwV0OOOJgrFK/wI8H5FKsoG/0j/NhoGlk=
SIZE (passenger-3.0.0.tar.gz) = 3048705

4
www/ruby-passenger/files/nginx-passenger.conf.sample
View File

@ -1,4 +1,4 @@
# $OpenBSD: nginx-passenger.conf.sample,v 1.1.1.1 2009/08/20 20:36:13 bernd Exp $
# $OpenBSD: nginx-passenger.conf.sample,v 1.2 2010/11/08 23:47:37 jeremy Exp $
#
# Example nginx.conf for Phusion Passenger
#
@ -29,7 +29,7 @@ http {
# Some more
passenger_log_level 1;
passenger_ruby /usr/local/bin/ruby;
passenger_ruby /usr/local/bin/ruby18;
server {
listen 80;

59
www/ruby-passenger/patches/patch-Rakefile
View File

@ -1,59 +0,0 @@
$OpenBSD: patch-Rakefile,v 1.2 2009/09/01 17:45:43 bernd Exp $
--- Rakefile.orig Tue Sep 1 10:51:22 2009
+++ Rakefile Tue Sep 1 19:26:08 2009
@@ -36,13 +36,13 @@ OPTIMIZE = ["yes", "on", "true"].include?(ENV['OPTIMIZ
include PlatformInfo
-CC = "gcc"
-CXX = "g++"
+CC = ENV['CC']
+CXX = ENV['CXX']
LIBEXT = PlatformInfo.library_extension
if OPTIMIZE
- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS"
+ OPTIMIZATION_FLAGS = "#{ENV['CFLAGS']} -DBOOST_DISABLE_ASSERTS"
else
- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS"
+ OPTIMIZATION_FLAGS = "#{ENV['CFLAGS']} #{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS"
end
# Extra compiler flags that should always be passed to the C/C++ compiler.
@@ -736,7 +736,7 @@ Rake::Task['package:force'].prerequisites.unshift(:doc
task :clobber => :'package:clean'
desc "Create a fakeroot, useful for building native packages"
-task :fakeroot => [:apache2, :native_support, :doc] do
+task :fakeroot => [:native_support, :doc] do
require 'rbconfig'
include Config
fakeroot = "pkg/fakeroot"
@@ -744,11 +744,11 @@ task :fakeroot => [:apache2, :native_support, :doc] do
# We don't use CONFIG['archdir'] and the like because we want
# the files to be installed to /usr, and the Ruby interpreter
# on the packaging machine might be in /usr/local.
- libdir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}"
+ libdir = "#{fakeroot}/usr/local/lib/ruby/#{CONFIG['ruby_version']}"
extdir = "#{libdir}/#{CONFIG['arch']}"
- bindir = "#{fakeroot}/usr/bin"
- docdir = "#{fakeroot}/usr/share/doc/phusion_passenger"
- libexecdir = "#{fakeroot}/usr/lib/phusion_passenger"
+ bindir = "#{fakeroot}/usr/local/bin"
+ docdir = "#{fakeroot}/usr/local/share/doc/phusion_passenger"
+ libexecdir = "#{fakeroot}/usr/local/lib/phusion_passenger"
sh "rm -rf #{fakeroot}"
sh "mkdir -p #{fakeroot}"
@@ -763,9 +763,9 @@ task :fakeroot => [:apache2, :native_support, :doc] do
sh "cp bin/* #{bindir}/"
sh "mkdir -p #{libexecdir}"
- sh "cp ext/apache2/mod_passenger.so #{libexecdir}/"
- sh "mv #{fakeroot}/usr/bin/passenger-spawn-server #{libexecdir}/"
- sh "cp ext/apache2/ApplicationPoolServerExecutable #{libexecdir}/"
+# sh "cp ext/apache2/mod_passenger.so #{libexecdir}/"
+ sh "mv #{fakeroot}/usr/local/bin/passenger-spawn-server #{libexecdir}/"
+# sh "cp ext/apache2/ApplicationPoolServerExecutable #{libexecdir}/"
sh "mkdir -p #{docdir}"
sh "cp -R doc/* #{docdir}/"

15
www/ruby-passenger/patches/patch-build_config_rb Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-build_config_rb,v 1.1 2010/11/08 23:47:37 jeremy Exp $
--- build/config.rb.orig Wed Oct 27 15:09:05 2010
+++ build/config.rb Wed Oct 27 15:10:41 2010
@@ -18,9 +18,9 @@ OPTIMIZE = boolean_option("OPTIMIZE")
CC = string_option("CC", "gcc")
CXX = string_option("CXX", "g++")
if OPTIMIZE
- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS".strip
+ OPTIMIZATION_FLAGS = "#{ENV['CFLAGS']} -DBOOST_DISABLE_ASSERTS".strip
else
- OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS".strip
+ OPTIMIZATION_FLAGS = "#{ENV['CFLAGS']} #{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS".strip
end
# Extra compiler flags that should always be passed to the C/C++ compiler.

12
www/ruby-passenger/patches/patch-build_documentation_rb Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-build_documentation_rb,v 1.1 2010/11/08 23:47:37 jeremy Exp $
--- build/documentation.rb.orig Sun Nov 7 19:51:08 2010
+++ build/documentation.rb Sun Nov 7 19:51:47 2010
@@ -29,7 +29,7 @@ task :doc => Packaging::ASCII_DOCS
Packaging::ASCII_DOCS.each do |target|
source = target.sub(/\.html$/, '.txt')
file target => [source] + Dir["doc/users_guide_snippets/**/*"] do
- if PlatformInfo.asciidoc
+ if false
if target =~ /apache/i
type = "-a apache"
elsif target =~ /nginx/i

44
www/ruby-passenger/patches/patch-build_packaging_rb Normal file
View File

@ -0,0 +1,44 @@
$OpenBSD: patch-build_packaging_rb,v 1.1 2010/11/08 23:47:37 jeremy Exp $
--- build/packaging.rb.orig Wed Oct 27 15:11:05 2010
+++ build/packaging.rb Wed Oct 27 15:20:48 2010
@@ -83,7 +83,7 @@ Rake::Task['package:force'].prerequisites.unshift(:doc
task :clobber => :'package:clean'
desc "Create a fakeroot, useful for building native packages"
-task :fakeroot => [:apache2, :nginx] + Packaging::ASCII_DOCS do
+task :fakeroot => [:nginx] + Packaging::ASCII_DOCS do
require 'rbconfig'
require 'fileutils'
include Config
@@ -92,17 +92,17 @@ task :fakeroot => [:apache2, :nginx] + Packaging::ASCI
# We don't use CONFIG['archdir'] and the like because we want
# the files to be installed to /usr, and the Ruby interpreter
# on the packaging machine might be in /usr/local.
- fake_libdir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}"
- fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
+ fake_libdir = "#{fakeroot}/usr/local/lib/ruby/#{CONFIG['ruby_version']}"
+ fake_native_support_dir = "#{fakeroot}/usr/local/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
fake_agents_dir = "#{fakeroot}#{NATIVELY_PACKAGED_AGENTS_DIR}"
fake_helper_scripts_dir = "#{fakeroot}#{NATIVELY_PACKAGED_HELPER_SCRIPTS_DIR}"
fake_docdir = "#{fakeroot}#{NATIVELY_PACKAGED_DOCDIR}"
- fake_bindir = "#{fakeroot}/usr/bin"
- fake_sbindir = "#{fakeroot}/usr/sbin"
+ fake_bindir = "#{fakeroot}/usr/local/bin"
+ fake_sbindir = "#{fakeroot}/usr/local/sbin"
fake_source_root = "#{fakeroot}#{NATIVELY_PACKAGED_SOURCE_ROOT}"
fake_apache2_module = "#{fakeroot}#{NATIVELY_PACKAGED_APACHE2_MODULE}"
fake_apache2_module_dir = File.dirname(fake_apache2_module)
- fake_certificates_dir = "#{fakeroot}/usr/share/phusion-passenger/certificates"
+ fake_certificates_dir = "#{fakeroot}/usr/local/share/phusion-passenger/certificates"
sh "rm -rf #{fakeroot}"
sh "mkdir -p #{fakeroot}"
@@ -140,8 +140,6 @@ task :fakeroot => [:apache2, :nginx] + Packaging::ASCI
sh "cp bin/#{exe} #{fake_sbindir}/"
end
- sh "mkdir -p #{fake_apache2_module_dir}"
- sh "cp #{APACHE2_MODULE} #{fake_apache2_module_dir}/"
sh "mkdir -p #{fake_certificates_dir}"
sh "cp misc/*.crt #{fake_certificates_dir}/"

12
www/ruby-passenger/patches/patch-ext_boost_detail_atomic_count_hpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ext_boost_detail_atomic_count_hpp,v 1.1 2010/07/31 10:18:06 kettenis Exp $
--- ext/boost/detail/atomic_count.hpp.orig Sat Dec 20 18:19:18 2008
+++ ext/boost/detail/atomic_count.hpp Fri Jul 30 18:07:15 2010
@@ -101,7 +101,7 @@ typedef long atomic_count;
# include <boost/detail/atomic_count_win32.hpp>
-#elif defined( __GNUC__ ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 )
+#elif defined( __GNUC__ ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined( __hppa )
# include <boost/detail/atomic_count_sync.hpp>

12
www/ruby-passenger/patches/patch-ext_boost_detail_sp_counted_base_hpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ext_boost_detail_sp_counted_base_hpp,v 1.1 2010/07/31 10:18:06 kettenis Exp $
--- ext/boost/detail/sp_counted_base.hpp.orig Thu Mar 12 13:55:49 2009
+++ ext/boost/detail/sp_counted_base.hpp Fri Jul 30 18:07:28 2010
@@ -55,7 +55,7 @@
# include <boost/detail/sp_counted_base_gcc_sparc.hpp>
-#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 )
+#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined( __hppa )
# include <boost/detail/sp_counted_base_sync.hpp>

12
www/ruby-passenger/patches/patch-ext_boost_smart_ptr_detail_sp_has_sync_hpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-ext_boost_smart_ptr_detail_sp_has_sync_hpp,v 1.1 2010/11/08 23:47:37 jeremy Exp $
--- ext/boost/smart_ptr/detail/sp_has_sync.hpp.orig Wed Oct 27 15:23:51 2010
+++ ext/boost/smart_ptr/detail/sp_has_sync.hpp Wed Oct 27 15:24:15 2010
@@ -20,7 +20,7 @@
// are available.
//
-#if defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 )
+#if defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined( __hppa )
#define BOOST_SP_HAS_SYNC

12
www/ruby-passenger/patches/patch-ext_common_AgentBase_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-ext_common_AgentBase_cpp,v 1.1 2010/11/08 23:47:37 jeremy Exp $
--- ext/common/AgentBase.cpp.orig Wed Oct 27 15:44:19 2010
+++ ext/common/AgentBase.cpp Wed Oct 27 15:44:34 2010
@@ -132,8 +132,6 @@ appendSignalReason(char *buf, siginfo_t *info) {
#endif
SI_CODE_HANDLER(SI_QUEUE);
SI_CODE_HANDLER(SI_TIMER);
- SI_CODE_HANDLER(SI_ASYNCIO);
- SI_CODE_HANDLER(SI_MESGQ);
#ifdef SI_SIGIO
SI_CODE_HANDLER(SI_SIGIO);
#endif

39
www/ruby-passenger/patches/patch-ext_common_ResourceLocator_h Normal file
View File

@ -0,0 +1,39 @@
$OpenBSD: patch-ext_common_ResourceLocator_h,v 1.1 2010/11/08 23:47:37 jeremy Exp $
--- ext/common/ResourceLocator.h.orig Wed Oct 27 16:15:28 2010
+++ ext/common/ResourceLocator.h Wed Oct 27 16:16:13 2010
@@ -44,7 +44,7 @@ class ResourceLocator { (public)
string getSourceRoot() const {
if (nativelyPackaged) {
- return "/usr/lib/phusion-passenger/source";
+ return "/usr/local/lib/phusion-passenger/source";
} else {
return root;
}
@@ -52,7 +52,7 @@ class ResourceLocator { (public)
string getAgentsDir() const {
if (nativelyPackaged) {
- return "/usr/lib/phusion-passenger/agents";
+ return "/usr/local/lib/phusion-passenger/agents";
} else {
return root + "/agents";
}
@@ -60,7 +60,7 @@ class ResourceLocator { (public)
string getHelperScriptsDir() const {
if (nativelyPackaged) {
- return "/usr/share/phusion-passenger/helper-scripts";
+ return "/usr/local/lib/phusion-passenger/bin";
} else {
return root + "/helper-scripts";
}
@@ -72,7 +72,7 @@ class ResourceLocator { (public)
string getCertificatesDir() const {
if (nativelyPackaged) {
- return "/usr/share/phusion-passenger/certificates";
+ return "/usr/local/share/phusion-passenger/certificates";
} else {
return root + "/misc";
}

12
www/ruby-passenger/patches/patch-ext_nginx_HelperServer_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ext_nginx_HelperServer_cpp,v 1.1.1.1 2009/08/20 20:36:12 bernd Exp $
--- ext/nginx/HelperServer.cpp.orig Wed Jun 10 10:12:29 2009
+++ ext/nginx/HelperServer.cpp Tue Jun 23 23:05:05 2009
@@ -709,7 +709,7 @@ class Server { (public)
}
pool = ptr(new StandardApplicationPool(
- rootDir + "/bin/passenger-spawn-server",
+ rootDir + "/passenger-spawn-server",
"", ruby
));
pool->setMax(maxPoolSize);

24
www/ruby-passenger/patches/patch-ext_nginx_StaticContentHandler_c
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-ext_nginx_StaticContentHandler_c,v 1.1 2010/06/21 03:56:02 william Exp $
Fix build with nginx->=0.7.66
from upstream commit e973b93e8998edbbb4c6
--- ext/nginx/StaticContentHandler.c.orig Sat Jun 19 21:41:10 2010
+++ ext/nginx/StaticContentHandler.c Sat Jun 19 21:46:41 2010
@@ -66,9 +66,12 @@ passenger_static_content_handler(ngx_http_request_t *r
return NGX_DECLINED;
}
- if (r->zero_in_uri) {
- return NGX_DECLINED;
- }
+ #if (PASSENGER_NGINX_MINOR_VERSION == 8 && PASSENGER_NGINX_MICRO_VERSION < 38 ) || \
+ (PASSENGER_NGINX_MINOR_VERSION == 7 && PASSENGER_NGINX_MICRO_VERSION < 66)
+ if (r->zero_in_uri) {
+ return NGX_DECLINED;
+ }
+ #endif
log = r->connection->log;

18
www/ruby-passenger/patches/patch-ext_nginx_config
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-ext_nginx_config,v 1.1.1.1 2009/08/20 20:36:12 bernd Exp $
--- ext/nginx/config.orig Sat May 23 11:02:29 2009
+++ ext/nginx/config Tue Jun 23 23:06:13 2009
@@ -25,7 +25,7 @@ NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
$OpenBSD: patch-ext_nginx_config,v 1.2 2010/11/08 23:47:37 jeremy Exp $
--- ext/nginx/config.orig Wed Oct 27 15:31:20 2010
+++ ext/nginx/config Wed Oct 27 15:31:28 2010
@@ -37,7 +37,7 @@ NGX_ADDON_DEPS="$NGX_ADDON_DEPS \
CORE_LIBS="$CORE_LIBS \
${ngx_addon_dir}/libpassenger_common.a \
${ngx_addon_dir}/libboost_oxt.a \
${ngx_addon_dir}/../common/libpassenger_common.a \
${ngx_addon_dir}/../common/libboost_oxt.a \
- -lstdc++ -lpthread"
+ -lstdc++ -pthread"
if test x`uname` = xOpenBSD; then
CORE_LIBS="$CORE_LIBS -lm"
fi
nginx_version=`grep 'NGINX_VERSION ' src/core/nginx.h | awk '{ print $3 }' | sed 's/"//g'`

19
www/ruby-passenger/patches/patch-lib_phusion_passenger_packaging_rb Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-lib_phusion_passenger_packaging_rb,v 1.1 2010/11/08 23:47:37 jeremy Exp $
--- lib/phusion_passenger/packaging.rb.orig Wed Oct 27 15:19:07 2010
+++ lib/phusion_passenger/packaging.rb Wed Oct 27 15:19:21 2010
@@ -35,7 +35,6 @@ module Packaging
USER_EXECUTABLES = [
'passenger',
- 'passenger-install-apache2-module',
'passenger-install-nginx-module',
'passenger-config',
'passenger-stress-test'
@@ -44,7 +43,6 @@ module Packaging
SUPER_USER_EXECUTABLES = [
'passenger-status',
'passenger-memory-stats',
- 'passenger-make-enterprisey'
]
# A list of globs which match all files that should be packaged

12
www/ruby-passenger/patches/patch-lib_phusion_passenger_platform_info_compiler_rb Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_phusion_passenger_platform_info_compiler_rb,v 1.1 2010/11/08 23:47:37 jeremy Exp $
--- lib/phusion_passenger/platform_info/compiler.rb.orig Wed Oct 27 15:34:10 2010
+++ lib/phusion_passenger/platform_info/compiler.rb Wed Oct 27 15:34:16 2010
@@ -149,6 +149,8 @@ module PlatformInfo
def self.portability_ldflags
if RUBY_PLATFORM =~ /solaris/
return '-lxnet -lrt -lsocket -lnsl -lpthread'
+ elsif RUBY_PLATFORM =~ /openbsd/
+ return '-pthread'
else
return '-lpthread'
end

12
www/ruby-passenger/patches/patch-lib_phusion_passenger_platform_info_rb
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-lib_phusion_passenger_platform_info_rb,v 1.2 2009/09/01 17:45:43 bernd Exp $
--- lib/phusion_passenger/platform_info.rb.orig Mon Aug 31 15:39:27 2009
+++ lib/phusion_passenger/platform_info.rb Tue Sep 1 19:26:08 2009
@@ -361,6 +361,8 @@ public
def self.portability_ldflags
if RUBY_PLATFORM =~ /solaris/
return '-lxnet -lrt -lsocket -lnsl -lpthread'
+ elsif RUBY_PLATFORM =~ /openbsd/
+ return '-pthread'
else
return '-lpthread'
end

27
www/ruby-passenger/patches/patch-lib_phusion_passenger_rb Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-lib_phusion_passenger_rb,v 1.1 2010/11/08 23:47:37 jeremy Exp $
--- lib/phusion_passenger.rb.orig Wed Oct 27 15:14:30 2010
+++ lib/phusion_passenger.rb Wed Oct 27 15:28:20 2010
@@ -46,10 +46,10 @@ module PhusionPassenger
return @natively_packaged
end
- NATIVELY_PACKAGED_SOURCE_ROOT = "/usr/share/phusion-passenger/source"
- NATIVELY_PACKAGED_DOCDIR = "/usr/share/doc/phusion-passenger"
- NATIVELY_PACKAGED_AGENTS_DIR = "/usr/lib/phusion-passenger/agents"
- NATIVELY_PACKAGED_HELPER_SCRIPTS_DIR = "/usr/share/phusion-passenger/helper-scripts"
+ NATIVELY_PACKAGED_SOURCE_ROOT = "/usr/local/share/phusion-passenger/source"
+ NATIVELY_PACKAGED_DOCDIR = "/usr/local/share/doc/phusion-passenger"
+ NATIVELY_PACKAGED_AGENTS_DIR = "/usr/local/lib/phusion-passenger/agents"
+ NATIVELY_PACKAGED_HELPER_SCRIPTS_DIR = "/usr/local/lib/phusion-passenger/bin"
NATIVELY_PACKAGED_APACHE2_MODULE = "/usr/lib/apache2/modules/mod_passenger.so"
# Directory containing the Phusion Passenger Ruby libraries.
@@ -62,7 +62,7 @@ module PhusionPassenger
LOCAL_DIR = ".passenger"
# Directories in which to look for plugins.
- PLUGIN_DIRS = ["/usr/share/phusion-passenger/plugins",
+ PLUGIN_DIRS = [
"/usr/local/share/phusion-passenger/plugins",
"~/#{LOCAL_DIR}/plugins"]

3069
www/ruby-passenger/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff