Fix postinst-en.txt for bug 81802.

(Portage version: 2.0.51.16)

4 files changed, 22 insertions, 26 deletions

diff --git a/net-www/awstats/ChangeLog b/net-www/awstats/ChangeLog
index 1de564aae492..c1ab69a09c0a 100644
--- a/net-www/awstats/ChangeLog
+++ b/net-www/awstats/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/awstats
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.12 2005/02/12 21:55:46 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.13 2005/02/13 01:51:26 ka0ttic Exp $
+
+  12 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> files/postinst-en.txt,
+  awstats-6.3-r1.ebuild:
+  Fix postinst-en.txt for bug 81802.
 
 *awstats-6.3-r1 (12 Feb 2005)
 
diff --git a/net-www/awstats/Manifest b/net-www/awstats/Manifest
index 53a98e8e067a..f2fdd3d17a4e 100644
--- a/net-www/awstats/Manifest
+++ b/net-www/awstats/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 83d35d33a66e5ba35d2a87e05f7cd985 awstats-6.3-r1.ebuild 3816
-MD5 3ba5a2fe236a19ed01ba9c4beb38f06b ChangeLog 2131
+MD5 5778ea07e765d27d1c448d56d344300d awstats-6.3-r1.ebuild 3968
+MD5 08bfec536ffa52fb85dcad45bbd23a4d ChangeLog 2266
 MD5 6bc2db5b1e135821863e91fa8658ad48 metadata.xml 255
 MD5 6e7773a7ddac4fe0259957c488da02cd files/digest-awstats-6.3-r1 60
 MD5 8f8b0ad336b5066db17452db770ed878 files/awstats-6.3-CAN-2005-0016.diff 1243
 MD5 7a52d3f65ff7220a519056716d460ecd files/awstats-6.3-gentoo.diff 1219
-MD5 102ec928bf01d326931ea260173c1dab files/postinst-en.txt 649
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCDntrEZCkKN40op4RAj1eAJ9pe73/MuEnCQ3Fu+LuE4oz+XpFUgCglwc/
-1BmCpV9qKo8ps69zV8QCGk4=
-=sK6r
------END PGP SIGNATURE-----
+MD5 182b67a3023a0807ce19f8876d48c81d files/postinst-en.txt 657
diff --git a/net-www/awstats/awstats-6.3-r1.ebuild b/net-www/awstats/awstats-6.3-r1.ebuild
index f081ed08c2a7..e72d055d7ee1 100644
--- a/net-www/awstats/awstats-6.3-r1.ebuild
+++ b/net-www/awstats/awstats-6.3-r1.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/net-www/awstats/awstats-6.3-r1.ebuild,v 1.1 2005/02/12 21:55:46 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.3-r1.ebuild,v 1.2 2005/02/13 01:51:26 ka0ttic Exp $
 
 inherit eutils webapp
 
@@ -12,11 +12,12 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ppc ~mips ~sparc x86 ~amd64"
 IUSE=""
 
-DEPEND=">=dev-lang/perl-5.6.1
+RDEPEND=">=dev-lang/perl-5.6.1
 	>=media-libs/libpng-1.2
 	dev-perl/Time-Local
 	net-www/apache"
-RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
@@ -49,10 +50,11 @@ src_unpack() {
 	    -e "s#DataDir=.*#DataDir=\"${MY_HOSTROOTDIR}/awstats/datadir\"#" \
 	${S}/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
 
+	# set version in postinst-en.txt
+	sed -e "s/PVR/${PVR}/g" \
+		${FILESDIR}/postinst-en.txt > ${WORKDIR}/postinst-en.txt || die
 }
 
-
-
 src_install() {
 	webapp_src_preinst
 
@@ -67,7 +69,7 @@ src_install() {
 	docinto xslt
 	dodoc tools/xslt/*
 
-	webapp_postinst_txt en ${FILESDIR}/postinst-en.txt
+	webapp_postinst_txt en ${WORKDIR}/postinst-en.txt
 
 	keepdir /var/lib/awstats
 
diff --git a/net-www/awstats/files/postinst-en.txt b/net-www/awstats/files/postinst-en.txt
index 959f99af59f4..2b289c6be30a 100644
--- a/net-www/awstats/files/postinst-en.txt
+++ b/net-www/awstats/files/postinst-en.txt
@@ -1,9 +1,9 @@
-Alias /awstats/classes "/usr/share/webapps/awstats/6.3/htdocs/classes/"
-Alias /awstats/css "/usr/share/webapps/awstats/6.3/htdocs/css/"
-Alias /awstats/icons "/usr/share/webapps/awstats/6.3/htdocs/icon/"
-ScriptAlias /awstats/ "/usr/share/webapps/awstats/6.3/hostroot/cgi-bin/"
+Alias /awstats/classes "/usr/share/webapps/awstats/PVR/htdocs/classes/"
+Alias /awstats/css "/usr/share/webapps/awstats/PVR/htdocs/css/"
+Alias /awstats/icons "/usr/share/webapps/awstats/PVR/htdocs/icon/"
+ScriptAlias /awstats/ "/usr/share/webapps/awstats/PVR/hostroot/cgi-bin/"
 
-<Directory "/usr/share/webapps/awstats/6.3/htdocs">
+<Directory "/usr/share/webapps/awstats/PVR/htdocs">
     Options None
     AllowOverride None
     <IfModule mod_access.c>
@@ -12,7 +12,7 @@ ScriptAlias /awstats/ "/usr/share/webapps/awstats/6.3/hostroot/cgi-bin/"
     </IfModule>
 </Directory>
 
-<Directory "/usr/share/webapps/6.3/hostroot/cgi-bin">
+<Directory "/usr/share/webapps/awstats/PVR/hostroot/cgi-bin">
     Options ExecCGI
     AllowOverride None
     <IfModule mod_access.c>