imlib2: => 1.4.2 (sec update), cleaned up

7 files changed, 41 insertions, 31 deletions

diff --git a/e/imlib2/BUILD b/e/imlib2/BUILD
index 8bce30bbaf..7b82be6ea5 100755
--- a/e/imlib2/BUILD
+++ b/e/imlib2/BUILD
@@ -1,5 +1,5 @@
-if [[ "$HOST" == x86_64-* ]]; then
-  OPTS="$OPTS --disable-mmx"
-fi  &&
+if [[ $HOST == x86_64-* ]]; then
+  OPTS="--disable-mmx $OPTS"
+fi &&
 
 default_build
diff --git a/e/imlib2/DEPENDS b/e/imlib2/DEPENDS
index e6579f6d65..4991b369e2 100755
--- a/e/imlib2/DEPENDS
+++ b/e/imlib2/DEPENDS
@@ -1,24 +1,28 @@
-depends  libtool    &&
-depends  zlib       &&
-depends  freetype2  &&
-depends  xorg-libs   &&
+depends libtool &&
+depends zlib &&
+depends freetype2 &&
+depends xorg-libs &&
+
+if [[ $IMLIB2_CVS == y ]]; then
+  depends CVS &&
+  depends automake-1.9
+fi &&
 
-if  [  "$IMLIB2_CVS"  ==  "y"  ];  then
-  depends  CVS        &&
-  depends  automake-1.9
-fi                    &&
 optional_depends 'tiff'              \
                  '--with-tiff'       \
                  '--without-tiff'    \
                  'TIFF image loader' &&
+
 optional_depends 'libpng'            \
                  '--with-png'        \
                  '--without-png'     \
                  'PNG image loader'  &&
+
 optional_depends 'jpeg'              \
                  '--with-jpeg'       \
                  '--without-jpeg'    \
                  'JPEG image loader' &&
+
 optional_depends 'giflib'            \
                  '--with-gif'        \
                  '--without-gif'     \
diff --git a/e/imlib2/DETAILS b/e/imlib2/DETAILS
index a074e7e539..7bbd017588 100755
--- a/e/imlib2/DETAILS
+++ b/e/imlib2/DETAILS
@@ -1,28 +1,28 @@
            SPELL=imlib2
-if  [  "$IMLIB2_CVS"  ==  "y"  ];  then
-  if  [  "$IMLIB2_CVS_AUTOUPDATE"  ==  "y"  ];  then
+if [[ $IMLIB2_CVS == y ]]; then
+  if [[ $IMLIB2_CVS_AUTOUPDATE == y ]]; then
          VERSION=$(date +%Y%m%d)
   else
          VERSION=cvs
   fi
           SOURCE=$SPELL-cvs.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-cvs"
    SOURCE_URL[0]=cvs://:pserver:anonymous@anoncvs.enlightenment.org:/var/cvs/e:e17/libs/$SPELL
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
 else
-         VERSION=1.4.1
-  SECURITY_PATCH=1
+         VERSION=1.4.2
+  SECURITY_PATCH=2
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/$SOURCE
-     SOURCE_HASH=sha512:532237ceab36c74b26caf4186e9e27690211f27d4ff8e442f4e40df22d9c37bd82038d58475ea37e6f3b013668e94753b2e23ec0eed478a67ecebbe724668f66
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION%-*}
+     SOURCE_HASH=sha512:d2db1f5efef58c1705cb7088b22323d29996229a2964655723f0e3812df08645b1c18b543bce774b990e2c3db32ff23b709059a1d8e941c0f7f45f1602661596
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION%-*}"
 fi
         WEB_SITE=http://enlightenment.org/Libraries/Imlib2/
          ENTERED=20010922
       LICENSE[0]=BSD
         KEYWORDS="enlightenment e16 e17 library wm window-manager"
-           SHORT="Successor to imlib graphics library"
+           SHORT="successor to imlib graphics library"
 cat << EOF
 Imlib2 is the successor to Imlib. It is NOT a newer version -- it is a
 completely new library. Imlib 2 can be installed alongside Imlib 1.x
diff --git a/e/imlib2/HISTORY b/e/imlib2/HISTORY
index 6c7248c3a1..73d51e1955 100644
--- a/e/imlib2/HISTORY
+++ b/e/imlib2/HISTORY
@@ -1,3 +1,9 @@
+2008-10-23 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 1.4.2; quoting paths; cleaned up;
+	  SECURITY_PATCH+=1 (http://secunia.com/Advisories/32354/);
+	* PRE_BUILD, PREPARE, TRIGGERS: cleaned up
+	* DEPENDS: cleaned up; quoting paths
+
 2008-07-12 Vlad Glagolev <stealth@sourcemage.org>
 	* DEPENDS: depends on giflib, provider deprecated
 
diff --git a/e/imlib2/PREPARE b/e/imlib2/PREPARE
index c4132bf8d0..48873b998d 100755
--- a/e/imlib2/PREPARE
+++ b/e/imlib2/PREPARE
@@ -1,6 +1,6 @@
-config_query  IMLIB2_CVS  "Use CVS version?"  n  &&
+config_query IMLIB2_CVS "Use CVS version?" n &&
 
-if  [  "$IMLIB2_CVS"  ==  "y"  ];  then
-  config_query  IMLIB2_CVS_AUTOUPDATE                               \
-                "Automatically update on every system update?"  n
+if [[ $IMLIB2_CVS == y ]]; then
+  config_query IMLIB2_CVS_AUTOUPDATE \
+               "Automatically update on every system update?" n
 fi
diff --git a/e/imlib2/PRE_BUILD b/e/imlib2/PRE_BUILD
index ca4fee19a0..e2c00f43c4 100755
--- a/e/imlib2/PRE_BUILD
+++ b/e/imlib2/PRE_BUILD
@@ -1,9 +1,9 @@
-default_pre_build  &&
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
 
-if  [  "$IMLIB2_CVS"  ==  "y"  ];  then
-  cd  $SOURCE_DIRECTORY           &&
-  sedit  "s/root//"  autogen.sh  &&
-  sedit  "s/; aclocal/; aclocal-1.9/" autogen.sh &&
-  sedit  "s/; automake/; automake-1.9/" autogen.sh &&
-  NOCONFIGURE=ON  ./autogen.sh
+if [[ $IMLIB2_CVS == y ]]; then
+  sed -i "s/root//" autogen.sh  &&
+  sed -i "s/; aclocal/; aclocal-1.9/" autogen.sh &&
+  sed -i "s/; automake/; automake-1.9/" autogen.sh &&
+  NOCONFIGURE=ON ./autogen.sh
 fi
diff --git a/e/imlib2/TRIGGERS b/e/imlib2/TRIGGERS
index 0bff07e1c5..c83574f80c 100755
--- a/e/imlib2/TRIGGERS
+++ b/e/imlib2/TRIGGERS
@@ -1 +1 @@
-on_cast  zlib  cast_self
+on_cast zlib cast_self