several fixes; see changelog

8 files changed, 63 insertions, 86 deletions

diff --git a/app-admin/webalizer/ChangeLog b/app-admin/webalizer/ChangeLog
index 4deb58680fc2..b20640de07a6 100644
--- a/app-admin/webalizer/ChangeLog
+++ b/app-admin/webalizer/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/webalizer
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.2 2002/04/12 22:35:06 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.3 2002/04/18 06:33:17 woodchip Exp $
+
+*webalizer-2.01.06-r2 (18 Apr 2002)
+
+  18 Apr 2002; Donny Davies <woodchip@gentoo.org> :
+
+  Updated to match the new apache layout.  Add missing zlib dependency and correct
+  the libpng dependency.  Add a pkg_config for easy apache.conf auto-update.  Fix
+  the report output directory by moving it's creation into pkg_postinst.  Tweaked
+  the config file.
 
 *webalizer-2.01.06-r1 (12 Apr 2002)
 
diff --git a/app-admin/webalizer/files/httpd.webalizer b/app-admin/webalizer/files/apache.webalizer
index da8e0ccd68ae..f45ea56c71a4 100644
--- a/app-admin/webalizer/files/httpd.webalizer
+++ b/app-admin/webalizer/files/apache.webalizer
@@ -1,7 +1,7 @@
 #
 # This is the config file for modlogan-statistics
 #
-<Directory "/usr/local/httpd/webalizer">
+<Directory "/home/httpd/htdocs/webalizer">
   Options None
   AllowOverride None
 
@@ -9,5 +9,4 @@
   Allow from all
 </Directory>
 
-Alias /webalizer "/usr/local/httpd/webalizer"
-
+Alias /webalizer "/home/httpd/htdocs/webalizer"
diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.06-r1 b/app-admin/webalizer/files/digest-webalizer-2.01.06-r1
deleted file mode 100644
index f8bbce9f17e3..000000000000
--- a/app-admin/webalizer/files/digest-webalizer-2.01.06-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9e52cd91de25c87e29b105e5b23dcdfc webalizer-2.01-06-src.tar.bz2 211840
diff --git a/app-admin/webalizer/files/digest-webalizer-2.01.06 b/app-admin/webalizer/files/digest-webalizer-2.01.06-r2
index f8bbce9f17e3..f8bbce9f17e3 100644
--- a/app-admin/webalizer/files/digest-webalizer-2.01.06
+++ b/app-admin/webalizer/files/digest-webalizer-2.01.06-r2
diff --git a/app-admin/webalizer/files/webalizer-2.01.06.conf b/app-admin/webalizer/files/webalizer-2.01.06.conf
index 929b707b76d3..8c498711bb86 100644
--- a/app-admin/webalizer/files/webalizer-2.01.06.conf
+++ b/app-admin/webalizer/files/webalizer-2.01.06.conf
@@ -36,7 +36,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      /usr/local/httpd/webalizer
+OutputDir      /home/httpd/htdocs/webalizer
 
 # 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.06-r1.ebuild b/app-admin/webalizer/webalizer-2.01.06-r1.ebuild
deleted file mode 100644
index 9d0b80169544..000000000000
--- a/app-admin/webalizer/webalizer-2.01.06-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.06-r1.ebuild,v 1.1 2002/04/12 22:35:06 seemant Exp $
-
-MY_P=${P/.06/-06}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Webalizer"
-SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2"
-HOMEPAGE="http://www.mrunix.net/webalizer/"
-
-DEPEND=">=media-libs/libgd-1.8.3"
-
-RDEPEND="media-libs/libpng"
-
-src_compile() {
-	./configure 	\
-		--host=${CHOST}	\
-		--prefix=/usr	\
-		--with-etcdir=/etc/httpd	\
-		--mandir=/usr/share/man	\
-		|| die
-
-	make || die
-}
-
-src_install() {
-
-	into /usr
-	dobin webalizer
-	dosym webalizer /usr/bin/webazolver
-	doman webalizer.1
-	dodir /usr/local/httpd/webalizer
-	insinto /etc/httpd
-	newins ${FILESDIR}/webalizer-${PV}.conf webalizer.conf
-	doins ${FILESDIR}/httpd.webalizer
-	dodoc README* CHANGES COPYING Copyright sample.conf
-
-}
diff --git a/app-admin/webalizer/webalizer-2.01.06-r2.ebuild b/app-admin/webalizer/webalizer-2.01.06-r2.ebuild
new file mode 100644
index 000000000000..b0d5ca4b0779
--- /dev/null
+++ b/app-admin/webalizer/webalizer-2.01.06-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author: Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.06-r2.ebuild,v 1.1 2002/04/18 06:33:17 woodchip Exp $
+
+MY_P=${P/.06/-06}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Webalizer"
+SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${MY_P}-src.tar.bz2"
+HOMEPAGE="http://www.mrunix.net/webalizer/"
+
+DEPEND="virtual/glibc
+	>=media-libs/libgd-1.8.3
+	media-libs/libpng
+	>=sys-libs/zlib-1.1.4"
+
+src_compile() {
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--with-etcdir=/etc/apache/conf \
+		--mandir=/usr/share/man || die
+	make || die
+}
+
+src_install() {
+	into /usr
+	dobin webalizer
+	dosym webalizer /usr/bin/webazolver
+	doman webalizer.1
+	insinto /etc/apache/conf
+	newins ${FILESDIR}/webalizer-${PV}.conf webalizer.conf
+	insinto /etc/apache/conf/addon-modules
+	doins ${FILESDIR}/apache.webalizer
+	dodoc README* CHANGES COPYING Copyright sample.conf
+}
+
+pkg_postinst() {
+	install -d -o root -g root -m0755 ${ROOT}/home/httpd/htdocs/webalizer
+
+	einfo
+	einfo "Execute: 'ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config'"
+	einfo "to have your apache.conf auto-updated for use with webalizer."
+	einfo
+}
+
+pkg_config() {
+	echo "Include  conf/addon-modules/apache.webalizer" \
+		>> ${ROOT}/etc/apache/conf/apache.conf
+}
diff --git a/app-admin/webalizer/webalizer-2.01.06.ebuild b/app-admin/webalizer/webalizer-2.01.06.ebuild
deleted file mode 100644
index 39fd750e723e..000000000000
--- a/app-admin/webalizer/webalizer-2.01.06.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.06.ebuild,v 1.3 2001/11/10 02:30:19 hallski Exp $
-
-P=webalizer-2.01-06
-S=${WORKDIR}/${P}
-DESCRIPTION="Webalizer"
-SRC_URI="ftp://ftp.mrunix.net/pub/webalizer/${P}-src.tar.bz2"
-HOMEPAGE="http://www.mrunix.net/webalizer/"
-
-DEPEND="virtual/glibc
-	>=media-libs/libgd-1.8.3"
-
-RDEPEND="virtual/glibc
-	>=media-libs/libpng-1.0.10"
-
-src_compile() {
-  try ./configure --host=${CHOST} --prefix=/usr --with-etcdir=/etc/httpd --mandir=/usr/share/man
-
-  try make
-}
-
-src_install() {
-
-  into /usr
-  dobin webalizer
-  dosym webalizer /usr/bin/webazolver
-  doman webalizer.1
-  dodir /usr/local/httpd/webalizer
-  insinto /etc/httpd
-  newins ${FILESDIR}/webalizer-${PV}.conf webalizer.conf
-  doins ${FILESDIR}/httpd.webalizer
-  dodoc README* CHANGES COPYING Copyright sample.conf
-
-}
-
-
-
-
-