3 files changed, 22 insertions, 26 deletions
diff --git a/development/curlpp/curlpp.SlackBuild b/development/curlpp/curlpp.SlackBuild
index 0a685f034c10..222402b73718 100644
--- a/development/curlpp/curlpp.SlackBuild
+++ b/development/curlpp/curlpp.SlackBuild
@@ -22,13 +22,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=curlpp
-VERSION=${VERSION:-0.7.3}
+VERSION=${VERSION:-0.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -39,8 +39,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -66,28 +66,24 @@ 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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS -Wno-error=unused-function" \
-CXXFLAGS="$SLKCFLAGS -Wno-error=unused-function" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-static \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS CHANGES ChangeLog COPYING INSTALL README TODO doc/guide.pdf \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/curlpp/curlpp.info b/development/curlpp/curlpp.info
index 53576cb0382d..e4602de13ac9 100644
--- a/development/curlpp/curlpp.info
+++ b/development/curlpp/curlpp.info
@@ -1,8 +1,8 @@
 PRGNAM="curlpp"
-VERSION="0.7.3"
-HOMEPAGE="http://code.google.com/p/curlpp"
-DOWNLOAD="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/curlpp/curlpp-0.7.3.tar.gz"
-MD5SUM="ccc3d30d4b3b5d2cdbed635898c29485"
+VERSION="0.8.1"
+HOMEPAGE="http://www.curlpp.org/"
+DOWNLOAD="https://github.com/jpbarrette/curlpp/archive/v0.8.1/curlpp-0.8.1.tar.gz"
+MD5SUM="2fdd2fc2e577b7e76193018cac457e9c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/curlpp/slack-desc b/development/curlpp/slack-desc
index cae2d5adad4f..cd91b8d42e1b 100644
--- a/development/curlpp/slack-desc
+++ b/development/curlpp/slack-desc
@@ -8,10 +8,10 @@
       |-----handy-ruler------------------------------------------------------|
 curlpp: curlpp (C++ wrapper for libcURL)
 curlpp:
+curlpp: cURLpp is a C++ wrapper for libcURL
 curlpp:
 curlpp:
-curlpp:
-curlpp: Project URL: http://code.google.com/p/curlpp
+curlpp: Project URL: http://www.curlpp.org/
 curlpp:
 curlpp:
 curlpp: