summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-24 08:44:20 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-25 07:25:11 +0700
commit40e66daa3defde198a72695427dc606772d82fcd (patch)
treeac61d7c47d67711e366f58be75911455d55df963
parent6f1dcf8b87f7660a68c8a6fbcb81cae192792b48 (diff)
downloadslackbuilds-40e66daa3defde198a72695427dc606772d82fcd.tar.gz
system/diskscan: Updated for version 0.19.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--system/diskscan/diskscan.SlackBuild31
-rw-r--r--system/diskscan/diskscan.info6
2 files changed, 18 insertions, 19 deletions
diff --git a/system/diskscan/diskscan.SlackBuild b/system/diskscan/diskscan.SlackBuild
index dbc761a226..6f089fc7d8 100644
--- a/system/diskscan/diskscan.SlackBuild
+++ b/system/diskscan/diskscan.SlackBuild
@@ -6,7 +6,7 @@
PRGNAM=diskscan
-VERSION=${VERSION:-0.13}
+VERSION=${VERSION:-0.19}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -45,23 +45,24 @@ cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
cd $PRGNAM-$VERSION
-
-# fix doc and man patch
-sed -i "s!/share/man!/man!g" install.do
-sed -i "s!/share/doc/diskscan!/doc/diskscan-$VERSION!g" install.do
-
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-
-make
-make install DESTDIR=$PKG
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+sed -i "s|share/man/man1|man/man1|" CMakeLists.txt
+mkdir -p build
+cd build
+ cmake \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release ..
+ make
+ make install DESTDIR=$PKG
+cd ..
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -71,9 +72,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- COPYING README.md \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/system/diskscan/diskscan.info b/system/diskscan/diskscan.info
index a2b08e964a..1df80c552d 100644
--- a/system/diskscan/diskscan.info
+++ b/system/diskscan/diskscan.info
@@ -1,8 +1,8 @@
PRGNAM="diskscan"
-VERSION="0.13"
+VERSION="0.19"
HOMEPAGE="http://blog.disksurvey.org/proj/diskscan"
-DOWNLOAD="https://github.com/baruch/diskscan/archive/0.13.tar.gz"
-MD5SUM="47fd46468083a19794aa24ee24191087"
+DOWNLOAD="https://github.com/baruch/diskscan/archive/0.19.tar.gz"
+MD5SUM="14aad4aa22d97e691f48082e9d26199b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="BeautifulSoup Markdown"