Fix config files (#67551)

Package-Manager: portage-2.0.51.22-r1

6 files changed, 28 insertions, 33 deletions

diff --git a/app-admin/webalizer/ChangeLog b/app-admin/webalizer/ChangeLog
index 2275f3e516b6..457cdc744641 100644
--- a/app-admin/webalizer/ChangeLog
+++ b/app-admin/webalizer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/webalizer
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.36 2005/07/07 00:26:22 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.37 2005/07/07 22:26:03 rl03 Exp $
+
+  07 Jul 2005; Renat Lumpau <rl03@gentoo.org>
+  files/2.01.10/apache.webalizer, files/2.01.10/reconfig,
+  files/2.01.10/webalizer.conf, webalizer-2.01.10-r9.ebuild:
+  Fix config files (#67551)
 
 *webalizer-2.01.10-r9 (07 Jul 2005)
 
diff --git a/app-admin/webalizer/Manifest b/app-admin/webalizer/Manifest
index ddda69673641..cbb4732693c8 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -1,25 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 405f124a31b68e1285cbcebaf4bc8262 ChangeLog 4939
-MD5 8583552359d0c1414cb52fa99fc5578c metadata.xml 284
-MD5 fc94b5a5e53b4b4471672d0d2ecc6bf8 webalizer-2.01.10-r9.ebuild 2984
-MD5 5833410c77eec8d9cff653e67949b5a6 webalizer-2.01.10-r4.ebuild 2056
-MD5 d74bed80f6183e16dcbd161ccde1ef3d webalizer-2.01.10-r5.ebuild 2553
 MD5 e07be0b4516c1e9044aa0c668866b570 webalizer-2.01.10-r8.ebuild 2486
+MD5 d74bed80f6183e16dcbd161ccde1ef3d webalizer-2.01.10-r5.ebuild 2553
+MD5 14458eba5bb33627ef3c18834ff20c8e webalizer-2.01.10-r9.ebuild 2826
+MD5 5833410c77eec8d9cff653e67949b5a6 webalizer-2.01.10-r4.ebuild 2056
+MD5 6bec3240df3ecaec6cfe2b04f65832bf ChangeLog 5131
+MD5 8583552359d0c1414cb52fa99fc5578c metadata.xml 284
+MD5 cc68675ea63960bbc80d15110e41bf74 files/webalizer-db4.patch 574
+MD5 05805530b2e87a3d55e0056a45e330f5 files/output.c.patch 8088
 MD5 99b845afaf9f7417f82f508992e4a5ab files/digest-webalizer-2.01.10-r4 74
 MD5 e1a2a43e4148a750fc8ef91e0af3ba99 files/digest-webalizer-2.01.10-r5 157
 MD5 e1a2a43e4148a750fc8ef91e0af3ba99 files/digest-webalizer-2.01.10-r8 157
-MD5 05805530b2e87a3d55e0056a45e330f5 files/output.c.patch 8088
-MD5 cc68675ea63960bbc80d15110e41bf74 files/webalizer-db4.patch 574
 MD5 e1a2a43e4148a750fc8ef91e0af3ba99 files/digest-webalizer-2.01.10-r9 157
-MD5 08dd05c168f790b0af0b1cb5c0fd8340 files/2.01.10/apache.webalizer 337
-MD5 173d3eb05975b2d41d2cfda193208f1a files/2.01.10/reconfig 131
-MD5 43ba0f621ebb8fd776052f4ef30f20d5 files/2.01.10/webalizer.conf 23910
+MD5 72cc13055db3923e3b42824671712ed1 files/2.01.10/apache.webalizer 274
+MD5 d121e2b8e931e69a97c720cf30251959 files/2.01.10/webalizer.conf 23895
+MD5 7f29ecf09808176c22585f5205c6eceb files/2.01.10/reconfig 410
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCzHbAl5AvwDPiUowRAh+uAJ9fgYlBvUYGHJhCXAQ+2XIAeeAzMwCgjJJg
-EZtlJiYC4ySRR+Wf3NvUJj4=
-=zu2t
+iD8DBQFCzawEEzitwsaoONoRAlv8AKCanWThuDREfpIdA5ApO7zltqMMqgCggdcP
+xZYEvqw/JSgBO4gP5B6E9WI=
+=MK5K
 -----END PGP SIGNATURE-----
diff --git a/app-admin/webalizer/files/2.01.10/apache.webalizer b/app-admin/webalizer/files/2.01.10/apache.webalizer
index 6b1276b2fed2..37579f93dc67 100644
--- a/app-admin/webalizer/files/2.01.10/apache.webalizer
+++ b/app-admin/webalizer/files/2.01.10/apache.webalizer
@@ -1,15 +1,11 @@
 #
 # This is the config snippet for Webalizer
 #
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/files/2.01.10/apache.webalizer,v 1.2 2004/07/18 02:25:49 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/files/2.01.10/apache.webalizer,v 1.3 2005/07/07 22:26:03 rl03 Exp $
 
-Alias /webalizer "/var/www/webalizer"
-
-<Directory "/var/www/webalizer">
+<Directory "DIR">
   Options None
   AllowOverride None
   Order allow,deny
   Allow from all
 </Directory>
-
-
diff --git a/app-admin/webalizer/files/2.01.10/reconfig b/app-admin/webalizer/files/2.01.10/reconfig
index dc50871fcb5b..2e2f2cba82a2 100644
--- a/app-admin/webalizer/files/2.01.10/reconfig
+++ b/app-admin/webalizer/files/2.01.10/reconfig
@@ -1,4 +1,7 @@
 #!/bin/bash
 if [ $1 = "start" -o $1 = "install" ]; then
-	sed -e "s|/var/www/webalizer|${MY_INSTALLDIR}|" -i /etc/webalizer.conf
+	# somewhat braindead - not sure which Apache we're using, so try both
+	[[ -a /etc/apache/modules.d/55_webalizer.conf ]] && file1="/etc/apache/modules.d/55_webalizer.conf"
+	[[ -a /etc/apache2/modules.d/55_webalizer.conf ]] && file2="/etc/apache2/modules.d/55_webalizer.conf"
+	sed -e "s|DIR|${MY_INSTALLDIR}|g" -i ${file1} ${file2} /etc/webalizer.conf
 fi
diff --git a/app-admin/webalizer/files/2.01.10/webalizer.conf b/app-admin/webalizer/files/2.01.10/webalizer.conf
index cc94511d7788..b82707937968 100644
--- a/app-admin/webalizer/files/2.01.10/webalizer.conf
+++ b/app-admin/webalizer/files/2.01.10/webalizer.conf
@@ -39,7 +39,7 @@ LogFile        /var/log/apache/access_log
 # should be a full path name, however relative ones might work as well.
 # If no output directory is specified, the current directory will be used.
 
-OutputDir      /var/www/webalizer
+OutputDir      DIR
 
 # HistoryName allows you to specify the name of the history file produced
 # by the Webalizer.  The history file keeps the data for up to 12 months
diff --git a/app-admin/webalizer/webalizer-2.01.10-r9.ebuild b/app-admin/webalizer/webalizer-2.01.10-r9.ebuild
index 0ec5914a5283..fd954f97cefa 100644
--- a/app-admin/webalizer/webalizer-2.01.10-r9.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.10-r9.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/app-admin/webalizer/webalizer-2.01.10-r9.ebuild,v 1.1 2005/07/07 00:26:22 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r9.ebuild,v 1.2 2005/07/07 22:26:03 rl03 Exp $
 
 # uses webapps to create directories with right permissions
 # probably slight overkil but works well
@@ -76,17 +76,8 @@ src_install() {
 	doman webalizer.1
 
 	insinto /etc
-	newins ${FILESDIR}/${PV}/webalizer.conf webalizer.conf
-
-	if use apache2; then
-		# patch for apache2
-		sed -i -e "s/apache/apache2/g" ${D}/etc/webalizer.conf
-		insinto ${APACHE2_CONFDIR}
-	else
-		insinto ${APACHE1_CONFDIR}
-	fi
-
 	doins ${FILESDIR}/${PV}/webalizer.conf
+	use apache2 && sed -i -e "s/apache/apache2/g" ${D}/etc/webalizer.conf
 
 	if use apache2; then
 		insinto ${APACHE2_MODULES_CONFDIR}