Fix postinstall instructions, bug #135233.

Package-Manager: portage-2.1.2_pre1

diff --git a/net-www/awstats/ChangeLog b/net-www/awstats/ChangeLog
index ff3529bd7e2056ff1ca9aa076bf1edb9181e996e..9a38ef0b13b472bcde74fc014ee21de2df2fe746 100644 (file)
--- a/net-www/awstats/ChangeLog
+++ b/net-www/awstats/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/awstats
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.40 2006/07/09 20:37:49 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.41 2006/10/27 01:28:34 rl03 Exp $
+
+  27 Oct 2006; Renat Lumpau <rl03@gentoo.org> awstats-6.5-r2.ebuild,
+  awstats-6.6.ebuild:
+  Fix postinstall instructions, bug #135233.
 
   09 Jul 2006; Renat Lumpau <rl03@gentoo.org> awstats-6.5-r1.ebuild,
   awstats-6.5-r2.ebuild, awstats-6.6.ebuild:

diff --git a/net-www/awstats/Manifest b/net-www/awstats/Manifest
index 9a3d9d59c7792995be378251f887f95880dfa651..9973d7376bcf5c4337f0b8f22ee8dd9261f47095 100644 (file)
--- a/net-www/awstats/Manifest
+++ b/net-www/awstats/Manifest
@@ -19,18 +19,18 @@ EBUILD awstats-6.5-r1.ebuild 4113 RMD160 ea32d69e5f88fea89199e151f798f9e0cd0264b
 MD5 c5be53074e3fbf922c0710ddae6d0f17 awstats-6.5-r1.ebuild 4113
 RMD160 ea32d69e5f88fea89199e151f798f9e0cd0264b1 awstats-6.5-r1.ebuild 4113
 SHA256 d50a1d234189ff470eb395e914c7e7936e8184ee257530f313f3cbcc89ce8e02 awstats-6.5-r1.ebuild 4113
