system/conky: Miscellaneous tweaks/enhancements

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 17 insertions, 25 deletions

diff --git a/system/conky/README b/system/conky/README
index 46d3f0c81d..94da7195c7 100644
--- a/system/conky/README
+++ b/system/conky/README
@@ -1,5 +1,3 @@
-conky - A light-weight system monitor for X
- 
 Conky is a system monitor for X originally based on the torsmo code.
 Since it's original conception, Conky has changed a fair bit from
 it's predecessor.  Conky can display just about anything, either on
@@ -7,13 +5,5 @@ your root desktop or in it's own window.  Conky has  many  built-in
 objects, as well as the ability to execute programs and scripts, then
 display the output from stdout.
 
-To enable lua scripting engine support run the build with 
-LUA=yes ./conky.SlackBuild
-
-The required dependencies for lua support are: lua, imlib2 and tolua++ 
-
-All of the above requirements are available from slackbuilds.org
-
-
-
-
+To enable lua scripting engine support, you will need lua, imlib2, and
+tolua++, and run this script like this:  LUA=yes ./conky.SlackBuild
diff --git a/system/conky/conky.SlackBuild b/system/conky/conky.SlackBuild
index a21bf397f4..75a39990d8 100644
--- a/system/conky/conky.SlackBuild
+++ b/system/conky/conky.SlackBuild
@@ -6,15 +6,13 @@
 
 PRGNAM=conky
 VERSION=1.8.1
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -44,18 +42,17 @@ fi
 set -e
 
 if [ "${LUA:-yes}" = "yes" ]; then
-  lua="--enable-lua --enable-lua-cairo --enable-imlib2 --enable-lua-imlib2"
+  lua_params="--enable-lua --enable-lua-cairo --enable-imlib2 --enable-lua-imlib2"
 else
-  lua="--disable-lua"
+  lua_params="--disable-lua"
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xjvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
-#patch -p1 < $CWD/audacious-2.3-fix.txt
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -72,12 +69,17 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --enable-shared=yes \
   --enable-static=no \
+  --enable-ibm \
+  --enable-hddtemp \
+  --enable-xft \
+  --enable-weather-metar \
   --enable-weather-xoap \
+  --enable-portmon \
   --enable-audacious \
   --enable-mpd=yes \
   --enable-rss=yes \
   --enable-wlan=yes \
-  $lua \
+  $lua_params \
   --build=$ARCH-slackware-linux \
   --host=$ARCH-slackware-linux
 
@@ -85,11 +87,11 @@ make
 make install-strip DESTDIR=$PKG
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ;
-  rm $i ; done
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-# Move existing config file
+# Move existing config files
 mv $PKG/etc/conky/conky.conf $PKG/etc/conky/conky.conf.new
+mv $PKG/etc/conky/conky_no_x11.conf $PKG/etc/conky/conky_no_x11.conf.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \
diff --git a/system/conky/conky.info b/system/conky/conky.info
index 9ec9624282..c074da391f 100644
--- a/system/conky/conky.info
+++ b/system/conky/conky.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="M.Dinslage"
 EMAIL="daedra1980@gmail.com"
-APPROVED="michiel"
+APPROVED="rworkman"
diff --git a/system/conky/doinst.sh b/system/conky/doinst.sh
index 78304645d3..ffd3d4ab11 100644
--- a/system/conky/doinst.sh
+++ b/system/conky/doinst.sh
@@ -10,5 +10,5 @@ config() {
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
-
 config etc/conky/conky.conf.new
+config etc/conky/conky_no_x11.conf.new