Fix THTTPD_DOCROOT

(Portage version: 2.1.10.65/cvs/Linux x86_64)

5 files changed, 19 insertions, 13 deletions

diff --git a/www-servers/thttpd/ChangeLog b/www-servers/thttpd/ChangeLog
index ec3a94990235..89dc4070740c 100644
--- a/www-servers/thttpd/ChangeLog
+++ b/www-servers/thttpd/ChangeLog
@@ -1,12 +1,16 @@
 # ChangeLog for www-servers/thttpd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.46 2012/08/05 15:50:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/ChangeLog,v 1.47 2012/08/08 13:24:57 blueness Exp $
+
+  08 Aug 2012; Anthony G. Basile <blueness@gentoo.org> thttpd-2.26.4-r1.ebuild,
+  files/thttpd.conf.sample, files/thttpd.confd, files/thttpd.confd.1:
+  Fix THTTPD_DOCROOT
 
 *thttpd-2.26.4-r1 (05 Aug 2012)
 
   05 Aug 2012; Anthony G. Basile <blueness@gentoo.org> -thttpd-2.26.4.ebuild,
   +thttpd-2.26.4-r1.ebuild:
-  Move distribution's htdocs to doc dir, bug #429632
+  Move htdocs to docdir, bug #429632
 
 *thttpd-2.26.4 (13 Jul 2012)
 
diff --git a/www-servers/thttpd/files/thttpd.conf.sample b/www-servers/thttpd/files/thttpd.conf.sample
index 85660fede36a..462bd0c198d0 100644
--- a/www-servers/thttpd/files/thttpd.conf.sample
+++ b/www-servers/thttpd/files/thttpd.conf.sample
@@ -9,7 +9,7 @@
 ## what interface to bind to?
 ## (default is binding to any interface)
 #host=www.example.org
-port=8080
+port=80
 user=thttpd
 ##
 ## CGI:
diff --git a/www-servers/thttpd/files/thttpd.confd b/www-servers/thttpd/files/thttpd.confd
index a98718e4492f..4e1f76f12885 100644
--- a/www-servers/thttpd/files/thttpd.confd
+++ b/www-servers/thttpd/files/thttpd.confd
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/files/thttpd.confd,v 1.2 2012/04/04 15:05:36 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/files/thttpd.confd,v 1.3 2012/08/08 13:24:57 blueness Exp $
 
 ## Config file for /etc/init.d/thttpd
 
 ## the startup-dir of thttpd is the docroot, so we specify it here
 ## and the init-script does a "cd" prior to startup:
-THTTPD_DOCROOT="/var/www/localhost"
+THTTPD_DOCROOT="/var/www/localhost/htdocs"
 
 ## There are 2 ways to configure thttpd:
 ##	1) specify all params on the cmd-line
diff --git a/www-servers/thttpd/files/thttpd.confd.1 b/www-servers/thttpd/files/thttpd.confd.1
index cb61a1f2ae52..b5f630e7ecc2 100644
--- a/www-servers/thttpd/files/thttpd.confd.1
+++ b/www-servers/thttpd/files/thttpd.confd.1
@@ -24,7 +24,7 @@ THTTPD_DOCROOT="/var/www/localhost"
 ## We choose 1) here -- if you have a more complicated setup read
 ## thttpd(8) for details on 2).
 
-THTTPD_OPTS="-p 8080 -u thttpd -r"
+THTTPD_OPTS="-p 80 -u thttpd -r"
 
 ## For a more complex setup (e.g. cgi-support) use an external configfile:
 ## comment the THTTPD_OPTS line above und use the one below.
diff --git a/www-servers/thttpd/thttpd-2.26.4-r1.ebuild b/www-servers/thttpd/thttpd-2.26.4-r1.ebuild
index aa2666fa3815..c6f95a1f46bd 100644
--- a/www-servers/thttpd/thttpd-2.26.4-r1.ebuild
+++ b/www-servers/thttpd/thttpd-2.26.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.26.4-r1.ebuild,v 1.1 2012/08/05 15:50:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/thttpd/thttpd-2.26.4-r1.ebuild,v 1.2 2012/08/08 13:24:57 blueness Exp $
 
 EAPI="4"
 
@@ -21,9 +21,11 @@ IUSE=""
 RDEPEND=""
 DEPEND=""
 
+WEBROOT="/var/www/localhost"
+
 THTTPD_USER=thttpd
 THTTPD_GROUP=thttpd
-THTTPD_DOCROOT="${EPREFIX}/var/www/localhost/htdocs"
+THTTPD_DOCROOT="${EPREFIX}${WEBROOT}/htdocs"
 
 DOCS=( README TODO )
 
@@ -49,12 +51,13 @@ src_install () {
 	insinto /etc/thttpd
 	doins "${FILESDIR}"/thttpd.conf.sample
 
+	#move htdocs to docdir, bug #429632
 	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-
-	mv "${ED}"/var/www/localhost/htdocs \
+	mv "${ED}"${WEBROOT}/htdocs \
 		"${ED}"/usr/share/doc/"${PF}"/htdocs.dist
+	mkdir "${ED}"${WEBROOT}/htdocs
 
-	mkdir "${ED}"/var/www/localhost/htdocs
+	keepdir ${WEBROOT}/htdocs
 }
 
 pkg_postinst() {
@@ -62,7 +65,6 @@ pkg_postinst() {
 		|| die "Failed chown makeweb"
 	chmod 2751 "${EROOT}/usr/sbin/makeweb" \
 		|| die "Failed chmod makeweb"
-	chmod 755 "${THTTPD_DOCROOT}/cgi-bin/printenv" \
+	chmod 755 "${EROOT}/usr/share/doc/${PF}/htdocs.dist/cgi-bin/printenv" \
 		|| die "Failed chmod printenv"
-	elog "Adjust THTTPD_DOCROOT in /etc/conf.d/thttpd !"
 }