Gentoo Archives: gentoo-commits

From: "Benedikt Boehm (hollow)" <hollow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-www/awstats: ChangeLog awstats-6.7.ebuild awstats-6.5-r2.ebuild
Date: Sat, 08 Sep 2007 12:05:31
Message-Id: E1ITyxW-0008Ut-3G@stork.gentoo.org
1 hollow 07/09/08 11:58:42
2
3 Modified: ChangeLog awstats-6.7.ebuild
4 Removed: awstats-6.5-r2.ebuild
5 Log:
6 do not use USE_APACHE2; whitespace cleanup
7 (Portage version: 2.1.3.7)
8
9 Revision Changes Path
10 1.50 net-www/awstats/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/awstats/ChangeLog?rev=1.50&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/awstats/ChangeLog?rev=1.50&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/awstats/ChangeLog?r1=1.49&r2=1.50
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v
19 retrieving revision 1.49
20 retrieving revision 1.50
21 diff -u -r1.49 -r1.50
22 --- ChangeLog 7 Sep 2007 04:43:20 -0000 1.49
23 +++ ChangeLog 8 Sep 2007 11:58:41 -0000 1.50
24 @@ -1,6 +1,10 @@
25 # ChangeLog for net-www/awstats
26 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.49 2007/09/07 04:43:20 jer Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.50 2007/09/08 11:58:41 hollow Exp $
29 +
30 + 08 Sep 2007; Benedikt Böhm <hollow@g.o> -awstats-6.5-r2.ebuild,
31 + awstats-6.7.ebuild:
32 + do not use USE_APACHE2; whitespace cleanup
33
34 07 Sep 2007; Jeroen Roovers <jer@g.o> awstats-6.7.ebuild:
35 Marked ~hppa (bug #191525).
36
37
38
39 1.3 net-www/awstats/awstats-6.7.ebuild
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/awstats/awstats-6.7.ebuild?rev=1.3&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/awstats/awstats-6.7.ebuild?rev=1.3&content-type=text/plain
43 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-www/awstats/awstats-6.7.ebuild?r1=1.2&r2=1.3
44
45 Index: awstats-6.7.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.7.ebuild,v
48 retrieving revision 1.2
49 retrieving revision 1.3
50 diff -u -r1.2 -r1.3
51 --- awstats-6.7.ebuild 7 Sep 2007 04:43:20 -0000 1.2
52 +++ awstats-6.7.ebuild 8 Sep 2007 11:58:41 -0000 1.3
53 @@ -1,6 +1,6 @@
54 # Copyright 1999-2007 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.7.ebuild,v 1.2 2007/09/07 04:43:20 jer Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.7.ebuild,v 1.3 2007/09/08 11:58:41 hollow Exp $
58
59 inherit eutils webapp versionator depend.apache
60
61 @@ -33,29 +33,31 @@
62
63 # change default installation directory
64 for file in tools/* wwwroot/cgi-bin/*; do
65 - if [[ -f "${file}" ]]; then
66 - sed -i -e "s#/usr/local/awstats/wwwroot/cgi-bin#${MY_CGIBINDIR}#g" \
67 - -e "s#/usr/local/awstats/wwwroot/icon#${MY_HTDOCSDIR}/icon#g" \
68 - -e "s#/usr/local/awstats/wwwroot/plugins#${MY_HOSTROOTDIR}/plugins#g" \
69 - -e "s#/usr/local/awstats/wwwroot/classes#${MY_HTDOCSDIR}/classes#g" \
70 - -e "s#/usr/local/awstats/wwwroot#${MY_HTDOCSDIR}#g" \
71 - "${file}" || die "sed ${file} failed"
72 - fi
73 + if [[ -f "${file}" ]]; then
74 + sed \
75 + -e "s#/usr/local/awstats/wwwroot/cgi-bin#${MY_CGIBINDIR}#g" \
76 + -e "s#/usr/local/awstats/wwwroot/icon#${MY_HTDOCSDIR}/icon#g" \
77 + -e "s#/usr/local/awstats/wwwroot/plugins#${MY_HOSTROOTDIR}/plugins#g" \
78 + -e "s#/usr/local/awstats/wwwroot/classes#${MY_HTDOCSDIR}/classes#g" \
79 + -e "s#/usr/local/awstats/wwwroot#${MY_HTDOCSDIR}#g" \
80 + -i "${file}" || die "sed ${file} failed"
81 + fi
82 done
83
84 # set the logpath
85 if use apache2; then
86 - logpath="apache${USE_APACHE2}/access_log"
87 + logpath="apache2/access_log"
88 else
89 logpath="awstats_log"
90 fi
91
92 # set default values for directories
93 - sed -i -e "s|^\(LogFile=\).*$|\1\"/var/log/${logpath}\"|" \
94 - -e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" \
95 - -e "s|^\(DirIcons=\).*$|\1\"/awstats/icons\"|" \
96 - -e "s|^\(DirCgi=\).*$|\1\"/cgi-bin/awstats\"|" \
97 - "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
98 + sed \
99 + -e "s|^\(LogFile=\).*$|\1\"/var/log/${logpath}\"|" \
100 + -e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" \
101 + -e "s|^\(DirIcons=\).*$|\1\"/awstats/icons\"|" \
102 + -e "s|^\(DirCgi=\).*$|\1\"/cgi-bin/awstats\"|" \
103 + -i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
104
105 # set version in postinst-en.txt
106 sed -e "s/PVR/${PVR}/g" \
107
108
109
110 --
111 gentoo-commits@g.o mailing list