[Lunar-commits] <moonbase> xfce4-xkb-plugin: fix download

[Duncan Gibson]

commit 6753ce2f1d2148e3f0c967ece175773b79b96fb2
Author: Paul Bredbury <brebs at sent.com>
Date:   Tue Dec 14 21:46:46 2010 +0100

    xfce4-xkb-plugin: fix download
    
    and tidy BUILD.
---
 xfce4/goodies/xfce4-xkb-plugin/BUILD   |   17 ++++++++++-------
 xfce4/goodies/xfce4-xkb-plugin/DETAILS |    5 +++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/xfce4/goodies/xfce4-xkb-plugin/BUILD b/xfce4/goodies/xfce4-xkb-plugin/BUILD
index cc97e93..8e91166 100644
--- a/xfce4/goodies/xfce4-xkb-plugin/BUILD
+++ b/xfce4/goodies/xfce4-xkb-plugin/BUILD
@@ -1,16 +1,19 @@
 (
-   [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
+
+  if [ -f /etc/profile.d/xfce4.rc ] ; then
+    . /etc/profile.d/xfce4.rc
+  fi  &&
 
   patch_it $SOURCE_CACHE/$SOURCE2 1  &&
   patch_it $SOURCE_CACHE/$SOURCE3 1  &&
 
-   # make sure proper PKG_CONFIG_PATH is set
-   export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"  &&
+  # Make sure proper PKG_CONFIG_PATH is set
+  export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"  &&
 
-   ./configure  --build=$BUILD             \
-                --prefix=${MODULE_PREFIX}  \
-                $OPTS                     &&
+  ./configure  --build=$BUILD             \
+               --prefix=${MODULE_PREFIX}  \
+               $OPTS                     &&
 
-   default_make
+  default_make
 
 ) > $C_FIFO 2>&1
diff --git a/xfce4/goodies/xfce4-xkb-plugin/DETAILS b/xfce4/goodies/xfce4-xkb-plugin/DETAILS
index 33db0f7..aa7ddde 100644
--- a/xfce4/goodies/xfce4-xkb-plugin/DETAILS
+++ b/xfce4/goodies/xfce4-xkb-plugin/DETAILS
@@ -1,9 +1,10 @@
           MODULE=xfce4-xkb-plugin
-         VERSION=0.5.3.3
+           MAJOR=0.5
+         VERSION=$MAJOR.3.3
           SOURCE=$MODULE-$VERSION.tar.gz
          SOURCE2=$MODULE-$VERSION-libxklavier.patch.bz2
          SOURCE3=$MODULE-$VERSION-segfaults.patch.bz2
-      SOURCE_URL=http://goodies.xfce.org/releases/$MODULE
+      SOURCE_URL=http://archive.xfce.org/src/panel-plugins/$MODULE/$MAJOR
      SOURCE2_URL=$PATCH_URL
      SOURCE3_URL=$PATCH_URL
       SOURCE_VFY=sha1:5e83d55cd6f14a62a87ccadd0f11eee070a6f4a7