Added ${ROOT}

diff --git a/app-admin/usermin/ChangeLog b/app-admin/usermin/ChangeLog
index 049870ef0c7f498a00f903913de843e8be50dcb1..73c790d18765dbc2ef89dfc6358db0d8a5c851ac 100644 (file)
--- a/app-admin/usermin/ChangeLog
+++ b/app-admin/usermin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/usermin
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.42 2004/12/19 13:53:09 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.43 2004/12/28 17:14:07 eradicator Exp $
+
+  28 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  usermin-1.100.ebuild:
+  Added ${ROOT}
 
   19 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> usermin-1.100.ebuild:
   Stable on alpha.

diff --git a/app-admin/usermin/usermin-1.100.ebuild b/app-admin/usermin/usermin-1.100.ebuild
index 58d6327d0623e1118a2cf55baca7e0bdcdc536f0..40b8063e9ff2cca6ca3d3ac737a55684aa56a2d9 100644 (file)
--- a/app-admin/usermin/usermin-1.100.ebuild
+++ b/app-admin/usermin/usermin-1.100.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.100.ebuild,v 1.3 2004/12/19 13:53:09 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.100.ebuild,v 1.4 2004/12/28 17:14:07 eradicator Exp $
 
 IUSE="ssl"
 
@@ -51,17 +51,17 @@ src_install() {
 }
 
 pkg_postinst() {
-       /etc/init.d/usermin stop >& /dev/null
+       ${ROOT}/etc/init.d/usermin stop >& /dev/null
        stopstatus=$?
 
-       cd /usr/libexec/usermin
-       config_dir=/etc/usermin
-       var_dir=/var/log/usermin
-       perl=/usr/bin/perl
+       cd ${ROOT}/usr/libexec/usermin
+       config_dir=${ROOT}/etc/usermin
+       var_dir=${ROOT}/var/log/usermin
+       perl=${ROOT}/usr/bin/perl
        autoos=1
        port=20000
        login=root
-       crypt=`grep "^root:" /etc/shadow | cut -f 2 -d :`
+       crypt=`grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :`
        host=`hostname`
        use ssl && ssl=1 || ssl=0
        atboot=0
@@ -71,20 +71,20 @@ pkg_postinst() {
        nouninstall=1
        noperlpath=1
        export config_dir var_dir perl autoos port login crypt host ssl nochown autothird nouninstall nostart noperlpath
-       perl /usr/libexec/usermin/maketemp.pl
-       ./setup.sh > /tmp/.webmin/usermin-setup.out 2>&1
+       perl ${ROOT}/usr/libexec/usermin/maketemp.pl
+       ./setup.sh > ${ROOT}/tmp/.webmin/usermin-setup.out 2>&1
 
        if [ "$stopstatus" = "0" ]; then
                # Start if it was running before
-               /etc/init.d/usermin start
+               ${ROOT}/etc/init.d/usermin start
        fi
 
-       sed -i 's:^pidfile=.*$:pidfile=/var/run/usermin.pid:' /etc/usermin/miniserv.conf
+       sed -i 's:^pidfile=.*$:pidfile=${ROOT}/var/run/usermin.pid:' ${ROOT}/etc/usermin/miniserv.conf
 
        einfo "Add usermin to your boot-time services with 'rc-update add usermin'."
        einfo "Point your web browser to http://localhost:20000 to use usermin."
 }
 
 pkg_prerm() {
-       /etc/init.d/usermin stop >& /dev/null
+       ${ROOT}/etc/init.d/usermin stop >& /dev/null
 }

diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog
index 5d098b1f3036508728015a0ba8e2391722e511ed..a9ff265c24e723434dd39fd10ba4b65f6474e9bb 100644 (file)
--- a/app-admin/webmin/ChangeLog
+++ b/app-admin/webmin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/webmin
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.66 2004/12/19 07:20:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.67 2004/12/28 17:12:32 eradicator Exp $
+
+  28 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  webmin-1.170-r1.ebuild:
+  Added ${ROOT}
 
   18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   webmin-1.170-r1.ebuild:

diff --git a/app-admin/webmin/webmin-1.170-r1.ebuild b/app-admin/webmin/webmin-1.170-r1.ebuild
index 5b1775b3fa3b9785c3afeab0836e28cd5d0c4413..402713ac675f2d3a77d049ea879f494e95f6a12b 100644 (file)
--- a/app-admin/webmin/webmin-1.170-r1.ebuild
+++ b/app-admin/webmin/webmin-1.170-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.170-r1.ebuild,v 1.3 2004/12/19 07:20:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.170-r1.ebuild,v 1.4 2004/12/28 17:12:32 eradicator Exp $
 
 IUSE="ssl apache2 webmin-minimal"
 
@@ -85,16 +85,16 @@ src_install() {
 }
 
 pkg_postinst() {
-       /etc/init.d/webmin stop >/dev/null 2>&1
+       ${ROOT}/etc/init.d/webmin stop >/dev/null 2>&1
        stopstatus=$?
-       cd /usr/libexec/webmin
-       config_dir=/etc/webmin
-       var_dir=/var/log/webmin
-       perl=/usr/bin/perl
+       cd ${ROOT}/usr/libexec/webmin
+       config_dir=${ROOT}/etc/webmin
+       var_dir=${ROOT}/var/log/webmin
+       perl=${ROOT}/usr/bin/perl
        autoos=1
        port=10000
        login=root
-       crypt=`grep "^root:" /etc/shadow | cut -f 2 -d :`
+       crypt=`grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :`
        host=`hostname`
        use ssl && ssl=1 || ssl=0
        atboot=0
@@ -104,20 +104,20 @@ pkg_postinst() {
        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
+       perl ${ROOT}/usr/libexec/webmin/maketemp.pl
+       ./setup.sh > ${ROOT}/tmp/.webmin/webmin-setup.out 2>&1
 
        if [ "$stopstatus" = "0" ]; then
                # Start if it was running before
-               /etc/init.d/webmin start
+               ${ROOT}/etc/init.d/webmin start
        fi
 
-       sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' /etc/webmin/miniserv.conf
+       sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' ${ROOT}/etc/webmin/miniserv.conf
 
        einfo "Add webmin to your boot-time services with 'rc-update add webmin'."
        einfo "Point your web browser to http://localhost:10000 to use webmin."
 }
 
 pkg_prerm() {
-       /etc/init.d/webmin stop >& /dev/null
+       ${ROOT}/etc/init.d/webmin stop >& /dev/null
 }