system/unshieldv3: Updated for version 0.2.1.

Signed-off-by: B. Watson <urchlay@slackware.uk>

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

4 files changed, 66 insertions, 30 deletions

diff --git a/system/unshieldv3/unshieldv3.1 b/system/unshieldv3/unshieldv3.1
index 51cc0906b6..8a9f51c546 100644
--- a/system/unshieldv3/unshieldv3.1
+++ b/system/unshieldv3/unshieldv3.1
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "UNSHIELDV3" 1 "2022-01-12" "1.30_beta+20190930_0037ff5" "SlackBuilds.org"
+.TH "UNSHIELDV3" 1 "2022-12-28" "0.2.1" "SlackBuilds.org"
 .SH NAME
 unshieldv3 \- Extract InstallShield v3 archives
 .\" RST source for unshieldv3(1) man page. Convert with:
@@ -38,9 +38,11 @@ unshieldv3 \- Extract InstallShield v3 archives
 .
 .SH SYNOPSIS
 .sp
-unshieldv3 list \fIfile.z\fP
+unshieldv3 \fBinfo\fP \fIfile.z\fP
 .sp
-unshieldv3 extract \fIfile.z\fP [\fIoutput\-dir\fP]
+unshieldv3 \fBlist\fP [\fB\-v\fP] \fIfile.z\fP
+.sp
+unshieldv3 \fBextract\fP \fIfile.z\fP \fIoutput\-dir\fP
 .SH DESCRIPTION
 .sp
 \fBunshieldv3\fP is a command line tool to extract the .Z InstallShield v3
@@ -73,7 +75,7 @@ $ head \-c6 data.Z | xxd
 .UNINDENT
 .UNINDENT
 .sp
-If \fBfile\fP says "compress\(aqd data" or similar, your file isn\(aqt an
+If \fBfile\fP says "compress\(aqd data" or similar, your .Z file isn\(aqt an
 InstallShield archive; it\(aqs compressed with the old UNIX compress
 command, and can be extracted with \fBuncompress\fP(1) or \fBgzip\fP(1).
 .sp
@@ -85,17 +87,21 @@ the files in the same directory.
 Options may not be abbreviated.
 .INDENT 0.0
 .TP
+.B \fBinfo\fP
+Show archive metadata: number of files, compressed size, and
+uncompressed size.
+.TP
 .B \fBlist\fP
-List contents of archive.
+List contents of archive. With \fB\-v\fP, shows the size and timestamp
+of each file.
 .TP
 .B \fBextract\fP
-Extract archive. If an \fIoutput\-dir\fP is given, extracted files will be written
-there (the \fIoutput\-dir\fP must already exist). Without \fIoutput\-dir\fP, the current
-directory is used.
+Extract archive. \fIoutput\-dir\fP is required, but will not be created if
+it doesn\(aqt exist. Use \fB\&.\fP to extract to the current directory.
 .UNINDENT
 .SH COPYRIGHT
 .sp
-See the file /usr/doc/unshieldv3\-1.30_beta+20190930_0037ff5/LICENSE for license information.
+See the file /usr/doc/unshieldv3\-0.2.1/LICENSE for license information.
 .SH AUTHORS
 .sp
 unshieldv3 was written by Wolfgang Frisch.
diff --git a/system/unshieldv3/unshieldv3.SlackBuild b/system/unshieldv3/unshieldv3.SlackBuild
index 05462cd048..b58994e9c4 100644
--- a/system/unshieldv3/unshieldv3.SlackBuild
+++ b/system/unshieldv3/unshieldv3.SlackBuild
@@ -6,12 +6,16 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20221228 bkw: updated for v0.2.1 (including man page). Also add
+# test-data to the doc dir (it's small, and might be useful).
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=unshieldv3
-VERSION=${VERSION:-20190930_0037ff5}
+VERSION=${VERSION:-0.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -30,7 +34,19 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# No flags needed, qmake will use the CXXFLAGS qt5 was built with.
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+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
 
@@ -38,28 +54,36 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-qmake
-make
-
-mkdir -p $PKG/usr/{bin,man/man1}
-install -s -m0755 $PRGNAM $PKG/usr/bin
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  # use my flags or die!
+  sed -i 's,-O3 ,,' CMakeCache.txt
+  make VERBOSE=1
+  make install/strip DESTDIR=$PKG
+cd ..
 
 # man page written by SlackBuild author.
+mkdir -p $PKG/usr/man/man1
 gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
 PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 mkdir -p $PKGDOC
-cp -a README* LICENSE $PKGDOC
+cp -a README* LICENSE test-data $PKGDOC
 cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/unshieldv3/unshieldv3.info b/system/unshieldv3/unshieldv3.info
index 166cea00a9..c5c65275a9 100644
--- a/system/unshieldv3/unshieldv3.info
+++ b/system/unshieldv3/unshieldv3.info
@@ -1,8 +1,8 @@
 PRGNAM="unshieldv3"
-VERSION="20190930_0037ff5"
+VERSION="0.2.1"
 HOMEPAGE="https://github.com/wfr/unshieldv3/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/unshieldv3-20190930_0037ff5.tar.xz"
-MD5SUM="290d7f150ee6cc2bc471ba6b2ccfb271"
+DOWNLOAD="https://github.com/wfr/unshieldv3/archive/v0.2.1/unshieldv3-0.2.1.tar.gz"
+MD5SUM="e62b7d9cde2b5c75e0a3d16bf808ffbe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/unshieldv3/unshieldv3.rst b/system/unshieldv3/unshieldv3.rst
index 401c445ea1..4e7a1e9dbb 100644
--- a/system/unshieldv3/unshieldv3.rst
+++ b/system/unshieldv3/unshieldv3.rst
@@ -2,7 +2,7 @@
 ..   rst2man.py unshieldv3.rst > unshieldv3.1
 .. rst2man.py comes from the SBo development/docutils package.
 
-.. |version| replace:: 1.30_beta+20190930_0037ff5
+.. |version| replace:: 0.2.1
 .. |date| date::
 
 ==========
@@ -21,9 +21,11 @@ Extract InstallShield v3 archives
 SYNOPSIS
 ========
 
-unshieldv3 list *file.z*
+unshieldv3 **info** *file.z*
 
-unshieldv3 extract *file.z* [*output-dir*]
+unshieldv3 **list** [**-v**] *file.z*
+
+unshieldv3 **extract** *file.z* *output-dir*
 
 DESCRIPTION
 ===========
@@ -46,7 +48,7 @@ identified by the **file**\(1) command:
   $ head -c6 data.Z | xxd
   00000000: 135d 658c 3a01                           .]e.:.
 
-If **file** says "compress'd data" or similar, your file isn't an
+If **file** says "compress'd data" or similar, your .Z file isn't an
 InstallShield archive; it's compressed with the old UNIX compress
 command, and can be extracted with **uncompress**\(1) or **gzip**\(1).
 
@@ -59,13 +61,17 @@ OPTIONS
 
 Options may not be abbreviated.
 
+**info**
+  Show archive metadata: number of files, compressed size, and
+  uncompressed size.
+
 **list**
-  List contents of archive.
+  List contents of archive. With **-v**, shows the size and timestamp
+  of each file.
 
 **extract**
-  Extract archive. If an *output-dir* is given, extracted files will be written
-  there (the *output-dir* must already exist). Without *output-dir*, the current
-  directory is used.
+  Extract archive. *output-dir* is required, but will not be created if
+  it doesn't exist. Use **.** to extract to the current directory.
 
 COPYRIGHT
 =========