desktop/ede: Updated for version 2.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 17 insertions, 26 deletions

diff --git a/desktop/ede/README b/desktop/ede/README
index dfa27458395b..fd71e1ddc629 100644
--- a/desktop/ede/README
+++ b/desktop/ede/README
@@ -1,2 +1,4 @@
 Equinox Desktop Environment is fast desktop environment with familiar
 look and feel. It should work fine on slower computers too.
+
+This package conflicts with pekwm
diff --git a/desktop/ede/doinst.sh b/desktop/ede/doinst.sh
index 4410fea4d95d..eff4bc518226 100644
--- a/desktop/ede/doinst.sh
+++ b/desktop/ede/doinst.sh
@@ -1,13 +1,3 @@
-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
-}
-
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications 2>/dev/null
 fi
@@ -17,4 +7,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
     /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
-
diff --git a/desktop/ede/ede.SlackBuild b/desktop/ede/ede.SlackBuild
index 81568d34a8ec..3119fa2a51f9 100644
--- a/desktop/ede/ede.SlackBuild
+++ b/desktop/ede/ede.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ede
 
-# Copyright 2013, Andrew Tkalia <anddt@yandex.ru>, Ukraine, Kyiv
+# Copyright 2013-2014, Andrew Tkalia <anddt@yandex.ua>, Ukraine, Kyiv
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=ede
-VERSION=2.0
+VERSION=${VERSION:-2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -64,11 +64,13 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}/fltk13" \
+FLTK_CONFIG="/usr/bin/fltk13-config" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -78,6 +80,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --with-fltk-path=/usr/lib${LIBDIRSUFFIX}/fltk13 \
   --enable-profile=yes \
   --enable-hal=no \
   --enable-largefile=yes \
@@ -90,9 +93,7 @@ jam -sDESTDIR=$PKG -sEDE_DOC_DIR=/usr/doc/${PRGNAM}-${VERSION} install
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-cp -a \
-  AUTHORS AUTHORS.pekwm COPYING ChangeLog README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS AUTHORS.pekwm COPYING ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/etc/X11/xinit
diff --git a/desktop/ede/ede.info b/desktop/ede/ede.info
index fb6e56275a33..c8d82804b9c2 100644
--- a/desktop/ede/ede.info
+++ b/desktop/ede/ede.info
@@ -1,10 +1,10 @@
 PRGNAM="ede"
-VERSION="2.0"
-HOMEPAGE="http://sourceforge.net/projects/ede/"
-DOWNLOAD="http://kent.dl.sourceforge.net/project/ede/ede/2.0/ede-2.0.tar.gz"
-MD5SUM="8b9820c84929d66e6258e223737c27c6"
+VERSION="2.1"
+HOMEPAGE="http://edeproject.org/"
+DOWNLOAD="http://sourceforge.net/projects/ede/files/ede/2.1/ede-2.1.tar.gz"
+MD5SUM="232300328557a75ad2aef5fdc064002e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="edelib"
 MAINTAINER="Andrew Tkalia"
-EMAIL="anddt@yandex.ru"
+EMAIL="anddt@yandex.ua"
diff --git a/desktop/ede/xinitrc.ede b/desktop/ede/xinitrc.ede
index 1b0abda42137..fc6438b6efcf 100644
--- a/desktop/ede/xinitrc.ede
+++ b/desktop/ede/xinitrc.ede
@@ -29,4 +29,3 @@ if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
 else
   exec /usr/bin/startede
 fi
-