Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/chmsee/PKGBUILD
	community/darkstat/PKGBUILD
	community/dbmail/PKGBUILD
	community/dvdisaster/PKGBUILD
	community/epic4/PKGBUILD
	community/fb-client/PKGBUILD
	community/fcrackzip/PKGBUILD
	community/fdupes/PKGBUILD
	community/flobopuyo/PKGBUILD
	community/intel-tbb/PKGBUILD
	community/openbsd-netcat/PKGBUILD
	community/sunpinyin/PKGBUILD
	community/tinc/PKGBUILD
	community/uudeview/PKGBUILD
	community/zathura/PKGBUILD
	core/libedit/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	core/openssl/PKGBUILD
	core/util-linux/PKGBUILD
	extra/lua/PKGBUILD
	gnome-unstable/pidgin/PKGBUILD
	testing/openssl/PKGBUILD
	testing/sudo/PKGBUILD
	testing/udev/PKGBUILD
	testing/util-linux/PKGBUILD

2 files changed, 15 insertions, 14 deletions

diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD
index a1181cbb5..220375dc6 100644
--- a/community/passenger/PKGBUILD
+++ b/community/passenger/PKGBUILD
@@ -1,30 +1,31 @@
-# $Id: PKGBUILD 59679 2011-11-29 10:41:58Z spupykin $
+# $Id: PKGBUILD 67809 2012-03-14 13:50:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=passenger
 pkgver=3.0.11
-pkgrel=1
+pkgrel=2
 _pkgdlnr=75548
 pkgdesc="mod_rails passenger"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.modrails.com"
 license=('GPL')
 depends=('apache' 'ruby' 'ruby-rack' 'curl')
-install=$pkgname.install
+install=passenger.install
 options=('!emptydirs')
-source=(http://rubyforge.org/frs/download.php/${_pkgdlnr}/$pkgname-$pkgver.tar.gz
-	$pkgname-install-apache2-module.patch)
+source=(http://rubyforge.org/frs/download.php/${_pkgdlnr}/passenger-$pkgver.tar.gz
+	passenger-install-apache2-module.patch)
 md5sums=('9186d799e065ccad803cbc0289954f40'
          '3d04eba10c55a955c378678d5df8497f')
 
 build(){
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/passenger-$pkgver
   patch bin/passenger-install-apache2-module <$srcdir/passenger-install-apache2-module.patch
   ./bin/passenger-install-apache2-module
-  mkdir -p $pkgdir/etc/httpd/modules/
-  cp ext/apache2/mod_passenger.so $pkgdir/etc/httpd/modules/mod_passenger.so
+  rake nginx
+
   mkdir -p $pkgdir/usr/lib/passenger/
   cp -R * $pkgdir/usr/lib/passenger/
-  mkdir -p $pkgdir/usr/lib/httpd
-  mv $pkgdir/etc/httpd/modules $pkgdir/usr/lib/httpd/modules
+
+  mkdir -p $pkgdir/usr/lib/httpd/modules
+  ln -sf /usr/lib/passenger/ext/apache2/mod_passenger.so $pkgdir/usr/lib/httpd/modules/mod_passenger.so
 }
diff --git a/community/passenger/passenger.install b/community/passenger/passenger.install
index 9c683e7cd..6faaab1b6 100644
--- a/community/passenger/passenger.install
+++ b/community/passenger/passenger.install
@@ -1,9 +1,9 @@
 post_install() {
 	echo "Please edit your Apache configuration file, and add these lines:"
 	echo ""
-	echo "LoadModule passenger_module /var/aur/passenger3/src/passenger-3.0.0/ext/apache2/mod_passenger.so"
-	echo "PassengerRoot /var/aur/passenger3/src/passenger-3.0.0"
-	echo "PassengerRuby /opt/ruby1.8/bin/ruby"
+	echo "LoadModule passenger_module /usr/lib/httpd/modules/mod_passenger.so"
+	echo "PassengerRoot /usr/lib/passenger"
+	echo "PassengerRuby /usr/bin/ruby"
 	echo ""
 	echo "After you restart Apache, you are ready to deploy any number of Ruby on Rails"
 	echo "applications on Apache, without any further Ruby on Rails-specific"
@@ -28,5 +28,5 @@ post_install() {
 	echo "And that's it! You may also want to check the Users Guide for security and"
 	echo "optimization tips, troubleshooting and other useful information:"
 	echo ""
-	echo "/var/aur/passenger3/src/passenger-3.0.0/doc/Users guide Apache.html"
+	echo "/usr/lib/passenger/doc/Users guide Apache.html"
 }