New commits:
commit 1c1274e51cf20b0b1b7226c94e744ec7471cf9e5
Author: Jeremy Blosser <jblosser-smgl AT firinn.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>
Fix some easy to spot bad TRACK_ROOT usage.
diff --git a/audio-drivers/alsa-driver/BUILD b/audio-drivers/alsa-driver/BUILD
index 8f99356..f98ba6e 100755
--- a/audio-drivers/alsa-driver/BUILD
+++ b/audio-drivers/alsa-driver/BUILD
@@ -1,5 +1,5 @@
# Clean out the old alsa drivers. FIXME: Bad location for 2.6!
-rm -f ${TRACK_ROOT}/lib/modules/`get_kernel_version`/misc/snd* &&
+rm -f ${INSTALL_ROOT}/lib/modules/`get_kernel_version`/misc/snd* &&
if [[ $(get_sorcery_kernel_config CONFIG_SOUND) == m ||
`grep -c CONFIG_SOUND=m ${CONFIG_CACHE}/kernel.config` == 1 ]]
diff --git a/audio-drivers/alsa-driver/CONFIGURE
b/audio-drivers/alsa-driver/CONFIGURE
index 663847c..67e7be2 100755
--- a/audio-drivers/alsa-driver/CONFIGURE
+++ b/audio-drivers/alsa-driver/CONFIGURE
@@ -1,8 +1,8 @@
if ! grep -q "CARDS=" $SPELL_CONFIG; then
diff --git a/database/mysql/INSTALL b/database/mysql/INSTALL
index f226c7d..8f28509 100755
--- a/database/mysql/INSTALL
+++ b/database/mysql/INSTALL
@@ -1,2 +1,2 @@
make pkglibdir=${TRACK_ROOT}/usr/lib install &&
-rm -rf ${TRACK_ROOT}/usr/mysql-test
+rm -rf ${INSTALL_ROOT}/usr/mysql-test
diff --git a/devel/doxygen/HISTORY b/devel/doxygen/HISTORY
index ced51af..2af9b16 100644
--- a/devel/doxygen/HISTORY
+++ b/devel/doxygen/HISTORY
@@ -1,3 +1,6 @@
+2007-03-03 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * PRE_BUILD: Replace bad TRACK_ROOT usage (automated).
+
2007-01-04 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: For new installs, /etc/profile.d/qt.sh won't be sourced
until relogin, so we need to check for QTDIR and source qt.sh if
diff --git a/devel/doxygen/PRE_BUILD b/devel/doxygen/PRE_BUILD
index 975837f..0ca9b3f 100755
--- a/devel/doxygen/PRE_BUILD
+++ b/devel/doxygen/PRE_BUILD
@@ -10,6 +10,6 @@ source "$GRIMOIRE/is_depends_enabled.fu
if is_depends_enabled $SPELL qt-x11; then
if [[ -z $QTDIR ]]; then
- source $TRACK_ROOT/etc/profile.d/qt.sh
+ source $INSTALL_ROOT/etc/profile.d/qt.sh
fi
fi
diff --git a/devel/eclipse/BUILD b/devel/eclipse/BUILD
index 8049f79..5e4d881 100755
--- a/devel/eclipse/BUILD
+++ b/devel/eclipse/BUILD
@@ -1,8 +1,8 @@
#
# Setup ANT_HOME
#
-if [ -f $TRACK_ROOT/etc/profile.d/ant.sh ]; then
- . $TRACK_ROOT/etc/profile.d/ant.sh
+if [ -f $INSTALL_ROOT/etc/profile.d/ant.sh ]; then
+ . $INSTALL_ROOT/etc/profile.d/ant.sh
else
#
# ant must not be installed
@@ -18,8 +18,8 @@ fi &&
#
# Setup JAVA_HOME
#
-if [ -f $TRACK_ROOT/etc/profile.d/java.sh ]; then
- . $TRACK_ROOT/etc/profile.d/java.sh
+if [ -f $INSTALL_ROOT/etc/profile.d/java.sh ]; then
+ . $INSTALL_ROOT/etc/profile.d/java.sh
else
#
# JAVA must not be installed
diff --git a/devel/eclipse/HISTORY b/devel/eclipse/HISTORY
index e8e6b51..02ae054 100644
--- a/devel/eclipse/HISTORY
+++ b/devel/eclipse/HISTORY
@@ -1,3 +1,7 @@
+2007-03-03 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * INSTALL: Replace bad TRACK_ROOT usage (automated).
+ * BUILD: Replace bad TRACK_ROOT usage (automated).
+
2007-03-01 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 3.2.2 and timestamp 200702121330
Fixes Bug #12954 (update to 3.2)
diff --git a/devel/eclipse/INSTALL b/devel/eclipse/INSTALL
index 46d408e..3447171 100755
--- a/devel/eclipse/INSTALL
+++ b/devel/eclipse/INSTALL
@@ -1,5 +1,5 @@
-if [ -f $TRACK_ROOT/etc/profile.d/java.sh ]; then
- source $TRACK_ROOT/etc/profile.d/java.sh
+if [ -f $INSTALL_ROOT/etc/profile.d/java.sh ]; then
+ source $INSTALL_ROOT/etc/profile.d/java.sh
fi &&
cd $INSTALL_ROOT/usr/share &&
diff --git a/devel/guile/HISTORY b/devel/guile/HISTORY
index 7fbc33e..cdb42e9 100644
--- a/devel/guile/HISTORY
+++ b/devel/guile/HISTORY
@@ -1,3 +1,6 @@
+2007-03-03 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * POST_REMOVE: Replace bad TRACK_ROOT usage (automated).
+
2007-03-02 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* UP_TRIGGERS: only trigger on the 1.6->1.8 update
* DETAILS: PATCHLEVEL++
diff --git a/devel/guile/POST_REMOVE b/devel/guile/POST_REMOVE
index 4f064b0..0309726 100755
--- a/devel/guile/POST_REMOVE
+++ b/devel/guile/POST_REMOVE
@@ -1 +1 @@
-rm -rf ${TRACK_ROOT}/usr/share/guile
+rm -rf ${INSTALL_ROOT}/usr/share/guile
diff --git a/disk/genisoimage/HISTORY b/disk/genisoimage/HISTORY
index 407ab3d..120084a 100644
--- a/disk/genisoimage/HISTORY
+++ b/disk/genisoimage/HISTORY
@@ -1,3 +1,6 @@
+2007-03-03 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * INSTALL: Replace bad TRACK_ROOT usage (automated).
+
2007-02-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* CONFLICTS: removed mkisofs, deprecation complete
diff --git a/disk/genisoimage/INSTALL b/disk/genisoimage/INSTALL
index 207ff9b..2bebad1 100755
--- a/disk/genisoimage/INSTALL
+++ b/disk/genisoimage/INSTALL
@@ -1,5 +1,5 @@
default_install &&
if [ $SYM_ISO = y ] ; then
- cd $TRACK_ROOT/usr/bin &&
+ cd $INSTALL_ROOT/usr/bin &&
ln -s genisoimage mkisofs
fi
diff --git a/disk/grub/HISTORY b/disk/grub/HISTORY
index 200d2c3..1070c20 100644
--- a/disk/grub/HISTORY
+++ b/disk/grub/HISTORY
@@ -1,3 +1,6 @@
+2007-03-03 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * INSTALL: Replace bad TRACK_ROOT usage (automated).
+
2006-12-20 Pol Vinogradov <vin.public AT gmail.com>
* PRE_BUILD, configure.ac.patch: added a patch to get rid of
automake-1.9, works with automake now
diff --git a/disk/grub/INSTALL b/disk/grub/INSTALL
index e49a39c..7eab73a 100755
--- a/disk/grub/INSTALL
+++ b/disk/grub/INSTALL
@@ -1,9 +1,9 @@
-if [ ! -e ${TRACK_ROOT}/boot/grub ]; then
+if [ ! -e ${INSTALL_ROOT}/boot/grub ]; then
mkdir -p ${INSTALL_ROOT}/boot/grub
fi &&
config_query_string SUSPEND_SWAP "What is your swap device/file?" "$TMP_SWAP"
diff --git a/kernels/suspend/HISTORY b/kernels/suspend/HISTORY
index cd7f6bf..2b51c2e 100644
--- a/kernels/suspend/HISTORY
+++ b/kernels/suspend/HISTORY
@@ -1,3 +1,6 @@
+2007-03-03 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * CONFIGURE: Replace bad TRACK_ROOT usage (automated).
+
2006-01-01 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on pciutils (vbetool fails to build without
pci/pci.h)
diff --git a/libs/slib/HISTORY b/libs/slib/HISTORY
index 805dd14..64ae5d4 100644
--- a/libs/slib/HISTORY
+++ b/libs/slib/HISTORY
@@ -1,3 +1,6 @@
+2007-03-03 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * INSTALL: Replace bad TRACK_ROOT usage (automated).
+
2007-01-28 George Sherwood <george AT beernabeer.com>
* DETAILS: PATCHLEVEL++
* INSTALL: link to /usr/share/guile/slib vice /usr/share/guile/site
diff --git a/libs/slib/INSTALL b/libs/slib/INSTALL
index d39ef88..5de0b92 100755
--- a/libs/slib/INSTALL
+++ b/libs/slib/INSTALL
@@ -1,10 +1,10 @@
local GUILE SLIB &&
#GUILE=${INSTALL_ROOT}/usr/share/guile/`installed_version guile|cut
-c-3`/slib &&
-GUILE=${TRACK_ROOT}/usr/share/guile/slib &&
+GUILE=${INSTALL_ROOT}/usr/share/guile/slib &&
SLIB=${INSTALL_ROOT}/usr/lib/slib &&
mkdir -p $SLIB &&
cp * $SLIB &&
-ln -sf $SLIB $GUILE &&
+ln -sf ${TRACK_ROOT}/usr/lib/slib $GUILE &&
# initialize
guile -s $SLIB/guile.init -c \
"(use-modules (ice-9 slib)) (require 'new-catalog)" "(exit)"
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index c451f2f..95647e8 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,6 @@
+2007-03-03 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * PRE_BUILD: Replace bad TRACK_ROOT usage (automated).
+
2007-02-01 Juuso Alasuutari <iuso AT sourcemage.org>
* init.d/wpa_supplicant: Added check for wireless extensions,
removed redundant iwconfig forks.
diff --git a/net/wpa_supplicant/PRE_BUILD b/net/wpa_supplicant/PRE_BUILD
index 969fb3d..ea5763c 100755
--- a/net/wpa_supplicant/PRE_BUILD
+++ b/net/wpa_supplicant/PRE_BUILD
@@ -13,5 +13,5 @@ fi &&
if [[ -z $QTDIR ]] && is_depends_enabled $SPELL qt-x11
then
- . "$TRACK_ROOT/etc/profile.d/qt.sh"
+ . "$INSTALL_ROOT/etc/profile.d/qt.sh"
fi
diff --git a/net/wwwoffle/FINAL b/net/wwwoffle/FINAL
index 3b1dd42..173982a 100755
--- a/net/wwwoffle/FINAL
+++ b/net/wwwoffle/FINAL
@@ -1 +1 @@
-chown -R proxy.proxy ${TRACK_ROOT}/var/spool/${SPELL}
+chown -R proxy.proxy ${INSTALL_ROOT}/var/spool/${SPELL}
diff --git a/net/wwwoffle/HISTORY b/net/wwwoffle/HISTORY
index 8b5bbd9..b51d859 100644
--- a/net/wwwoffle/HISTORY
+++ b/net/wwwoffle/HISTORY
@@ -1,3 +1,6 @@
+2007-03-03 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * FINAL: Replace bad TRACK_ROOT usage (automated).
+
2006-08-20 Pol Vinogradov <vin.public AT gmail.com>
* BUILD, FINAL: switching to TRACK_ROOT
diff --git a/science/cern_root/HISTORY b/science/cern_root/HISTORY
index 8977a90..7e3aa39 100644
--- a/science/cern_root/HISTORY
+++ b/science/cern_root/HISTORY
@@ -1,3 +1,6 @@
+2007-03-03 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * INSTALL: Replace bad TRACK_ROOT usage (automated).
+
2006-12-04 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: version 5.13.06, removed UPDATED, MD5[0]
* BUILD: added docdir to ./configure, added more variables to OPTS
diff --git a/science/cern_root/INSTALL b/science/cern_root/INSTALL
index 83f861f..c600464 100755
--- a/science/cern_root/INSTALL
+++ b/science/cern_root/INSTALL
@@ -1,6 +1,6 @@
default_install &&
-if ! grep -q "root" ${TRACK_ROOT}/etc/ld.so.conf
+if ! grep -q "root" ${INSTALL_ROOT}/etc/ld.so.conf
then
echo "${TRACK_ROOT}/usr/lib/root" >> ${INSTALL_ROOT}/etc/ld.so.conf
fi
diff --git a/science/octave-devel/FINAL b/science/octave-devel/FINAL
index f75100d..193b172 100755
--- a/science/octave-devel/FINAL
+++ b/science/octave-devel/FINAL
@@ -1,4 +1,4 @@
-if ! grep -q "\/usr\/lib\/octave" ${TRACK_ROOT}/etc/ld.so.conf; then
+if ! grep -q "\/usr\/lib\/octave" ${INSTALL_ROOT}/etc/ld.so.conf; then
echo "${TRACK_ROOT}/usr/lib/octave" >> ${INSTALL_ROOT}/etc/ld.so.conf
fi &&
ldconfig
diff --git a/science/octave-devel/HISTORY b/science/octave-devel/HISTORY
index ddebdf3..f83d2be 100644
--- a/science/octave-devel/HISTORY
+++ b/science/octave-devel/HISTORY
@@ -1,3 +1,6 @@
+2007-03-03 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * FINAL: Replace bad TRACK_ROOT usage (automated).
+
2006-12-11 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: updated to 2.9.9
* FINAL: removed symbolic link creation, install and track_rootifying,
diff --git a/smgl/smgl-gl_select/HISTORY b/smgl/smgl-gl_select/HISTORY
index 40e09e8..273f0df 100644
--- a/smgl/smgl-gl_select/HISTORY
+++ b/smgl/smgl-gl_select/HISTORY
@@ -1,3 +1,6 @@
+2007-03-03 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * smgl-gl_select: Replace bad TRACK_ROOT usage (automated).
+
2006-10-26 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* smgl-gl_select: applied patch from Renan M??rour
* DETAILS: version bump 0.5
diff --git a/smgl/smgl-gl_select/smgl-gl_select
b/smgl/smgl-gl_select/smgl-gl_select
index e6ddcad..cf7557c 100755
--- a/smgl/smgl-gl_select/smgl-gl_select
+++ b/smgl/smgl-gl_select/smgl-gl_select
@@ -20,47 +20,47 @@ function gl_pick() {
exit 1
fi
message "Selecting $1 as the default system GL library"
- if [[ -L ${TRACK_ROOT}/usr/lib/libGL.so ]] ||
- [[ ! -e ${TRACK_ROOT}/usr/lib/libGL.so ]]
+ if [[ -L ${INSTALL_ROOT}/usr/lib/libGL.so ]] ||
+ [[ ! -e ${INSTALL_ROOT}/usr/lib/libGL.so ]]
then
- ln -vfs ${TRACK_ROOT}/usr/lib/$1/libGL.so* ${TRACK_ROOT}/usr/lib/
+ ln -vfs ${TRACK_ROOT}/usr/lib/$1/libGL.so* ${INSTALL_ROOT}/usr/lib/
case "$1" in
ati) if gaze installed xorg-server ; then
ln -vfs ${TRACK_ROOT}/usr/include/GL/mesa/*.h
\
- ${TRACK_ROOT}/usr/include/GL/
&&
+ ${INSTALL_ROOT}/usr/include/GL/
&&
ln -vfs ${TRACK_ROOT}/usr/lib/xorg/modules/extensions/mesa/*
\
- ${TRACK_ROOT}/usr/lib/xorg/modules/extensions/
+ ${INSTALL_ROOT}/usr/lib/xorg/modules/extensions/
else
ln -vfs ${TRACK_ROOT}/usr/X11R6/include/GL/monolithic/*.h
\
- ${TRACK_ROOT}/usr/X11R6/include/GL/
&&
+ ${INSTALL_ROOT}/usr/X11R6/include/GL/
&&
ln -vfs
${TRACK_ROOT}/usr/X11R6/lib/modules/extensions/monolithic/* \
- ${TRACK_ROOT}/usr/X11R6/lib/modules/extensions/
+ ${INSTALL_ROOT}/usr/X11R6/lib/modules/extensions/
fi
;;
mesa) ln -vfs ${TRACK_ROOT}/usr/include/GL/mesa/*.h
\
- ${TRACK_ROOT}/usr/include/GL/
&&
+ ${INSTALL_ROOT}/usr/include/GL/
&&
ln -vfs ${TRACK_ROOT}/usr/lib/xorg/modules/extensions/mesa/*
\
- ${TRACK_ROOT}/usr/lib/xorg/modules/extensions/
;;
+ ${INSTALL_ROOT}/usr/lib/xorg/modules/extensions/
;;
nvidia) if gaze installed xorg-server ; then
ln -vfs ${TRACK_ROOT}/usr/include/GL/nvidia/*.h
\
- ${TRACK_ROOT}/usr/include/GL/
&&
+ ${INSTALL_ROOT}/usr/include/GL/
&&
ln -vfs ${TRACK_ROOT}/usr/lib/xorg/modules/extensions/nvidia/*
\
- ${TRACK_ROOT}/usr/lib/xorg/modules/extensions/
+ ${INSTALL_ROOT}/usr/lib/xorg/modules/extensions/
else
ln -vfs ${TRACK_ROOT}/usr/X11R6/include/GL/nvidia/*.h
\
- ${TRACK_ROOT}/usr/X11R6/include/GL/
&&
+ ${INSTALL_ROOT}/usr/X11R6/include/GL/
&&
ln -vfs ${TRACK_ROOT}/usr/X11R6/lib/modules/extensions/nvidia/*
\
- ${TRACK_ROOT}/usr/X11R6/lib/modules/extensions/
+ ${INSTALL_ROOT}/usr/X11R6/lib/modules/extensions/
fi
;;
monolithic) ln -vfs ${TRACK_ROOT}/usr/X11R6/include/GL/monolithic/*.h
\
- ${TRACK_ROOT}/usr/X11R6/include/GL/
&&
+ ${INSTALL_ROOT}/usr/X11R6/include/GL/
&&
ln -vfs
${TRACK_ROOT}/usr/X11R6/lib/modules/extensions/monolithic/* \
- ${TRACK_ROOT}/usr/X11R6/lib/modules/extensions/
;;
+ ${INSTALL_ROOT}/usr/X11R6/lib/modules/extensions/
;;
*) message "Unknown secondary files so I only linked the libGL.so"
;;
esac
exit 0
else
- message "Error ${TRACK_ROOT}/usr/lib/libGL.so is not a symlink unable to
procede!!!"
+ message "Error ${INSTALL_ROOT}/usr/lib/libGL.so is not a symlink unable
to procede!!!"
message "Please recast X and whatever GL driver you use."
exit 1
fi
diff --git a/utils/fwcutter/HISTORY b/utils/fwcutter/HISTORY
index 2922f2d..0388f4d 100644
--- a/utils/fwcutter/HISTORY
+++ b/utils/fwcutter/HISTORY
@@ -1,3 +1,6 @@
+2007-03-03 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * INSTALL: Replace bad TRACK_ROOT usage (automated).
+
2006-12-29 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 006