silc: version fix

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

3 files changed, 13 insertions, 9 deletions

diff --git a/net/im/silc-plugin/silc-plugin.SlackBuild b/net/im/silc-plugin/silc-plugin.SlackBuild
index 9b037db6..12ffdc49 100755
--- a/net/im/silc-plugin/silc-plugin.SlackBuild
+++ b/net/im/silc-plugin/silc-plugin.SlackBuild
@@ -44,10 +44,12 @@ SRC_DIR=${SRC:=$CWD}
 TMP=${TMP:=/tmp}
 REPOS=${REPOS:=$TMP}
 
+PKG_VERSION="`echo $VERSION | sed -e 's/-/_/g'`"
+
 rm -rf $TMP/$PACKAGE
 mkdir -p $SRC_DIR/$PACKAGE $TMP/$PACKAGE
 
-slacktrack -b $REPOS -x $TMP,$SRC_DIR,/dev -jefkzp "$PACKAGE-$VERSION-$ARCH-$BUILD.tgz" "./$PACKAGE.build"
+slacktrack -b $REPOS -x $TMP,$SRC_DIR,/dev -jefkzp "$PACKAGE-$PKG_VERSION-$ARCH-$BUILD.tgz" "./$PACKAGE.build"
 
 if [ "$CLEANUP" == "yes" ]; then
   rm -rf $TMP/$PACKAGE
diff --git a/net/im/silc-plugin/silc-plugin.build b/net/im/silc-plugin/silc-plugin.build
index ee2b7354..772aba0a 100755
--- a/net/im/silc-plugin/silc-plugin.build
+++ b/net/im/silc-plugin/silc-plugin.build
@@ -58,6 +58,7 @@ fi
 
 RTOOL="wget"
 PACKAGE_EXT="bz2"
+PKG_VERSION="`echo $VERSION | sed -e 's/-/_/g'`"
 SRC="silc-client-$VERSION.tar.$PACKAGE_EXT"
 URL="http://silcnet.org/download/client/sources/$SRC"
 
@@ -83,7 +84,7 @@ if [ -f "$CWD/$PACKAGE-$VERSION.diff" ]; then
   patch -p1 < $CWD/$PACKAGE-$VERSION.diff
 fi
 
-./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR --with-docdir=/usr/doc/$PACKAGE-$VERSION \
+./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR --with-docdir=/usr/doc/$PACKAGE-$PKG_VERSION \
             --enable-silc-plugin --without-silc-includes
 make || exit 32
 make install
@@ -115,12 +116,12 @@ silc-plugin:
 silc-plugin: 
 EOF
 
-mkdir -p /usr/doc/$PACKAGE-$VERSION
+mkdir -p /usr/doc/$PACKAGE-$PKG_VERSION
 
 DOCS="CHANGES COPYING CREDITS README README.PLUGIN TODO"
 
 for file in $DOCS; do
-  cp $CWD/$file* /usr/doc/$PACKAGE-$VERSION/
+  cp $CWD/$file* /usr/doc/$PACKAGE-$PKG_VERSION/
 done
 
 # TODO: one should check in the source how to make that stop to being copied to the root folder
diff --git a/net/im/silc-toolkit/silc-toolkit.SlackBuild b/net/im/silc-toolkit/silc-toolkit.SlackBuild
index b3389287..1fd03b48 100755
--- a/net/im/silc-toolkit/silc-toolkit.SlackBuild
+++ b/net/im/silc-toolkit/silc-toolkit.SlackBuild
@@ -18,7 +18,7 @@
 
 if [ -s "slack-required" ]; then
   echo Recomended and required packages for building silc-toolkit are:
-  cat silc-toolkit.slack-required | sed -e 's/^/\t/'
+  cat slack-required | sed -e 's/^/\t/'
   if [ "$INTERACT" != "no" ]; then
     echo If you dont have those installed, press Ctrl-C. Otherwise, hit ENTER.
     read crap
@@ -53,6 +53,7 @@ fi
 
 RTOOL="wget"
 PACKAGE_EXT="bz2"
+PKG_VERSION="`echo $VERSION | sed -e 's/-/_/g'`"
 SRC="$PACKAGE-$VERSION.tar.$PACKAGE_EXT"
 URL="http://silcnet.org/download/toolkit/sources/$SRC"
 
@@ -81,7 +82,7 @@ if [ -f "$CWD/$PACKAGE-$VERSION.diff" ]; then
   patch -p1 < $CWD/$PACKAGE-$VERSION.diff
 fi
 
-./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR --with-docdir=/usr/doc/$PACKAGE-$VERSION
+./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR --with-docdir=/usr/doc/$PACKAGE-$PKG_VERSION
 make || exit 32
 make DESTDIR=$TMP/package-$PACKAGE install
 
@@ -116,13 +117,13 @@ silc-toolkit:
 EOF
 
 # docs
-mkdir -p usr/doc/$PACKAGE-$VERSION
+mkdir -p usr/doc/$PACKAGE-$PKG_VERSION
 
 for file in BSD CHANGES COPYING CREDITS GPL INSTALL README README.CVS README.MACOSX README.WIN32 TODO;do
-  cp $CWD/$file* usr/doc/$PACKAGE-$VERSION/
+  cp $CWD/$file* usr/doc/$PACKAGE-$PKG_VERSION/
 done
 
-makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz
+makepkg -c y -l y $REPOS/$PACKAGE-$PKG_VERSION-$ARCH-$BUILD.tgz
 
 if [ "$CLEANUP" == "yes" ]; then
   rm -rf $TMP