1 files changed, 23 insertions, 20 deletions
diff --git a/libraries/libvmime/libvmime.SlackBuild b/libraries/libvmime/libvmime.SlackBuild
index ca595c8f93..10eb0927c8 100644
--- a/libraries/libvmime/libvmime.SlackBuild
+++ b/libraries/libvmime/libvmime.SlackBuild
@@ -26,7 +26,9 @@
 # revision date 2013/03/31
 
 PRGNAM=libvmime
-VERSION=${VERSION:-0.9.1}
+SRCNAM=vmime
+VERSION=${VERSION:-156edf5c}
+GITVER=${GITVER:-156edf5cba99a9d95bb3cfbcbd287c449a9385d9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,11 +61,11 @@ fi
 
 set -e
 
-rm -rf $TMP/$PRGNAM-$VERSION $PKG
+rm -rf $TMP/$SRCNAM-$GITVER $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM-$VERSION
+unzip $CWD/$GITVER.zip
+cd $SRCNAM-$GITVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,25 +73,26 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Apply patch for newer gnutls version
-patch -p1 <$CWD/libvmime_gnutls3.patch
-
-EXTRA_CFLAGS=$SLKCFLAGS \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --build=$ARCH-slackware-linux
-
-make docdir=/usr/doc/$PRGNAM-$VERSION
-make docdir=/usr/doc/$PRGNAM-$VERSION install DESTDIR=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -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
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING HACKING README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc