Cleanup ebuild and improve sample apache config

4 files changed, 78 insertions, 32 deletions

diff --git a/net-www/mod_scgi/ChangeLog b/net-www/mod_scgi/ChangeLog
index 8c3332072b68..5f974b2d537c 100644
--- a/net-www/mod_scgi/ChangeLog
+++ b/net-www/mod_scgi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/mod_scgi
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/ChangeLog,v 1.1 2003/08/12 04:40:48 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/ChangeLog,v 1.2 2003/08/13 21:08:03 robbat2 Exp $
+
+  13 Aug 2003; Robin H. Johnson <robbat2@gentoo.org>
+  mod_scgi-1.2_alpha1.ebuild, files/20_mod_scgi.conf:
+  Cleanup ebuild and improve sample apache config
 
 *mod_scgi-1.2_alpha1 (12 Aug 2003)
 
diff --git a/net-www/mod_scgi/Manifest b/net-www/mod_scgi/Manifest
index 5fa635679ccb..0d1998c499f7 100644
--- a/net-www/mod_scgi/Manifest
+++ b/net-www/mod_scgi/Manifest
@@ -1,4 +1,4 @@
-MD5 c88cc1e17740d8b35139af7a915341a1 mod_scgi-1.2_alpha1.ebuild 1214
-MD5 094b07f31ed336f5bf553ca221162686 ChangeLog 349
+MD5 f860324902fdfd6997c0aff55f1ca6dd mod_scgi-1.2_alpha1.ebuild 1118
+MD5 1ce109ee1f74b5fe02b6c53441fe0533 ChangeLog 505
 MD5 fe6e3027503038b59f1e9b4ee2cb3baa files/digest-mod_scgi-1.2_alpha1 61
-MD5 3d1c20f03676d9a3da3d0fe3ea73720f files/20_mod_scgi.conf 118
+MD5 c976952610ece51914d17df249e7f337 files/20_mod_scgi.conf 1245
diff --git a/net-www/mod_scgi/files/20_mod_scgi.conf b/net-www/mod_scgi/files/20_mod_scgi.conf
index 126feefd3357..46405fc2db8f 100644
--- a/net-www/mod_scgi/files/20_mod_scgi.conf
+++ b/net-www/mod_scgi/files/20_mod_scgi.conf
@@ -1,5 +1,58 @@
 <IfDefine MODSCGI>
 	<IfModule !mod_scgi.c>
-		LoadModule scgi_module	extramodules/mod_scgi.so
-	<!IfModule>
+	LoadModule scgi_module	extramodules/mod_scgi.so
+	</IfModule>
+
+	<IfModule mod_scgi.c>
+	# Apache2 example
+	#<Location "/dynamic">
+	#	SetHandler scgi-handler
+	#	SCGIServer localhost:4000
+	#	SCGIHandler On
+	#	Options -Multiviews
+	#</Location>
+	#<LocationMatch "^/(dynamic|login)($|/)">
+	#	SetHandler scgi-handler
+	#	SCGIServer localhost:4000
+	#	SCGIHandler On
+	#	Options -Multiviews
+	#</Location>
+	#<Location "/foo">
+	#	SCGIServer localhost:4000
+	#	SCGIHandler On
+	#	Options -Multiviews
+	#</Location>
+	#<Location "/bar">
+	#	SCGIServer localhost:4001
+	#	SCGIHandler On
+	#	SCGIServerTimeout 10
+	#	Options -Multiviews
+	#</Location>
+	#<Location "/bar/images">
+	#	SCGIHander Off
+	#</Location>
+
+	# Apache1 example
+	#<Location "/dynamic">
+	#	 SCGIServer 127.0.0.1 4000
+	#	 SCGIHandler On
+	#	 Options -Multiviews
+	#</Location>
+	#<LocationMatch "^/(dynamic|login)($|/)">
+	#	 SCGIServer 127.0.0.1 4000
+	#	 SCGIHandler On
+	#	 Options -Multiviews
+	#</Location>
+	#<Location "/foo">
+	#	 SCGIServer 127.0.0.1 4000
+	#	 SCGIHandler On
+	#	 Options -Multiviews
+	#</Location>
+	#<Location "/bar">
+	#	 SCGIServer 127.0.0.1 4001
+	#	 SCGIHandler On
+	#	 Options -Multiviews
+	#</Location>
+	</IfModule>
 </IfDefine>
+# vim:ft=apache:
diff --git a/net-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild b/net-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild
index 926c16cc09f2..17c394dee64d 100644
--- a/net-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild
+++ b/net-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild,v 1.1 2003/08/12 04:40:48 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_scgi/mod_scgi-1.2_alpha1.ebuild,v 1.2 2003/08/13 21:08:03 robbat2 Exp $
+
+apachedir='1'
+apache=''
+use apache2 && apache=2 apachedir=2
 
 P0=${P/mod_/}
 MY_P=${P0/_alpha/a}
@@ -9,7 +13,7 @@ DESCRIPTION="Apache module for a Replacement for the CGI protocol that is simila
 HOMEPAGE="http://www.mems-exchange.org/software/scgi/"
 SRC_URI="http://www.mems-exchange.org/software/files/${PN}/${MY_P}.tar.gz"
 LICENSE="CNRI"
-SLOT="0"
+SLOT="${apachedir}"
 KEYWORDS="~x86"
 IUSE="apache2"
 DEPEND="net-www/scgi
@@ -17,31 +21,16 @@ DEPEND="net-www/scgi
 		apache2? ( >=net-www/apache-2 )"
 
 src_compile() {
-	if [ -z "`use apache2`" ]
-	then
-		cd apache1
-		make || die "apache1 mod_scgi make failed"
-	else
-		cd apache2
-		make || die "apache2 mod_scgi make failed"
-	fi
+	cd apache${apachedir}
+	make || die "apache${apachedir} mod_scgi make failed"
 }
 
 src_install() {
-	if [ -z "`use apache2`" ]
-	then
-		cd apache1
-		exeinto /usr/lib/apache-extramodules
-		doexe .libs/${PN}.so
-		dodoc README
-		insinto /etc/apache/conf/modules.d
-		doins ${FILESDIR}/20_mod_scgi.conf
-	else
-		cd apache2
-		exeinto /usr/lib/apache2-extramodules
-		doexe .libs/${PN}.so
-		dodoc README
-		insinto /etc/apache2/conf/modules.d
-		doins ${FILESDIR}/20_mod_scgi.conf
-	fi
+	newdoc apache1/README README.apache1
+	newdoc apache2/README README.apache2
+	dodoc README PKG-INFO LICENSE.txt CHANGES
+	exeinto /usr/lib/apache${apache}-extramodules
+	doexe apache${apachedir}/.libs/${PN}.so
+	insinto /etc/apache${apache}/conf/modules.d
+	doins ${FILESDIR}/20_mod_scgi.conf
 }