main/encfs: upgrade to 1.9.5

switch to cmake, modernize, use system libs
remove unneccessary depends= line, since it gets traced correctly
add encfs-lang subpackage

1 files changed, 28 insertions, 31 deletions

diff --git a/main/encfs/APKBUILD b/main/encfs/APKBUILD
index ce158c74ed..0168fe7507 100644
--- a/main/encfs/APKBUILD
+++ b/main/encfs/APKBUILD
@@ -1,49 +1,46 @@
 # Contributor: ScrumpyJack <scrumpyjack@st.ilet.to>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=encfs
-pkgver=1.8.1
+pkgver=1.9.5
 _ver=${pkgver/_/-}
-pkgrel=9
+pkgrel=0
 pkgdesc="EncFS provides an encrypted filesystem in user-space"
 url="https://vgough.github.io/encfs/"
 arch="all"
 license="GPL"
-depends="fuse"
-depends_dev=""
 makedepends="rlog-dev libressl-dev fuse-dev boost-dev
-        libtool gettext-dev autoconf automake"
-install=""
-subpackages="$pkgname-doc"
+        libtool gettext-dev cmake tinyxml2-dev"
+subpackages="$pkgname-doc $pkgname-lang"
 source="$pkgname-$_ver.tar.gz::https://github.com/vgough/encfs/archive/v$_ver.tar.gz"
-
-_builddir="$srcdir/${pkgname}-$_ver"
-prepare() {
-        local i
-        cd "$_builddir"
-        for i in $source; do
-                case $i in
-                *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-                esac
-        done
-        autoreconf -if
-}
+options="!check" # No test suite
+builddir="$srcdir/$pkgname-$_ver"
 
 build() {
-        cd "$_builddir"
-        ./configure \
-                --build=$CBUILD \
-                --host=$CHOST \
-                --prefix=/usr \
-                --disable-nls \
-                || return 1
+        cd "$builddir"
+        if [ "$CBUILD" != "$CHOST" ]; then
+                CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+        fi
+
+        mkdir build
+        cd build
+
+        cmake .. \
+                -DCMAKE_INSTALL_PREFIX=/usr \
+                -DUSE_INTERNAL_TINYXML=OFF \
+                -DINSTALL_LIBENCFS=ON \
+                -DBUILD_SHARED_LIBS=ON \
+                -DCMAKE_INSTALL_LIBDIR=lib \
+                -DBUILD_SHARED_LIBS=True \
+                -DCMAKE_BUILD_TYPE=Release \
+                -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+                -DCMAKE_C_FLAGS="$CFLAGS" \
+                ${CMAKE_CROSSOPTS}
         make
 }
 
 package() {
-        cd "$_builddir"
-        make DESTDIR="${pkgdir}" install || return 1
+        cd "$builddir"/build
+        make DESTDIR="$pkgdir" install
 }
 
-md5sums="ecc4f04ccd6017cafcf98781421589bd  encfs-1.8.1.tar.gz"
-sha256sums="ed6b69d8aba06382ad01116bbce2e4ad49f8de85cdf4e2fab7ee4ac82af537e9  encfs-1.8.1.tar.gz"
-sha512sums="47e6cdded84c65bdb98c14774472a2f9df67f2bea05e4c2e20811d785c5ee458b708030922db9a5b49382495235a329bc8e889d104cc8501cd954119699847c6  encfs-1.8.1.tar.gz"
+sha512sums="036e08ca9bc13b44742aebdee49bf7029d0c6b7e59cd6dedc9a09da2af99482859f6a79eddf07e3db296edaf45aafc48fe08488840e765682e9b192dd6ae4c46  encfs-1.9.5.tar.gz"