Merge branch 'master' of github.com:cycojesus/slackbuilds

a/i8kutils/i8kutils.SlackBuild

@@ -14,7 +14,7 @@ EXT=tar.gz
 DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README* TODO examples patches"
 
 ARCH=$(uname -m)
-BUILD=1cyco
+BUILD=2cyco
 
 PREFIX=/usr
 
@@ -37,9 +37,50 @@ make -j3 PREFIX=$PREFIX
 
 # installation
 mkdir -p $PKG$PREFIX/{sbin,bin,man}
-make install DESTDIR=$PKG  PREFIX=$PREFIX
+make install DESTDIR=$PKG PREFIX=$PREFIX
 cp *.1 $PKG$PREFIX/man
 
+mkdir -p $PKG/etc/rc.d
+cat <<EOF > $PKG/etc/rc.d/rc.i8kmon.new
+#!/bin/sh
+# Start/stop/restart i8kmon.
+
+# Start i8kmon:
+i8kmon_start() {
+  if [ -x /usr/bin/i8kmon -a -d /proc/i8k ]; then
+    echo "Starting i8k daemon:  /usr/sbin/i8kmon"
+    /usr/bin/i8kmon
+  fi
+}
+
+# Stop i8kmon:
+i8kmon_stop() {
+  killall i8kmon
+}
+
+# Restart i8kmon:
+i8kmon_restart() {
+  i8kmon_stop
+  sleep 1
+  i8kmon_start
+}
+
+case "$1" in
+'start')
+  i8kmon_start
+  ;;
+'stop')
+  i8kmon_stop
+  ;;
+'restart')
+  i8kmon_restart
+  ;;
+*)
+  echo "usage $0 start|stop|restart"
+esac
+EOF
+chmod +x $PKG/etc/rc.d/rc.i8kmon.new
+
 # correction
 cd $PKG
 chown -R root:root *
@@ -61,6 +102,21 @@ cp i8kmon.conf $PKG/etc/i8kmon.conf.new
 
 # embaumement
 mkdir -p $PKG/install
+cat <<EOF > $PKG/install/doinst.sh
+config() {
+  NEW="\$1"
+  OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r \$OLD ]; then
+    mv \$NEW \$OLD
+  elif [ "\$(cat \$OLD | md5sum)" = "\$(cat \$NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm \$NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+config etc/rc.d/rc.i8kmon.new
+EOF
 cat <<EOF > $PKG/install/slack-desc
 $APP_NAME: $APP_NAME (user-space programs for accessing the SMM BIOS of Dell laptops.)
 $APP_NAME:

xap/mozilla-firefox-trunk/mozilla-firefox.SlackBuild

@@ -18,7 +18,8 @@ ARCH=${ARCH:-$(uname -m)}
 BUILD=1 #$(date +%F | tr -d '-')
 PACKAGER=cyco
 
-[ ! -e firefox-*.tar.bz2 ] && lftp http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/ -e "mget firefox-*.en-US.linux-x86_64.tar.bz2 ; quit"
+[ -e firefox-*.en-US.linux-x86_64.tar.bz2 ] && for f in firefox-*.en-US.linux-x86_64.tar.bz2 ; do mv $f $f.orig ; done
+lftp http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-central/ -e "mget firefox-*.en-US.linux-x86_64.tar.bz2 ; quit"
 
 VERSION=$(ls firefox-*.tar.bz2 | cut -d - -f 2 | sed 's|.en||') #rev | cut -f 3- -d . | rev)