-EBUILD awstats-6.5-r2.ebuild 4125 RMD160 1df6bd1f8a0b5b43359a80083cc834fe3e6e9b32 SHA1 8583a56c6c725a8a52302b4447da4ff01f608dcd SHA256 c94fab438a6fc4d4cd98b50f5f6b3add013afb794cd6138d276b9f513b3f71e8
-MD5 d2ffb7b8435c83c9b1dd71c47be551db awstats-6.5-r2.ebuild 4125
-RMD160 1df6bd1f8a0b5b43359a80083cc834fe3e6e9b32 awstats-6.5-r2.ebuild 4125
-SHA256 c94fab438a6fc4d4cd98b50f5f6b3add013afb794cd6138d276b9f513b3f71e8 awstats-6.5-r2.ebuild 4125
-EBUILD awstats-6.6.ebuild 4049 RMD160 3c4d326052babcab9364cae213dfa04e3d52ffdc SHA1 c1751342147788e52db7cefac72c8ed2faa2a268 SHA256 b0b14c118edea7493ffec9cda7260fcfda4ec325a85acee5dd49368b81eeae09
-MD5 719e45ddb8f466227dd1d1dec77c2311 awstats-6.6.ebuild 4049
-RMD160 3c4d326052babcab9364cae213dfa04e3d52ffdc awstats-6.6.ebuild 4049
-SHA256 b0b14c118edea7493ffec9cda7260fcfda4ec325a85acee5dd49368b81eeae09 awstats-6.6.ebuild 4049
-MISC ChangeLog 6420 RMD160 d6d9def7e860755d43d31b3ab9a35d8f5c239967 SHA1 6b84d9fa48a3712043b091dfbb55e9feca645c82 SHA256 5e22343d1633b6095e8bdcdbfc282e80e666a0e8a2a3e297af1adb3e723ebe79
-MD5 1f83b88adce3ac3f8e215b4b95665f8e ChangeLog 6420
-RMD160 d6d9def7e860755d43d31b3ab9a35d8f5c239967 ChangeLog 6420
-SHA256 5e22343d1633b6095e8bdcdbfc282e80e666a0e8a2a3e297af1adb3e723ebe79 ChangeLog 6420
+EBUILD awstats-6.5-r2.ebuild 3761 RMD160 79b3d43896a2018fa05ae2a3a89d91c42a95525a SHA1 dbf3ccfe4966e5d6c7aafdf840f06b5b9ea04434 SHA256 12e5168b70989ab525ac6245e6551ff3a32f21cd930261998c397242a4098822
+MD5 4d24bdf90cd1c04f4f83017a8475b1fb awstats-6.5-r2.ebuild 3761
+RMD160 79b3d43896a2018fa05ae2a3a89d91c42a95525a awstats-6.5-r2.ebuild 3761
+SHA256 12e5168b70989ab525ac6245e6551ff3a32f21cd930261998c397242a4098822 awstats-6.5-r2.ebuild 3761
+EBUILD awstats-6.6.ebuild 3686 RMD160 ab56e6d0eba8a62c1a69f4546c22e55d6e762c46 SHA1 9b74f25fcac76c1e6a0d480eeea6556aadcb9f3a SHA256 e3abf3798d48e395a626b1506bcf24b700a9a49ed769cf429348a6846fb64775
+MD5 12e7c82e39e0f36107ea07202e197d73 awstats-6.6.ebuild 3686
+RMD160 ab56e6d0eba8a62c1a69f4546c22e55d6e762c46 awstats-6.6.ebuild 3686
+SHA256 e3abf3798d48e395a626b1506bcf24b700a9a49ed769cf429348a6846fb64775 awstats-6.6.ebuild 3686
+MISC ChangeLog 6557 RMD160 a74e8fb21745558b02977cc847b180ee07734e6b SHA1 69f435fca0e7651d3b1e2202dad914059a467ffb SHA256 a54d82fe0b7a067451b0813191778cf0c9e1091a0658a7ab06de75bcd22d85bd
+MD5 00a3f0b1e4e3138a498a9e5b687a379e ChangeLog 6557
+RMD160 a74e8fb21745558b02977cc847b180ee07734e6b ChangeLog 6557
+SHA256 a54d82fe0b7a067451b0813191778cf0c9e1091a0658a7ab06de75bcd22d85bd ChangeLog 6557
 MISC metadata.xml 255 RMD160 2110d243ad1031f4c62dd2693795205158d8aaf0 SHA1 906a9beb4201080eeb68c4663c55a48a2476c8a9 SHA256 fa1e1d64d93dcf37a9b736a9df5e8055e35229ef40a6be62d7e4ece99693b204
 MD5 6bc2db5b1e135821863e91fa8658ad48 metadata.xml 255
 RMD160 2110d243ad1031f4c62dd2693795205158d8aaf0 metadata.xml 255
@@ -47,7 +47,7 @@ SHA256 02336412b5abcd4d831be5e2d6e580fb491f015f862ab5ad3f31c616fc08560b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEsWkwEzitwsaoONoRAjqeAKCeHJHf0OhNhmTis52clFmQelsJQACg2c6d
-+aJg7O7XpzVIv4scviQzZRw=
-=Rd3Z
+iD8DBQFFQWDLEzitwsaoONoRAmu7AJ4xBQm5iZINwEGTSSmzrsiRxI+pewCfSXkp
+rR3jGhMyt4DIDz7CgHx3MG8=
+=MVm5
 -----END PGP SIGNATURE-----

diff --git a/net-www/awstats/awstats-6.5-r2.ebuild b/net-www/awstats/awstats-6.5-r2.ebuild
index ed67226dbf007112e43f8bb5463553680d3c0535..9e226c645e1ebb40e3050bf98ac163b6492c602b 100644 (file)
--- a/net-www/awstats/awstats-6.5-r2.ebuild
+++ b/net-www/awstats/awstats-6.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.5-r2.ebuild,v 1.2 2006/07/09 20:37:49 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.5-r2.ebuild,v 1.3 2006/10/27 01:28:34 rl03 Exp $
 
 inherit eutils webapp versionator depend.apache
 
