Fixed bug #103398

Package-Manager: portage-2.0.53_rc7

3 files changed, 16 insertions, 29 deletions

diff --git a/www-apps/dspam-web/ChangeLog b/www-apps/dspam-web/ChangeLog
index d6f9f5a41889..e30a6ea22193 100644
--- a/www-apps/dspam-web/ChangeLog
+++ b/www-apps/dspam-web/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-apps/dspam-web
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/ChangeLog,v 1.17 2005/04/05 09:30:24 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/ChangeLog,v 1.18 2005/11/06 04:14:16 st_lim Exp $
+
+  06 Nov 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-web-3.6.0.ebuild:
+  Fixed bug #103398
 
 *dspam-web-3.4.2 (05 Apr 2005)
 
diff --git a/www-apps/dspam-web/Manifest b/www-apps/dspam-web/Manifest
index 799afe96680a..3b600c51d91c 100644
--- a/www-apps/dspam-web/Manifest
+++ b/www-apps/dspam-web/Manifest
@@ -1,7 +1,7 @@
-MD5 6ce7bcd554633c8d80ff5a4ef7a562ca ChangeLog 3080
+MD5 51161c6fc666a6d8d8404d8b44471b65 ChangeLog 3173
 MD5 03096ac1ea250450da7db871a098de1a dspam-web-3.2.7.ebuild 5253
 MD5 b03f7e094bd7bedf29e20baff13ca420 dspam-web-3.4.9.ebuild 5064
-MD5 bd6ad2a128be68aeaadad50c28985fb2 dspam-web-3.6.0.ebuild 5674
+MD5 dd8731eb3e2b022fc6de7a4d8df368df dspam-web-3.6.0.ebuild 5214
 MD5 7735956f416bd58bfcbeee99af43bea0 files/digest-dspam-web-3.2.7 63
 MD5 c26bf920b2afa7ae432ac6b6d96fb9b4 files/digest-dspam-web-3.4.9 63
 MD5 03b69dda833751bdda04e5413a9305e0 files/digest-dspam-web-3.6.0 129
diff --git a/www-apps/dspam-web/dspam-web-3.6.0.ebuild b/www-apps/dspam-web/dspam-web-3.6.0.ebuild
index dc5cda68d430..e290d11cbfa5 100644
--- a/www-apps/dspam-web/dspam-web-3.6.0.ebuild
+++ b/www-apps/dspam-web/dspam-web-3.6.0.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-apps/dspam-web/dspam-web-3.6.0.ebuild,v 1.1 2005/11/05 15:53:55 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.6.0.ebuild,v 1.2 2005/11/06 04:14:16 st_lim Exp $
 
 inherit webapp eutils
 
@@ -109,42 +109,26 @@ src_install () {
 		-i ${S}/webui/cgi-bin/admin.cgi
 	sed -e 's,/var/dspam,/etc/mail/dspam,' \
 		-e 's,/usr/local,/usr,' \
-		-i ${S}/webui/cgi-bin/admingraph.cgi
-	sed -e 's,/var/dspam,/etc/mail/dspam,' \
-		-e 's,/usr/local,/usr,' \
 		-i ${S}/webui/cgi-bin/dspam.cgi
-	sed -e 's,/var/dspam,/etc/mail/dspam,' \
-		-e 's,/usr/local,/usr,' \
-		-i ${S}/webui/cgi-bin/graph.cgi
 
+	cp -r ${S}/webui/htdocs/* ${D}/${MY_HTDOCSDIR} || die
+	cp -r ${S}/webui/cgi-bin/* ${D}/${MY_CGIBINDIR} || die
 	insinto ${MY_HTDOCSDIR}
 	insopts -m644 -o apache -g apache
-	doins ${S}/webui/htdocs/base.css
-	doins ${S}/webui/htdocs/dspam-logo-small.gif
-	doins ${S}/webui/cgi-bin/rgb.txt
-	doins ${S}/webui/cgi-bin/default.prefs
-	doins ${S}/webui/cgi-bin/admins
-	doins ${S}/webui/cgi-bin/configure.pl
 
 	newins ${FILESDIR}/htaccess .htaccess
 	newins ${FILESDIR}/htpasswd .htpasswd
 
-	insopts -m755 -o apache -g apache
-	doins ${S}/webui/cgi-bin/*.cgi
-
-	for CGI_SCRIPT in admin.cgi admingraph.cgi dspam.cgi graph.cgi; do
-		webapp_runbycgibin perl ${MY_HTDOCSDIR}/${CGI_SCRIPT}
+	#All files must be owned by server
+	cd ${D}/${MY_HTDOCSDIR}
+	for file in `find -type d -printf "%p/* "`; do
+		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
 	done
 
-	dodir ${MY_HTDOCSDIR}/templates
-
-	insinto ${MY_HTDOCSDIR}/templates
-	doins ${S}/webui/cgi-bin/templates/*.html
-
 	#All files must be owned by server
-	cd ${D}${MY_HTDOCSDIR}
-	for x in `find . -type f -print` ; do
-		webapp_serverowned ${MY_HTDOCSDIR}/$x
+	cd ${D}/${MY_CGIBINDIR}
+	for file in `find -type d -printf "%p/* "`; do
+		webapp_serverowned "${MY_CGIBINDIR}/${file}"
 	done
 
 	webapp_src_install