--- netjuke-1.0_beta17.ebuild.orig	2003-04-04 11:21:27.000000000 -0800
+++ netjuke-1.0_beta17.ebuild	2003-04-07 11:55:16.000000000 -0700
@@ -4,6 +4,7 @@
 
 MY_P="${PN}-$(echo ${PV} | sed -e 's:_beta:b:')-php4.1+"
 S="${WORKDIR}/${PN}"
+RESTRICT="nostrip"
 DESCRIPTION="Artekopia Netjuke is a Web-Based Audio Streaming Jukebox powered by PHP, an increasing choice of databases and all the MP3, Ogg Vorbis, Windows Media Audio and other format files that constitute your digital music collection."
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 HOMEPAGE="http://netjuke.sourceforge.net/"
@@ -21,17 +22,21 @@
 
 src_install() {
 
-	HTTPD_USER="apache"
-	HTTPD_GROUP="apache"
-
-	if [ `use apache2` ] && [ -e "/etc/apache2/conf/apache2.conf" ] ; then
-		HTTPD_ROOT="`grep '^DocumentRoot' /etc/apache2/conf/apache2.conf | cut -d' '  -f2`"
-	elif [ -e "/etc/apache/conf/apache.conf" ] ; then
-		HTTPD_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d' ' -f2`"
+	if [ `use apache2` ] && [ -e "/etc/apache2/conf" ] ; then
+		HTTPD_ROOT="`grep '^DocumentRoot' /etc/apache2/conf/*.conf | head -1 | cut -d' '  -f2`"
+		HTTPD_USER="`grep '^User' /etc/apache2/conf/*.conf | head -1 | cut -d' '  -f2`"
+		HTTPD_GROUP="`grep '^Group' /etc/apache2/conf/*.conf | head -1 | cut -d' '  -f2`"
+	elif [ -e "/etc/apache/conf" ] ; then
+		HTTPD_ROOT="`grep '^DocumentRoot' /etc/apache/conf/*.conf | head -1 | cut -d' '  -f2`"
+		HTTPD_USER="`grep '^User' /etc/apache/conf/*.conf | head -1 | cut -d' '  -f2`"
+		HTTPD_GROUP="`grep '^Group' /etc/apache/conf/*.conf | head -1 | cut -d' '  -f2`"
 	else
-        HTTPD_ROOT="/home/httpd/htdocs"
+		HTTPD_ROOT="/home/httpd/htdocs"
+		HTTPD_USER="apache"
+		HTTPD_GROUP="apache"
 		ewarn
-		ewarn "No apache config file found in /etc, assuming DocumentRoot /home/httpd/htdocs"
+		ewarn "No valid apache configuration file found in /etc/apache/conf,"
+		ewarn "assuming User/Group: apache/apache and DocumentRoot: /home/httpd/htdocs"
 		ewarn
 	fi
 
@@ -44,8 +49,8 @@
 	# server user, or world-writable (Read/Write privileges for all. Less secure)."
 
 	touch "${D}/${HTTPD_ROOT}/${PN}/etc/inc-prefs.php"
-	chown ${HTTPD_USER}:${HTTPD_GROUP} "${D}/${HTTPD_ROOT}/${PN}/etc/inc-prefs.php"
-	chown -R ${HTTPD_USER}:${HTTPD_GROUP} "${D}/${HTTPD_ROOT}/${PN}/var/data"
+	chown "${HTTPD_USER}:${HTTPD_GROUP}" "${D}/${HTTPD_ROOT}/${PN}/etc/inc-prefs.php"
+	chown -R "${HTTPD_USER}:${HTTPD_GROUP}" "${D}/${HTTPD_ROOT}/${PN}/var/data"
 
 	dodoc ${WORKDIR}/${PN}/docs/*.txt
 
@@ -54,6 +59,10 @@
 pkg_postinst() {
 
 	einfo
+	einfo "User/Group ownership set to ${HTTPD_USER}/${HTTPD_GROUP} on:"
+	einfo "${HTTPD_ROOT}/${PN}/etc/inc-prefs.php"
+	einfo "${HTTPD_ROOT}/${PN}/var/data"
+	einfo
 	einfo "To configure Netjuke please point your web browser to:"
 	einfo "http://<yourhost.tld>/netjuke/installer/installer.php"
 	einfo