summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lauer <patrick@gentoo.org>2010-02-27 21:06:58 +0000
committerPatrick Lauer <patrick@gentoo.org>2010-02-27 21:06:58 +0000
commitafefc45bd0fdde1e57feca223998f66ea94ff454 (patch)
treec0b2904aacd3c005cf5836899df07ca897e684c9
parentELF file installed under game_libdir. Fix bug #304943 (diff)
downloadgentoo-2-afefc45bd0fdde1e57feca223998f66ea94ff454.tar.gz
gentoo-2-afefc45bd0fdde1e57feca223998f66ea94ff454.tar.bz2
gentoo-2-afefc45bd0fdde1e57feca223998f66ea94ff454.zip
Rebased patch for #307109
(Portage version: 2.2_rc63/cvs/Linux x86_64)
-rw-r--r--www-apache/mod_mono/ChangeLog6
-rw-r--r--www-apache/mod_mono/files/mono26_auto_application_aspnet2.patch11
-rw-r--r--www-apache/mod_mono/mod_mono-2.6.ebuild4
3 files changed, 18 insertions, 3 deletions
diff --git a/www-apache/mod_mono/ChangeLog b/www-apache/mod_mono/ChangeLog
index 627ee604191b..616a94bfe085 100644
--- a/www-apache/mod_mono/ChangeLog
+++ b/www-apache/mod_mono/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-apache/mod_mono
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/ChangeLog,v 1.63 2010/02/27 00:22:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/ChangeLog,v 1.64 2010/02/27 21:06:57 patrick Exp $
+
+ 27 Feb 2010; Patrick Lauer <patrick@gentoo.org>
+ +files/mono26_auto_application_aspnet2.patch, mod_mono-2.6.ebuild:
+ Rebased patch for #307109
*mod_mono-2.6 (27 Feb 2010)
diff --git a/www-apache/mod_mono/files/mono26_auto_application_aspnet2.patch b/www-apache/mod_mono/files/mono26_auto_application_aspnet2.patch
new file mode 100644
index 000000000000..a04e2efe56c7
--- /dev/null
+++ b/www-apache/mod_mono/files/mono26_auto_application_aspnet2.patch
@@ -0,0 +1,11 @@
+--- src/mod_mono.h 2009-09-25 16:01:20.000000000 +0000
++++ src/mod_mono.h.new 2010-02-27 21:00:27.000000000 +0000
+@@ -89,7 +89,7 @@
+ #define DIRECTORY_SEPARATOR "/"
+ #endif
+
+-#define MODMONO_SERVER_PATH MONO_PREFIX "/bin/mod-mono-server"
++#define MODMONO_SERVER_PATH MONO_PREFIX "/bin/mod-mono-server2"
+ #define WAPIDIR "/tmp"
+ #define DOCUMENT_ROOT NULL
+ #define APPCONFIG_FILE NULL
diff --git a/www-apache/mod_mono/mod_mono-2.6.ebuild b/www-apache/mod_mono/mod_mono-2.6.ebuild
index 7fe366af360c..006edcafc910 100644
--- a/www-apache/mod_mono/mod_mono-2.6.ebuild
+++ b/www-apache/mod_mono/mod_mono-2.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-2.6.ebuild,v 1.1 2010/02/27 00:22:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-2.6.ebuild,v 1.2 2010/02/27 21:06:57 patrick Exp $
EAPI=2
@@ -30,7 +30,7 @@ src_prepare() {
sed -e "s:@LIBDIR@:$(get_libdir):" "${FILESDIR}/${APACHE2_MOD_CONF}.conf" \
> "${WORKDIR}/${APACHE2_MOD_CONF##*/}.conf" || die
go-mono_src_prepare
- use aspnet2 && epatch "${FILESDIR}/mono_auto_application_aspnet2.patch"
+ use aspnet2 && epatch "${FILESDIR}/mono26_auto_application_aspnet2.patch"
}
src_configure() {