moin update

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@56 370017ae-e619-0410-ac65-c121f96126d4

2 files changed, 46 insertions, 5 deletions

diff --git a/moin/moin.SlackBuild b/moin/moin.SlackBuild
new file mode 100755
index 00000000..852690da
--- /dev/null
+++ b/moin/moin.SlackBuild
@@ -0,0 +1,32 @@
+#!/bin/bash
+#
+# SlackBuild script to call moin.build with correct settings
+#
+
+CWD="`pwd`"
+
+if [ -f "/etc/slackbuildrc" ]; then
+  source /etc/slackbuildrc
+fi
+
+if [ -f "~/.slackbuildrc" ]; then
+  source ~/.slackbuildrc
+fi
+
+# default settings
+PACKAGE="moin"
+VERSION=${VERSION:=1.5.4}
+ARCH="noarch"
+BUILD=${BUILD:=1rha}
+SRC_DIR=${SRC:=$CWD}
+TMP=${TMP:=/tmp}
+REPOS=${REPOS:=$TMP}
+
+rm -rf $TMP/$PACKAGE
+mkdir -p $SRC_DIR/$PACKAGE $TMP/$PACKAGE
+
+slacktrack -x $TMP,$SRC_DIR,/dev -jefkzp "$PACKAGE-$VERSION-$ARCH-$BUILD.tgz" "./$PACKAGE.build"
+
+if [ "$CLEANUP" == "yes" ]; then
+  rm -rf $TMP/$PACKAGE
+fi
diff --git a/moin/moin.build b/moin/moin.build
index 262b989e..8ee2c071 100755
--- a/moin/moin.build
+++ b/moin/moin.build
@@ -3,7 +3,7 @@
 # build script for moin
 # build it with slacktrack, example:
 #
-#   slacktrack -jefkzp "moin-1.5.3-noarch-1rha.tgz" "./moin.build"
+#   slacktrack -jefkzp "moin-1.5.4-noarch-1rha.tgz" "./moin.build"
 # 
 
 CWD="`pwd`"
@@ -18,7 +18,7 @@ fi
 
 # default settings
 PACKAGE="moin"
-VERSION=${VERSION:=1.5.3}
+VERSION=${VERSION:=1.5.4}
 ARCH="noarch"
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC:=$CWD}
@@ -29,6 +29,12 @@ PACKAGE_EXT="gz"
 SRC="$PACKAGE-$VERSION.tar.$PACKAGE_EXT"
 URL="http://easynews.dl.sourceforge.net/sourceforge/moin/$SRC"
 
+SRC_DIR="$SRC_DIR/$PACKAGE"
+
+if [ ! -d "$SRC_DIR" ]; then
+  mkdir -p $SRC_DIR
+fi
+
 if [ "$PACKAGE_EXT" == "bz2" ]; then
   tarflag="j"
 else
@@ -39,10 +45,13 @@ if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then
   wget "$URL" -O "$SRC_DIR/$SRC"
 fi
 
+TMP="$TMP/$PACKAGE"
+
+if [ ! -d "$TMP" ]; then
+  mkdir -p $TMP
+fi
+
 cd $TMP
-rm -rf package-$PACKAGE
-mkdir package-$PACKAGE
-cd package-$PACKAGE
 
 tar xvf$tarflag $SRC_DIR/$SRC
 cd $PACKAGE-$VERSION