5 files changed, 39 insertions, 18 deletions
diff --git a/desktop/enlightenment/README b/desktop/enlightenment/README
index d177c51a95..4054dfb98d 100644
--- a/desktop/enlightenment/README
+++ b/desktop/enlightenment/README
@@ -1,8 +1,6 @@
 Enlightenment DR17 is the next generation of UNIX graphical
-environments.  It is not just a window manager, but it is also a
-desktop shell.  A desktop shell means a window manager plus a file
-manager plus configuration utilities all in one.
+environments.  It is not just a window manager, but it is also a desktop
+shell.  A desktop shell means a window manager plus a file manager plus
+configuration utilities all in one.
 
-Requires: lua, and then eina, eet, evas, ecore, embryo, edje, e_dbus
-and efreet, all available at SlackBuilds.org (build requirements
-exactly in the order given).
+This requires embryo, edje, e_dbus, efreet, and eeze.
diff --git a/desktop/enlightenment/doinst.sh b/desktop/enlightenment/doinst.sh
new file mode 100644
index 0000000000..60ed6a83ca
--- /dev/null
+++ b/desktop/enlightenment/doinst.sh
@@ -0,0 +1,12 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    rm $NEW
+  fi
+}
+
+config etc/enlightenment/sysactions.conf.new
+
diff --git a/desktop/enlightenment/enlightenment.SlackBuild b/desktop/enlightenment/enlightenment.SlackBuild
index 1a8f1adbad..5bf81314e2 100644
--- a/desktop/enlightenment/enlightenment.SlackBuild
+++ b/desktop/enlightenment/enlightenment.SlackBuild
@@ -5,8 +5,8 @@
 # Written by Aleksandar Samardzic <asamardzic@gmail.com>
 
 PRGNAM=enlightenment
-VERSION=${VERSION:-0.16.999.52995}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.16.999.55225}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -65,6 +65,13 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
+# Don't clobber config files on upgrade
+mv $PKG/etc/enlightenment/sysactions.conf $PKG/etc/enlightenment/sysactions.conf.new
+
+# Handle the xinitrc file
+mkdir -p $PKG/etc/X11/xinit
+cat $CWD/xinitrc.enlightenment17 > $PKG/etc/X11/xinit/xinitrc.enlightenment17
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -72,12 +79,9 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# handle the xinitrc file
-mkdir -p $PKG/etc/X11/xinit
-cat $CWD/xinitrc.enlightenment17 > $PKG/etc/X11/xinit/xinitrc.enlightenment17
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/enlightenment/enlightenment.info b/desktop/enlightenment/enlightenment.info
index 0a255de4bc..0d0d2460af 100644
--- a/desktop/enlightenment/enlightenment.info
+++ b/desktop/enlightenment/enlightenment.info
@@ -1,10 +1,10 @@
 PRGNAM="enlightenment"
-VERSION="0.16.999.52995"
+VERSION="0.16.999.55225"
 HOMEPAGE="http://www.enlightenment.org/"
-DOWNLOAD="http://download.enlightenment.org/snapshots/2010-10-03/enlightenment-0.16.999.52995.tar.bz2"
-MD5SUM="a7286e5e4ff8b7d53473866e8b527b1a"
+DOWNLOAD="http://download.enlightenment.org/snapshots/2010-12-03/enlightenment-0.16.999.55225.tar.bz2"
+MD5SUM="296e321c66e5819b21179307342e1d29"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Aleksandar Samardzic"
 EMAIL="asamardzic@gmail.com"
-APPROVED="Erik Hanson"
+APPROVED="rworkman"
diff --git a/desktop/enlightenment/slack-desc b/desktop/enlightenment/slack-desc
index e961647881..58164ef619 100644
--- a/desktop/enlightenment/slack-desc
+++ b/desktop/enlightenment/slack-desc
@@ -1,4 +1,11 @@
-             |---- Handy ruler ----------------------------------------|
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+             |-----handy-ruler------------------------------------------------------|
 enlightenment: Enlightenment DR17 (a window manager and desktop shell)
 enlightenment:
 enlightenment: Enlightenment DR17 is the next generation of UNIX
@@ -6,7 +13,7 @@ enlightenment: graphical environments.  It is not just a window
 enlightenment: manager, but it is also a desktop shell.  A desktop
 enlightenment: shell means, a window manager plus a file manager, plus
 enlightenment: configuration utilities all in one.
-enlightenment: 
+enlightenment:
 enlightenment: Enlightenment home page is: http://www.enlightenment.org/
 enlightenment:
 enlightenment: