1 files changed, 18 insertions, 11 deletions
diff --git a/development/CVSTools/CVSTools.SlackBuild b/development/CVSTools/CVSTools.SlackBuild
index d3a82c6aa1..c1f4a4453d 100644
--- a/development/CVSTools/CVSTools.SlackBuild
+++ b/development/CVSTools/CVSTools.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for CVSTools
 
@@ -28,13 +28,23 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220330 bkw: Modified by SlackBuilds.org, BUILD=3: install cvslib.pl
+# to a subdirectory instead of directly to /usr/share.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=CVSTools
 VERSION=${VERSION:-21.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -47,19 +57,16 @@ cd $TMP
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 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 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+chmod 644 *
+sed -i '/cvslib\.pl/s,/usr/share,&/cvslib,' *
 
 mkdir -p $PKG/usr/bin
 install -o root -g root -m 755 \
     checkpoint vers_string cvsver tarup commit cvssync \
     $PKG/usr/bin
 
-mkdir -p $PKG/usr/share
-install -o root -g root -m 644 cvslib.pl $PKG/usr/share
+mkdir -p $PKG/usr/share/cvslib
+install -o root -g root -m 644 cvslib.pl $PKG/usr/share/cvslib
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
@@ -69,4 +76,4 @@ 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