1 files changed, 23 insertions, 11 deletions
diff --git a/system/nagvis/nagvis.SlackBuild b/system/nagvis/nagvis.SlackBuild
index d905260602..6fbc3d041e 100644
--- a/system/nagvis/nagvis.SlackBuild
+++ b/system/nagvis/nagvis.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nagvis
 
@@ -22,14 +22,25 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220413 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - use relative symlinks in usr/share/$PRGNAM.
+# - remove 0-byte files from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nagvis
 VERSION=${VERSION:-1.9.2}
 BUILD=${BUILD:-1}
 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}
@@ -45,9 +56,9 @@ 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 \
+  -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 {} \+
 
 # Patches thanks to Debian folks!
 patch -p1 <$CWD/global.diff
@@ -72,12 +83,12 @@ mv $PKG/etc/$PRGNAM/geomap/demo* $PKG/usr/doc/$PRGNAM-$VERSION/demo/geomap
 mv $PKG/etc/$PRGNAM/maps/demo* $PKG/usr/doc/$PRGNAM-$VERSION/demo/maps
 
 # Symlink stupidity
-ln -s /var/lib/$PRGNAM/userfiles $PKG/usr/share/$PRGNAM/share/userfiles
-ln -s /usr/doc/$PRGNAM-$VERSION/html $PKG/usr/share/$PRGNAM/share/docs
-ln -s /usr/doc/$PRGNAM-$VERSION/html $PKG/usr/share/$PRGNAM/docs
-ln -s /etc/$PRGNAM $PKG/usr/share/$PRGNAM/etc
-ln -s /var/cache/$PRGNAM $PKG/usr/share/$PRGNAM/share/var
-ln -s /var/cache/$PRGNAM $PKG/usr/share/$PRGNAM/var
+ln -s ../../../../var/lib/$PRGNAM/userfiles $PKG/usr/share/$PRGNAM/share/userfiles
+ln -s ../../../doc/$PRGNAM-$VERSION/html $PKG/usr/share/$PRGNAM/share/docs
+ln -s ../../doc/$PRGNAM-$VERSION/html $PKG/usr/share/$PRGNAM/docs
+ln -s ../../../etc/$PRGNAM $PKG/usr/share/$PRGNAM/etc
+ln -s ../../../../var/cache/$PRGNAM $PKG/usr/share/$PRGNAM/share/var
+ln -s ../../../var/cache/$PRGNAM $PKG/usr/share/$PRGNAM/var
 
 # Install configuration
 sed -e "s#@NAGVIS_WEB@#/$PRGNAM#g" \
@@ -106,6 +117,7 @@ find $PKG/etc/$PRGNAM -type f ! -name '*.new' -exec mv {} {}.new \;
 # Apache needs permissions
 chown -R apache:apache $PKG/etc/$PRGNAM $PKG/var/{cache,lib}/$PRGNAM
 
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -a -empty | xargs rm -f
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -113,4 +125,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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