add symlinks to awstats.pl and htdocs (bug #220407); fix manifest (bug #246977)

Package-Manager: portage-2.1.4.5

3 files changed, 21 insertions, 22 deletions

diff --git a/net-www/awstats/ChangeLog b/net-www/awstats/ChangeLog
index 1aaef6964634..bf3569a95f7d 100644
--- a/net-www/awstats/ChangeLog
+++ b/net-www/awstats/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/awstats
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.67 2008/11/08 20:19:10 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.68 2008/11/17 13:18:53 hollow Exp $
+
+  17 Nov 2008; Benedikt Böhm <hollow@gentoo.org> awstats-6.9.ebuild:
+  add symlinks to awstats.pl and htdocs (bug #220407); fix manifest (bug #246977)
 
   08 Nov 2008; Gunnar Wrobel <wrobel@gentoo.org> -awstats-6.7-r2.ebuild:
   Removed vulnerable awstats-6.7-r2.ebuild (#235225).
diff --git a/net-www/awstats/Manifest b/net-www/awstats/Manifest
index 2951b37980f6..044da7e13c6c 100644
--- a/net-www/awstats/Manifest
+++ b/net-www/awstats/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX awstats-6.3-gentoo.diff 1219 RMD160 8c6ea2a093c231043674f8f14bc4332cfeeee930 SHA1 8a1971c0e710cec05004a7e94461f83f77b2fd1a SHA256 0de073550f021a93d883c307f999b4b6ead1abf3a587118e2e01578907d15814
 AUX postinst-en-r1.txt 2412 RMD160 6f4b9705b36ab0968d82f94915d8d6526f52fbe8 SHA1 953ec2765fd8322035c4b5dbc92741343814ffee SHA256 ae1c4d318867c444583af0b34b057955cc10f45fc6fa5457f06261d8ba5b3884
-DIST awstats-6.9.tar.gz 1106301 RMD160 e1237b54b848e79f762212d46da7dba3240472bc SHA1 cf5543e43905749ae004dd8ca9849ac7aba2c7c7 SHA256 174a7f76715d4857ab1d2aa57ef98170f8fdb255fead78954c9d37d0b531cd1c
-EBUILD awstats-6.9.ebuild 3748 RMD160 44d6f99483e5cb6c7fb939450d99f3d934497292 SHA1 7ef5980e5cd1217a8fc9bcc881a295f2e73d92fe SHA256 bcec41445d3e07aaf1ebffbf7c337b400b81ba89b97badbe56aa08ca6b8e6211
-MISC ChangeLog 9711 RMD160 25ab3767423e8f7ea570b077a4293a3b74037f9c SHA1 391d0b3a7d799491f57ede586341e6b8fca533a3 SHA256 5dcf0e35c7e9a607eb296e2db381787e76304d138dbb7b12cf74fe1e0d1141bd
+DIST awstats-6.9.tar.gz 1119817 RMD160 52bcd48935d124403183aa6feac43f57910b9e7e SHA1 253ff148d54ed83252f115d065761abd6f18de69 SHA256 16fad1fea08e07590caac790bcb6524b3ad71046733c983c671ed9ef07232b5f
+EBUILD awstats-6.9.ebuild 3868 RMD160 3072ab5bd2d78e7b74ea791b8632f6b5d22f389f SHA1 04cf111910d02a680bbd617751981fe3d83694c7 SHA256 3da19ebf80241458a79105b1ca1cc2932861ed0ce46bf0c237ee732cba7413b3
+MISC ChangeLog 9864 RMD160 618bfdd603be400b2c4bc0645301e73c4e5aaeae SHA1 0f1813f98c409ca8e8f8920aa9829cca8f563a5f SHA256 7dea546e25772d127c7ca4aa5f477ec3f6440377725cd9e16987635d0ec7b804
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkV9b0ACgkQEEcxCpcDQ74POQCfeRxfWIHtnIEXOU4nlV0E8h2r
-RvwAn3BIKUshdEPNChEnlcIxky8reS2K
-=lMnM
------END PGP SIGNATURE-----
diff --git a/net-www/awstats/awstats-6.9.ebuild b/net-www/awstats/awstats-6.9.ebuild
index fb5be5a94ea3..fc67797ba590 100644
--- a/net-www/awstats/awstats-6.9.ebuild
+++ b/net-www/awstats/awstats-6.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.9.ebuild,v 1.5 2008/10/16 18:14:47 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.9.ebuild,v 1.6 2008/11/17 13:18:53 hollow Exp $
 
 inherit eutils webapp versionator depend.apache
 
@@ -81,23 +81,28 @@ src_install() {
 	doexe "${S}"/wwwroot/classes/*.jar
 
 	# install language files, libraries and plugins
-	mkdir -p "${D}${MY_CGIBINDIR}"
+	dodir "${MY_CGIBINDIR}"
 	for dir in lang lib plugins; do
-		cp -R "${S}/wwwroot/cgi-bin/${dir}" "${D}${MY_CGIBINDIR}"
+		insinto "${MY_CGIBINDIR}"
+		doins -r "${S}"/wwwroot/cgi-bin/${dir}
 	done
 
 	# install the app's www files
-	mkdir -p "${D}${MY_HTDOCSDIR}"
+	dodir "${MY_HTDOCSDIR}"
 	for dir in icon css js; do
-		cp -R "${S}/wwwroot/${dir}" "${D}${MY_HTDOCSDIR}"
+		insinto "${MY_HTDOCSDIR}"
+		doins -r "${S}"/wwwroot/${dir}
 	done
 
+	dodir /usr/share/awstats
+	dosym "${MY_HTDOCSDIR}" /usr/share/awstats/htdocs
+
 	# copy configuration file
 	insinto /etc/awstats
 	doins "${S}"/wwwroot/cgi-bin/awstats.model.conf
 
 	# create the data directory for awstats
-	mkdir -p "${D}/${MY_HOSTROOTDIR}/datadir"
+	dodir "${MY_HOSTROOTDIR}"/datadir
 
 	# install command line tools
 	cd "${S}"/tools
@@ -105,15 +110,16 @@ src_install() {
 		awstats_updateall.pl logresolvemerge.pl \
 		maillogconvert.pl awstats_configure.pl
 	newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl
+	dosym "${MY_CGIBINDIR}"/awstats.pl /usr/bin/awstats.pl
 
 	webapp_src_install
 
 	# fix perms
 	for dir in lang lib plugins; do
-		chmod 0755 "${D}${MY_CGIBINDIR}/${dir}"
+		fperms 0755 "${MY_CGIBINDIR}"/${dir}
 	done
 	for dir in icon css js; do
-		chmod 0755 "${D}${MY_HTDOCSDIR}/${dir}"
+		fperms 0755 "${MY_HTDOCSDIR}"/${dir}
 	done
 }