network/vidalia: Updated for version 0.1.15

1 files changed, 18 insertions, 10 deletions

diff --git a/network/vidalia/vidalia.SlackBuild b/network/vidalia/vidalia.SlackBuild
index fdf599d3ee..c2584d8825 100644
--- a/network/vidalia/vidalia.SlackBuild
+++ b/network/vidalia/vidalia.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=vidalia
-VERSION=${VERSION:-0.1.13}
+VERSION=${VERSION:-0.1.15}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -42,12 +42,20 @@ find . \
  -exec chmod 644 {} \;
 
 mkdir build && cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-	-DLIB_SUFFIX=${LIBDIRSUFFIX} \
-	-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-	-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-	-DCMAKE_BUILD_TYPE=Release ..
-  make
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_SKIP_RPATH:BOOL=YES \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release ..
+
+  # Remove -O3 flag.
+  for i in $(find . -name "flags.make"); do
+    sed -i 's|-O3 ||g' $i
+  done
+
+  make VERBOSE=1
   make install DESTDIR=$PKG
 cd -
 
@@ -64,14 +72,14 @@ gzip -9c doc/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   CHANGELOG CREDITS HACKING INSTALL LICENSE* README doc/TODO \
-    $PKG/usr/doc/$PRGNAM-$VERSION
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/README.SBo > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-chmod 0644 $PKG/usr/doc/$PRGNAM-$VERSION/*
+find $PKG/usr/doc -type f -exec chmod 0644 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}