@@ -34,7 +34,7 @@ src_unpack() {
 
        epatch "${FILESDIR}"/${PN}-6.3-gentoo.diff
 
-       # change AWStats default installation directory to installation directory of Gentoo
+       # change default installation directory
        for file in tools/* wwwroot/cgi-bin/*; do
            if [[ -f "${file}" ]]; then
                sed -i -e "s#/usr/local/awstats/wwwroot/cgi-bin#${MY_CGIBINDIR}#g" \
@@ -68,11 +68,6 @@ src_unpack() {
 src_install() {
        webapp_src_preinst
 
-       # handle documentation files
-       #
-       # NOTE that doc files go into /usr/share/doc as normal; they do NOT
-       # get installed per vhost!
-
        dohtml -r docs/*.html docs/*.xml docs/*.css docs/*.js docs/images
        dodoc README.TXT docs/COPYING.TXT docs/LICENSE.TXT
        newdoc wwwroot/cgi-bin/plugins/example/example.pm example_plugin.pm
@@ -118,10 +113,6 @@ src_install() {
                maillogconvert.pl awstats_configure.pl
        newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl
 
-       # all done
-       #
-       # now we let the eclass strut its stuff ;-)
-
        webapp_src_install
 }
 
@@ -133,7 +124,4 @@ pkg_postinst() {
        elog
        ewarn "Copy the /etc/awstats/awstats.model.conf to"
        ewarn "/etc/awstats/awstats.<yourdomain>.conf and edit it."
-       ewarn "Use the command"
-       ewarn "    webapp-config"
-       ewarn "to install AWStats for each virtual host. See the proper man page."
 }

diff --git a/net-www/awstats/awstats-6.6.ebuild b/net-www/awstats/awstats-6.6.ebuild
index fa4c0771a1848fb9196fb7de2a57d10ee7528fe4..f3956cf9f96fd4ec33e5de8ad082e89f940aabd9 100644 (file)
--- a/net-www/awstats/awstats-6.6.ebuild
+++ b/net-www/awstats/awstats-6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.6.ebuild,v 1.9 2006/07/09 20:37:49 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.6.ebuild,v 1.10 2006/10/27 01:28:34 rl03 Exp $
 
 inherit eutils webapp versionator depend.apache
 
@@ -31,7 +31,7 @@ src_unpack() {
 
        epatch "${FILESDIR}"/${PN}-6.3-gentoo.diff
 
-       # change AWStats default installation directory to installation directory of Gentoo
+       # change default installation directory
        for file in tools/* wwwroot/cgi-bin/*; do
            if [[ -f "${file}" ]]; then
                sed -i -e "s#/usr/local/awstats/wwwroot/cgi-bin#${MY_CGIBINDIR}#g" \
@@ -65,11 +65,6 @@ src_unpack() {
 src_install() {
        webapp_src_preinst
 
-       # handle documentation files
-       #
-       # NOTE that doc files go into /usr/share/doc as normal; they do NOT
-       # get installed per vhost!
-
        dohtml -r docs/*.html docs/*.xml docs/*.css docs/*.js docs/images
        dodoc README.TXT docs/COPYING.TXT docs/LICENSE.TXT
        newdoc wwwroot/cgi-bin/plugins/example/example.pm example_plugin.pm
@@ -115,10 +110,6 @@ src_install() {
                maillogconvert.pl awstats_configure.pl
        newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl
 
-       # all done
-       #
-       # now we let the eclass strut its stuff ;-)
-
        webapp_src_install
 }
 
@@ -130,8 +121,5 @@ pkg_postinst() {
        elog
        ewarn "Copy the /etc/awstats/awstats.model.conf to"
        ewarn "/etc/awstats/awstats.<yourdomain>.conf and edit it."
-       ewarn "Use the command"
-       ewarn "    webapp-config"
-       ewarn "to install AWStats for each virtual host. See the proper man page."
        webapp_pkg_postinst
 }