5 files changed, 50 insertions, 52 deletions
diff --git a/academic/aris/aris.SlackBuild b/academic/aris/aris.SlackBuild
index a377d31a7f1c5..4d0f2a04f263e 100644
--- a/academic/aris/aris.SlackBuild
+++ b/academic/aris/aris.SlackBuild
@@ -2,16 +2,34 @@
 
 # Slackware build script for GNU aris
 
-# Written by Juan M. Lasca <juanmlasca@gmail.com>
+# Originally written by Juan M. Lasca <juanmlasca at gmail dot com>
+# Currently maintained by Philip Lacroix <slackph at posteo dot de>
+
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=aris
-VERSION=${VERSION:-2.1.1}
+VERSION=${VERSION:-2.2}
 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
@@ -22,18 +40,14 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -46,26 +60,20 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 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 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" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --htmldir=/usr/doc/$PRGNAM-$VERSION/html \
+  --disable-static \
   --build=$ARCH-slackware-linux
 
-# this will allow aris to find its documentation
-# in a better place.
-patch -p1 < $CWD/html_doc.patch
+# Fix path for local manual
+patch src/aris.c < $CWD/help_path.diff
 
 make
 make install DESTDIR=$PKG
@@ -73,15 +81,13 @@ make install DESTDIR=$PKG
 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
 
-# "make install" won't locate the aris.info file in DESTDIR.
-# Workaround:
-mkdir -p $PKG/usr/info
+# Install documentation
+mkdir -p $PKG/usr/info $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a doc/$PRGNAM.info $PKG/usr/info/
 gzip -9 $PKG/usr/info/$PRGNAM.info
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
-cp -ar doc/$PRGNAM/ $PKG/usr/doc/$PRGNAM-$VERSION/html
+cp -a README AUTHORS ChangeLog NEWS THANKS TODO $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -ar doc/$PRGNAM/ $PKG/usr/doc/$PRGNAM-$VERSION/html/
+cp -ar doc/proofs $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/academic/aris/aris.info b/academic/aris/aris.info
index 8362eaa9bb7ab..484ce063154ad 100644
--- a/academic/aris/aris.info
+++ b/academic/aris/aris.info
@@ -1,8 +1,8 @@
 PRGNAM="aris"
-VERSION="2.1.1"
-HOMEPAGE="http://www.gnu.org/software/aris/"
-DOWNLOAD="http://ftp.gnu.org/gnu/aris/aris-2.1.1.tar.bz2"
-MD5SUM="ef1b8f3be8edac44305e36493068f745"
+VERSION="2.2"
+HOMEPAGE="https://www.gnu.org/software/aris/"
+DOWNLOAD="https://ftp.gnu.org/gnu/aris/aris-2.2.tar.bz2"
+MD5SUM="523e2c40f17e6e857b533c22a26ff4e1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/academic/aris/help_path.diff b/academic/aris/help_path.diff
new file mode 100644
index 0000000000000..0d2853fcbe7b0
--- /dev/null
+++ b/academic/aris/help_path.diff
@@ -0,0 +1,11 @@
+--- a/aris.c	2021-02-10 17:51:33.532759576 +0400
++++ b/aris.c	2021-02-10 17:52:15.210759108 +0400
+@@ -845,7 +845,7 @@
+       if (the_app->working_dir)
+ 	{
+ 	  parent = g_file_get_parent (parent);
+-	  sprintf (the_app->help_file, "file://%s/doc/aris/index.html", g_file_get_path (parent));
++	  sprintf (the_app->help_file, "file:///usr/doc/aris-2.2/html/index.html", g_file_get_path (parent));
+ 	}
+ 
+       int ret;
diff --git a/academic/aris/html_doc.patch b/academic/aris/html_doc.patch
deleted file mode 100644
index 1b359b73d6529..0000000000000
--- a/academic/aris/html_doc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- aris-2.0/configure	2012-09-25 05:06:22.000000000 -0300
-+++ aris-2.0b/configure	2013-03-23 18:34:59.483719378 -0300
-@@ -4610,3 +4610,1 @@
--cat >>confdefs.h <<_ACEOF
--#define HELP_FILE "file://`pwd`/doc/aris/index.html"
--_ACEOF
-+echo "#define HELP_FILE \"file://"$htmldir"/index.html\"" >>confdefs.h
---- aris-2.0/src/aris.c	2012-09-25 05:06:22.000000000 -0300
-+++ aris-2.0b/src/aris.c	2013-03-23 18:45:25.290749474 -0300
-@@ -1064,0 +1065,6 @@
-+#ifdef HELP_FILE /* Which should be defined in config.h */
-+
-+      strcpy (the_app->help_file, HELP_FILE);
-+
-+#else
-+
-@@ -1076,0 +1083,2 @@
-+
-+#endif /* HELP FILE */
diff --git a/academic/aris/slack-desc b/academic/aris/slack-desc
index 218444d055d87..c061cf1dc471b 100644
--- a/academic/aris/slack-desc
+++ b/academic/aris/slack-desc
@@ -15,5 +15,5 @@ aris: in the form of abstract sequences. It uses a predefined set of both
 aris: inference and equivalence rules, however gives the user options to use
 aris: older proofs as lemmas, including Isabelle's Isar proofs.
 aris:
-aris: Home page: http://www.gnu.org/software/aris/
+aris: Home page: https://www.gnu.org/software/aris/
 aris: