graaff      14/08/23 06:45:00

  Added:                passenger-4.0.49-gentoo.patch
  Log:
  Version bump.
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 
0x8883FA56A308A8D7!)

Revision  Changes    Path
1.1                  www-apache/passenger/files/passenger-4.0.49-gentoo.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/files/passenger-4.0.49-gentoo.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apache/passenger/files/passenger-4.0.49-gentoo.patch?rev=1.1&content-type=text/plain

Index: passenger-4.0.49-gentoo.patch
===================================================================
--- build/packaging.rb.~1~      2013-10-27 00:00:00.000000000 +0200
+++ build/packaging.rb  2014-08-23 08:35:20.372738004 +0200
@@ -429,7 +429,7 @@
        psg_ruby_extension_source_dir = 
"#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
        psg_nginx_module_source_dir   = 
"#{fs_datadir}/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module"
 
-       fakeroot = "pkg/fakeroot"
+       fakeroot = ENV['DISTDIR']
        fake_rubylibdir = "#{fakeroot}#{psg_rubylibdir}"
        fake_nodelibdir = "#{fakeroot}#{psg_nodelibdir}"
        fake_libdir     = "#{fakeroot}#{psg_libdir}"
@@ -447,7 +447,6 @@
 
        native_packaging_method = ENV['NATIVE_PACKAGING_METHOD'] || "deb"
 
-       sh "rm -rf #{fakeroot}"
        sh "mkdir -p #{fakeroot}"
 
        # Ruby sources
@@ -532,10 +531,6 @@
                end
        end
 
-       # Apache 2 module
-       sh "mkdir -p #{File.dirname(fake_apache2_module_path)}"
-       sh "cp #{APACHE2_MODULE} #{fake_apache2_module_path}"
-
        # Ruby extension sources
        sh "mkdir -p #{fake_ruby_extension_source_dir}"
        sh "cp -R #{PhusionPassenger.ruby_extension_source_dir}/* 
#{fake_ruby_extension_source_dir}"




Reply via email to