development/Bear: Updated for version 3.1.6.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

development/Bear/Bear.SlackBuild

@@ -25,11 +25,10 @@
 cd "$(dirname "$0")" ; CWD=$(pwd)
 
 PRGNAM=Bear
-VERSION=${VERSION:-3.1.4}
+VERSION=${VERSION:-3.1.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
-NAMVER=$PRGNAM-$VERSION
 
 if [ -z "$ARCH" ]; then
 	case "$(uname -m)" in
@@ -45,7 +44,6 @@ if [ -n "${PRINT_PACKAGE_NAME}" ]; then
 fi
 
 TMP="${TMP:-/tmp/SBo}"
-SRC="$TMP/$NAMVER"
 PKG="$TMP/package-$PRGNAM"
 OUTPUT="${OUTPUT:-/tmp}"
 
@@ -77,42 +75,55 @@ cd "$PRGNAM-$VERSION"
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-INSTPREFIX='/usr'
+mkdir -p $TMP/$PRGNAM-build
+cd       $TMP/$PRGNAM-build
 
 cmake \
-	-DENABLE_UNIT_TESTS=OFF \
-	-DENABLE_FUNC_TESTS=OFF \
-	-DCMAKE_INSTALL_PREFIX=$INSTPREFIX \
-	-DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
-	-DCMAKE_INSTALL_DOCDIR=doc/$NAMVER \
+  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
+  -DCMAKE_INSTALL_MANDIR=/usr/man \
+  -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \
+  -DENABLE_UNIT_TESTS=OFF \
+  -DENABLE_FUNC_TESTS=OFF \
+  -DCMAKE_BUILD_TYPE=Release \
+  ../$PRGNAM-$VERSION
 
 make all
-make DESTDIR="$PKG" install
+make install/strip DESTDIR="$PKG"
+cd ..
 
 # There is an install/strip Makefile recipe, but sbopkglint still compalins.
 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
 
 # The project does not respect -DCMAKE_INSTALL_MANDIR.
-# I have reported the issue, so, hopefully, it will be fixed soon.
-mv "$PKG$INSTPREFIX/share/man" "$PKG$INSTPREFIX"
-rm -rf "$PKG$INSTPREFIX/share"
+# Ivan reported the issue, but it was not fixed.
+# https://github.com/rizsotto/Bear/issues/516
+mv "$PKG/usr/share/man" "$PKG/usr"
+rm -rf "$PKG/usr/share"
 
 # Remove useless garbage after the install Makefile recipe.
-rm "$PKG$INSTPREFIX/doc/$NAMVER/CODE_OF_CONDUCT.md"
-rm "$PKG$INSTPREFIX/doc/$NAMVER/CONTRIBUTING.md"
-rm "$PKG$INSTPREFIX/doc/$NAMVER/INSTALL.md"
-mv "$PKG$INSTPREFIX/doc/$NAMVER/COPYING" "$PKG$INSTPREFIX/doc/$NAMVER/LICENSE"
-mv "$PKG$INSTPREFIX/doc/$NAMVER/README.md" "$PKG$INSTPREFIX/doc/$NAMVER/repository-README.md"
+rm "$PKG/usr/doc/$PRGNAM-$VERSION/CODE_OF_CONDUCT.md"
+rm "$PKG/usr/doc/$PRGNAM-$VERSION/CONTRIBUTING.md"
+rm "$PKG/usr/doc/$PRGNAM-$VERSION/INSTALL.md"
+mv "$PKG/usr/doc/$PRGNAM-$VERSION/COPYING"   "$PKG/usr/doc/$PRGNAM-$VERSION/LICENSE"
+mv "$PKG/usr/doc/$PRGNAM-$VERSION/README.md" "$PKG/usr/doc/$PRGNAM-$VERSION/repository-README.md"
 
 # Compress man pages.
-find "$PKG$INSTPREFIX/man" -type f -exec gzip {} +;
+find "$PKG/usr/man" -type f -exec gzip {} +;
 
 mkdir -p "$PKG/install"
-mkdir -p "$PKG/usr/doc/$NAMVER"
-cat "$CWD/$PRGNAM.SlackBuild" > "$PKG/usr/doc/$NAMVER/$PRGNAM.SlackBuild"
-cat "$CWD/README"             > "$PKG/usr/doc/$NAMVER/README"
+cat "$CWD/$PRGNAM.SlackBuild" > "$PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild"
+cat "$CWD/README"             > "$PKG/usr/doc/$PRGNAM-$VERSION/README"
 cat "$CWD/slack-desc"         > "$PKG/install/slack-desc"
 
 cd "$PKG"
-/sbin/makepkg -l y -c n "$OUTPUT/$NAMVER-$ARCH-$BUILD$TAG.$PKGTYPE"
+# There's a "stage/" directory in the build dir that gets installed
+# to the $PKG dir, e.g.: $PKG/tmp/SBo/Bear-3.1.6/stage
+# Remove the unwanted parent of this "stage/" dir inside the $PKG.
+# https://github.com/rizsotto/Bear/issues/625
+# https://github.com/rizsotto/Bear/issues/627
+rm -r $(find . -type d -name stage | cut -d '/' -f2)
+/sbin/makepkg -l y -c n "$OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"

development/Bear/Bear.info

@@ -1,10 +1,10 @@
 PRGNAM="Bear"
-VERSION="3.1.4"
+VERSION="3.1.6"
 HOMEPAGE="https://github.com/rizsotto/Bear"
-DOWNLOAD="https://github.com/rizsotto/Bear/archive/3.1.4/Bear-3.1.4.tar.gz"
-MD5SUM="a3ed915ce8d65d30c792adcef27beea0"
+DOWNLOAD="https://github.com/rizsotto/Bear/archive/3.1.6/Bear-3.1.6.tar.gz"
+MD5SUM="e9c7151bdb3a98fe7ff64f7fa19eebcb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="grpc spdlog nlohmann_json"
-MAINTAINER="Ivan Kovmir"
-EMAIL="i@kovmir.eu"
+MAINTAINER="Shahab Vahedi"
+EMAIL="list+sbo@vahedi.org"