minor fixes

(Portage version: 2.0.51-r15)

3 files changed, 49 insertions, 12 deletions

diff --git a/www-apache/mod_mono/ChangeLog b/www-apache/mod_mono/ChangeLog
index 8aae2facd68c..920a999c27ed 100644
--- a/www-apache/mod_mono/ChangeLog
+++ b/www-apache/mod_mono/ChangeLog
@@ -1,14 +1,11 @@
 # ChangeLog for www-apache/mod_mono
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/ChangeLog,v 1.13 2005/02/17 05:36:55 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/ChangeLog,v 1.14 2005/02/17 05:56:24 trapni Exp $
 
   17 Feb 2005; Christian Parpart <trapni@gentoo.org>
-  files/mod_mono-1.0.5-70_mod_mono.conf:
-  adopted to changes recommented in bug 70943
-
-  17 Feb 2005; Christian Parpart <trapni@gentoo.org>
-  files/mod_mono-1.0.5-70_mod_mono.conf:
-  module .conf cleanup
+  files/1.0.5-r1/70_mod_mono.conf, files/mod_mono-1.0.5-r1.ebuild:
+  * adopted to changes recommented in bug 70943
+  * module .conf cleanup
 
 *mod_mono-1.0.5-r1 (17 Feb 2005)
 
diff --git a/www-apache/mod_mono/files/1.0.5-r1/70_mod_mono.conf b/www-apache/mod_mono/files/1.0.5-r1/70_mod_mono.conf
new file mode 100644
index 000000000000..2b10ba4b6465
--- /dev/null
+++ b/www-apache/mod_mono/files/1.0.5-r1/70_mod_mono.conf
@@ -0,0 +1,40 @@
+# For more information on the Mono* directives, see the man page for
+# mod_mono(8)
+
+<IfDefine MONO>
+	# Set this to False if you manage your ASP.Net server through
+	# /etc/init.d/mod-mono-server
+	MonoRunXSP False
+
+	<IfModule !mod_mono.c>
+		LoadModule mono_module extramodules/mod_mono.so
+	</IfModule>
+
+	<IfModule mod_mime.c>
+		AddHandler mono .aspx .ashx .asmx .ascx .asax .config .ascx
+	</IfModule>
+
+### please also add "-D MONO_DEMO" in order to activate out-of-the-box mono demo
+###
+	<IfDefine MONO_DEMO>
+		<IfModule mod_alias.c>
+			Alias /mono "/usr/share/doc/xsp/test"
+		</IfModule>
+
+		MonoApplications "/mono:/usr/share/doc/xsp/test"
+
+		<Directory /usr/share/doc/xsp/test>
+			<IfModule mod_access.c>
+				Order allow,deny
+				Allow from all
+			</IfModule>
+			<IfModule mod_dir.c>
+				DirectoryIndex index.aspx
+			</IfModule>
+		</Directory>
+	</IfDefine>
+### MONO_DEMO end.
+
+</IfDefine>
+
+# vim:syntax=apache:ts=4
diff --git a/www-apache/mod_mono/mod_mono-1.0.5-r1.ebuild b/www-apache/mod_mono/mod_mono-1.0.5-r1.ebuild
index 0875625e42d7..11bbd04bbd12 100644
--- a/www-apache/mod_mono/mod_mono-1.0.5-r1.ebuild
+++ b/www-apache/mod_mono/mod_mono-1.0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-1.0.5-r1.ebuild,v 1.1 2005/02/17 02:28:59 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_mono/mod_mono-1.0.5-r1.ebuild,v 1.2 2005/02/17 05:56:24 trapni Exp $
 
 inherit apache-module
 
@@ -15,11 +15,11 @@ DEPEND=">=dev-dotnet/mono-${PV}
 		>=dev-dotnet/xsp-${PV}"
 
 APACHE1_MOD_FILE="${S}/src/.libs/mod_mono.so"
-APACHE1_MOD_CONF="70_mod_mono"
+APACHE1_MOD_CONF="${PVR}/70_mod_mono"
 APACHE1_MOD_DEFINE="MONO"
 
 APACHE2_MOD_FILE="${S}/src/.libs/mod_mono.so"
-APACHE2_MOD_CONF="70_mod_mono"
+APACHE2_MOD_CONF="${PVR}/70_mod_mono"
 APACHE2_MOD_DEFINE="MONO"
 
 DOCFILES="AUTHORS ChangeLog COPYING INSTALL NEWS README"
@@ -57,6 +57,6 @@ src_install() {
 pkg_postinst() {
 	apache-module_pkg_postinst
 
-	einfo "To view the sameples, uncomment the commented blocks in the above"
-	einfo "configuration file."
+	einfo "To view the sameples, add \"-D MONO_DEMO\" at your apache's"
+	einfo "conf.d configuration file."
 }