aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xnet/im/silc-client/silc-client.SlackBuild4
-rwxr-xr-xnet/im/silc-client/silc-client.build8
2 files changed, 8 insertions, 4 deletions
diff --git a/net/im/silc-client/silc-client.SlackBuild b/net/im/silc-client/silc-client.SlackBuild
index ab97890b..fbaddcd3 100755
--- a/net/im/silc-client/silc-client.SlackBuild
+++ b/net/im/silc-client/silc-client.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-client/silc-client.build b/net/im/silc-client/silc-client.build
index c5306a62..9756223e 100755
--- a/net/im/silc-client/silc-client.build
+++ b/net/im/silc-client/silc-client.build
@@ -52,12 +52,14 @@ REPOS=${REPOS:=$TMP}
if [ "$ARCH" == "x86_64" ]; then
LIBDIR=/usr/lib64
+ CONF_OPTIONS="--with-pic"
else
LIBDIR=/usr/lib
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/client/sources/$SRC"
@@ -89,7 +91,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 $CONF_OPTIONS
make || exit 32
make install
@@ -120,10 +122,10 @@ silc-client: being developed in the IETF.
silc-client:
EOF
-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
# TODO: one should check in the source how to make that stop to being copied to the root folder