fix for #20686

4 files changed, 31 insertions, 20 deletions

diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 87775a0bbdd9..ffde246ad9e1 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-analyzer/cacti
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.8 2003/06/11 15:28:38 tad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.9 2003/06/13 20:06:19 vapier Exp $
 
 *cacti-0.8.1 (12 Jun 2003)
 
@@ -8,8 +8,14 @@
   Version Bump. Now works with net-snmp (default for virtual/snmp) and ucd-snmp.
   Updated postinst einfo message.
 
+  13 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Permissions fix, variable fix, dos format fix (#20686)
+
 *cacti-0.6.8a (23 Oct 2002)
 
+  13 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Permissions fix, variable fix, dos format fix (#20686)
+
   13 May 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.6.8a.ebuild:
   Added net-analyzer/rrdtool to RDEPEND. Closes #20953
 
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 14f5bb297722..f94bcde6b52c 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,5 +1,5 @@
-MD5 3d921a483aa688dda1ba970c0ae96055 cacti-0.8.1.ebuild 4095
-MD5 57395465876dc8e6c61d0cc68f6c3620 cacti-0.6.8a.ebuild 1465
-MD5 68ba28b575a17e1a4d4e8e6ea4a8da0e ChangeLog 996
+MD5 705369f21668a78c220879bf25b24fd2 cacti-0.8.1.ebuild 4023
+MD5 7451de290ab3f387c25e726f9227cde0 cacti-0.6.8a.ebuild 1483
+MD5 977f8735d281f5f247b8161c0c8c4e20 ChangeLog 1216
 MD5 f1e420ab088a8222b4020ab76a92c387 files/digest-cacti-0.8.1 63
 MD5 36cff775a40a01ca080d9b290109a795 files/digest-cacti-0.6.8a 64
diff --git a/net-analyzer/cacti/cacti-0.6.8a.ebuild b/net-analyzer/cacti/cacti-0.6.8a.ebuild
index 4f749f1d2959..c69152650092 100644
--- a/net-analyzer/cacti/cacti-0.6.8a.ebuild
+++ b/net-analyzer/cacti/cacti-0.6.8a.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.6.8a.ebuild,v 1.7 2003/05/13 19:15:25 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.6.8a.ebuild,v 1.8 2003/06/13 20:06:19 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Cacti is a complete frondend to rrdtool"
 HOMEPAGE="http://www.raxnet.net/products/cacti/"
 SRC_URI="http://www.raxnet.net/downloads/${P}.tar.gz"
 
-IUSE="snmp"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc ~alpha"
+IUSE="snmp"
 
 DEPEND=""
 RDEPEND="net-www/apache
@@ -19,16 +21,18 @@ RDEPEND="net-www/apache
 	dev-php/php
 	dev-php/mod_php"
 
-INSTALL_DEST="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\  -f2`"
-[ -z "${INSTALL_DEST}" ] && INSTALL_DEST="/home/httpd/htdocs"
-INSTALL_DEST="${INSTALL_DEST}/cacti"
+export HTTPD_ROOT=/home/httpd/htdocs
+export HTTPD_USER=apache
+export HTTPD_GROUP=apache
+export INSTALL_DEST=${HTTPD_ROOT}/cacti
 
 src_install() {
 	dodoc docs/{CHANGELOG,CONTRIB,README}
 	rm README LICENSE docs/{CHANGELOG,CONTRIB,README}
 
 	dodir ${INSTALL_DEST}
-	chown apache.apache * -R
+	edos2unix `find -type f -name '*.php'`
+	chown -R ${HTTPD_USER}.${HTTPD_GROUP} *
 	mv * ${D}/${INSTALL_DEST}/
 }
 
diff --git a/net-analyzer/cacti/cacti-0.8.1.ebuild b/net-analyzer/cacti/cacti-0.8.1.ebuild
index 2d273f4862ce..42d70e47c5a5 100644
--- a/net-analyzer/cacti/cacti-0.8.1.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.1.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.1.ebuild,v 1.3 2003/06/11 15:37:39 tad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.1.ebuild,v 1.4 2003/06/13 20:06:19 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Cacti is a complete frondend to rrdtool"
 HOMEPAGE="http://www.raxnet.net/products/cacti/"
 SRC_URI="http://www.raxnet.net/downloads/${P}.tar.gz"
 
-IUSE="snmp"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+IUSE="snmp"
 
 DEPEND=""
 RDEPEND="net-www/apache
@@ -19,12 +21,10 @@ RDEPEND="net-www/apache
 	dev-php/php
 	dev-php/mod_php"
 
-# Allow users to move the default data directory by setting the
-# home directory of the 'apache' user elsewhere.
-HTTPD_ROOT=`grep apache /etc/passwd | cut -d: -f6`/htdocs
-[ -z "${HTTPD_ROOT}" ] && HTTPD_ROOT="/home/httpd/htdocs"
-
-INSTALL_DEST="${HTTPD_ROOT}/cacti"
+export HTTPD_ROOT=/home/httpd/htdocs
+export HTTPD_USER=apache
+export HTTPD_GROUP=apache
+export INSTALL_DEST=${HTTPD_ROOT}/cacti
 
 src_install() {
 	dohtml docs/{INSTALL,UPGRADE}.htm
@@ -39,7 +39,8 @@ src_install() {
 	rm -fr docs
 
 	dodir ${INSTALL_DEST}
-	chown apache.apache * -R
+	edos2unix `find -type f -name '*.php'`
+	chown -R ${HTTPD_USER}.${HTTPD_GROUP} *
 	mv * ${D}/${INSTALL_DEST}/
 }
 
@@ -86,7 +87,7 @@ pkg_postinst() {
 		einfo "The cacti has been copied to ${INSTALL_DEST}"
 		einfo
 		einfo "Before cacti works you must:"
-        einfo "1. Create the new cacti database"
+		einfo "1. Create the new cacti database"
 		einfo "  shell> mysqladmin --user=root create cacti"
 		einfo "2. Import the default cacti database:"
 		einfo "  shell> mysql cacti < ${INSTALL_DEST}/cacti.sql"