more changes for conf file locations

8 files changed, 17 insertions, 220 deletions

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 8a651b6d8114..561c64737c44 100644
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/webmin
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.11 2003/01/16 11:44:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.12 2003/01/17 07:23:57 seemant Exp $
+
+*webmin-1.050-r2 (16 Jan 2002)
+
+  16 Jan 2002; Seemant Kulleen <seemant@gentoo.org> webmin-1.050-r2.ebuild
+  files/digest-webmin-1.050-r2 :
+
+  webalizer config file needs to be in /etc/apache/conf instead, closing bug
+  #14039 by peter.hermsdorf@web.de (peter hermsdorf)
 
 *webmin-1.050-r1 (16 Jan 2002)
 
diff --git a/app-admin/webmin/files/digest-webmin-1.020-r1 b/app-admin/webmin/files/digest-webmin-1.020-r1
deleted file mode 100644
index 96d4c685faa1..000000000000
--- a/app-admin/webmin/files/digest-webmin-1.020-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ca559d49ad71abf721564df8436de2cf webmin-1.020.tar.gz 5686280
diff --git a/app-admin/webmin/files/digest-webmin-1.030 b/app-admin/webmin/files/digest-webmin-1.030
deleted file mode 100644
index 20516dfdfa3d..000000000000
--- a/app-admin/webmin/files/digest-webmin-1.030
+++ /dev/null
@@ -1 +0,0 @@
-MD5 52616747ec6aef3fff99887e84e196bf webmin-1.030.tar.gz 5665384
diff --git a/app-admin/webmin/files/digest-webmin-1.050-r1 b/app-admin/webmin/files/digest-webmin-1.050-r2
index 26fed42648d4..26fed42648d4 100644
--- a/app-admin/webmin/files/digest-webmin-1.050-r1
+++ b/app-admin/webmin/files/digest-webmin-1.050-r2
diff --git a/app-admin/webmin/webmin-1.020-r1.ebuild b/app-admin/webmin/webmin-1.020-r1.ebuild
deleted file mode 100644
index 2a89b22524bb..000000000000
--- a/app-admin/webmin/webmin-1.020-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.020-r1.ebuild,v 1.2 2002/11/07 08:10:19 seemant Exp $
-
-IUSE="ssl"
-
-DESCRIPTION="Webmin, a web-based system administration interface"
-SRC_URI="http://www.webmin.com/download/${P}.tar.gz"
-HOMEPAGE="http://www.webmin.com/"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="x86"
-
-DEPEND="sys-devel/perl
-	ssl? ( dev-perl/Net-SSLeay )"
-
-RDEPEND=""
-
-src_install() {
-	rm -f mount/freebsd-mounts*
-	rm -f mount/openbsd-mounts*
-	rm -f mount/macos-mounts*
-	(find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-	dodir /usr/libexec/webmin
-	dodir /etc/init.d
-	dodir /var
-	dodir /etc/pam.d
-	cp -rp * ${D}/usr/libexec/webmin
-	mv ${D}/usr/libexec/webmin/openslp/config \
-		${D}/usr/libexec/webmin/openslp/config-gentoo-linux
-	
-	insinto /etc/init.d
-	newins webmin-gentoo-init webmin
-
-	insinto /etc/pam.d/
-	newins webmin-pam webmin
-	echo gentoo > ${D}/usr/libexec/webmin/install-type
-
-	exeinto /etc/webmin
-	doexe ${FILESDIR}/uninstall.sh
-
-}
-
-pkg_postinst() {
-	/etc/init.d/webmin stop >/dev/null 2>&1
-	stopstatus=$?
-	cd /usr/libexec/webmin
-	config_dir=/etc/webmin
-	var_dir=/var/webmin
-	perl=/usr/bin/perl
-	autoos=1
-	port=10000
-	login=root
-	crypt=`grep "^root:" /etc/shadow | cut -f 2 -d :`
-	host=`hostname`
-	ssl=0
-	atboot=0
-	nostart=1
-	nochown=1
-	autothird=1
-	nouninstall=1
-	noperlpath=1
-	export config_dir var_dir perl autoos port login crypt host ssl nochown autothird nouninstall nostart noperlpath
-	perl /usr/libexec/webmin/maketemp.pl
-	./setup.sh >/tmp/.webmin/webmin-setup.out 2>&1
-
-	if [ "$stopstatus" = "0" ]; then
-		# Start if it was running before
-		/etc/init.d/webmin start
-	fi
-}
diff --git a/app-admin/webmin/webmin-1.030.ebuild b/app-admin/webmin/webmin-1.030.ebuild
deleted file mode 100644
index 9faa687704f4..000000000000
--- a/app-admin/webmin/webmin-1.030.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.030.ebuild,v 1.4 2002/11/30 20:08:50 seemant Exp $
-
-IUSE="ssl"
-
-DESCRIPTION="Webmin, a web-based system administration interface"
-SRC_URI="http://www.webmin.com/download/${P}.tar.gz"
-HOMEPAGE="http://www.webmin.com/"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="x86 ~ppc"
-
-DEPEND="sys-devel/perl
-	ssl? ( dev-perl/Net-SSLeay )"
-
-RDEPEND=""
-
-src_install() {
-	rm -f mount/freebsd-mounts*
-	rm -f mount/openbsd-mounts*
-	rm -f mount/macos-mounts*
-	(find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-	dodir /usr/libexec/webmin
-	dodir /etc/init.d
-	dodir /var
-	dodir /etc/pam.d
-	cp -rp * ${D}/usr/libexec/webmin
-	mv ${D}/usr/libexec/webmin/openslp/config \
-		${D}/usr/libexec/webmin/openslp/config-gentoo-linux
-	
-	exeinto /etc/init.d
-	newexe webmin-gentoo-init webmin
-
-	insinto /etc/pam.d/
-	newins webmin-pam webmin
-	echo gentoo > ${D}/usr/libexec/webmin/install-type
-
-	exeinto /etc/webmin
-	doexe ${FILESDIR}/uninstall.sh
-
-}
-
-pkg_postinst() {
-	/etc/init.d/webmin stop >/dev/null 2>&1
-	stopstatus=$?
-	cd /usr/libexec/webmin
-	config_dir=/etc/webmin
-	var_dir=/var/webmin
-	perl=/usr/bin/perl
-	autoos=1
-	port=10000
-	login=root
-	crypt=`grep "^root:" /etc/shadow | cut -f 2 -d :`
-	host=`hostname`
-	ssl=0
-	atboot=0
-	nostart=1
-	nochown=1
-	autothird=1
-	nouninstall=1
-	noperlpath=1
-	export config_dir var_dir perl autoos port login crypt host ssl nochown autothird nouninstall nostart noperlpath
-	perl /usr/libexec/webmin/maketemp.pl
-	./setup.sh >/tmp/.webmin/webmin-setup.out 2>&1
-
-	if [ "$stopstatus" = "0" ]; then
-		# Start if it was running before
-		/etc/init.d/webmin start
-	fi
-}
diff --git a/app-admin/webmin/webmin-1.050-r1.ebuild b/app-admin/webmin/webmin-1.050-r2.ebuild
index 40b7f374f332..8d5bc66c6541 100644
--- a/app-admin/webmin/webmin-1.050-r1.ebuild
+++ b/app-admin/webmin/webmin-1.050-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.050-r1.ebuild,v 1.1 2003/01/16 11:44:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.050-r2.ebuild,v 1.1 2003/01/17 07:23:57 seemant Exp $
 
 IUSE="ssl"
 
@@ -20,9 +20,16 @@ RDEPEND=""
 src_unpack() {
 	unpack ${A}
 
+	# fix paths for conf files -- will be unnecessary at next upstream
+	# release for webmin
 	cp ${S}/postgresql/config-gentoo-linux  ${T}
 	sed "s:hba_conf=.*:hba_conf=/var/lib/postgresql/data/pg_hba.conf:" \
 		${T}/config-gentoo-linux > ${S}/postgresql/config-gentoo-linux
+
+	cp "${S}/webalizer/config-*-linux" ${T}
+	sed "s:webalizer_conf=.*:webalizer_conf=/etc/apache/webalizer.conf:" \
+		"${T}/config-*-linux" > "${S}/webalizer/config-*-linux"
+	
 }
 
 src_install() {
diff --git a/app-admin/webmin/webmin-1.050.ebuild b/app-admin/webmin/webmin-1.050.ebuild
deleted file mode 100644
index ff5b843c0f5a..000000000000
--- a/app-admin/webmin/webmin-1.050.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.050.ebuild,v 1.2 2003/01/08 03:31:41 weeve Exp $
-
-IUSE="ssl"
-
-DESCRIPTION="Webmin, a web-based system administration interface"
-SRC_URI="http://www.webmin.com/download/${P}.tar.gz"
-HOMEPAGE="http://www.webmin.com/"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="x86 ~ppc sparc"
-
-DEPEND="sys-devel/perl
-	ssl? ( dev-perl/Net-SSLeay )"
-
-RDEPEND=""
-
-src_install() {
-	rm -f mount/freebsd-mounts*
-	rm -f mount/openbsd-mounts*
-	rm -f mount/macos-mounts*
-	(find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-	dodir /usr/libexec/webmin
-	dodir /etc/init.d
-	dodir /var
-	dodir /etc/pam.d
-	cp -rp * ${D}/usr/libexec/webmin
-	mv ${D}/usr/libexec/webmin/openslp/config \
-		${D}/usr/libexec/webmin/openslp/config-gentoo-linux
-	
-	exeinto /etc/init.d
-	newexe webmin-gentoo-init webmin
-
-	insinto /etc/pam.d/
-	newins webmin-pam webmin
-	echo gentoo > ${D}/usr/libexec/webmin/install-type
-
-	exeinto /etc/webmin
-	doexe ${FILESDIR}/uninstall.sh
-
-}
-
-pkg_postinst() {
-	/etc/init.d/webmin stop >/dev/null 2>&1
-	stopstatus=$?
-	cd /usr/libexec/webmin
-	config_dir=/etc/webmin
-	var_dir=/var/webmin
-	perl=/usr/bin/perl
-	autoos=1
-	port=10000
-	login=root
-	crypt=`grep "^root:" /etc/shadow | cut -f 2 -d :`
-	host=`hostname`
-	ssl=0
-	atboot=0
-	nostart=1
-	nochown=1
-	autothird=1
-	nouninstall=1
-	noperlpath=1
-	export config_dir var_dir perl autoos port login crypt host ssl nochown autothird nouninstall nostart noperlpath
-	perl /usr/libexec/webmin/maketemp.pl
-	./setup.sh >/tmp/.webmin/webmin-setup.out 2>&1
-
-	if [ "$stopstatus" = "0" ]; then
-		# Start if it was running before
-		/etc/init.d/webmin start
-	fi
-}