4 files changed, 34 insertions, 32 deletions
diff --git a/libraries/exempi/README b/libraries/exempi/README
index 4948d271f6a1..20565c39d845 100644
--- a/libraries/exempi/README
+++ b/libraries/exempi/README
@@ -1,10 +1,11 @@
-Exempi is an implementation of XMP. Version 1.99.x is based on 
-Adobe XMP SDK 4.1.1 and released under a BSD-style license like 
-Adobe's. 
+exempi: exempi (an implementation of Adobe's XMP)
 
 The Adobe Extensible Metadata Platform (XMP) is a standard for 
 processing and storing standardized and proprietary metadata, 
-created by Adobe Systems Inc..
+created by Adobe Systems, Inc.
+
+Exempi is an implementation of XMP. It is based on the Adobe XMP SDK
+and released under a BSD-style license like Adobe's.
 
 XMP standardizes the definition, creation, and processing of 
 extensible metadata. Serialized XMP can be embedded into a 
diff --git a/libraries/exempi/exempi.SlackBuild b/libraries/exempi/exempi.SlackBuild
index 5e28ba2c5a01..85d2ce485f53 100644
--- a/libraries/exempi/exempi.SlackBuild
+++ b/libraries/exempi/exempi.SlackBuild
@@ -2,6 +2,7 @@
 
 # Slackware build script for exempi
 # Copyright 2007-2012  Michiel van Wessem, Leicester, United Kingdom
+# Copyright 2020 B. Watson
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -23,14 +24,21 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Now maintained by B. Watson <yalhcru@gmail.com>
+
+# 20200101 bkw:
+# - take over maintenance
+# - update for v2.5.1
+# - various cleanups/changes in script, slack-desc, README
+
 PRGNAM=exempi
-VERSION=${VERSION:-2.2.1}
+VERSION=${VERSION:-2.5.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
@@ -41,8 +49,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"
@@ -61,14 +69,11 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 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 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -85,15 +90,11 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
+# could install samples/, but it's big & complex, not gonna.
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog NEWS README *.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/exempi/exempi.info b/libraries/exempi/exempi.info
index a1095b62c6f6..c018deaa6ac6 100644
--- a/libraries/exempi/exempi.info
+++ b/libraries/exempi/exempi.info
@@ -1,10 +1,10 @@
 PRGNAM="exempi"
-VERSION="2.2.1"
-HOMEPAGE="http://libopenraw.freedesktop.org/wiki/Exempi"
-DOWNLOAD="http://libopenraw.freedesktop.org/download/exempi-2.2.1.tar.gz"
-MD5SUM="4657deb13b77c2a0e30e144857d2ff7a"
+VERSION="2.5.1"
+HOMEPAGE="https://libopenraw.freedesktop.org/exempi/"
+DOWNLOAD="https://libopenraw.freedesktop.org/download/exempi-2.5.1.tar.bz2"
+MD5SUM="c32bcd9feed5a0c1523d5652ef1804b0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Michiel van Wessem"
-EMAIL="michiel@slackbuilds.org"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/libraries/exempi/slack-desc b/libraries/exempi/slack-desc
index 9ace4cba7ca3..e67cb1459cd4 100644
--- a/libraries/exempi/slack-desc
+++ b/libraries/exempi/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-exempi: exempi (an implementation of adobe's XMP)
+exempi: exempi (an implementation of Adobe's XMP)
 exempi:
-exempi: Exempi is an implementation of XMP. Version 1.99.x is based on Adobe
-exempi: XMP SDK 4.1.1 and released under a BSD-style license like Adobe's.
+exempi: Exempi is an implementation of XMP. It is based on the Adobe
+exempi: XMP SDK and released under a BSD-style license like Adobe's.
 exempi:
 exempi: The Adobe Extensible Metadata Platform (XMP) is a standard for
 exempi: processing and storing standardized and proprietary metadata,
-exempi: created by Adobe Systems Inc..
+exempi: created by Adobe Systems, Inc.
 exempi:
-exempi: Homepage: http://libopenraw.freedesktop.org/wiki/Exempi
+exempi: Homepage: https://libopenraw.freedesktop.org/exempi/
 exempi: